summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/de/man1/dos2unix.199
-rw-r--r--man/de/man1/dos2unix.htm67
-rw-r--r--man/de/man1/dos2unix.po532
-rw-r--r--man/de/man1/dos2unix.pod100
-rw-r--r--man/de/man1/dos2unix.txt96
-rw-r--r--man/es/man1/dos2unix.193
-rw-r--r--man/es/man1/dos2unix.htm67
-rw-r--r--man/es/man1/dos2unix.po536
-rw-r--r--man/es/man1/dos2unix.pod94
-rw-r--r--man/es/man1/dos2unix.txt88
-rw-r--r--man/fr/man1/dos2unix.1106
-rw-r--r--man/fr/man1/dos2unix.htm70
-rw-r--r--man/fr/man1/dos2unix.po532
-rw-r--r--man/fr/man1/dos2unix.pod106
-rw-r--r--man/fr/man1/dos2unix.txt103
-rw-r--r--man/man1/dos2unix-man.pot571
-rw-r--r--man/man1/dos2unix.192
-rw-r--r--man/man1/dos2unix.htm67
-rw-r--r--man/man1/dos2unix.pod92
-rw-r--r--man/man1/dos2unix.txt90
-rw-r--r--man/nl/man1/dos2unix.1103
-rw-r--r--man/nl/man1/dos2unix.htm71
-rw-r--r--man/nl/man1/dos2unix.po534
-rw-r--r--man/nl/man1/dos2unix.pod104
-rw-r--r--man/nl/man1/dos2unix.txt95
-rw-r--r--man/pl/man1/dos2unix.192
-rw-r--r--man/pl/man1/dos2unix.htm67
-rw-r--r--man/pl/man1/dos2unix.po534
-rw-r--r--man/pl/man1/dos2unix.pod93
-rw-r--r--man/pl/man1/dos2unix.txt87
-rw-r--r--man/pt_BR/man1/dos2unix.198
-rw-r--r--man/pt_BR/man1/dos2unix.htm67
-rw-r--r--man/pt_BR/man1/dos2unix.po530
-rw-r--r--man/pt_BR/man1/dos2unix.pod99
-rw-r--r--man/pt_BR/man1/dos2unix.txt94
-rw-r--r--man/uk/man1/dos2unix.197
-rw-r--r--man/uk/man1/dos2unix.htm67
-rw-r--r--man/uk/man1/dos2unix.po528
-rw-r--r--man/uk/man1/dos2unix.pod98
-rw-r--r--man/uk/man1/dos2unix.txt90
40 files changed, 5232 insertions, 1917 deletions
diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1
index 88876b9..abd2634 100644
--- a/man/de/man1/dos2unix.1
+++ b/man/de/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,6 +178,70 @@ die Option \f(CW\*(C`\-r\*(C'\fR.
.IX Item "-c, --convmode UMWANDLUNGSMODUS"
legt den Umwandlungsmodus fest. \s-1UMWANDLUNGSMODUS\s0 kann \fIascii\fR, \fI7bit\fR,
\&\fIiso\fR oder \fImac\fR sein, wobei \fIascii\fR die Vorgabe ist.
+.IP "\fB\-D, \-\-display\-enc \s-1KODIERUNG\s0\fR" 4
+.IX Item "-D, --display-enc KODIERUNG"
+legt die Kodierung des angezeigten Texts fest. \s-1KODIERUNG\s0 kann \fIansi\fR,
+\&\fIunicode\fR oder \fIutf8\fR sein, wobei \fIansi\fR die Vorgabe ist.
+.Sp
+Diese Option ist nur in dos2unix für Windows mit Unterstützung für
+Unicode-Dateinamen verfügbar. Sie bleibt wirkungslos, wenn die tatsächlichen
+Dateinamen gelesen und geschrieben werden, lediglich bei der Darstellung
+wird sie berücksichtigt.
+.Sp
+Es gibt verschiedene Möglichkeiten, Text in einer Windows-Konsole basierend
+auf dessen Kodierung darzustellen. Alle haben verschiedene Vor\- und
+Nachteile.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Die Standardmethode von dos2unix ist die Verwendung von ANSI-kodiertem Text,
+der Vorteil ist deren Abwärtskompatibilität. Dies funktioniert mit Raster\-
+und TrueType-Schriften. In manchen Gebieten müssen Sie mit dem Befehl
+\&\f(CW\*(C`chcp\*(C'\fR die aktive DOS-OEM-Codepage in die \-System\-ANSI\-Codepage des Systems
+ändern, da dos2unix Letztere verwendet.
+.Sp
+Der Nachteil von \s-1ANSI\s0 ist, dass internationale Dateinamen nicht korrekt
+dargestellt werden, wenn darin Zeichen enthalten sind, die nicht in der im
+System voreingestellten Codepage enthalten sind. Stattdessen wird entweder
+ein Fragezeichen oder ein falsches Zeichen angezeigt. Sofern Sie nicht mit
+fremden Dateinamen arbeiten, ist diese Methode in Ordnung.
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+Der Vorteil von Unicode (dem Windows-Namen für \s-1UTF\-16\s0) ist die üblicherweise
+korrekte Textdarstellung. Eine Änderung der aktiven Codepage ist nicht
+erforderlich. Sie müssen die Schriftart der Konsole auf eine
+TrueType-Schrift einstellen, damit internationale Zeichen richtig angezeigt
+werden können. Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten
+sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch ein
+Fragezeichen enthält.
+.Sp
+Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text korrekt
+dargestellt, da ConEmu automatisch eine passende Schrift wählt.
+.Sp
+Nachteilig für Unicode ist, dass es nicht zu \s-1ASCII\s0 kompatibel ist. Die
+Ausgabe ist schwer zu verarbeiten, wenn sie in ein anderes Programm oder
+eine Datei weitergeleitet wird. Die Weiterleitung erzeugt keine korrekte
+UTF\-16\-Datei.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+Der Vorteil von \s-1UTF\-8\s0 ist die ASCII\-Kompatibilität. Weiterleitungen in
+Dateien ergeben stets korrektes \s-1UTG\-8.\s0 Sie müssen die Schriftart der Konsole
+auf eine TrueType-Schrift setzen. Dadurch wird der Text ähnlich wie in der
+\&\f(CW\*(C`unicode\*(C'\fR\-Kodierung dargestellt.
+.Sp
+Der Nachteil ist die falsche Darstellung aller Nicht-ASCII-Zeichen, wenn Sie
+die Standard-Rasterschrift verwenden. Nicht nur Unicode-Dateinamen, sondern
+auch übersetzte Meldungen werden unlesbar. Auf einem Windows-System, das für
+eine ostasiatische Region eingerichtet wurde, wird die Konsole bei der
+Anzeige von Meldungen deutlich flackern.
+.Sp
+In einer ConEmu-Konsole funktioniert die UTF\-8\-Kodierung gut.
+.RE
+.RS 4
+.Sp
+Die Standardkodierung kann durch Setzen der Umgebungsvariable
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 auf \f(CW\*(C`unicode\*(C'\fR oder \f(CW\*(C`utf8\*(C'\fR geändert werden.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
erzwingt die Umwandlung von Binärdateien.
@@ -298,8 +362,8 @@ Wenn die Eingabedatei in \s-1UTF\-16\s0 kodiert ist und die Option \f(CW\*(C`\-u
wird, wird eine \s-1UTF\-16\-BOM\s0 geschrieben.
.Sp
Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei
-weder \s-1UTF\-8\s0 noch \s-1UTF\-16\s0 ist. Weitere Informationen finden Sie im Abschnitt
-\&\s-1UNICODE.\s0
+nicht \s-1UTF\-8, UTF\-16\s0 oder \s-1GB 18030\s0 ist. Weitere Informationen finden Sie im
+Abschnitt \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1EINGABEDATEI AUSGABEDATEI\s0 …\fR" 4
.IX Item "-n, --newfile EINGABEDATEI AUSGABEDATEI …"
Neue-Datei-Modus. Die \s-1EINGABEDATEI\s0 wird umgewandelt und in die \s-1AUSGABEDATEI\s0
@@ -557,6 +621,19 @@ Option \f(CW\*(C`\-r\*(C'\fR, um die \s-1BOM\s0 zu entfernen.
.PP
Dos2unix und unix2dos schreiben immer eine \s-1BOM,\s0 wenn die Option \f(CW\*(C`\-m\*(C'\fR
angegeben ist.
+.SS "Unicode-Dateinamen unter Windows"
+.IX Subsection "Unicode-Dateinamen unter Windows"
+Dos2unix verfügt über optionale Unterstützung für das Lesen und Schreiben
+von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann
+dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die nicht zur
+Standard-ANSI-Codepage des Systems gehören. Geben Sie \f(CW\*(C`dos2unix \-V\*(C'\fR ein, um
+zu sehen, ob dos2unix für Windows mit Unterstützung für Unicode-Dateinamen
+erstellt wurde.
+.PP
+Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich
+nicht fehlerfrei, siehe die Option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. Die Dateinamen
+können falsch dargestellt werden, allerdings werden die Dateien mit deren
+korrekten Namen gespeichert.
.SS "Unicode-Beispiele"
.IX Subsection "Unicode-Beispiele"
Umwandlung von Windows \s-1UTF\-16 \s0(mit \s-1BOM\s0) nach Unix \s-1UTF\-8:\s0
@@ -596,10 +673,8 @@ Windows, auch als \s-1GBK\s0 bekannt.
.PP
Unter Unix/Linux werden UTF\-16\-Dateien in \s-1GB18030\s0 umgewandelt, wenn die
Einstellung der Locale auf \s-1GB18030\s0 gesetzt ist. Beachten Sie, dass dies nur
-funktioniert, wenn der Ort auf »China« gesetzt ist. Zum Beispiel wird in
-einer Locale-Einstellung \f(CW\*(C`en_GB.GB18030\*(C'\fR (Britisches Englisch) die
-Umwandlung von \s-1UTF\-16\s0 in \s-1GB18030\s0 nicht möglich sein, aber in der
-chinesischen Einstellung \f(CW\*(C`zh_CN.GB18030\*(C'\fR dagegen funktionieren.
+funktioniert, wenn die Locale vom System unterstützt wird. Mit dem Befehl
+\&\f(CW\*(C`locale \-a\*(C'\fR erhalten Sie eine Liste der unterstützten Locales.
.PP
Unter Windows benötigen Sie die Option \f(CW\*(C`\-gb\*(C'\fR, um UTF\-16\-Dateien in \s-1GB18030\s0
umwandeln zu können.
@@ -694,7 +769,13 @@ alle *.txt\-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen
umzuwandeln, geben Sie Folgendes ein:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "LOKALISIERUNG"
.IX Header "LOKALISIERUNG"
diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm
index a76aa0d..b3c4b51 100644
--- a/man/de/man1/dos2unix.htm
+++ b/man/de/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title>
+<title>dos2unix 7.3 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Zeichenkodierungen">Zeichenkodierungen</a></li>
<li><a href="#Umwandlung">Umwandlung</a></li>
<li><a href="#Markierung-der-Bytereihenfolge">Markierung der Bytereihenfolge</a></li>
+ <li><a href="#Unicode-Dateinamen-unter-Windows">Unicode-Dateinamen unter Windows</a></li>
<li><a href="#Unicode-Beispiele">Unicode-Beispiele</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann <i>ascii</i>, <i>7bit</i>, <i>iso</i> oder <i>mac</i> sein, wobei <i>ascii</i> die Vorgabe ist.</p>
</dd>
+<dt id="D---display-enc-KODIERUNG"><b>-D, --display-enc KODIERUNG</b></dt>
+<dd>
+
+<p>legt die Kodierung des angezeigten Texts fest. KODIERUNG kann <i>ansi</i>, <i>unicode</i> oder <i>utf8</i> sein, wobei <i>ansi</i> die Vorgabe ist.</p>
+
+<p>Diese Option ist nur in dos2unix f&uuml;r Windows mit Unterst&uuml;tzung f&uuml;r Unicode-Dateinamen verf&uuml;gbar. Sie bleibt wirkungslos, wenn die tats&auml;chlichen Dateinamen gelesen und geschrieben werden, lediglich bei der Darstellung wird sie ber&uuml;cksichtigt.</p>
+
+<p>Es gibt verschiedene M&ouml;glichkeiten, Text in einer Windows-Konsole basierend auf dessen Kodierung darzustellen. Alle haben verschiedene Vor- und Nachteile.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Die Standardmethode von dos2unix ist die Verwendung von ANSI-kodiertem Text, der Vorteil ist deren Abw&auml;rtskompatibilit&auml;t. Dies funktioniert mit Raster- und TrueType-Schriften. In manchen Gebieten m&uuml;ssen Sie mit dem Befehl <code>chcp</code> die aktive DOS-OEM-Codepage in die -System-ANSI-Codepage des Systems &auml;ndern, da dos2unix Letztere verwendet.</p>
+
+<p>Der Nachteil von ANSI ist, dass internationale Dateinamen nicht korrekt dargestellt werden, wenn darin Zeichen enthalten sind, die nicht in der im System voreingestellten Codepage enthalten sind. Stattdessen wird entweder ein Fragezeichen oder ein falsches Zeichen angezeigt. Sofern Sie nicht mit fremden Dateinamen arbeiten, ist diese Methode in Ordnung.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>Der Vorteil von Unicode (dem Windows-Namen f&uuml;r UTF-16) ist die &uuml;blicherweise korrekte Textdarstellung. Eine &Auml;nderung der aktiven Codepage ist nicht erforderlich. Sie m&uuml;ssen die Schriftart der Konsole auf eine TrueType-Schrift einstellen, damit internationale Zeichen richtig angezeigt werden k&ouml;nnen. Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch ein Fragezeichen enth&auml;lt.</p>
+
+<p>Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text korrekt dargestellt, da ConEmu automatisch eine passende Schrift w&auml;hlt.</p>
+
+<p>Nachteilig f&uuml;r Unicode ist, dass es nicht zu ASCII kompatibel ist. Die Ausgabe ist schwer zu verarbeiten, wenn sie in ein anderes Programm oder eine Datei weitergeleitet wird. Die Weiterleitung erzeugt keine korrekte UTF-16-Datei.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>Der Vorteil von UTF-8 ist die ASCII-Kompatibilit&auml;t. Weiterleitungen in Dateien ergeben stets korrektes UTG-8. Sie m&uuml;ssen die Schriftart der Konsole auf eine TrueType-Schrift setzen. Dadurch wird der Text &auml;hnlich wie in der <code>unicode</code>-Kodierung dargestellt.</p>
+
+<p>Der Nachteil ist die falsche Darstellung aller Nicht-ASCII-Zeichen, wenn Sie die Standard-Rasterschrift verwenden. Nicht nur Unicode-Dateinamen, sondern auch &uuml;bersetzte Meldungen werden unlesbar. Auf einem Windows-System, das f&uuml;r eine ostasiatische Region eingerichtet wurde, wird die Konsole bei der Anzeige von Meldungen deutlich flackern.</p>
+
+<p>In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut.</p>
+
+</dd>
+</dl>
+
+<p>Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_ENC auf <code>unicode</code> oder <code>utf8</code> ge&auml;ndert werden.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>Wenn die Eingabedatei in UTF-16 kodiert ist und die Option <code>-u</code> verwendet wird, wird eine UTF-16-BOM geschrieben.</p>
-<p>Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt UNICODE.</p>
+<p>Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere Informationen finden Sie im Abschnitt UNICODE.</p>
</dd>
<dt id="n---newfile-EINGABEDATEI-AUSGABEDATEI"><b>-n, --newfile EINGABEDATEI AUSGABEDATEI &hellip;</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option <code>-m</code> angegeben ist.</p>
+<h2 id="Unicode-Dateinamen-unter-Windows">Unicode-Dateinamen unter Windows</h2>
+
+<p>Dos2unix verf&uuml;gt &uuml;ber optionale Unterst&uuml;tzung f&uuml;r das Lesen und Schreiben von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann dos2unix Dateien &ouml;ffnen, deren Namen Zeichen enthalten, die nicht zur Standard-ANSI-Codepage des Systems geh&ouml;ren. Geben Sie <code>dos2unix -V</code> ein, um zu sehen, ob dos2unix f&uuml;r Windows mit Unterst&uuml;tzung f&uuml;r Unicode-Dateinamen erstellt wurde.</p>
+
+<p>Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich nicht fehlerfrei, siehe die Option <code>-D</code>, <code>--display-enc</code>. Die Dateinamen k&ouml;nnen falsch dargestellt werden, allerdings werden die Dateien mit deren korrekten Namen gespeichert.</p>
+
<h2 id="Unicode-Beispiele">Unicode-Beispiele</h2>
<p>Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:</p>
@@ -510,7 +561,7 @@
<p>GB18030 ist vollst&auml;ndig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrahctet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt.</p>
-<p>Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn der Ort auf &raquo;China&laquo; gesetzt ist. Zum Beispiel wird in einer Locale-Einstellung <code>en_GB.GB18030</code> (Britisches Englisch) die Umwandlung von UTF-16 in GB18030 nicht m&ouml;glich sein, aber in der chinesischen Einstellung <code>zh_CN.GB18030</code> dagegen funktionieren.</p>
+<p>Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn die Locale vom System unterst&uuml;tzt wird. Mit dem Befehl <code>locale -a</code> erhalten Sie eine Liste der unterst&uuml;tzten Locales.</p>
<p>Unter Windows ben&ouml;tigen Sie die Option <code>-gb</code>, um UTF-16-Dateien in GB18030 umwandeln zu k&ouml;nnen.</p>
@@ -574,7 +625,11 @@
<p>Verwenden Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1), um Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="LOKALISIERUNG">LOKALISIERUNG</h1>
diff --git a/man/de/man1/dos2unix.po b/man/de/man1/dos2unix.po
index 31f0759..9f16642 100644
--- a/man/de/man1/dos2unix.po
+++ b/man/de/man1/dos2unix.po
@@ -1,20 +1,20 @@
# German translation of the dos2unix man page.
# Copyright (C) 2014 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2015.
#
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-03 17:39+0100\n"
+"Project-Id-Version: dos2unix-man-7.3-beta9\n"
+"POT-Creation-Date: 2015-08-13 09:03+0200\n"
+"PO-Revision-Date: 2015-08-21 00:05+0200\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.4\n"
#. type: =head1
#: dos2unix.pod:52
@@ -235,56 +235,136 @@ msgstr "legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann I<ascii>, I<7bit>,
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr "B<-D, --display-enc KODIERUNG>"
+
+#. type: textblock
+#: dos2unix.pod:157
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "legt die Kodierung des angezeigten Texts fest. KODIERUNG kann I<ansi>, I<unicode> oder I<utf8> sein, wobei I<ansi> die Vorgabe ist."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr "Diese Option ist nur in dos2unix für Windows mit Unterstützung für Unicode-Dateinamen verfügbar. Sie bleibt wirkungslos, wenn die tatsächlichen Dateinamen gelesen und geschrieben werden, lediglich bei der Darstellung wird sie berücksichtigt."
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr "Es gibt verschiedene Möglichkeiten, Text in einer Windows-Konsole basierend auf dessen Kodierung darzustellen. Alle haben verschiedene Vor- und Nachteile."
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr "B<ansi>"
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr "Die Standardmethode von dos2unix ist die Verwendung von ANSI-kodiertem Text, der Vorteil ist deren Abwärtskompatibilität. Dies funktioniert mit Raster- und TrueType-Schriften. In manchen Gebieten müssen Sie mit dem Befehl C<chcp> die aktive DOS-OEM-Codepage in die -System-ANSI-Codepage des Systems ändern, da dos2unix Letztere verwendet."
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr "Der Nachteil von ANSI ist, dass internationale Dateinamen nicht korrekt dargestellt werden, wenn darin Zeichen enthalten sind, die nicht in der im System voreingestellten Codepage enthalten sind. Stattdessen wird entweder ein Fragezeichen oder ein falsches Zeichen angezeigt. Sofern Sie nicht mit fremden Dateinamen arbeiten, ist diese Methode in Ordnung."
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr "B<unicode>"
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr "Der Vorteil von Unicode (dem Windows-Namen für UTF-16) ist die üblicherweise korrekte Textdarstellung. Eine Änderung der aktiven Codepage ist nicht erforderlich. Sie müssen die Schriftart der Konsole auf eine TrueType-Schrift einstellen, damit internationale Zeichen richtig angezeigt werden können. Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch ein Fragezeichen enthält."
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr "Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text korrekt dargestellt, da ConEmu automatisch eine passende Schrift wählt."
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr "Nachteilig für Unicode ist, dass es nicht zu ASCII kompatibel ist. Die Ausgabe ist schwer zu verarbeiten, wenn sie in ein anderes Programm oder eine Datei weitergeleitet wird. Die Weiterleitung erzeugt keine korrekte UTF-16-Datei."
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr "B<utf8>"
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr "Der Vorteil von UTF-8 ist die ASCII-Kompatibilität. Weiterleitungen in Dateien ergeben stets korrektes UTG-8. Sie müssen die Schriftart der Konsole auf eine TrueType-Schrift setzen. Dadurch wird der Text ähnlich wie in der C<unicode>-Kodierung dargestellt."
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr "Der Nachteil ist die falsche Darstellung aller Nicht-ASCII-Zeichen, wenn Sie die Standard-Rasterschrift verwenden. Nicht nur Unicode-Dateinamen, sondern auch übersetzte Meldungen werden unlesbar. Auf einem Windows-System, das für eine ostasiatische Region eingerichtet wurde, wird die Konsole bei der Anzeige von Meldungen deutlich flackern."
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr "In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut."
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr "Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_ENC auf C<unicode> oder C<utf8> geändert werden."
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "erzwingt die Umwandlung von Binärdateien."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "wandelt unter Windows UTF-16-Dateien standardmäßig in UTF-8 um, ungeachtet der Einstellung der Locale. Verwenden Sie diese Option zum umwandeln von Utf-16-Dateien in GB18030. Diese Option ist nur unter Windows verfügbar. Siehe auch Abschnitt GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "zeigt eine Hilfe an und beendet das Programm."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[SCHALTER], --info[=SCHALTER] DATEI>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "zeigt Dateiinformationen an. Es wird keine Umwandlung vorgenommen."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "Die Ausgabe der Informationen geschieht in der folgenden Reihenfolge: Anzahl der DOS-Zeilenumbrüche, Anzahl der Unix-Zeilenumbrüche, Anzahl der Mac-Zeilenumbrüche, Markierung der Bytereihenfolge, Text- oder Binärformat, Dateiname."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Beispielausgabe:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -308,87 +388,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "gibt die Anzahl der DOS-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "gibt die Anzahl der Unix-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "gibt die Anzahl der Mac-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "gibt die Markierung der Bytereihenfolge aus."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "gibt nur die Dateien aus, die umgewandelt werden würden."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Mit dem Schalter C<c> gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Beispiele:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Informationen zu allen *.txt-Dateien anzeigen:"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -398,12 +478,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Nur die Anzahl der DOS-Zeilenumbrüche und Unix-Zeilenumbrüche anzeigen:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -413,12 +493,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Nur die Markierung der Bytereihenfolge anzeigen:"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -428,12 +508,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -443,12 +523,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Die Dateien auflisten, die Unix-Zeilenumbrüche enthalten:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -458,307 +538,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "übernimmt den Zeitstempel der Eingabedatei in die Ausgabedatei."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "zeigt die Lizenz des Programms an."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "fügt eine zusätzliche neue Zeile hinzu."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: Nur DOS-Zeilenumbrüche werden in Unix-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Mac-Zeilenumbrüche in Unix-Zeilenumbrüche umgewandelt."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: Nur Unix-Zeilenumbrüche werden in DOS-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Unix-Zeilenumbrüche in Mac-Zeilenumbrüche umgewandelt."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "schreibt eine Markierung der Bytereihenfolge (BOM) in die Ausgabedatei. In der Voreinstellung wird eine UTF-8-BOM geschrieben."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Wenn die Eingabedatei in UTF-16 kodiert ist und die Option C<-u> verwendet wird, wird eine UTF-16-BOM geschrieben."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere Informationen finden Sie im Abschnitt UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile EINGABEDATEI AUSGABEDATEI …>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die AUSGABEDATEI geschrieben. Die Dateinamen müssen paarweise angegeben werden. Platzhalter sollten I<nicht> verwendet werden, sonst werden Sie Ihre Dateien I<verlieren>."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "Der Benutzer, der die Umwandlung im Neue-Datei-Modus startet, wird Besitzer der umgewandelten Datei. Die Lese- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile DATEI …>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese- und Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt werden. Der Rückgabewert ist 0, außer wenn fehlerhafte Befehlszeilenoptionen angegeben werden."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "entfernt die Markierung der Bytereihenfolge (BOM). Es wird keine BOM in die Ausgabedatei geschrieben. Dies ist das Standardverhalten beim Umwandeln von Unix-Zeilenumbrüchen. Siehe auch die Option C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "überspringt Binärdateien (Vorgabe)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "erhält die originale UTF-16-Kodierung der Eingabedatei. Die Ausgabedatei wird in der gleichen UTF-16-Kodierung geschrieben (Little-Endian- oder Big-Endian-Bytereihenfolge) wie die Eingabedatei. Dies verhindert die Umwandlung in UTF-8. Eine UTF-16-BOM wird dementsprechend geschrieben. Diese Option kann durch Angabe der Option C<-ascii> deaktiviert werden."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "nimmt an, dass die Eingabedatei das Format UTF-16LE hat."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Wenn die Eingabedatei eine Markierung der Bytereihenfolge enthält (BOM), dann hat die BOM Vorrang vor dieser Option."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Durch eine falsche Annahme (die Eingabedatei war nicht in UTF-16LE kodiert) mit erfolgreicher Umwandlung erhalten Sie eine UTF-8-Ausgabedatei mit fehlerhaftem Text. Sie können die fehlgeschlagene Umwandlung mit iconv(1) rückgängig machen, indem Sie die Rückumwandlung von UTF-8 nach UTF-16LE vornehmen. Dadurch gewinnen Sie die Originaldatei zurück."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "Die Annahme von UTF-16LE wirkt wie ein I<Umwandlungsmodus>. Beim Wechsel zum vorgegebenen I<ascii>-Modus wird die UTF16LE-Annahme deaktiviert."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "nimmt an, dass die Eingabedatei das Format UTF-16BE hat."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Diese Option ist gleichbedeutend mit C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den Markierungen der Bytereihenfolge (BOM) und zur Anzahl der umgewandelten Zeilenumbrüche angezeigt."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "folgt symbolischen Links und wandelt die Zieldateien um."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "ersetzt symbolische Links durch die umgewandelten Dateien (die originalen Zieldateien bleiben unverändert)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "erhält symbolische Links als solche und lässt die Ziele unverändert (Vorgabe)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "zeigt Versionsinformationen an und beendet das Programm."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "MAC-MODUS"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Um das Programm im Mac-Modus auszuführen, verwenden Sie die Befehlszeilenoption C<-c mac> oder die Befehle C<mac2unix> oder C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "UMWANDLUNGSMODI"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "Im C<ascii>-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Obwohl der Name dieses Modus auf ASCII hinweist, welches ein 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF-8-Kodierung umwandeln."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "In diesem Modus werden alle Nicht-ASCII-Zeichen aus 8 Bit in das 7-Bit-Bitmuster umgewandelt."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Die Zeichen werden aus dem DOS-Zeichensatz (der Codepage) in den ISO-Zeichensatz ISO-8859-1 (Latin-1) in Unix umgewandelt. DOS-Zeichen ohne Äquivalent in ISO-8859-1, für die die Umwandlung nicht möglich ist, werden durch einen Punkt ersetzt. Gleiches gilt für ISO-8859-1-Zeichen ohne DOS-Gegenstück."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Wenn nur die Option C<-iso> angegeben ist, versucht dos2unix die aktive Codepage selbst zu ermitteln. Sollte dies nicht möglich sein, wird die Standard-Codepage CP437 verwendet, welche hauptsächlich in den USA eingesetzt wird. Um eine bestimmte Codepage zu erzwingen, verwenden Sie die Optionen C<-437> (US), C<-850> (Westeuropäisch), C<-860> (Portugiesisch), C<-863> (Kanadisches Französisch) oder C<-865> (Skandinavisch). Die Windows-Codepage CP1252 (Westeuropäisch) wird durch die Option C<-1252> unterstützt."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Wenden Sie niemals die ISO-Umwandlung auf Unicode-Textdateien an. In UTF-8 kodierte Dateien werden dadurch beschädigt."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Umwandlung aus der vorgegebenen DOS-Codepage nach Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -768,12 +848,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Umwandlung von DOS CP850 nach Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -783,12 +863,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Umwandlung von Windows CP1252 nach Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -798,12 +878,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Umwandlung von Windows CP1252 nach Unix UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -813,12 +893,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Umwandlung von Unix Latin-1 in die vorgegebene DOS-Codepage:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -828,12 +908,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Umwandlung von Unix Latin-1 nach DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -843,12 +923,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Umwandlung von Unix Latin-1 nach Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -858,12 +938,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Umwandlung von Unix UTF-8 (Unicode) nach Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -873,127 +953,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Siehe auch L<http://czyborra.com/charsets/codepages.html> und L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Zeichenkodierungen"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Es gibt verschiedene Unicode-Zeichenkodierungen. Unter Unix und Linux sind Unicode-Dateien typischerweise in UTF-8 kodiert. Unter Windows können Textdateien in UTF-8, UTF-16 oder UTF-16 in Big-Endian-Bytereihenfolge kodiert sein, liegen aber meist im Format UTF-16 vor."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Umwandlung"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie reguläre Textdateien."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatiblität mit ASCII entwickelt wurde."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix und unix2dos mit Unterstützung für UTF-16 können in UTF-16 kodierte Dateien in Little-Endian- und Big-Endian-Bytereihenfolge lesen. Um festzustellen, ob dos2unix mit UTF-16-Unterstützung kompiliert wurde, geben Sie C<dos2unix -V> ein."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "Unter Unix/Linux werden UTF-16 kodierte Dateien standardmäßig in die Zeichenkodierung entsprechend der Locale umgewandelt. Mit dem Befehl locale(1) können Sie herausfinden, wie die Zeichenkodierung der Locale eingestellt ist. Wenn eine Umwandlung nicht möglich ist, verursacht dies einen Umwandlungsfehler, wodurch die Datei übersprungen wird."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "Unter Windows werden UTF-16-Dateien standardmäßig in UTF-8 umgewandelt. In UTF-8 formatierte Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Die Kodierungen UTF-16 und UTF-8 sind vollständig kompatibel, daher wird bei der Umwandlung keinerlei Text verlorengehen. Sollte bei der Umwandlung von UTF-16 in UTF-8 ein Problem auftreten, beispielsweise wenn die UTF-16-kodierte Eingabedatei einen Fehler enthält, dann wird diese Datei übersprungen."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Wenn die Option C<-u> verwendet wird, wird die Ausgabedatei in der gleichen UTF-16-Kodierung wie die Eingabedatei geschrieben. Die Option C<-u> verhindert die Umwandlung in UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF-8-Dateien in UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Markierung der Bytereihenfolge"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L<http://de.wikipedia.org/wiki/Byte-Reihenfolge>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix kann nur dann erkennen, ob eine Datei UTF-16-kodiert ist, wenn die Datei eine BOM enthält. Ist dies nicht der Fall, nimmt dos2unix an, dass es sich um eine Binärdatei handelt."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Verwenden Sie die Optionen C<-ul> oder C<-ub>, um eine UTF-16-Datei ohne BOM umzuwandeln."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2unix schreibt in der Voreinstellung keine BOM in die Ausgabedatei. Mit der Option C<-b> schreibt Dos2unix eine BOM, wenn die Eingabedatei ebenfalls eine BOM hat."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos schreibt in der Voreinstellung eine BOM in die Ausgabedatei, wenn die Eingabedatei ebenfalls eine solche Markierung hat. Verwenden Sie die Option C<-r>, um die BOM zu entfernen."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option C<-m> angegeben ist."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr "Unicode-Dateinamen unter Windows"
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr "Dos2unix verfügt über optionale Unterstützung für das Lesen und Schreiben von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die nicht zur Standard-ANSI-Codepage des Systems gehören. Geben Sie C<dos2unix -V> ein, um zu sehen, ob dos2unix für Windows mit Unterstützung für Unicode-Dateinamen erstellt wurde."
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr "Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich nicht fehlerfrei, siehe die Option C<-D>, C<--display-enc>. Die Dateinamen können falsch dargestellt werden, allerdings werden die Dateien mit deren korrekten Namen gespeichert."
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Unicode-Beispiele"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1003,12 +1098,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Umwandlung von Windows UTF-16LE (ohne BOM) nach Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1018,12 +1113,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-8 mit BOM:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1033,12 +1128,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1048,47 +1143,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L<http://de.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrahctet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn der Ort auf »China« gesetzt ist. Zum Beispiel wird in einer Locale-Einstellung C<en_GB.GB18030> (Britisches Englisch) die Umwandlung von UTF-16 in GB18030 nicht möglich sein, aber in der chinesischen Einstellung C<zh_CN.GB18030> dagegen funktionieren."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn die Locale vom System unterstützt wird. Mit dem Befehl C<locale -a> erhalten Sie eine Liste der unterstützten Locales."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Unter Windows benötigen Sie die Option C<-gb>, um UTF-16-Dateien in GB18030 umwandeln zu können."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "In GB 18030 kodierte Dateien haben wie Unicode-Dateien eine Markierung der Bytereihenfolge (BOM)."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "BEISPIELE"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Aus der Standardeingabe lesen und in die Standardausgabe schreiben:"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1100,12 +1195,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1117,12 +1212,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "a.txt im ascii-Modus umwandeln und ersetzen:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1132,12 +1227,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "a.txt im ascii-Modus umwandeln und ersetzen, b.txt im 7bit-Modus umwandeln und ersetzen:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1151,12 +1246,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "a.txt aus dem Mac- in das Unix-Format umwandeln:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1168,12 +1263,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "a.txt aus dem Unix- in das Mac-Format umwandeln:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1185,12 +1280,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "a.txt unter Beibehaltung des ursprünglichen Zeitstempels umwandeln:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1202,12 +1297,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1217,12 +1312,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben, wobei e.txt den gleichen Zeitstempel erhält wie a.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1232,12 +1327,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und das Ergebnis nach e.txt schreiben:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1249,12 +1344,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "c.txt umwandeln und das Ergebnis nach e.txt schreiben, a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen, d.txt umwandeln und das Ergebnis nach f.txt schreiben:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1264,42 +1359,57 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "REKURSIVE UMWANDLUNG"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Verwenden Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1), um Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:690
+#, no-wrap
+msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr "In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:"
+
+#. type: verbatim
+#: dos2unix.pod:694
#, no-wrap
msgid ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "LOKALISIERUNG"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "Die primäre Sprache wird durch die Umgebungsvariable LANG festgelegt. Diese Variable besteht aus mehreren Teilen: Der erste Teil besteht aus zwei Kleinbuchstaben, die den Sprachcode angeben. Der zweite Teil ist optional und bezeichnet den Ländercode in Großbuchstaben, vom davor stehenden Sprachcode durch einen Unterstrich getrennt. Der dritte Teil ist ebenfalls optional und gibt die Zeichenkodierung an, vom Ländercode durch einen Punkt getrennt. Einige Beispiele für Standard-POSIX-Shells:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1321,47 +1431,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Mit der Umgebungsvariable LANGUAGE können Sie eine Prioritätenliste für Sprachen übergeben, die Sie durch Doppelpunkte voneinander trennen. Dos2unix gibt LANGUAGE vor LANG den Vorzug, zum Beispiel bei Deutsch vor Niederländisch: C<LANGUAGE=de:nl>. Sie müssen zunächst die Lokalisierung aktivieren, indem Sie die Variable LANG (oder LC_ALL) auf einen anderen Wert als »C« setzen, bevor Sie die Liste der Sprachprioritäten mit der Variable LANGUAGE nutzen können. Weitere Informationen finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Falls Sie eine Sprache auswählen, die nicht verfügbar ist, erhalten Sie die Standardmeldungen in englischer Sprache."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Durch die Umgebungsvariable DOS2UNIX_LOCALEDIR wird LOCALEDIR während der Kompilierung übergangen. LOCALEDIR wird verwendet, um Sprachdateien zu finden. Der GNU-Standardwert ist C</usr/local/share/locale>. Die Option B<--version> zeigt das verwendete LOCALEDIR an."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Beispiel (POSIX-Shell):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1371,71 +1481,71 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "RÜCKGABEWERT"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "Bei Erfolg wird 0 zurückgegeben. Bei aufgetretenen Systemfehlern wird der letzte Systemfehler zurückgegeben. Für alle anderen Fehler wird 1 zurückgegeben."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "Der Rückgabewert ist im stillen Modus stets 0, außer wenn fehlerhafte Befehlszeilenoptionen verwendet werden."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "STANDARDS"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://de.wikipedia.org/wiki/Textdatei>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://de.wikipedia.org/wiki/Wagenr%C3%BCcklauf>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://de.wikipedia.org/wiki/Zeilenumbruch>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTOREN"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (Mac2unix-Modus) - <wuebben@kde.org>, Christian Wurll (Extra Zeilenumbruch) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (Betreuer)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Projektseite: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge-Seite: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/de/man1/dos2unix.pod b/man/de/man1/dos2unix.pod
index b6f989a..e4191e0 100644
--- a/man/de/man1/dos2unix.pod
+++ b/man/de/man1/dos2unix.pod
@@ -128,6 +128,76 @@ die Option C<-r>.
legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann I<ascii>, I<7bit>,
I<iso> oder I<mac> sein, wobei I<ascii> die Vorgabe ist.
+=item B<-D, --display-enc KODIERUNG>
+
+legt die Kodierung des angezeigten Texts fest. KODIERUNG kann I<ansi>,
+I<unicode> oder I<utf8> sein, wobei I<ansi> die Vorgabe ist.
+
+Diese Option ist nur in dos2unix für Windows mit Unterstützung für
+Unicode-Dateinamen verfügbar. Sie bleibt wirkungslos, wenn die tatsächlichen
+Dateinamen gelesen und geschrieben werden, lediglich bei der Darstellung
+wird sie berücksichtigt.
+
+Es gibt verschiedene Möglichkeiten, Text in einer Windows-Konsole basierend
+auf dessen Kodierung darzustellen. Alle haben verschiedene Vor- und
+Nachteile.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Die Standardmethode von dos2unix ist die Verwendung von ANSI-kodiertem Text,
+der Vorteil ist deren Abwärtskompatibilität. Dies funktioniert mit Raster-
+und TrueType-Schriften. In manchen Gebieten müssen Sie mit dem Befehl
+C<chcp> die aktive DOS-OEM-Codepage in die -System-ANSI-Codepage des Systems
+ändern, da dos2unix Letztere verwendet.
+
+Der Nachteil von ANSI ist, dass internationale Dateinamen nicht korrekt
+dargestellt werden, wenn darin Zeichen enthalten sind, die nicht in der im
+System voreingestellten Codepage enthalten sind. Stattdessen wird entweder
+ein Fragezeichen oder ein falsches Zeichen angezeigt. Sofern Sie nicht mit
+fremden Dateinamen arbeiten, ist diese Methode in Ordnung.
+
+=item B<unicode>
+
+Der Vorteil von Unicode (dem Windows-Namen für UTF-16) ist die üblicherweise
+korrekte Textdarstellung. Eine Änderung der aktiven Codepage ist nicht
+erforderlich. Sie müssen die Schriftart der Konsole auf eine
+TrueType-Schrift einstellen, damit internationale Zeichen richtig angezeigt
+werden können. Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten
+sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch ein
+Fragezeichen enthält.
+
+Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text korrekt
+dargestellt, da ConEmu automatisch eine passende Schrift wählt.
+
+Nachteilig für Unicode ist, dass es nicht zu ASCII kompatibel ist. Die
+Ausgabe ist schwer zu verarbeiten, wenn sie in ein anderes Programm oder
+eine Datei weitergeleitet wird. Die Weiterleitung erzeugt keine korrekte
+UTF-16-Datei.
+
+=item B<utf8>
+
+Der Vorteil von UTF-8 ist die ASCII-Kompatibilität. Weiterleitungen in
+Dateien ergeben stets korrektes UTG-8. Sie müssen die Schriftart der Konsole
+auf eine TrueType-Schrift setzen. Dadurch wird der Text ähnlich wie in der
+C<unicode>-Kodierung dargestellt.
+
+Der Nachteil ist die falsche Darstellung aller Nicht-ASCII-Zeichen, wenn Sie
+die Standard-Rasterschrift verwenden. Nicht nur Unicode-Dateinamen, sondern
+auch übersetzte Meldungen werden unlesbar. Auf einem Windows-System, das für
+eine ostasiatische Region eingerichtet wurde, wird die Konsole bei der
+Anzeige von Meldungen deutlich flackern.
+
+In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut.
+
+=back
+
+Die Standardkodierung kann durch Setzen der Umgebungsvariable
+DOS2UNIX_DISPLAY_ENC auf C<unicode> oder C<utf8> geändert werden.
+
=item B<-f, --force>
erzwingt die Umwandlung von Binärdateien.
@@ -249,8 +319,8 @@ Wenn die Eingabedatei in UTF-16 kodiert ist und die Option C<-u> verwendet
wird, wird eine UTF-16-BOM geschrieben.
Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei
-weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt
-UNICODE.
+nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere Informationen finden Sie im
+Abschnitt UNICODE.
@@ -521,6 +591,20 @@ Option C<-r>, um die BOM zu entfernen.
Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option C<-m>
angegeben ist.
+=head2 Unicode-Dateinamen unter Windows
+
+Dos2unix verfügt über optionale Unterstützung für das Lesen und Schreiben
+von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann
+dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die nicht zur
+Standard-ANSI-Codepage des Systems gehören. Geben Sie C<dos2unix -V> ein, um
+zu sehen, ob dos2unix für Windows mit Unterstützung für Unicode-Dateinamen
+erstellt wurde.
+
+Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich
+nicht fehlerfrei, siehe die Option C<-D>, C<--display-enc>. Die Dateinamen
+können falsch dargestellt werden, allerdings werden die Dateien mit deren
+korrekten Namen gespeichert.
+
=head2 Unicode-Beispiele
Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:
@@ -553,10 +637,8 @@ Windows, auch als GBK bekannt.
Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die
Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur
-funktioniert, wenn der Ort auf »China« gesetzt ist. Zum Beispiel wird in
-einer Locale-Einstellung C<en_GB.GB18030> (Britisches Englisch) die
-Umwandlung von UTF-16 in GB18030 nicht möglich sein, aber in der
-chinesischen Einstellung C<zh_CN.GB18030> dagegen funktionieren.
+funktioniert, wenn die Locale vom System unterstützt wird. Mit dem Befehl
+C<locale -a> erhalten Sie eine Liste der unterstützten Locales.
Unter Windows benötigen Sie die Option C<-gb>, um UTF-16-Dateien in GB18030
umwandeln zu können.
@@ -630,7 +712,11 @@ Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise
alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen
umzuwandeln, geben Sie Folgendes ein:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 LOKALISIERUNG
diff --git a/man/de/man1/dos2unix.txt b/man/de/man1/dos2unix.txt
index 92c0581..5b51d40 100644
--- a/man/de/man1/dos2unix.txt
+++ b/man/de/man1/dos2unix.txt
@@ -94,6 +94,73 @@ OPTIONEN
legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann *ascii*,
*7bit*, *iso* oder *mac* sein, wobei *ascii* die Vorgabe ist.
+ -D, --display-enc KODIERUNG
+ legt die Kodierung des angezeigten Texts fest. KODIERUNG kann
+ *ansi*, *unicode* oder *utf8* sein, wobei *ansi* die Vorgabe ist.
+
+ Diese Option ist nur in dos2unix für Windows mit Unterstützung für
+ Unicode-Dateinamen verfügbar. Sie bleibt wirkungslos, wenn die
+ tatsächlichen Dateinamen gelesen und geschrieben werden, lediglich
+ bei der Darstellung wird sie berücksichtigt.
+
+ Es gibt verschiedene Möglichkeiten, Text in einer Windows-Konsole
+ basierend auf dessen Kodierung darzustellen. Alle haben verschiedene
+ Vor- und Nachteile.
+
+ ansi
+ Die Standardmethode von dos2unix ist die Verwendung von
+ ANSI-kodiertem Text, der Vorteil ist deren
+ Abwärtskompatibilität. Dies funktioniert mit Raster- und
+ TrueType-Schriften. In manchen Gebieten müssen Sie mit dem
+ Befehl "chcp" die aktive DOS-OEM-Codepage in die
+ -System-ANSI-Codepage des Systems ändern, da dos2unix Letztere
+ verwendet.
+
+ Der Nachteil von ANSI ist, dass internationale Dateinamen nicht
+ korrekt dargestellt werden, wenn darin Zeichen enthalten sind,
+ die nicht in der im System voreingestellten Codepage enthalten
+ sind. Stattdessen wird entweder ein Fragezeichen oder ein
+ falsches Zeichen angezeigt. Sofern Sie nicht mit fremden
+ Dateinamen arbeiten, ist diese Methode in Ordnung.
+
+ unicode
+ Der Vorteil von Unicode (dem Windows-Namen für UTF-16) ist die
+ üblicherweise korrekte Textdarstellung. Eine Änderung der
+ aktiven Codepage ist nicht erforderlich. Sie müssen die
+ Schriftart der Konsole auf eine TrueType-Schrift einstellen,
+ damit internationale Zeichen richtig angezeigt werden können.
+ Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten
+ sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch
+ ein Fragezeichen enthält.
+
+ Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text
+ korrekt dargestellt, da ConEmu automatisch eine passende Schrift
+ wählt.
+
+ Nachteilig für Unicode ist, dass es nicht zu ASCII kompatibel
+ ist. Die Ausgabe ist schwer zu verarbeiten, wenn sie in ein
+ anderes Programm oder eine Datei weitergeleitet wird. Die
+ Weiterleitung erzeugt keine korrekte UTF-16-Datei.
+
+ utf8
+ Der Vorteil von UTF-8 ist die ASCII-Kompatibilität.
+ Weiterleitungen in Dateien ergeben stets korrektes UTG-8. Sie
+ müssen die Schriftart der Konsole auf eine TrueType-Schrift
+ setzen. Dadurch wird der Text ähnlich wie in der
+ "unicode"-Kodierung dargestellt.
+
+ Der Nachteil ist die falsche Darstellung aller
+ Nicht-ASCII-Zeichen, wenn Sie die Standard-Rasterschrift
+ verwenden. Nicht nur Unicode-Dateinamen, sondern auch übersetzte
+ Meldungen werden unlesbar. Auf einem Windows-System, das für
+ eine ostasiatische Region eingerichtet wurde, wird die Konsole
+ bei der Anzeige von Meldungen deutlich flackern.
+
+ In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut.
+
+ Die Standardkodierung kann durch Setzen der Umgebungsvariable
+ DOS2UNIX_DISPLAY_ENC auf "unicode" oder "utf8" geändert werden.
+
-f, --force
erzwingt die Umwandlung von Binärdateien.
@@ -192,8 +259,8 @@ OPTIONEN
verwendet wird, wird eine UTF-16-BOM geschrieben.
Verwenden Sie diese Option niemals, wenn die Kodierung der
- Ausgabedatei weder UTF-8 noch UTF-16 ist. Weitere Informationen
- finden Sie im Abschnitt UNICODE.
+ Ausgabedatei nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere
+ Informationen finden Sie im Abschnitt UNICODE.
-n, --newfile EINGABEDATEI AUSGABEDATEI …
Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die
@@ -442,6 +509,19 @@ UNICODE
Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option "-m"
angegeben ist.
+ Unicode-Dateinamen unter Windows
+ Dos2unix verfügt über optionale Unterstützung für das Lesen und
+ Schreiben von Unicode-Dateinamen in der Windows-Eingabeaufforderung.
+ Dadurch kann dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die
+ nicht zur Standard-ANSI-Codepage des Systems gehören. Geben Sie
+ "dos2unix -V" ein, um zu sehen, ob dos2unix für Windows mit
+ Unterstützung für Unicode-Dateinamen erstellt wurde.
+
+ Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist
+ gelegentlich nicht fehlerfrei, siehe die Option "-D", "--display-enc".
+ Die Dateinamen können falsch dargestellt werden, allerdings werden die
+ Dateien mit deren korrekten Namen gespeichert.
+
Unicode-Beispiele
Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:
@@ -472,10 +552,8 @@ GB18030
Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die
Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies
- nur funktioniert, wenn der Ort auf »China« gesetzt ist. Zum Beispiel
- wird in einer Locale-Einstellung "en_GB.GB18030" (Britisches Englisch)
- die Umwandlung von UTF-16 in GB18030 nicht möglich sein, aber in der
- chinesischen Einstellung "zh_CN.GB18030" dagegen funktionieren.
+ nur funktioniert, wenn die Locale vom System unterstützt wird. Mit dem
+ Befehl "locale -a" erhalten Sie eine Liste der unterstützten Locales.
Unter Windows benötigen Sie die Option "-gb", um UTF-16-Dateien in
GB18030 umwandeln zu können.
@@ -547,7 +625,11 @@ REKURSIVE UMWANDLUNG
beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen
Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:
+
+ for /R %G in (*.txt) do dos2unix "%G"
LOKALISIERUNG
LANG
diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1
index c294253..bce2e77 100644
--- a/man/es/man1/dos2unix.1
+++ b/man/es/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -179,6 +179,66 @@ por defecto en la conversión a saltos de línea \s-1DOS.\s0 Vea también la opc
.IX Item "-c, --convmode CONVMODE"
Establece el modo de conversión, Donde \s-1CONVMODE\s0 puede ser: \fIascii\fR,
\&\fI7bit\fR, \fIiso\fR, \fImac\fR siendo ascii el valor por defecto.
+.IP "\fB\-D, \-\-display\-enc \s-1ENCODING\s0\fR" 4
+.IX Item "-D, --display-enc ENCODING"
+Set encoding of displayed text. Where \s-1ENCODING\s0 is one of: \fIansi\fR,
+\&\fIunicode\fR, \fIutf8\fR with ansi being the default.
+.Sp
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+.Sp
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
+system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
+Windows system code page.
+.Sp
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+.Sp
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+.Sp
+The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when you
+redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
+.Sp
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+.Sp
+In a ConEmu console the utf8 encoding method works well.
+.RE
+.RS 4
+.Sp
+The default encoding can be changed with environment variable
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Fuerza la conversión de archivos binarios.
@@ -298,7 +358,7 @@ Cuando el archivo de entrada es \s-1UTF\-16\s0 y se usa la opción \f(CW\*(C`\-u
escribirá un \s-1BOM UTF\-16.\s0
.Sp
No utilice esta opción cuando la codificación de salida sea distinta de
-\&\s-1UTF\-8\s0 o \s-1UTF\-16.\s0 Véase también la sección \s-1UNICODE.\s0
+\&\s-1UTF\-8, UTF\-16\s0 o \s-1GB18030.\s0 Véase también la sección \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...\s0\fR" 4
.IX Item "-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ..."
Modo de archivo nuevo. Convierte el archivo \s-1ARCHIVO_DE_ENTRADA\s0 y escribe la
@@ -545,6 +605,18 @@ Unix2dos escribe \s-1BOM\s0 en el archivo de salida cuando el archivo de entrada
tiene \s-1BOM.\s0 Use la opción \f(CW\*(C`\-r\*(C'\fR para eliminar la \s-1BOM.\s0
.PP
Dos2unix y unix2dos escriben siempre \s-1BOM\s0 cuando se usa la opción \f(CW\*(C`\-m\*(C'\fR.
+.SS "Unicode file names on Windows"
+.IX Subsection "Unicode file names on Windows"
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system \s-1ANSI\s0
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+There are some issues with displaying Unicode file names in a Windows
+console. See option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
.SS "Ejemplos Unicode"
.IX Subsection "Ejemplos Unicode"
Convertir de Windows \s-1UTF\-16 \s0(con una \s-1BOM\s0) a Unix \s-1UTF\-8:\s0
@@ -583,10 +655,9 @@ de Windows 936, también conocida como \s-1GBK.\s0
.PP
En Unix/Linux los archivos \s-1UTF\-16\s0 se convierten a \s-1GB18030\s0 cuando la
codificación local se establece en \s-1GB18030.\s0 Tenga en cuenta que esto sólo
-funcionará si se establece la ubicación en China. Por ejemplo en una
-configuración local English British la conversión \f(CW\*(C`en_GB.GB18030\*(C'\fR de \s-1UTF\-16\s0
-a \s-1GB18030\s0 no funcionará, pero en una configuración local China
-\&\f(CW\*(C`zh_CN.GB18030\*(C'\fR sí lo hará.
+funcionará si la configuración local es soportada por el sistema. Utilice
+\&\f(CW\*(C`locale \-a\*(C'\fR para obtener el listado de configuraciones regionales
+admitidas.
.PP
Use la opción \f(CW\*(C`\-ul\*(C'\fR o \f(CW\*(C`\-ub\*(C'\fR para convertir un archivo \s-1UTF\-16\s0 sin \s-1BOM.\s0
.PP
@@ -678,7 +749,13 @@ directorios. Por ejemplo para convertir todos los archivos .txt en el árbol
de directorios debajo del directorio actual escriba:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+In a Windows Command Prompt the following command can be used:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "INTERNACIONALIZACIÓN"
.IX Header "INTERNACIONALIZACIÓN"
diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm
index d85a74e..fc5d154 100644
--- a/man/es/man1/dos2unix.htm
+++ b/man/es/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title>
+<title>dos2unix 7.3 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Codificaciones">Codificaciones</a></li>
<li><a href="#Conversion">Conversion</a></li>
<li><a href="#Marca-de-orden-de-bytes">Marca de orden de bytes</a></li>
+ <li><a href="#Unicode-file-names-on-Windows">Unicode file names on Windows</a></li>
<li><a href="#Ejemplos-Unicode">Ejemplos Unicode</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>Establece el modo de conversi&oacute;n, Donde CONVMODE puede ser: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> siendo ascii el valor por defecto.</p>
</dd>
+<dt id="D---display-enc-ENCODING"><b>-D, --display-enc ENCODING</b></dt>
+<dd>
+
+<p>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> with ansi being the default.</p>
+
+<p>This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed.</p>
+
+<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+
+<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+
+<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+
+<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+
+<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+
+<p>In a ConEmu console the utf8 encoding method works well.</p>
+
+</dd>
+</dl>
+
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>Cuando el archivo de entrada es UTF-16 y se usa la opci&oacute;n <code>-u</code>, se escribir&aacute; un BOM UTF-16.</p>
-<p>No utilice esta opci&oacute;n cuando la codificaci&oacute;n de salida sea distinta de UTF-8 o UTF-16. V&eacute;ase tambi&eacute;n la secci&oacute;n UNICODE.</p>
+<p>No utilice esta opci&oacute;n cuando la codificaci&oacute;n de salida sea distinta de UTF-8, UTF-16 o GB18030. V&eacute;ase tambi&eacute;n la secci&oacute;n UNICODE.</p>
</dd>
<dt id="n---newfile-ARCHIVO_DE_ENTRADA-ARCHIVO_DE_SALIDA"><b>-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix y unix2dos escriben siempre BOM cuando se usa la opci&oacute;n <code>-m</code>.</p>
+<h2 id="Unicode-file-names-on-Windows">Unicode file names on Windows</h2>
+
+<p>Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type <code>dos2unix -V</code>.</p>
+
+<p>There are some issues with displaying Unicode file names in a Windows console. See option <code>-D</code>, <code>--display-enc</code>. The file names may be displayed wrongly in the console, but the files will be written with the correct name.</p>
+
<h2 id="Ejemplos-Unicode">Ejemplos Unicode</h2>
<p>Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:</p>
@@ -510,7 +561,7 @@
<p>GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformaci&oacute;n Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 tambi&eacute;n es compatible con la p&aacute;gina de c&oacute;digos de Windows 936, tambi&eacute;n conocida como GBK.</p>
-<p>En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificaci&oacute;n local se establece en GB18030. Tenga en cuenta que esto s&oacute;lo funcionar&aacute; si se establece la ubicaci&oacute;n en China. Por ejemplo en una configuraci&oacute;n local English British la conversi&oacute;n <code>en_GB.GB18030</code> de UTF-16 a GB18030 no funcionar&aacute;, pero en una configuraci&oacute;n local China <code>zh_CN.GB18030</code> s&iacute; lo har&aacute;.</p>
+<p>En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificaci&oacute;n local se establece en GB18030. Tenga en cuenta que esto s&oacute;lo funcionar&aacute; si la configuraci&oacute;n local es soportada por el sistema. Utilice <code>locale -a</code> para obtener el listado de configuraciones regionales admitidas.</p>
<p>Use la opci&oacute;n <code>-ul</code> o <code>-ub</code> para convertir un archivo UTF-16 sin BOM.</p>
@@ -574,7 +625,11 @@
<p>Use dos2unix en combinaci&oacute;n con los comandos find(1) y xargs(1) para convertir recursivamente archivos de texto contenidos en un &aacute;rbol de directorios. Por ejemplo para convertir todos los archivos .txt en el &aacute;rbol de directorios debajo del directorio actual escriba:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>In a Windows Command Prompt the following command can be used:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="INTERNACIONALIZACIN">INTERNACIONALIZACI&Oacute;N</h1>
diff --git a/man/es/man1/dos2unix.po b/man/es/man1/dos2unix.po
index 53bf2d5..7b4d5fe 100644
--- a/man/es/man1/dos2unix.po
+++ b/man/es/man1/dos2unix.po
@@ -6,16 +6,16 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-29 14:32+0100\n"
+"Project-Id-Version: dos2unix-man-7.2.1-beta1\n"
+"POT-Creation-Date: 2015-08-13 08:57+0300\n"
+"PO-Revision-Date: 2015-03-19 09:38+0100\n"
"Last-Translator: Enrique Lazcorreta Puigmartí <enrique.lazcorreta@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.4\n"
+"X-Generator: Poedit 1.7.5\n"
#. type: =head1
#: dos2unix.pod:52
@@ -236,56 +236,138 @@ msgstr "Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>, I<
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:157
+#, fuzzy
+#| msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>, I<7bit>, I<iso>, I<mac> siendo ascii el valor por defecto."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Fuerza la conversión de archivos binarios."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "En Windows los archivos UTF-16 se convierten por defecto a UTF-8, sin tener en cuenta la configuración local. Use esta opción para convertir archivos UTF-16 a GB18030. Esta opción sólo está disponible en Windows.l Véase también la sección GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Despiega la ayuda y termina el programa."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[MARCAS], --info[= MARCAS] ARCHIVO ...>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Muestra la información del archivo. No se realiza ninguna conversión."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "Se muestra la siguiente información, en este orden: número de saltos de línea DOS, número de saltos de línea Unix, número de saltos de línea Mac, Marca de Orden de Byte, de texto o binario, nombre del archivo."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Ejemplo de salida:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -309,87 +391,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Muestra el número de saltos de línea DOS."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Muestra el número de saltos de línea Unix."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Muestra el número de saltos de línea Mac."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "Muestra la Marca de Orden de Byte."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Muestra si el archivo es de texto o binario."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Muestra sólo los archivos que pueden ser convertidos."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Con la marca C<c> dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Ejemplos:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Muestra información para todos los archivos *.txt:"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -399,12 +481,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Muestra sólo el número de saltos de línea de DOS y de Unix:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -414,12 +496,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Muestra sólo la Marca de Orden de Byte."
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -429,12 +511,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Muestra los archivos que tienen saltos de línea DOS:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -444,12 +526,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Muestra los archivos que tienen saltos de línea Unix:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -459,307 +541,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "Mantiene la fecha del archivo de salida igual a la del archivo de entrada."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "Muestra la licencia del programa."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Añade salto de línea adicional."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: Sólo los saltos de línea DOS son cambiados por dos saltos de línea Unix. En modo Mac sólo los saltos de línea Mac son cambiados por dos saltos de línea Unix."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: Sólo los saltos de línea Unix son cambiados por dos saltos de línea DOS. En modo Mac los saltos de línea Unix son cambiados por dos saltos de línea Mac."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Escribe una Marca de Orden de Bytes (BOM) en el archivo de salida. Por defecto se escribe una BOM UTF-8."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Cuando el archivo de entrada es UTF-16 y se usa la opción C<-u>, se escribirá un BOM UTF-16."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "No utilice esta opción cuando la codificación de salida sea distinta de UTF-8 o UTF-16. Véase también la sección UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "No utilice esta opción cuando la codificación de salida sea distinta de UTF-8, UTF-16 o GB18030. Véase también la sección UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Modo de archivo nuevo. Convierte el archivo ARCHIVO_DE_ENTRADA y escribe la salida al archivo ARCHIVO_DE_SALIDA. Los nombres de archivo deben ser dados en pares y los comodines I<no> deben ser usados o I<perderá> sus archivos."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "La persona que inicia la conversión en el modo de archivo nuevo (emparejado) será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la umask(1) de la persona que ejecute la conversión."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ARCHIVO ...>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Modo de archivo antiguo. Convierte el archivo ARCHIVO y lo sobrescribe con la salida. El programa por defecto se ejecuta en este modo. Se pueden emplear comodines."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "En modo de archivo antiguo (in situ), el archivo convertido tiene el mismo propietario, grupo y permisos de lectura/escritura que el archivo original. Lo mismo aplica cuando el archivo es convertido por otro usuario que tiene permiso de lectura en el archivo (p.e. usuario root). La conversión será abortada cuando no sea posible preservar los valores originales. Cambiar el propietario implicaría que el propietario original ya no podrá leer el archivo. Cambiar el grupo podría ser un riesgo de seguridad, ya que el archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Modo silencioso. Suprime todas las advertencias y mensajes. El valor retornado es cero. Excepto cuando se emplean parámetros incorrectos."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "Elimina la Marca de Orden de Byte (BOM). No escribe el BOM en el archivo de salida. Este es el comportamiento por defecto al convertir a saltos de línea Unix. Vea también la opción C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Ignora los archivos binarios (por defecto)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "Mantiene la codificación original UTF-16 en el archivo de entrada. El archivo de salida se escribirá con la misma codificación UTF-16, little o big endian, como el archivo de entrada. Esto impide la transformación a UTF-8. En consecuencia se escribirá un BOM UTF-16. Esta opción se puede desactivar con la opción C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Se asume que el formato de archivo de entrada es UTF-16LE."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Cuando existe una Marca de Orden de Bytes (BOM) en el archivo de entrada, la BOM tiene prioridad sobre esta opción."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Cuando se hace una suposición incorrecta (el archivo de entrada no estaba en formato UTF-16LE) y la conversión tiene éxito, obtendrá un archivo UTF-8 de salida con el texto erróneo. La conversión errónea puede deshacerse con iconv(1) convirtiendo el archivo UTF-8 de salida de vuelta a UTF-16LE. Esto restaurará el archivo original."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "El supuesto de UTF-16LE funciona como un I<modo de conversión>. Al cambiar al modo por defecto I<ascii> el supuesto UTF-16LE es deshabilitado."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Se asume que el formato del archivo de entrada es UTF-16BE."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Esta opción funciona igual que la opción C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Mostrar mensajes detallados. Se muestra información extra acerca de Marcas de Orden de Bytes (BOM) y el número de saltos de línea convertidos."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Sigue los enlaces simbólicos y convierte los destinos."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Reemplaza los enlaces simbólicos con los archivos convertidos (los archivos destino originales no se alteran)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "No altera los enlaces simbólicos ni sus destinos (por defecto)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Despiega la información de la versión y termina el programa."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "MODO MAC"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "En modo normal los saltos de línea son convertidos de DOS a Unix y viceversa. Los saltos de línea Mac no son convertidos."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Para ejecutar en modo Mac use el modificador C<-c mac> o use los comandos C<mac2unix> o C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "MODOS DE CONVERSIÓN"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "En modo C<ascii> sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "En este modo todos los caracteres no ASCII de 8 bits (con valores de 128 a 255) son convertidos al espacio de 7 bits."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Los caracteres son convertidos entre un conjunto de caracteres DOS (página de códigos) y el conjunto de caracteres ISO-8859-1 (Latín-1) de Unix. Los caracteres DOS sin equivalente ISO-8859-1, para los cuales la conversión es imposible, son convertidos en un punto. Lo mismo se aplica para caracteres ISO-8859-1 sin contraparte DOS."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Cuando sólo se emplea el parámetro C<-iso>, dos2unix intentará determinar la página de códigos activa. Cuando esto no sea posible, dos2unix utilizará la página de códigos 437 por defecto, la cual es empleada principalmente en EE. UU. Para forzar una página de códigos específica emplee los parámetros C<-437> (EE. UU.), C<-850> (Europa Occidental), C<-860> (Portugués), C<-863> (Francocanadiense), o C<-865> (Nórdico). La página de códigos Windows 1252 (Europa Occidental) también está soportada con el parámetro C<-1252>. Para acceder a otras páginas de códigos use dos2unix en combinación con iconv(1). Iconv puede convertir entre una larga lista de codificaciones de caracteres."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "No use la conversión ISO en archivos de texto Unicode. Esto corrompería los archivos codificados como UTF-8."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Convierte de la página de códigos por defecto de DOS a Latín-1 de Unix:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -769,12 +851,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Convierte de DOS CP850 a Unix Latín-1:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -784,12 +866,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Convierte de Windows CP1252 a Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -799,12 +881,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Convierte de Windows CP1252 a Unix UTF-8 (Unicode)."
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -814,12 +896,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Convierte de Unix Latin-1 a la página de códigos por defecto de DOS:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -829,12 +911,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Convierte de Unix Latin-1 a DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -844,12 +926,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Convierte de Unix Latin-1 a Windows CP1252."
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -859,12 +941,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Convierte de Unix UTF-8 (Unicode) a Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -874,127 +956,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Véase también L<http://czyborra.com/charsets/codepages.html> y L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Codificaciones"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Existen diferentes codificaciones Unicode. En Unix y Linux los archivos Unicode son codificados comúnmente en UTF-8. En Windows los archivos de texto Unicode pueden estar codificados en UTF-8, UTF-16, o UTF-16 big endian, pero en general son codificados en formato UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Conversion"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o Mac, como cualquier archivo de texto."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix y unix2dos con soporte Unicode UTF-16, pueden leer archivos de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "En Unix/Linux los archivos codificados con UTF-16 se convierten a la codificación de caracteres local. Use el comando locale(1) para averiguar la codificación de caracteres local. Cuando no se puede hacer la conversión se obtendrá un error de conversión y se omitirá el archivo."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "En Windows los archivos UTF-16 se convierten por defecto a UTF-8. Los archivos de texto forrajeados con UTF-8 están soportados tanto en Windows como en Unix/Linux."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Las codificaciones UTF-16 y UTF-8 son totalmente compatibles, no se perderá ningún texto en la conversión. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por ejemplo cuando el archivo de entrada UTF-16 contiene un error, se omitirá el archivo."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Cuando se usa la opción C<-u>, el archivo de salida se escribirá en la misma codificación UTF-16 que el archivo de entrada. La opción C<-u> previene la conversión a UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix y unix2dos no tienen la opción de convertir archivos UTF-8 a UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "La conversión en modos ISO y 7-bit no funciona en archivos UTF-16."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Marca de orden de bytes"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "En Windows los archivos de texto Unicode típicamente tienen una Marca de Orden de Bytes (BOM), debido a que muchos programas de Windows (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también L<http://es.wikipedia.org/wiki/Marca_de_orden_de_bytes_%28BOM%29>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de caracteres."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix sólo puede detectar si un archivo está en formato UTF-16 si el archivo tiene una BOM. Cuando un archivo UTF-16 no tiene una BOM, dos2unix tratará el archivo como un archivo binario."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2Unix, por defecto, no escribe BOM en el archivo de salida. Con la opción C<-b> Dos2unix escribe el BOM cuando el archivo de entrada tiene BOM."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos escribe BOM en el archivo de salida cuando el archivo de entrada tiene BOM. Use la opción C<-r> para eliminar la BOM."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción C<-m>."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr ""
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Ejemplos Unicode"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1004,12 +1101,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Convertir de Windows UTF-16LE (sin una BOM) a Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1019,12 +1116,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Convertir de Unix UTF-8 a Windows UTF-8 sin una BOM:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1034,12 +1131,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Convertir de Unix UTF-8 a Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1049,47 +1146,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del GB18030 estándar. Véase L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 también es compatible con la página de códigos de Windows 936, también conocida como GBK."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificación local se establece en GB18030. Tenga en cuenta que esto sólo funcionará si se establece la ubicación en China. Por ejemplo en una configuración local English British la conversión C<en_GB.GB18030> de UTF-16 a GB18030 no funcionará, pero en una configuración local China C<zh_CN.GB18030> sí lo hará."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificación local se establece en GB18030. Tenga en cuenta que esto sólo funcionará si la configuración local es soportada por el sistema. Utilice C<locale -a> para obtener el listado de configuraciones regionales admitidas."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "Los archivos codificados como GB18030 pueden tener una Marca de Orden de Bytes, como ocurre con los archivos Unicode."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "EJEMPLOS"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Lee la entrada desde 'stdin' y escribe la salida a 'stdout':"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1101,12 +1198,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1118,12 +1215,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1133,12 +1230,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii, convierte y reemplaza b.txt empleando modo de conversión de 7bits:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1152,12 +1249,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Convierte a.txt del formato de Mac a Unix:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1169,12 +1266,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Convierte a.txt del formato de Unix a Mac:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1186,12 +1283,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Convierte y reemplaza a.txt manteniendo la fecha del archivo original:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1203,12 +1300,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Convierte a.txt y escribe la salida en e.txt:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1218,12 +1315,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Convierte a.txt y escribe la salida en e.txt, manteniendo la fecha de e.txt igual a la de a.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1233,12 +1330,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Convierte y reemplaza a.txt, convierte b.txt y escribe en e.txt:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1250,12 +1347,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Convierte c.txt y escribe en e.txt, convierte y reemplaza a.txt, convierte y reemplaza b.txt, convierte d.txt y escribe en f.txt:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1265,42 +1362,63 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "CONVERSIÓN RECURSIVA"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Use dos2unix en combinación con los comandos find(1) y xargs(1) para convertir recursivamente archivos de texto contenidos en un árbol de directorios. Por ejemplo para convertir todos los archivos .txt en el árbol de directorios debajo del directorio actual escriba:"
#. type: verbatim
-#: dos2unix.pod:616
-#, no-wrap
+#: dos2unix.pod:690
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:694
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
+msgid ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "INTERNACIONALIZACIÓN"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "El idioma principal se selecciona con la variable de entorno LANG. La variable LANG consiste de varias partes. La primer parte es el código del idioma en minúsculas. La segunda es opcional y es el código del país en mayúsculas, precedido por un guión bajo. Existe también una tercera parte opcional: la codificación de caracteres, precedida por un punto. Unos cuantos ejemplos para intérpretes de comandos tipo POSIX estándar:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1322,47 +1440,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Con la variable de entorno LANGUAGE puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y entonces alemán: C<LANGUAGE=nl:de>. Para usar una lista de prioridad de idiomas a través de la variable LANGUAGE tiene que habilitar antes la internacionalización, asignando un valor distinto de \"C\" a LANG (o LC_ALL). Véase también el manual de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Si selecciona un idioma que no está disponible el programa funcionará en ingles."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Con la variable de entorno DOS2UNIX_LOCALEDIR el LOCALEDIR asignado durante la compilación puede ser modificado. LOCALEDIR es usado para encontrar los archivos de idioma. El valor por defecto de GNU es C</usr/local/share/locale>. El parámetro B<--version> mostrará el LOCALEDIR en uso."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Ejemplo (intérprete de comandos POSIX):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1372,72 +1490,72 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "VALOR DE RETORNO"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "Se regresa cero cuando el programa termina exitosamente. Cuando ocurre un error del sistema se regresará el último número de error del sistema. Para otros errores se regresa 1."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "El valor de retorno es siempre cero en modo silencioso, excepto cuando se emplean parámetros incorrectos."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "ESTÁNDARES"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://es.wikipedia.org/wiki/Documento_de_texto>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://es.wikipedia.org/wiki/Retorno_de_carro>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://es.wikipedia.org/wiki/Nueva_l%C3%ADnea>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://es.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTORES"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Página del proyecto: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Página de SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "VÉASE TAMBIÉN"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod
index 8fc1427..867c7bc 100644
--- a/man/es/man1/dos2unix.pod
+++ b/man/es/man1/dos2unix.pod
@@ -129,6 +129,72 @@ C<-r>.
Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>,
I<7bit>, I<iso>, I<mac> siendo ascii el valor por defecto.
+=item B<-D, --display-enc ENCODING>
+
+Set encoding of displayed text. Where ENCODING is one of: I<ansi>,
+I<unicode>, I<utf8> with ansi being the default.
+
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix's default method is to use ANSI encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active DOS OEM code page to the Windows
+system ANSI code page using the C<chcp> command, because dos2unix uses the
+Windows system code page.
+
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is OK.
+
+=item B<unicode>
+
+The advantage of unicode (the Windows name for UTF-16) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+
+The disadvantage of unicode is that it is not compatible with ASCII. The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct UTF-16 file.
+
+=item B<utf8>
+
+The advantage of utf8 is that it is compatible with ASCII and when you
+redirect it to a file you get a proper UTF-8 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the C<unicode> encoding.
+
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+
+In a ConEmu console the utf8 encoding method works well.
+
+=back
+
+The default encoding can be changed with environment variable
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+
=item B<-f, --force>
Fuerza la conversión de archivos binarios.
@@ -249,7 +315,7 @@ Cuando el archivo de entrada es UTF-16 y se usa la opción C<-u>, se
escribirá un BOM UTF-16.
No utilice esta opción cuando la codificación de salida sea distinta de
-UTF-8 o UTF-16. Véase también la sección UNICODE.
+UTF-8, UTF-16 o GB18030. Véase también la sección UNICODE.
@@ -509,6 +575,19 @@ tiene BOM. Use la opción C<-r> para eliminar la BOM.
Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción C<-m>.
+=head2 Unicode file names on Windows
+
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system ANSI
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type C<dos2unix -V>.
+
+There are some issues with displaying Unicode file names in a Windows
+console. See option C<-D>, C<--display-enc>. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
+
=head2 Ejemplos Unicode
Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:
@@ -540,10 +619,9 @@ de Windows 936, también conocida como GBK.
En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la
codificación local se establece en GB18030. Tenga en cuenta que esto sólo
-funcionará si se establece la ubicación en China. Por ejemplo en una
-configuración local English British la conversión C<en_GB.GB18030> de UTF-16
-a GB18030 no funcionará, pero en una configuración local China
-C<zh_CN.GB18030> sí lo hará.
+funcionará si la configuración local es soportada por el sistema. Utilice
+C<locale -a> para obtener el listado de configuraciones regionales
+admitidas.
Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM.
@@ -614,7 +692,11 @@ convertir recursivamente archivos de texto contenidos en un árbol de
directorios. Por ejemplo para convertir todos los archivos .txt en el árbol
de directorios debajo del directorio actual escriba:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 INTERNACIONALIZACIÓN
diff --git a/man/es/man1/dos2unix.txt b/man/es/man1/dos2unix.txt
index 9eb86df..dc05298 100644
--- a/man/es/man1/dos2unix.txt
+++ b/man/es/man1/dos2unix.txt
@@ -93,6 +93,67 @@ PARÁMETROS
Establece el modo de conversión, Donde CONVMODE puede ser: *ascii*,
*7bit*, *iso*, *mac* siendo ascii el valor por defecto.
+ -D, --display-enc ENCODING
+ Set encoding of displayed text. Where ENCODING is one of: *ansi*,
+ *unicode*, *utf8* with ansi being the default.
+
+ This option is only available in dos2unix for Windows with Unicode
+ file name support. This option has no effect on the actual file
+ names read and written, only on how they are displayed.
+
+ There are several methods for displaying text in a Windows console
+ based on the encoding of the text. They all have their own
+ advantages and disadvantages.
+
+ ansi
+ Dos2unix's default method is to use ANSI encoded text. The
+ advantage is that it is backwards compatible. It works with
+ raster and TrueType fonts. In some regions you may need to
+ change the active DOS OEM code page to the Windows system ANSI
+ code page using the "chcp" command, because dos2unix uses the
+ Windows system code page.
+
+ The disadvantage of ansi is that international file names with
+ characters not inside the system default code page are not
+ displayed properly. You will see a question mark, or a wrong
+ symbol instead. When you don't work with foreign file names this
+ method is OK.
+
+ unicode
+ The advantage of unicode (the Windows name for UTF-16) encoding
+ is that text is usually properly displayed. There is no need to
+ change the active code page. You may need to set the console's
+ font to a TrueType font to have international characters
+ displayed properly. When a character is not included in the
+ TrueType font you usually see a small square, sometimes with a
+ question mark in it.
+
+ When you use the ConEmu console all text is displayed properly,
+ because ConEmu automatically selects a good font.
+
+ The disadvantage of unicode is that it is not compatible with
+ ASCII. The output is not easy to handle when you redirect it to
+ another program or a file. Redirection to a file does not give a
+ correct UTF-16 file.
+
+ utf8
+ The advantage of utf8 is that it is compatible with ASCII and
+ when you redirect it to a file you get a proper UTF-8 file. You
+ need to set the console's font to a TrueType font. With a
+ TrueType font the text is displayed similar as with the
+ "unicode" encoding.
+
+ The disadvantage is that when you use the default raster font
+ all non-ASCII characters are displayed wrong. Not only unicode
+ file names, but also translated messages become unreadable. On
+ Windows configured for an East-Asian region you may see a lot of
+ flickering of the console when the messages are displayed.
+
+ In a ConEmu console the utf8 encoding method works well.
+
+ The default encoding can be changed with environment variable
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+
-f, --force
Fuerza la conversión de archivos binarios.
@@ -192,7 +253,7 @@ PARÁMETROS
escribirá un BOM UTF-16.
No utilice esta opción cuando la codificación de salida sea distinta
- de UTF-8 o UTF-16. Véase también la sección UNICODE.
+ de UTF-8, UTF-16 o GB18030. Véase también la sección UNICODE.
-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...
Modo de archivo nuevo. Convierte el archivo ARCHIVO_DE_ENTRADA y
@@ -431,6 +492,18 @@ UNICODE
Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción "-m".
+ Unicode file names on Windows
+ Dos2unix has optional support for reading and writing Unicode file names
+ in the Windows Command Prompt. That means that dos2unix can open files
+ that have characters in the name that are not part of the default system
+ ANSI code page. To see if dos2unix for Windows was built with Unicode
+ file name support type "dos2unix -V".
+
+ There are some issues with displaying Unicode file names in a Windows
+ console. See option "-D", "--display-enc". The file names may be
+ displayed wrongly in the console, but the files will be written with the
+ correct name.
+
Ejemplos Unicode
Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:
@@ -460,10 +533,9 @@ GB18030
En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la
codificación local se establece en GB18030. Tenga en cuenta que esto
- sólo funcionará si se establece la ubicación en China. Por ejemplo en
- una configuración local English British la conversión "en_GB.GB18030" de
- UTF-16 a GB18030 no funcionará, pero en una configuración local China
- "zh_CN.GB18030" sí lo hará.
+ sólo funcionará si la configuración local es soportada por el sistema.
+ Utilice "locale -a" para obtener el listado de configuraciones
+ regionales admitidas.
Use la opción "-ul" o "-ub" para convertir un archivo UTF-16 sin BOM.
@@ -532,7 +604,11 @@ CONVERSIÓN RECURSIVA
directorios. Por ejemplo para convertir todos los archivos .txt en el
árbol de directorios debajo del directorio actual escriba:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
INTERNACIONALIZACIÓN
LANG
diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1
index 9ebc4e7..3dbbb55 100644
--- a/man/fr/man1/dos2unix.1
+++ b/man/fr/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,6 +178,71 @@ aussi l'option \f(CW\*(C`\-r\*(C'\fR.
.IX Item "-c, --convmode MODE_CONV"
Change le mode de conversion. \s-1MODE_CONV\s0 prend l'une des valeurs: \fIascii\fR,
\&\fI7bit\fR, \fIiso\fR, \fImac\fR. Ascii est la valeur par défaut.
+.IP "\fB\-D, \-\-display\-enc \s-1ENCODAGE\s0\fR" 4
+.IX Item "-D, --display-enc ENCODAGE"
+Choisi l'encodage des textes affichés. L'\s-1ENCODAGE\s0 peut être : \fIansi\fR,
+\&\fIunicode\fR, \fIutf8\fR. La valeur par défaut est ansi.
+.Sp
+Cette option est uniquement disponible dans dos2unix pour Windows avec
+support pour les noms de fichiers Unicode. Cette option n'a aucun effet sur
+les noms de fichiers lus et écrits. Son effet se limite à leur affichage.
+.Sp
+Il existe plusieurs méthodes pour afficher du texte dans une console Windows
+selon l'encodage du texte. Elles ont toutes leurs propres avantages et
+désavantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+La méthode par défaut de dos2unix est d'utiliser du texte encodé en
+\&\s-1ANSI.\s0 Elle a l'avantage d'être rétro compatible. Elle fonctionne avec des
+polices raster ou TrueType. Dans certaines régions, vous pouvez avoir besoin
+d'utiliser la commande \f(CW\*(C`chcp\*(C'\fR pour remplacer le code page \s-1DOS OEM\s0 actif par
+le code \s-1ANSI\s0 système de Windows car dos2unix utilise le code page système de
+Windows.
+.Sp
+Le désavantage de ansi est que les noms de fichiers internationaux avec des
+caractères en dehors du code page système par défaut ne sont pas affichés
+correctement. Vous verrez un point d'interrogation ou un mauvais symbole à
+leur place. Cette méthode est acceptable si vous ne travaillez pas avec des
+noms de fichiers étrangers.
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+L'avantage de l'encodage unicode (le nom de Windows pour \s-1UTF\-16\s0) est que le
+texte est habituellement affiché correctement. Il n'est pas nécessaire de
+changer le code page actif. Vous pouvez avoir besoin de remplacer la police
+de la console par une police TrueType pour afficher les caractères
+internationaux correctement. Lorsqu'un caractère n'est pas inclus dans la
+police TrueType, il sera généralement remplacé par un petit carré, parfois
+avec un point d'interrogation à l'intérieur.
+.Sp
+Lorsque vous utilisez la console ConEmu, les textes sont affichés
+correctement car ConEmu sélectionne automatiquement une bonne police.
+.Sp
+Le désavantage de unicode est qu'il n'est pas compatible avec \s-1ASCII.\s0 La
+sortie n'est pas facile à gérer quand vous la redirigez vers un autre
+programme ou un fichier. Rediriger la sortie vers un fichier ne donne pas un
+fichier \s-1UTF\-16\s0 correct.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+L'avantage de utf8 est qu'il est compatible avec \s-1ASCII\s0 et, lorsque vous le
+redirigez vers un fichier, vous obtenez un fichier \s-1UTF\-8\s0 correct. Vous devez
+utiliser une police TrueType dans la console. Avec une police TrueType, le
+texte est affiché comme avec un encodage \f(CW\*(C`unicode\*(C'\fR.
+.Sp
+Le désavantage est que, si vous utilisez la police raster par défaut, tous
+les caractères non \s-1ASCII\s0 sont mal affichés. Pas uniquement les noms de
+fichiers unicode ! Les messages traduits deviennent inintelligibles. Sous
+Windows configuré pour une région de l'est de l'Asie, vous pouvez observer
+énormément de scintillements dans la console quand des messages sont
+affichés.
+.Sp
+Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+.RE
+.RS 4
+.Sp
+L'encodage par défaut peut être changé en assignant la valeur \f(CW\*(C`unicode\*(C'\fR ou
+\&\f(CW\*(C`utf8\*(C'\fR à la variable d'environnement \s-1DOS2UNIX_DISPLAY_ENC.\s0
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Force la conversion de fichiers binaires.
@@ -297,9 +362,9 @@ Lorsque le fichier d'entrée est en \s-1UTF\-16\s0 et que l'option \f(CW\*(C`\-u
utilisée, une \s-1BOM UTF\-16\s0 est écrite.
.Sp
N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est
-ni \s-1UTF\-8\s0 ni \s-1UTF\-16.\s0 Consultez également la section \s-1UNICODE.\s0
-.IP "\fB\-n, \-\-newline FICHIER_ENTRÉE \s-1FICHIER_SORTIE\s0 …\fR" 4
-.IX Item "-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …"
+ni \s-1UTF\-8\s0 ni \s-1UTF\-16\s0 ni \s-1GB18030.\s0 Consultez également la section \s-1UNICODE.\s0
+.IP "\fB\-n, \-\-newfile FICHIER_ENTRÉE \s-1FICHIER_SORTIE\s0 …\fR" 4
+.IX Item "-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …"
Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la
sortie dans le fichier \s-1FICHIER_SORTIE.\s0 Les noms des fichiers doivent être
indiqués par paires. Les jokers \fIne\fR doivent \fIpas\fR être utilisés ou vous
@@ -554,6 +619,19 @@ d'entrée a une \s-1BOM.\s0 Utilisez l'option \f(CW\*(C`\-r\*(C'\fR pour supprim
.PP
Dos2unix et unix2dos écrivent toujours une \s-1BOM\s0 quand l'option \f(CW\*(C`\-m\*(C'\fR est
utilisée.
+.SS "Noms de fichiers unicode sous Windows"
+.IX Subsection "Noms de fichiers unicode sous Windows"
+Dos2unix supporte, en option, la lecture et l'écriture de noms de fichiers
+Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix
+peut ouvrir des fichiers qui ont, dans leur nom, des caractères
+n'appartenant pas au code page système \s-1ANSI\s0 par défaut. Pour voir si
+dos2unix pour Windows a été compilé avec le support des noms de fichiers
+Unicode, tapez \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans une
+console Windows. Voyez l'option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. Les noms de
+fichiers peuvent être mal affichés dans la console mais les fichiers seront
+écrits avec les bons noms.
.SS "Exemples Unicode"
.IX Subsection "Exemples Unicode"
Convertir de l'\s-1UTF\-16\s0 Windows (avec \s-1BOM\s0) vers l'\s-1UTF\-8\s0 de Unix :
@@ -591,11 +669,10 @@ compatible avec \s-1ASCII. GB18030\s0 est aussi compatible avec le code page 936
Windows aussi connu comme \s-1GBK.\s0
.PP
Sous Unix/Linux, les fichiers \s-1UTF\-16\s0 sont convertis en \s-1GB18030\s0 quand
-l'encodage de la localisation est \s-1GB18030.\s0 Notez que cela ne fonctionnera
-que si l'emplacement est en Chine. Autrement dit, dans la localisation
-anglaise britannique \f(CW\*(C`en_GB.GB18030\*(C'\fR, la conversion de \s-1UTF\-16\s0 vers \s-1GB18030\s0
-ne fonctionnera pas mais une localisation chinoise \f(CW\*(C`zh_CN.GB18030\*(C'\fR
-fonctionnera.
+l'encodage de l'environnement linguistique est \s-1GB18030.\s0 Notez que cela ne
+fonctionnera que si l'environnement linguistique est supporté par le
+système. Utilisez la commande \f(CW\*(C`locale \-a\*(C'\fR pour obtenir la liste des
+environnements linguistiques supportés.
.PP
Sous Windows, vous avez besoin de l'option \f(CW\*(C`\-gb\*(C'\fR pour convertir \s-1UTF\-16\s0 en
\&\s-1GB18030.\s0
@@ -688,7 +765,14 @@ exemple, pour convertir tous les fichiers .txt dans les répertoires sous le
répertoire courant, tapez:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+En ligne de commande sous Windows, la commande suivante peut être utilisée :
+.PP
+.Vb 2
+\& for /R %G in (*.txt) do dos2unix "%G"
+\& find /R %G in
.Ve
.SH "PARAMÈTRES LINGUISTIQUES"
.IX Header "PARAMÈTRES LINGUISTIQUES"
diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm
index 4d507ac..b849da4 100644
--- a/man/fr/man1/dos2unix.htm
+++ b/man/fr/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title>
+<title>dos2unix 7.3 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Codages">Codages</a></li>
<li><a href="#Conversion">Conversion</a></li>
<li><a href="#Marque-dordre-des-octets">Marque d&#39;ordre des octets</a></li>
+ <li><a href="#Noms-de-fichiers-unicode-sous-Windows">Noms de fichiers unicode sous Windows</a></li>
<li><a href="#Exemples-Unicode">Exemples Unicode</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>Change le mode de conversion. MODE_CONV prend l&#39;une des valeurs: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i>. Ascii est la valeur par d&eacute;faut.</p>
</dd>
+<dt id="D---display-enc-ENCODAGE"><b>-D, --display-enc ENCODAGE</b></dt>
+<dd>
+
+<p>Choisi l&#39;encodage des textes affich&eacute;s. L&#39;ENCODAGE peut &ecirc;tre : <i>ansi</i>, <i>unicode</i>, <i>utf8</i>. La valeur par d&eacute;faut est ansi.</p>
+
+<p>Cette option est uniquement disponible dans dos2unix pour Windows avec support pour les noms de fichiers Unicode. Cette option n&#39;a aucun effet sur les noms de fichiers lus et &eacute;crits. Son effet se limite &agrave; leur affichage.</p>
+
+<p>Il existe plusieurs m&eacute;thodes pour afficher du texte dans une console Windows selon l&#39;encodage du texte. Elles ont toutes leurs propres avantages et d&eacute;savantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>La m&eacute;thode par d&eacute;faut de dos2unix est d&#39;utiliser du texte encod&eacute; en ANSI. Elle a l&#39;avantage d&#39;&ecirc;tre r&eacute;tro compatible. Elle fonctionne avec des polices raster ou TrueType. Dans certaines r&eacute;gions, vous pouvez avoir besoin d&#39;utiliser la commande <code>chcp</code> pour remplacer le code page DOS OEM actif par le code ANSI syst&egrave;me de Windows car dos2unix utilise le code page syst&egrave;me de Windows.</p>
+
+<p>Le d&eacute;savantage de ansi est que les noms de fichiers internationaux avec des caract&egrave;res en dehors du code page syst&egrave;me par d&eacute;faut ne sont pas affich&eacute;s correctement. Vous verrez un point d&#39;interrogation ou un mauvais symbole &agrave; leur place. Cette m&eacute;thode est acceptable si vous ne travaillez pas avec des noms de fichiers &eacute;trangers.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>L&#39;avantage de l&#39;encodage unicode (le nom de Windows pour UTF-16) est que le texte est habituellement affich&eacute; correctement. Il n&#39;est pas n&eacute;cessaire de changer le code page actif. Vous pouvez avoir besoin de remplacer la police de la console par une police TrueType pour afficher les caract&egrave;res internationaux correctement. Lorsqu&#39;un caract&egrave;re n&#39;est pas inclus dans la police TrueType, il sera g&eacute;n&eacute;ralement remplac&eacute; par un petit carr&eacute;, parfois avec un point d&#39;interrogation &agrave; l&#39;int&eacute;rieur.</p>
+
+<p>Lorsque vous utilisez la console ConEmu, les textes sont affich&eacute;s correctement car ConEmu s&eacute;lectionne automatiquement une bonne police.</p>
+
+<p>Le d&eacute;savantage de unicode est qu&#39;il n&#39;est pas compatible avec ASCII. La sortie n&#39;est pas facile &agrave; g&eacute;rer quand vous la redirigez vers un autre programme ou un fichier. Rediriger la sortie vers un fichier ne donne pas un fichier UTF-16 correct.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>L&#39;avantage de utf8 est qu&#39;il est compatible avec ASCII et, lorsque vous le redirigez vers un fichier, vous obtenez un fichier UTF-8 correct. Vous devez utiliser une police TrueType dans la console. Avec une police TrueType, le texte est affich&eacute; comme avec un encodage <code>unicode</code>.</p>
+
+<p>Le d&eacute;savantage est que, si vous utilisez la police raster par d&eacute;faut, tous les caract&egrave;res non ASCII sont mal affich&eacute;s. Pas uniquement les noms de fichiers <span style="white-space: nowrap;">unicode !</span> Les messages traduits deviennent inintelligibles. Sous Windows configur&eacute; pour une r&eacute;gion de l&#39;est de l&#39;Asie, vous pouvez observer &eacute;norm&eacute;ment de scintillements dans la console quand des messages sont affich&eacute;s.</p>
+
+<p>Dans une console ConEmu, l&#39;encodage utf8 fonctionne bien.</p>
+
+</dd>
+</dl>
+
+<p>L&#39;encodage par d&eacute;faut peut &ecirc;tre chang&eacute; en assignant la valeur <code>unicode</code> ou <code>utf8</code> &agrave; la variable d&#39;environnement DOS2UNIX_DISPLAY_ENC.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,10 +320,10 @@
<p>Lorsque le fichier d&#39;entr&eacute;e est en UTF-16 et que l&#39;option <code>-u</code> est utilis&eacute;e, une BOM UTF-16 est &eacute;crite.</p>
-<p>N&#39;utilisez jamais cette option quand l&#39;encodage du fichier de sortie n&#39;est ni UTF-8 ni UTF-16. Consultez &eacute;galement la section UNICODE.</p>
+<p>N&#39;utilisez jamais cette option quand l&#39;encodage du fichier de sortie n&#39;est ni UTF-8 ni UTF-16 ni GB18030. Consultez &eacute;galement la section UNICODE.</p>
</dd>
-<dt id="n---newline-FICHIER_ENTRE-FICHIER_SORTIE"><b>-n, --newline FICHIER_ENTR&Eacute;E FICHIER_SORTIE &hellip;</b></dt>
+<dt id="n---newfile-FICHIER_ENTRE-FICHIER_SORTIE"><b>-n, --newfile FICHIER_ENTR&Eacute;E FICHIER_SORTIE &hellip;</b></dt>
<dd>
<p>Nouveau mode de fichiers. Convertit le fichier FICHER_ENTR&Eacute;E et &eacute;crit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent &ecirc;tre indiqu&eacute;s par paires. Les jokers <i>ne</i> doivent <i>pas</i> &ecirc;tre utilis&eacute;s ou vous <i>perdrez</i> vos fichiers.</p>
@@ -486,6 +531,12 @@
<p>Dos2unix et unix2dos &eacute;crivent toujours une BOM quand l&#39;option <code>-m</code> est utilis&eacute;e.</p>
+<h2 id="Noms-de-fichiers-unicode-sous-Windows">Noms de fichiers unicode sous Windows</h2>
+
+<p>Dos2unix supporte, en option, la lecture et l&#39;&eacute;criture de noms de fichiers Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix peut ouvrir des fichiers qui ont, dans leur nom, des caract&egrave;res n&#39;appartenant pas au code page syst&egrave;me ANSI par d&eacute;faut. Pour voir si dos2unix pour Windows a &eacute;t&eacute; compil&eacute; avec le support des noms de fichiers Unicode, tapez <code>dos2unix -V</code>.</p>
+
+<p>Il y a quelques soucis avec l&#39;affichage de noms de fichiers Unicode dans une console Windows. Voyez l&#39;option <code>-D</code>, <code>--display-enc</code>. Les noms de fichiers peuvent &ecirc;tre mal affich&eacute;s dans la console mais les fichiers seront &eacute;crits avec les bons noms.</p>
+
<h2 id="Exemples-Unicode">Exemples Unicode</h2>
<p>Convertir de l&#39;UTF-16 Windows (avec BOM) vers l&#39;UTF-8 de Unix :</p>
@@ -510,7 +561,7 @@
<p>GB18030 est enti&egrave;rement compatible avec Unicode et peut &ecirc;tre consid&eacute;r&eacute; comme &eacute;tant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK.</p>
-<p>Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l&#39;encodage de la localisation est GB18030. Notez que cela ne fonctionnera que si l&#39;emplacement est en Chine. Autrement dit, dans la localisation anglaise britannique <code>en_GB.GB18030</code>, la conversion de UTF-16 vers GB18030 ne fonctionnera pas mais une localisation chinoise <code>zh_CN.GB18030</code> fonctionnera.</p>
+<p>Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l&#39;encodage de l&#39;environnement linguistique est GB18030. Notez que cela ne fonctionnera que si l&#39;environnement linguistique est support&eacute; par le syst&egrave;me. Utilisez la commande <code>locale -a</code> pour obtenir la liste des environnements linguistiques support&eacute;s.</p>
<p>Sous Windows, vous avez besoin de l&#39;option <code>-gb</code> pour convertir UTF-16 en GB18030.</p>
@@ -574,7 +625,12 @@
<p>Utilisez dos2unix avec les commandes find(1) et xargs(1) pour convertir r&eacute;cursivement des fichiers textes dans une arborescence de r&eacute;pertoires. Par exemple, pour convertir tous les fichiers .txt dans les r&eacute;pertoires sous le r&eacute;pertoire courant, tapez:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>En ligne de commande sous Windows, la commande suivante peut &ecirc;tre utilis&eacute;e :</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;
+ find /R %G in </code></pre>
<h1 id="PARAMTRES-LINGUISTIQUES">PARAM&Egrave;TRES LINGUISTIQUES</h1>
diff --git a/man/fr/man1/dos2unix.po b/man/fr/man1/dos2unix.po
index da1c0f6..c2023a2 100644
--- a/man/fr/man1/dos2unix.po
+++ b/man/fr/man1/dos2unix.po
@@ -4,9 +4,9 @@
# Frédéric Marchal <fmarchal@perso.be>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-04 11:35+0100\n"
+"Project-Id-Version: dos2unix-man-7.3-beta9\n"
+"POT-Creation-Date: 2015-08-13 09:03+0200\n"
+"PO-Revision-Date: 2015-08-15 12:56+0200\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -234,56 +234,136 @@ msgstr "Change le mode de conversion. MODE_CONV prend l'une des valeurs: I<ascii
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr "B<-D, --display-enc ENCODAGE>"
+
+#. type: textblock
+#: dos2unix.pod:157
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Choisi l'encodage des textes affichés. L'ENCODAGE peut être : I<ansi>, I<unicode>, I<utf8>. La valeur par défaut est ansi."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr "Cette option est uniquement disponible dans dos2unix pour Windows avec support pour les noms de fichiers Unicode. Cette option n'a aucun effet sur les noms de fichiers lus et écrits. Son effet se limite à leur affichage."
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr "Il existe plusieurs méthodes pour afficher du texte dans une console Windows selon l'encodage du texte. Elles ont toutes leurs propres avantages et désavantages."
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr "B<ansi>"
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr "La méthode par défaut de dos2unix est d'utiliser du texte encodé en ANSI. Elle a l'avantage d'être rétro compatible. Elle fonctionne avec des polices raster ou TrueType. Dans certaines régions, vous pouvez avoir besoin d'utiliser la commande C<chcp> pour remplacer le code page DOS OEM actif par le code ANSI système de Windows car dos2unix utilise le code page système de Windows."
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr "Le désavantage de ansi est que les noms de fichiers internationaux avec des caractères en dehors du code page système par défaut ne sont pas affichés correctement. Vous verrez un point d'interrogation ou un mauvais symbole à leur place. Cette méthode est acceptable si vous ne travaillez pas avec des noms de fichiers étrangers."
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr "B<unicode>"
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr "L'avantage de l'encodage unicode (le nom de Windows pour UTF-16) est que le texte est habituellement affiché correctement. Il n'est pas nécessaire de changer le code page actif. Vous pouvez avoir besoin de remplacer la police de la console par une police TrueType pour afficher les caractères internationaux correctement. Lorsqu'un caractère n'est pas inclus dans la police TrueType, il sera généralement remplacé par un petit carré, parfois avec un point d'interrogation à l'intérieur."
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr "Lorsque vous utilisez la console ConEmu, les textes sont affichés correctement car ConEmu sélectionne automatiquement une bonne police."
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr "Le désavantage de unicode est qu'il n'est pas compatible avec ASCII. La sortie n'est pas facile à gérer quand vous la redirigez vers un autre programme ou un fichier. Rediriger la sortie vers un fichier ne donne pas un fichier UTF-16 correct."
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr "B<utf8>"
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr "L'avantage de utf8 est qu'il est compatible avec ASCII et, lorsque vous le redirigez vers un fichier, vous obtenez un fichier UTF-8 correct. Vous devez utiliser une police TrueType dans la console. Avec une police TrueType, le texte est affiché comme avec un encodage C<unicode>."
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr "Le désavantage est que, si vous utilisez la police raster par défaut, tous les caractères non ASCII sont mal affichés. Pas uniquement les noms de fichiers unicode ! Les messages traduits deviennent inintelligibles. Sous Windows configuré pour une région de l'est de l'Asie, vous pouvez observer énormément de scintillements dans la console quand des messages sont affichés."
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr "Dans une console ConEmu, l'encodage utf8 fonctionne bien."
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr "L'encodage par défaut peut être changé en assignant la valeur C<unicode> ou C<utf8> à la variable d'environnement DOS2UNIX_DISPLAY_ENC."
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Force la conversion de fichiers binaires."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "Sous Windows, les fichiers UTF-16 sont convertis en UTF-8 par défaut sans considération pour les paramètres de la localisation. Utilisez cette option pour convertir UTF-16 en GB18030. Cette option n'est disponible que sous Windows. Consultez aussi la section GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Affiche l'aide et s'arrête."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[FANIONS], --info[=FANIONS] FICHIER …>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Affiche les informations du fichier. Aucune conversion n'est réalisée."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "Les informations suivantes sont affichées dans cet ordre: le nombre de sauts de ligne DOS, le nombre de sauts de ligne Unix, le nombre de sauts de ligne Mac, la marque d'ordre des octets, texte ou binaire, nom du fichier."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Exemple de sortie :"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -307,87 +387,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Affiche le nombre de sauts de ligne DOS."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Affiche le nombre de sauts de ligne Unix."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Affiche le nombre de sauts de ligne Mac."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "Afficher la marque d'ordre des octets."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Affiche si le fichier est texte ou binaire."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Affiche uniquement les fichiers qui seraient convertis."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Avec le fanion C<c>, dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Exemples:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Afficher les informations pour tous les fichier *.txt :"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -397,12 +477,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Afficher uniquement le nombre de sauts de ligne DOS et Unix :"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -412,12 +492,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Montrer uniquement la marque d'ordre des octets :"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -427,12 +507,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Liste les fichiers qui ont des sauts de ligne DOS :"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -442,12 +522,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Liste les fichiers qui ont des sauts de ligne Unix :"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -457,307 +537,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "La date du fichier de sortie est la même que celle du fichier d'entrée."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "Affiche la licence du programme."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Ajoute des sauts de lignes additionnels."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: Seuls les sauts de lignes du DOS sont changés en deux sauts de lignes de Unix. En mode Mac, seuls les sauts de lignes Mac sont changés en deux sauts de lignes Unix."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: Seuls les sauts de lignes Unix sont changés en deux sauts de lignes du DOS. En mode Mac, les sauts de lignes Unix sont remplacés par deux sauts de lignes Mac."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. Par défaut une BOM UTF-8 est écrite."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Lorsque le fichier d'entrée est en UTF-16 et que l'option C<-u> est utilisée, une BOM UTF-16 est écrite."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est ni UTF-8 ni UTF-16. Consultez également la section UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
-msgstr "B<-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …>"
+msgstr "B<-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les jokers I<ne> doivent I<pas> être utilisés ou vous I<perdrez> vos fichiers."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le umask(1) de la personne qui exécute la conversion."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile FICHIER …>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent être utilisés."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier original. Idem quand le fichier est converti par un utilisateur qui a la permission d'écrire dans le fichier (par exemple, root). La conversion est interrompue si il n'est pas possible de conserver les valeurs d'origine. Le changement de propriétaire pourrait signifier que le propriétaire original n'est plus en mesure de lire le fichier. Le changement de groupe pourrait être un risque pour la sécurité. Le fichier pourrait être rendu accessible en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Mode silencieux. Supprime les avertissements et les messages. La valeur de sortie est zéro sauf quand de mauvaises options sont utilisées sur la ligne de commande."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "Supprime la marque d'ordre des octets (BOM). N'écrit pas la BOM dans le fichier de sortie. Ceci est le comportement par défaut lorsque les sauts de lignes sont convertis au format Unix. Consultez aussi l'option C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Ignore les fichiers binaires (par défaut)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier de sortie sera écrit dans le même encodage UTF-16 (petit ou grand boutien) que le fichier d'entrée. Ceci évite la transformation en UTF-8. Une BOM UTF-16 sera écrite en conséquent. Cette option peut être désactivée avec l'option C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Suppose que le fichier d'entrée est au format UTF-16LE."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Quand il y a un indicateur d'ordre des octets dans le fichier d'entrée, l'indicateur a priorité sur cette option."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Si vous vous êtes trompé sur le format du fichier d'entrée (par exemple, ce n'était pas un fichier UTF16-LE) et que la conversion réussi, vous obtiendrez un fichier UTF-8 contenant le mauvais texte. Vous pouvez récupérer le fichier original avec iconv(1) en convertissant le fichier de sortie UTF-8 vers du UTF-16LE."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "La présupposition de l'UTF-16LE fonctionne comme un I<mode de conversion>. En utilisant le mode I<ascii> par défaut, UTF-16LE n'est plus présupposé."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Suppose que le fichier d'entrée est au format UTF-16BE."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Cette option fonctionne comme l'option C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Affiche des messages verbeux. Des informations supplémentaires sont affichées à propos des marques d'ordre des octets et du nombre de sauts de lignes convertis."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Suit les liens symboliques et convertit les cibles."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Remplace les liens symboliques par les fichiers convertis (les fichiers cibles originaux restent inchangés)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Ne change pas les liens symboliques ni les cibles (par défaut)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Affiche les informations de version puis arrête."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "MODE MAC"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "En mode normal, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes DOS ne sont pas changés."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Pour fonctionner en mode Mac, utilisez l'option en ligne de commande C<-c mac> ou utilisez les commandes C<mac2unix> ou C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "MODES DE CONVERSION"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "En mode C<ascii>, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "Dans ce mode, tous les caractères 8 bits non ASCII (avec des valeurs entre 128 et 255) sont remplacés par une espace 7 bits."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Les caractères sont convertis entre un jeu de caractères DOS (code page) et le jeu de caractères ISO-8859-1 (Latin-1) de Unix. Les caractères DOS sans équivalent ISO-8859-1, pour lesquels la conversion n'est pas possible, sont remplacés par un point. La même chose est valable pour les caractères ISO-8859-1 sans équivalent DOS."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Quand seule l'option C<-iso> est utilisée, dos2unix essaie de déterminer le code page actif. Quand ce n'est pas possible, dos2unix utilise le code page CP437 par défaut qui est surtout utilisé aux USA. Pour forcer l'utilisation d'un code page spécifique, utilisez les options C<-437> (US), C<-850> (Europe de l'ouest), C<-860> (portugais), C<-863> (français canadien) ou C<-865> (nordique). Le code page CP1252 de Windows (Europe de l'ouest) est également supporté avec l'option C<-1252>. Pour d'autres codes pages, utilisez dos2unix avec iconv(1). Iconv supporte une longue liste de codages de caractères."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "N'utilisez jamais la conversion ISO sur des fichiers textes Unicode. Cela va corrompre les fichiers encodés en UTF-8."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Quelques exemples:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Convertir du code page par défaut du DOS au Latin-1 Unix :"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -767,12 +847,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Convertir du CP850 du DOS au Latin-1 Unix :"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -782,12 +862,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Convertir du CP1252 de Windows au Latin-1 de Unix :"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -797,12 +877,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Convertir le CP1252 de Windows en UTF-8 de Unix (Unicode) :"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -812,12 +892,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Convertir du Latin-1 de Unix au code page par défaut de DOS :"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -827,12 +907,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Convertir le Latin-1 de Unix en CP850 du DOS :"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -842,12 +922,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Convertir le Latin-1 de Unix en CP1252 de Windows :"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -857,12 +937,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Convertir le UTF-8 de Unix (Unicode) en CP1252 de Windows :"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -872,127 +952,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Consultez aussi L<http://czyborra.com/charsets/codepages.html> et L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Codages"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Il existe plusieurs codages Unicode. Sous Unix et Linux, les fichiers sont généralement codés en UTF-8. Sous Windows, les fichiers textes Unicode peuvent être codés en UTF-8, UTF-16 ou UTF-16 gros boutien mais ils sont majoritairement codés au format UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Conversion"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes normaux."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible avec l'ASCII."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix et unix2dos, avec le support pour l'Unicode UTF-16, peuvent lire les fichiers textes codés sous forme petit boutien ou gros boutien. Pour savoir si dos2unix a été compilé avec le support UTF-16 tapez C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "Sous Unix/Linux, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères de la localisation. Utilisez locale(1) pour découvrir quel encodage de caractères est utilisé. Lorsque la conversion n'est pas possible, une erreur de conversion est produite et le fichier est abandonné."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "Sous Windows, les fichiers UTF-16 sont convertis par défaut en UTF-8. Les fichiers textes formatés en UTF-8 sont bien supportés sous Windows et Unix/Linux."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Les codages UTF-16 et UTF-8 sont parfaitement compatibles. Il n'y a pas de pertes lors de la conversion. Lorsqu'une erreur de conversion UTF-16 vers UTF-8 survient, par exemple, quand le fichier d'entrée UTF-16 contient une erreur, le fichier est ignoré."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Quand l'option C<-u> est utilisée, le fichier de sortie est écrit dans le même encodage UTF-16 que le fichier d'entrée. L'option C<-u> empêche la conversion en UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers UTF-8 en UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Marque d'ordre des octets"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L<http://fr.wikipedia.org/wiki/Indicateur_d%27ordre_des_octets>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix ne peut détecter que le fichier est au format UTF-16 si le fichier n'a pas de BOM. Quand le fichier UTF-16 n'a pas cet indicateur, dos2unix voit le fichier comme un fichier binaire."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Utilisez l'option C<-ul> ou C<-ub> pour convertir un fichier UTF-16 sans BOM."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2unix, par défaut, n'écrit pas de BOM dans le fichier de sortie. Avec l'option C<-b>, Dos2unix écrit une BOM quand le fichier d'entrée a une BOM."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos écrit par défaut une BOM dans le fichier de sortie quand le fichier d'entrée a une BOM. Utilisez l'option C<-r> pour supprimer la BOM."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix et unix2dos écrivent toujours une BOM quand l'option C<-m> est utilisée."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr "Noms de fichiers unicode sous Windows"
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr "Dos2unix supporte, en option, la lecture et l'écriture de noms de fichiers Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix peut ouvrir des fichiers qui ont, dans leur nom, des caractères n'appartenant pas au code page système ANSI par défaut. Pour voir si dos2unix pour Windows a été compilé avec le support des noms de fichiers Unicode, tapez C<dos2unix -V>."
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr "Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans une console Windows. Voyez l'option C<-D>, C<--display-enc>. Les noms de fichiers peuvent être mal affichés dans la console mais les fichiers seront écrits avec les bons noms."
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Exemples Unicode"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Convertir de l'UTF-16 Windows (avec BOM) vers l'UTF-8 de Unix :"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1002,12 +1097,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Convertir de l'UTF-16LE de Windows (sans BOM) vers l'UTF-8 de Unix :"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1017,12 +1112,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-8 de Windows avec BOM :"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1032,12 +1127,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-16 de Windows :"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1047,47 +1142,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L<http://fr.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l'encodage de la localisation est GB18030. Notez que cela ne fonctionnera que si l'emplacement est en Chine. Autrement dit, dans la localisation anglaise britannique C<en_GB.GB18030>, la conversion de UTF-16 vers GB18030 ne fonctionnera pas mais une localisation chinoise C<zh_CN.GB18030> fonctionnera."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l'encodage de l'environnement linguistique est GB18030. Notez que cela ne fonctionnera que si l'environnement linguistique est supporté par le système. Utilisez la commande C<locale -a> pour obtenir la liste des environnements linguistiques supportés."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Sous Windows, vous avez besoin de l'option C<-gb> pour convertir UTF-16 en GB18030."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "Les fichiers encodés en GB18030 peuvent avoir une marque d'ordre des octets, comme les fichiers Unicode."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "EXEMPLES"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Lire l'entrée depuis « stdin » et écrire la sortie vers « stdout » :"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1099,12 +1194,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Convertir et remplacer a.txt. Convertir et remplace b.txt :"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1116,12 +1211,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Convertir et remplacer a.txt en mode de conversion ascii :"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1131,12 +1226,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Convertir et remplacer a.txt en mode de conversion ascii. Convertir et remplacer b.txt en mode de conversion 7 bits :"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1150,12 +1245,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Convertir a.txt depuis le format Mac vers le format Unix :"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1167,12 +1262,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Convertir a.txt du format Unix au format Mac :"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1184,12 +1279,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Convertir et remplacer a.txt tout en conservant la date originale :"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1201,12 +1296,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Convertir a.txt et écrire dans e.txt :"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1216,12 +1311,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Convertir a.txt et écrire dans e.txt. La date de e.txt est la même que celle de a.txt :"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1231,12 +1326,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Convertir et remplacer a.txt. Convertir b.txt et écrire dans e.txt :"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1248,12 +1343,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Convertir c.txt et écrire dans e.txt. Convertir et remplacer a.txt. Convertir et remplacer b.txt. Convertir d.txt et écrire dans f.txt :"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1263,42 +1358,59 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "CONVERSIONS RÉCURSIVES"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Utilisez dos2unix avec les commandes find(1) et xargs(1) pour convertir récursivement des fichiers textes dans une arborescence de répertoires. Par exemple, pour convertir tous les fichiers .txt dans les répertoires sous le répertoire courant, tapez:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:690
+#, no-wrap
+msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr "En ligne de commande sous Windows, la commande suivante peut être utilisée :"
+
+#. type: verbatim
+#: dos2unix.pod:694
#, no-wrap
msgid ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
+" find /R %G in \n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "PARAMÈTRES LINGUISTIQUES"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "La langue principale est sélectionnée par la variable d'environnement LANG. La variable LANG est composée de plusieurs parties. La première partie est le code de la langue en minuscules. La deuxième partie est le code du pays en majuscules précédé d'un souligné. Elle est facultative. Il y a aussi une troisième partie facultative qui est le codage des caractères précédé par un point. Voici quelques exemples pour un shell au standard POSIX:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1320,47 +1432,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "La liste complète des codes de langues et de pays est dans le manuel de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C<LANGUAGE=fr:en>. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Grâce à la variable d'environnement DOS2UNIX_LOCALEDIR, la variable LOCALEDIR compilée dans l'application peut être remplacée. LOCALEDIR est utilisée pour trouver les fichiers de langue. La valeur par défaut de GNU est C</usr/local/share/locale>. L'option B<--version> affiche la valeur de LOCALEDIR utilisée."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Exemple (shell POSIX):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1370,72 +1482,72 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "VALEUR DE RETOUR"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "Zéro est retourné en cas de succès. Si une erreur système se produit, la dernière erreur système est retournée. Pour les autres erreurs, 1 est renvoyé."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "La valeur de sortie est toujours zéro en mode silencieux sauf quand de mauvaises options sont utilisées sur la ligne de commande."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "STANDARDS"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://fr.wikipedia.org/wiki/Fichier_texte>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://fr.wikipedia.org/wiki/Retour_chariot>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://fr.wikipedia.org/wiki/Fin_de_ligne>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://fr.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTEURS"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mode mac2unix) - <wuebben@kde.org>, Christian Wurll (ajout de saut de ligne supplémentaire) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (Mainteneur)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Page du projet: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Page SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/fr/man1/dos2unix.pod b/man/fr/man1/dos2unix.pod
index 860cbef..d0d44ab 100644
--- a/man/fr/man1/dos2unix.pod
+++ b/man/fr/man1/dos2unix.pod
@@ -128,6 +128,77 @@ aussi l'option C<-r>.
Change le mode de conversion. MODE_CONV prend l'une des valeurs: I<ascii>,
I<7bit>, I<iso>, I<mac>. Ascii est la valeur par défaut.
+=item B<-D, --display-enc ENCODAGE>
+
+Choisi l'encodage des textes affichés. L'ENCODAGE peut être : I<ansi>,
+I<unicode>, I<utf8>. La valeur par défaut est ansi.
+
+Cette option est uniquement disponible dans dos2unix pour Windows avec
+support pour les noms de fichiers Unicode. Cette option n'a aucun effet sur
+les noms de fichiers lus et écrits. Son effet se limite à leur affichage.
+
+Il existe plusieurs méthodes pour afficher du texte dans une console Windows
+selon l'encodage du texte. Elles ont toutes leurs propres avantages et
+désavantages.
+
+
+
+=over 4
+
+=item B<ansi>
+
+La méthode par défaut de dos2unix est d'utiliser du texte encodé en
+ANSI. Elle a l'avantage d'être rétro compatible. Elle fonctionne avec des
+polices raster ou TrueType. Dans certaines régions, vous pouvez avoir besoin
+d'utiliser la commande C<chcp> pour remplacer le code page DOS OEM actif par
+le code ANSI système de Windows car dos2unix utilise le code page système de
+Windows.
+
+Le désavantage de ansi est que les noms de fichiers internationaux avec des
+caractères en dehors du code page système par défaut ne sont pas affichés
+correctement. Vous verrez un point d'interrogation ou un mauvais symbole à
+leur place. Cette méthode est acceptable si vous ne travaillez pas avec des
+noms de fichiers étrangers.
+
+=item B<unicode>
+
+L'avantage de l'encodage unicode (le nom de Windows pour UTF-16) est que le
+texte est habituellement affiché correctement. Il n'est pas nécessaire de
+changer le code page actif. Vous pouvez avoir besoin de remplacer la police
+de la console par une police TrueType pour afficher les caractères
+internationaux correctement. Lorsqu'un caractère n'est pas inclus dans la
+police TrueType, il sera généralement remplacé par un petit carré, parfois
+avec un point d'interrogation à l'intérieur.
+
+Lorsque vous utilisez la console ConEmu, les textes sont affichés
+correctement car ConEmu sélectionne automatiquement une bonne police.
+
+Le désavantage de unicode est qu'il n'est pas compatible avec ASCII. La
+sortie n'est pas facile à gérer quand vous la redirigez vers un autre
+programme ou un fichier. Rediriger la sortie vers un fichier ne donne pas un
+fichier UTF-16 correct.
+
+=item B<utf8>
+
+L'avantage de utf8 est qu'il est compatible avec ASCII et, lorsque vous le
+redirigez vers un fichier, vous obtenez un fichier UTF-8 correct. Vous devez
+utiliser une police TrueType dans la console. Avec une police TrueType, le
+texte est affiché comme avec un encodage C<unicode>.
+
+Le désavantage est que, si vous utilisez la police raster par défaut, tous
+les caractères non ASCII sont mal affichés. Pas uniquement les noms de
+fichiers S<unicode !> Les messages traduits deviennent inintelligibles. Sous
+Windows configuré pour une région de l'est de l'Asie, vous pouvez observer
+énormément de scintillements dans la console quand des messages sont
+affichés.
+
+Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+
+=back
+
+L'encodage par défaut peut être changé en assignant la valeur C<unicode> ou
+C<utf8> à la variable d'environnement DOS2UNIX_DISPLAY_ENC.
+
=item B<-f, --force>
Force la conversion de fichiers binaires.
@@ -248,11 +319,11 @@ Lorsque le fichier d'entrée est en UTF-16 et que l'option C<-u> est
utilisée, une BOM UTF-16 est écrite.
N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est
-ni UTF-8 ni UTF-16. Consultez également la section UNICODE.
+ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section UNICODE.
-=item B<-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …>
+=item B<-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …>
Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la
sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être
@@ -518,6 +589,20 @@ d'entrée a une BOM. Utilisez l'option C<-r> pour supprimer la BOM.
Dos2unix et unix2dos écrivent toujours une BOM quand l'option C<-m> est
utilisée.
+=head2 Noms de fichiers unicode sous Windows
+
+Dos2unix supporte, en option, la lecture et l'écriture de noms de fichiers
+Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix
+peut ouvrir des fichiers qui ont, dans leur nom, des caractères
+n'appartenant pas au code page système ANSI par défaut. Pour voir si
+dos2unix pour Windows a été compilé avec le support des noms de fichiers
+Unicode, tapez C<dos2unix -V>.
+
+Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans une
+console Windows. Voyez l'option C<-D>, C<--display-enc>. Les noms de
+fichiers peuvent être mal affichés dans la console mais les fichiers seront
+écrits avec les bons noms.
+
=head2 Exemples Unicode
Convertir de l'UTF-16 Windows (avec BOM) vers l'UTF-8 de Unix :
@@ -548,11 +633,10 @@ compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de
Windows aussi connu comme GBK.
Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand
-l'encodage de la localisation est GB18030. Notez que cela ne fonctionnera
-que si l'emplacement est en Chine. Autrement dit, dans la localisation
-anglaise britannique C<en_GB.GB18030>, la conversion de UTF-16 vers GB18030
-ne fonctionnera pas mais une localisation chinoise C<zh_CN.GB18030>
-fonctionnera.
+l'encodage de l'environnement linguistique est GB18030. Notez que cela ne
+fonctionnera que si l'environnement linguistique est supporté par le
+système. Utilisez la commande C<locale -a> pour obtenir la liste des
+environnements linguistiques supportés.
Sous Windows, vous avez besoin de l'option C<-gb> pour convertir UTF-16 en
GB18030.
@@ -624,7 +708,13 @@ récursivement des fichiers textes dans une arborescence de répertoires. Par
exemple, pour convertir tous les fichiers .txt dans les répertoires sous le
répertoire courant, tapez:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+En ligne de commande sous Windows, la commande suivante peut être utilisée :
+
+ for /R %G in (*.txt) do dos2unix "%G"
+ find /R %G in
+
=head1 PARAMÈTRES LINGUISTIQUES
diff --git a/man/fr/man1/dos2unix.txt b/man/fr/man1/dos2unix.txt
index 891c497..54a0de8 100644
--- a/man/fr/man1/dos2unix.txt
+++ b/man/fr/man1/dos2unix.txt
@@ -93,6 +93,74 @@ OPTIONS
Change le mode de conversion. MODE_CONV prend l'une des valeurs:
*ascii*, *7bit*, *iso*, *mac*. Ascii est la valeur par défaut.
+ -D, --display-enc ENCODAGE
+ Choisi l'encodage des textes affichés. L'ENCODAGE peut être :
+ *ansi*, *unicode*, *utf8*. La valeur par défaut est ansi.
+
+ Cette option est uniquement disponible dans dos2unix pour Windows
+ avec support pour les noms de fichiers Unicode. Cette option n'a
+ aucun effet sur les noms de fichiers lus et écrits. Son effet se
+ limite à leur affichage.
+
+ Il existe plusieurs méthodes pour afficher du texte dans une console
+ Windows selon l'encodage du texte. Elles ont toutes leurs propres
+ avantages et désavantages.
+
+ ansi
+ La méthode par défaut de dos2unix est d'utiliser du texte encodé
+ en ANSI. Elle a l'avantage d'être rétro compatible. Elle
+ fonctionne avec des polices raster ou TrueType. Dans certaines
+ régions, vous pouvez avoir besoin d'utiliser la commande "chcp"
+ pour remplacer le code page DOS OEM actif par le code ANSI
+ système de Windows car dos2unix utilise le code page système de
+ Windows.
+
+ Le désavantage de ansi est que les noms de fichiers
+ internationaux avec des caractères en dehors du code page
+ système par défaut ne sont pas affichés correctement. Vous
+ verrez un point d'interrogation ou un mauvais symbole à leur
+ place. Cette méthode est acceptable si vous ne travaillez pas
+ avec des noms de fichiers étrangers.
+
+ unicode
+ L'avantage de l'encodage unicode (le nom de Windows pour UTF-16)
+ est que le texte est habituellement affiché correctement. Il
+ n'est pas nécessaire de changer le code page actif. Vous pouvez
+ avoir besoin de remplacer la police de la console par une police
+ TrueType pour afficher les caractères internationaux
+ correctement. Lorsqu'un caractère n'est pas inclus dans la
+ police TrueType, il sera généralement remplacé par un petit
+ carré, parfois avec un point d'interrogation à l'intérieur.
+
+ Lorsque vous utilisez la console ConEmu, les textes sont
+ affichés correctement car ConEmu sélectionne automatiquement une
+ bonne police.
+
+ Le désavantage de unicode est qu'il n'est pas compatible avec
+ ASCII. La sortie n'est pas facile à gérer quand vous la
+ redirigez vers un autre programme ou un fichier. Rediriger la
+ sortie vers un fichier ne donne pas un fichier UTF-16 correct.
+
+ utf8
+ L'avantage de utf8 est qu'il est compatible avec ASCII et,
+ lorsque vous le redirigez vers un fichier, vous obtenez un
+ fichier UTF-8 correct. Vous devez utiliser une police TrueType
+ dans la console. Avec une police TrueType, le texte est affiché
+ comme avec un encodage "unicode".
+
+ Le désavantage est que, si vous utilisez la police raster par
+ défaut, tous les caractères non ASCII sont mal affichés. Pas
+ uniquement les noms de fichiers unicode ! Les messages traduits
+ deviennent inintelligibles. Sous Windows configuré pour une
+ région de l'est de l'Asie, vous pouvez observer énormément de
+ scintillements dans la console quand des messages sont affichés.
+
+ Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+
+ L'encodage par défaut peut être changé en assignant la valeur
+ "unicode" ou "utf8" à la variable d'environnement
+ DOS2UNIX_DISPLAY_ENC.
+
-f, --force
Force la conversion de fichiers binaires.
@@ -192,9 +260,10 @@ OPTIONS
utilisée, une BOM UTF-16 est écrite.
N'utilisez jamais cette option quand l'encodage du fichier de sortie
- n'est ni UTF-8 ni UTF-16. Consultez également la section UNICODE.
+ n'est ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section
+ UNICODE.
- -n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …
+ -n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …
Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et
écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des
fichiers doivent être indiqués par paires. Les jokers *ne* doivent
@@ -437,6 +506,19 @@ UNICODE
Dos2unix et unix2dos écrivent toujours une BOM quand l'option "-m" est
utilisée.
+ Noms de fichiers unicode sous Windows
+ Dos2unix supporte, en option, la lecture et l'écriture de noms de
+ fichiers Unicode dans la ligne de commande de Windows. Cela signifie que
+ dos2unix peut ouvrir des fichiers qui ont, dans leur nom, des caractères
+ n'appartenant pas au code page système ANSI par défaut. Pour voir si
+ dos2unix pour Windows a été compilé avec le support des noms de fichiers
+ Unicode, tapez "dos2unix -V".
+
+ Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans
+ une console Windows. Voyez l'option "-D", "--display-enc". Les noms de
+ fichiers peuvent être mal affichés dans la console mais les fichiers
+ seront écrits avec les bons noms.
+
Exemples Unicode
Convertir de l'UTF-16 Windows (avec BOM) vers l'UTF-8 de Unix :
@@ -465,11 +547,10 @@ GB18030
page 936 de Windows aussi connu comme GBK.
Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand
- l'encodage de la localisation est GB18030. Notez que cela ne
- fonctionnera que si l'emplacement est en Chine. Autrement dit, dans la
- localisation anglaise britannique "en_GB.GB18030", la conversion de
- UTF-16 vers GB18030 ne fonctionnera pas mais une localisation chinoise
- "zh_CN.GB18030" fonctionnera.
+ l'encodage de l'environnement linguistique est GB18030. Notez que cela
+ ne fonctionnera que si l'environnement linguistique est supporté par le
+ système. Utilisez la commande "locale -a" pour obtenir la liste des
+ environnements linguistiques supportés.
Sous Windows, vous avez besoin de l'option "-gb" pour convertir UTF-16
en GB18030.
@@ -539,7 +620,13 @@ CONVERSIONS RÉCURSIVES
Par exemple, pour convertir tous les fichiers .txt dans les répertoires
sous le répertoire courant, tapez:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ En ligne de commande sous Windows, la commande suivante peut être
+ utilisée :
+
+ for /R %G in (*.txt) do dos2unix "%G"
+ find /R %G in
PARAMÈTRES LINGUISTIQUES
LANG
diff --git a/man/man1/dos2unix-man.pot b/man/man1/dos2unix-man.pot
index 00cbfba..bbdbac2 100644
--- a/man/man1/dos2unix-man.pot
+++ b/man/man1/dos2unix-man.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-11 20:08+0100\n"
+"POT-Creation-Date: 2015-08-24 09:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -260,21 +260,140 @@ msgstr ""
#. type: =item
#: dos2unix.pod:155
-msgid "B<-f, --force>"
+msgid "B<-D, --display-enc ENCODING>"
msgstr ""
#. type: textblock
#: dos2unix.pod:157
+msgid ""
+"Set encoding of displayed text. Where ENCODING is one of: I<ansi>, "
+"I<unicode>, I<utf8> with ansi being the default."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid ""
+"This option is only available in dos2unix for Windows with Unicode file name "
+"support. This option has no effect on the actual file names read and "
+"written, only on how they are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid ""
+"There are several methods for displaying text in a Windows console based on "
+"the encoding of the text. They all have their own advantages and "
+"disadvantages."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid ""
+"Dos2unix's default method is to use ANSI encoded text. The advantage is that "
+"it is backwards compatible. It works with raster and TrueType fonts. In some "
+"regions you may need to change the active DOS OEM code page to the Windows "
+"system ANSI code page using the C<chcp> command, because dos2unix uses the "
+"Windows system code page."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid ""
+"The disadvantage of ansi is that international file names with characters "
+"not inside the system default code page are not displayed properly. You will "
+"see a question mark, or a wrong symbol instead. When you don't work with "
+"foreign file names this method is OK."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid ""
+"The advantage of unicode (the Windows name for UTF-16) encoding is that text "
+"is usually properly displayed. There is no need to change the active code "
+"page. You may need to set the console's font to a TrueType font to have "
+"international characters displayed properly. When a character is not "
+"included in the TrueType font you usually see a small square, sometimes with "
+"a question mark in it."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid ""
+"When you use the ConEmu console all text is displayed properly, because "
+"ConEmu automatically selects a good font."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid ""
+"The disadvantage of unicode is that it is not compatible with ASCII. The "
+"output is not easy to handle when you redirect it to another program or a "
+"file. Redirection to a file does not give a correct UTF-16 file."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid ""
+"The advantage of utf8 is that it is compatible with ASCII and when you "
+"redirect it to a file you get a proper UTF-8 file. You need to set the "
+"console's font to a TrueType font. With a TrueType font the text is "
+"displayed similar as with the C<unicode> encoding."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid ""
+"The disadvantage is that when you use the default raster font all non-ASCII "
+"characters are displayed wrong. Not only unicode file names, but also "
+"translated messages become unreadable. On Windows configured for an "
+"East-Asian region you may see a lot of flickering of the console when the "
+"messages are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid ""
+"The default encoding can be changed with environment variable "
+"DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:219
+msgid "B<-f, --force>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr ""
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid ""
"On Windows UTF-16 files are by default converted to UTF-8, regardless of the "
"locale setting. Use this option to convert UTF-16 files to GB18030. This "
@@ -282,27 +401,27 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr ""
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr ""
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid ""
"The following information is printed, in this order: number of DOS line "
"breaks, number of Unix line breaks, number of Mac line breaks, byte order "
@@ -310,12 +429,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -330,91 +449,91 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid ""
"Optionally extra flags can be set to change the output. One or more flags "
"can be added."
msgstr ""
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr ""
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr ""
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr ""
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid ""
"With the C<c> flag dos2unix will print only the files that contain DOS line "
"breaks, unix2dos will print only file names that have Unix line breaks."
msgstr ""
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr ""
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -422,12 +541,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -435,12 +554,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -448,12 +567,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -461,12 +580,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -474,82 +593,82 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr ""
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr ""
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr ""
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid ""
"B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In "
"Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr ""
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid ""
"B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In "
"Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid ""
"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is "
"written."
msgstr ""
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid ""
"When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM "
"will be written."
msgstr ""
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:335
msgid ""
-"Never use this option when the output encoding is other than UTF-8 or "
-"UTF-16. See also section UNICODE."
+"Never use this option when the output encoding is other than UTF-8, UTF-16, "
+"or GB18030. See also section UNICODE."
msgstr ""
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid ""
"New file mode. Convert file INFILE and write output to file OUTFILE. File "
"names must be given in pairs and wildcard names should I<not> be used or you "
@@ -557,7 +676,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid ""
"The person who starts the conversion in new file (paired) mode will be the "
"owner of the converted file. The read/write permissions of the new file will "
@@ -566,19 +685,19 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid ""
"Old file mode. Convert file FILE and overwrite output to it. The program "
"defaults to run in this mode. Wildcard names may be used."
msgstr ""
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid ""
"In old file (in-place) mode the converted file gets the same owner, group, "
"and read/write permissions as the original file. Also when the file is "
@@ -592,24 +711,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid ""
"Quiet mode. Suppress all warnings and messages. The return value is zero. "
"Except when wrong command-line options are used."
msgstr ""
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid ""
"Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This "
"is the default behavior when converting to Unix line breaks. See also "
@@ -617,22 +736,22 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr ""
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid ""
"Keep the original UTF-16 encoding of the input file. The output file will be "
"written in the same UTF-16 encoding, little or big endian, as the input "
@@ -641,24 +760,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr ""
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid ""
"When there is a Byte Order Mark in the input file the BOM has priority over "
"this option."
msgstr ""
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid ""
"When you made a wrong assumption (the input file was not in UTF-16LE format) "
"and the conversion succeeded, you will get an UTF-8 output file with wrong "
@@ -667,126 +786,126 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid ""
"The assumption of UTF-16LE works as a I<conversion mode>. By switching to "
"the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr ""
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr ""
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr ""
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid ""
"Display verbose messages. Extra information is displayed about Byte Order "
"Marks and the amount of converted line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr ""
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid ""
"Replace symbolic links with converted files (original target files remain "
"unchanged)."
msgstr ""
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr ""
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr ""
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr ""
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid ""
"In normal mode line breaks are converted from DOS to Unix and vice versa. "
"Mac line breaks are not converted."
msgstr ""
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid ""
"In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS "
"line breaks are not changed."
msgstr ""
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid ""
"To run in Mac mode use the command-line option C<-c mac> or use the commands "
"C<mac2unix> or C<unix2mac>."
msgstr ""
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr ""
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid ""
"In mode C<ascii> only line breaks are converted. This is the default "
"conversion mode."
msgstr ""
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid ""
"Although the name of this mode is ASCII, which is a 7 bit standard, the "
"actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 "
@@ -794,24 +913,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid ""
"In this mode all 8 bit non-ASCII characters (with values from 128 to 255) "
"are converted to a 7 bit space."
msgstr ""
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid ""
"Characters are converted between a DOS character set (code page) and ISO "
"character set ISO-8859-1 (Latin-1) on Unix. DOS characters without "
@@ -820,7 +939,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid ""
"When only option C<-iso> is used dos2unix will try to determine the active "
"code page. When this is not possible dos2unix will use default code page "
@@ -833,24 +952,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid ""
"Never use ISO conversion on Unicode text files. It will corrupt UTF-8 "
"encoded files."
msgstr ""
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr ""
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -858,12 +977,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -871,12 +990,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -884,12 +1003,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -897,12 +1016,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -910,12 +1029,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -923,12 +1042,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -936,12 +1055,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -949,24 +1068,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid ""
"See also L<http://czyborra.com/charsets/codepages.html> and "
"L<http://czyborra.com/charsets/iso8859.html>."
msgstr ""
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr ""
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr ""
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid ""
"There exist different Unicode encodings. On Unix and Linux Unicode files are "
"typically encoded in UTF-8 encoding. On Windows Unicode text files can be "
@@ -975,26 +1094,26 @@ msgid ""
msgstr ""
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr ""
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid ""
"Unicode text files can have DOS, Unix or Mac line breaks, like regular text "
"files."
msgstr ""
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid ""
"All versions of dos2unix and unix2dos can convert UTF-8 encoded files, "
"because UTF-8 was designed for backward compatibility with ASCII."
msgstr ""
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid ""
"Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big "
"endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 "
@@ -1002,7 +1121,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid ""
"On Unix/Linux UTF-16 encoded files are converted to the locale character "
"encoding. Use the locale(1) command to find out what the locale character "
@@ -1011,14 +1130,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid ""
"On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted "
"text files are well supported on both Windows and Unix/Linux."
msgstr ""
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid ""
"UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost "
"in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for "
@@ -1027,7 +1146,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid ""
"When option C<-u> is used, the output file will be written in the same "
"UTF-16 encoding as the input file. Option C<-u> prevents conversion to "
@@ -1035,22 +1154,22 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr ""
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr ""
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr ""
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid ""
"On Windows Unicode text files typically have a Byte Order Mark (BOM), "
"because many Windows programs (including Notepad) add BOMs by default. See "
@@ -1058,14 +1177,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid ""
"On Unix Unicode files typically don't have a BOM. It is assumed that text "
"files are encoded in the locale character encoding."
msgstr ""
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid ""
"Dos2unix can only detect if a file is in UTF-16 format if the file has a "
"BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as "
@@ -1073,41 +1192,65 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr ""
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid ""
"Dos2unix writes by default no BOM in the output file. With option C<-b> "
"Dos2unix writes a BOM when the input file has a BOM."
msgstr ""
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid ""
"Unix2dos writes by default a BOM in the output file when the input file has "
"a BOM. Use option C<-r> to remove the BOM."
msgstr ""
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr ""
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid ""
+"Dos2unix has optional support for reading and writing Unicode file names in "
+"the Windows Command Prompt. That means that dos2unix can open files that "
+"have characters in the name that are not part of the default system ANSI "
+"code page. To see if dos2unix for Windows was built with Unicode file name "
+"support type C<dos2unix -V>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid ""
+"There are some issues with displaying Unicode file names in a Windows "
+"console. See option C<-D>, C<--display-enc>. The file names may be "
+"displayed wrongly in the console, but the files will be written with the "
+"correct name."
+msgstr ""
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr ""
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1115,12 +1258,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1128,12 +1271,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1141,12 +1284,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1154,12 +1297,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr ""
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid ""
"GB18030 is a Chinese government standard. A mandatory subset of the GB18030 "
"standard is officially required for all software products sold in China. See "
@@ -1167,7 +1310,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid ""
"GB18030 is fully compatible with Unicode, and can be considered an unicode "
"transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 "
@@ -1175,37 +1318,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:544
+#: dos2unix.pod:620
msgid ""
"On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding "
-"is set to GB18030. Note that this will only work if the location is set to "
-"China. E.g. in an English British locale setting C<en_GB.GB18030> "
-"conversion of UTF-16 to GB18030 will not work, but in a Chinese "
-"C<zh_CN.GB18030> locale setting it will work."
+"is set to GB18030. Note that this will only work if the locale is supported "
+"by the system. Use command C<locale -a> to get the list of supported "
+"locales."
msgstr ""
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr ""
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr ""
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr ""
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1214,12 +1356,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1228,12 +1370,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1241,14 +1383,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid ""
"Convert and replace a.txt in ascii conversion mode, convert and replace "
"b.txt in 7bit conversion mode:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1258,12 +1400,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1272,12 +1414,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1286,12 +1428,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1300,12 +1442,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1313,12 +1455,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1326,12 +1468,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1340,14 +1482,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid ""
"Convert c.txt and write to e.txt, convert and replace a.txt, convert and "
"replace b.txt, convert d.txt and write to f.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1355,12 +1497,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr ""
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid ""
"Use dos2unix in combination with the find(1) and xargs(1) commands to "
"recursively convert text files in a directory tree structure. For instance "
@@ -1369,25 +1511,38 @@ msgid ""
msgstr ""
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:690
+#, no-wrap
+msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:694
#, no-wrap
msgid ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr ""
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid ""
"The primary language is selected with the environment variable LANG. The "
"LANG variable consists out of several parts. The first part is in small "
@@ -1398,7 +1553,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1412,26 +1567,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid ""
"For a complete list of language and country codes see the gettext manual: "
"L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid ""
"On Unix systems you can use the command locale(1) to get locale specific "
"information."
msgstr ""
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid ""
"With the LANGUAGE environment variable you can specify a priority list of "
"languages, separated by colons. Dos2unix gives preference to LANGUAGE over "
@@ -1443,19 +1598,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid ""
"If you select a language which is not available you will get the standard "
"English messages."
msgstr ""
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid ""
"With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during "
"compilation can be overruled. LOCALEDIR is used to find the language "
@@ -1464,12 +1619,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1477,56 +1632,56 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr ""
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid ""
"On success, zero is returned. When a system error occurs the last system "
"error will be returned. For other errors 1 is returned."
msgstr ""
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid ""
"The return value is always zero in quiet mode, except when wrong "
"command-line options are used."
msgstr ""
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr ""
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr ""
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr ""
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid ""
"Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix "
"mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - "
@@ -1534,21 +1689,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr ""
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr ""
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr ""
diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1
index 8596a9c..d604254 100644
--- a/man/man1/dos2unix.1
+++ b/man/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-01-02" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-13" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -167,6 +167,65 @@ breaks. See also option \f(CW\*(C`\-r\*(C'\fR.
Set conversion mode. Where \s-1CONVMODE\s0 is one of:
\&\fIascii\fR, \fI7bit\fR, \fIiso\fR, \fImac\fR
with ascii being the default.
+.IP "\fB\-D, \-\-display\-enc \s-1ENCODING\s0\fR" 4
+.IX Item "-D, --display-enc ENCODING"
+Set encoding of displayed text. Where \s-1ENCODING\s0 is one of:
+\&\fIansi\fR, \fIunicode\fR, \fIutf8\fR
+with ansi being the default.
+.Sp
+This option is only available in dos2unix for Windows with Unicode
+file name support. This option has no effect on the actual file names
+read and written, only on how they are displayed.
+.Sp
+There are several methods for displaying text in a Windows console based on the
+encoding of the text. They all have their own advantages and disadvantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that it
+is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
+system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
+Windows system code page.
+.Sp
+The disadvantage of ansi is that international file names with characters not
+inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text is
+usually properly displayed. There is no need to change the active code page.
+You may need to set the console's font to a TrueType font to have international
+characters displayed properly. When a character is not included in the TrueType
+font you usually see a small square, sometimes with a question mark in it.
+.Sp
+When you use the ConEmu console all text is displayed properly, because ConEmu
+automatically selects a good font.
+.Sp
+The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The output
+is not easy to handle when you redirect it to another program or a file.
+Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when
+you redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is displayed
+similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
+.Sp
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an East-Asian
+region you may see a lot of flickering of the console when the messages are
+displayed.
+.Sp
+In a ConEmu console the utf8 encoding method works well.
+.RE
+.RS 4
+.Sp
+The default encoding can be changed with environment variable \s-1DOS2UNIX_DISPLAY_ENC\s0
+by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Force conversion of binary files.
@@ -282,8 +341,8 @@ is written.
When the input file is \s-1UTF\-16,\s0 and the option \f(CW\*(C`\-u\*(C'\fR is used, an \s-1UTF\-16
BOM\s0 will be written.
.Sp
-Never use this option when the output encoding is other than \s-1UTF\-8\s0 or \s-1UTF\-16.\s0
-See also section \s-1UNICODE.\s0
+Never use this option when the output encoding is other than \s-1UTF\-8, UTF\-16,\s0 or
+\&\s-1GB18030.\s0 See also section \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1INFILE OUTFILE ...\s0\fR" 4
.IX Item "-n, --newfile INFILE OUTFILE ..."
New file mode. Convert file \s-1INFILE\s0 and write output to file \s-1OUTFILE.\s0
@@ -515,6 +574,17 @@ Unix2dos writes by default a \s-1BOM\s0 in the output file when the input file h
\&\s-1BOM.\s0 Use option \f(CW\*(C`\-r\*(C'\fR to remove the \s-1BOM.\s0
.PP
Dos2unix and unix2dos write always a \s-1BOM\s0 when option \f(CW\*(C`\-m\*(C'\fR is used.
+.SS "Unicode file names on Windows"
+.IX Subsection "Unicode file names on Windows"
+Dos2unix has optional support for reading and writing Unicode file names in the
+Windows Command Prompt. That means that dos2unix can open files that have
+characters in the name that are not part of the default system \s-1ANSI\s0 code page.
+To see if dos2unix for Windows was built with Unicode file name support type
+\&\f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+There are some issues with displaying Unicode file names in a Windows console.
+See option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. The file names may be displayed wrongly in
+the console, but the files will be written with the correct name.
.SS "Unicode examples"
.IX Subsection "Unicode examples"
Convert from Windows \s-1UTF\-16 \s0(with \s-1BOM\s0) to Unix \s-1UTF\-8:\s0
@@ -551,10 +621,8 @@ transformation format. Like \s-1UTF\-8, GB18030\s0 is compatible with \s-1ASCII.
is also compatible with Windows code page 936, also known as \s-1GBK.\s0
.PP
On Unix/Linux \s-1UTF\-16\s0 files are converted to \s-1GB18030\s0 when the locale encoding is
-set to \s-1GB18030.\s0 Note that this will only work if the location is set to China.
-E.g. in an English British locale setting \f(CW\*(C`en_GB.GB18030\*(C'\fR conversion of \s-1UTF\-16\s0
-to \s-1GB18030\s0 will not work, but in a Chinese \f(CW\*(C`zh_CN.GB18030\*(C'\fR locale setting it
-will work.
+set to \s-1GB18030.\s0 Note that this will only work if the locale is supported by the
+system. Use command \f(CW\*(C`locale \-a\*(C'\fR to get the list of supported locales.
.PP
On Windows you need to use option \f(CW\*(C`\-gb\*(C'\fR to convert \s-1UTF\-16\s0 files to \s-1GB18030.\s0
.PP
@@ -643,7 +711,13 @@ recursively convert text files in a directory tree structure. For instance to
convert all .txt files in the directory tree under the current directory type:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+In a Windows Command Prompt the following command can be used:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "LOCALIZATION"
.IX Header "LOCALIZATION"
diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm
index 8fbc87c..d2013b0 100644
--- a/man/man1/dos2unix.htm
+++ b/man/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - DOS/MAC to UNIX and vice versa text file format converter</title>
+<title>dos2unix 7.3 - DOS/MAC to UNIX and vice versa text file format converter</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Encodings">Encodings</a></li>
<li><a href="#Conversion">Conversion</a></li>
<li><a href="#Byte-Order-Mark">Byte Order Mark</a></li>
+ <li><a href="#Unicode-file-names-on-Windows">Unicode file names on Windows</a></li>
<li><a href="#Unicode-examples">Unicode examples</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>Set conversion mode. Where CONVMODE is one of: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> with ascii being the default.</p>
</dd>
+<dt id="D---display-enc-ENCODING"><b>-D, --display-enc ENCODING</b></dt>
+<dd>
+
+<p>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> with ansi being the default.</p>
+
+<p>This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed.</p>
+
+<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+
+<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+
+<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+
+<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+
+<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+
+<p>In a ConEmu console the utf8 encoding method works well.</p>
+
+</dd>
+</dl>
+
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>When the input file is UTF-16, and the option <code>-u</code> is used, an UTF-16 BOM will be written.</p>
-<p>Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE.</p>
+<p>Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE.</p>
</dd>
<dt id="n---newfile-INFILE-OUTFILE"><b>-n, --newfile INFILE OUTFILE ...</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix and unix2dos write always a BOM when option <code>-m</code> is used.</p>
+<h2 id="Unicode-file-names-on-Windows">Unicode file names on Windows</h2>
+
+<p>Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type <code>dos2unix -V</code>.</p>
+
+<p>There are some issues with displaying Unicode file names in a Windows console. See option <code>-D</code>, <code>--display-enc</code>. The file names may be displayed wrongly in the console, but the files will be written with the correct name.</p>
+
<h2 id="Unicode-examples">Unicode examples</h2>
<p>Convert from Windows UTF-16 (with BOM) to Unix UTF-8:</p>
@@ -510,7 +561,7 @@
<p>GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK.</p>
-<p>On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting <code>en_GB.GB18030</code> conversion of UTF-16 to GB18030 will not work, but in a Chinese <code>zh_CN.GB18030</code> locale setting it will work.</p>
+<p>On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command <code>locale -a</code> to get the list of supported locales.</p>
<p>On Windows you need to use option <code>-gb</code> to convert UTF-16 files to GB18030.</p>
@@ -574,7 +625,11 @@
<p>Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>In a Windows Command Prompt the following command can be used:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="LOCALIZATION">LOCALIZATION</h1>
diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod
index 453884d..eb6f8cc 100644
--- a/man/man1/dos2unix.pod
+++ b/man/man1/dos2unix.pod
@@ -152,6 +152,70 @@ Set conversion mode. Where CONVMODE is one of:
I<ascii>, I<7bit>, I<iso>, I<mac>
with ascii being the default.
+=item B<-D, --display-enc ENCODING>
+
+Set encoding of displayed text. Where ENCODING is one of:
+I<ansi>, I<unicode>, I<utf8>
+with ansi being the default.
+
+This option is only available in dos2unix for Windows with Unicode
+file name support. This option has no effect on the actual file names
+read and written, only on how they are displayed.
+
+There are several methods for displaying text in a Windows console based on the
+encoding of the text. They all have their own advantages and disadvantages.
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix's default method is to use ANSI encoded text. The advantage is that it
+is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active DOS OEM code page to the Windows
+system ANSI code page using the C<chcp> command, because dos2unix uses the
+Windows system code page.
+
+The disadvantage of ansi is that international file names with characters not
+inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is OK.
+
+=item B<unicode>
+
+The advantage of unicode (the Windows name for UTF-16) encoding is that text is
+usually properly displayed. There is no need to change the active code page.
+You may need to set the console's font to a TrueType font to have international
+characters displayed properly. When a character is not included in the TrueType
+font you usually see a small square, sometimes with a question mark in it.
+
+When you use the ConEmu console all text is displayed properly, because ConEmu
+automatically selects a good font.
+
+The disadvantage of unicode is that it is not compatible with ASCII. The output
+is not easy to handle when you redirect it to another program or a file.
+Redirection to a file does not give a correct UTF-16 file.
+
+=item B<utf8>
+
+The advantage of utf8 is that it is compatible with ASCII and when
+you redirect it to a file you get a proper UTF-8 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is displayed
+similar as with the C<unicode> encoding.
+
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an East-Asian
+region you may see a lot of flickering of the console when the messages are
+displayed.
+
+In a ConEmu console the utf8 encoding method works well.
+
+=back
+
+The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC
+by setting it to C<unicode> or C<utf8>.
+
=item B<-f, --force>
Force conversion of binary files.
@@ -268,8 +332,8 @@ is written.
When the input file is UTF-16, and the option C<-u> is used, an UTF-16
BOM will be written.
-Never use this option when the output encoding is other than UTF-8 or UTF-16.
-See also section UNICODE.
+Never use this option when the output encoding is other than UTF-8, UTF-16, or
+GB18030. See also section UNICODE.
=item B<-n, --newfile INFILE OUTFILE ...>
@@ -513,6 +577,18 @@ BOM. Use option C<-r> to remove the BOM.
Dos2unix and unix2dos write always a BOM when option C<-m> is used.
+=head2 Unicode file names on Windows
+
+Dos2unix has optional support for reading and writing Unicode file names in the
+Windows Command Prompt. That means that dos2unix can open files that have
+characters in the name that are not part of the default system ANSI code page.
+To see if dos2unix for Windows was built with Unicode file name support type
+C<dos2unix -V>.
+
+There are some issues with displaying Unicode file names in a Windows console.
+See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in
+the console, but the files will be written with the correct name.
+
=head2 Unicode examples
Convert from Windows UTF-16 (with BOM) to Unix UTF-8:
@@ -542,10 +618,8 @@ transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030
is also compatible with Windows code page 936, also known as GBK.
On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is
-set to GB18030. Note that this will only work if the location is set to China.
-E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16
-to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it
-will work.
+set to GB18030. Note that this will only work if the locale is supported by the
+system. Use command C<locale -a> to get the list of supported locales.
On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030.
@@ -613,7 +687,11 @@ Use dos2unix in combination with the find(1) and xargs(1) commands to
recursively convert text files in a directory tree structure. For instance to
convert all .txt files in the directory tree under the current directory type:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 LOCALIZATION
diff --git a/man/man1/dos2unix.txt b/man/man1/dos2unix.txt
index d773316..3900b94 100644
--- a/man/man1/dos2unix.txt
+++ b/man/man1/dos2unix.txt
@@ -85,6 +85,67 @@ OPTIONS
Set conversion mode. Where CONVMODE is one of: *ascii*, *7bit*,
*iso*, *mac* with ascii being the default.
+ -D, --display-enc ENCODING
+ Set encoding of displayed text. Where ENCODING is one of: *ansi*,
+ *unicode*, *utf8* with ansi being the default.
+
+ This option is only available in dos2unix for Windows with Unicode
+ file name support. This option has no effect on the actual file
+ names read and written, only on how they are displayed.
+
+ There are several methods for displaying text in a Windows console
+ based on the encoding of the text. They all have their own
+ advantages and disadvantages.
+
+ ansi
+ Dos2unix's default method is to use ANSI encoded text. The
+ advantage is that it is backwards compatible. It works with
+ raster and TrueType fonts. In some regions you may need to
+ change the active DOS OEM code page to the Windows system ANSI
+ code page using the "chcp" command, because dos2unix uses the
+ Windows system code page.
+
+ The disadvantage of ansi is that international file names with
+ characters not inside the system default code page are not
+ displayed properly. You will see a question mark, or a wrong
+ symbol instead. When you don't work with foreign file names this
+ method is OK.
+
+ unicode
+ The advantage of unicode (the Windows name for UTF-16) encoding
+ is that text is usually properly displayed. There is no need to
+ change the active code page. You may need to set the console's
+ font to a TrueType font to have international characters
+ displayed properly. When a character is not included in the
+ TrueType font you usually see a small square, sometimes with a
+ question mark in it.
+
+ When you use the ConEmu console all text is displayed properly,
+ because ConEmu automatically selects a good font.
+
+ The disadvantage of unicode is that it is not compatible with
+ ASCII. The output is not easy to handle when you redirect it to
+ another program or a file. Redirection to a file does not give a
+ correct UTF-16 file.
+
+ utf8
+ The advantage of utf8 is that it is compatible with ASCII and
+ when you redirect it to a file you get a proper UTF-8 file. You
+ need to set the console's font to a TrueType font. With a
+ TrueType font the text is displayed similar as with the
+ "unicode" encoding.
+
+ The disadvantage is that when you use the default raster font
+ all non-ASCII characters are displayed wrong. Not only unicode
+ file names, but also translated messages become unreadable. On
+ Windows configured for an East-Asian region you may see a lot of
+ flickering of the console when the messages are displayed.
+
+ In a ConEmu console the utf8 encoding method works well.
+
+ The default encoding can be changed with environment variable
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+
-f, --force
Force conversion of binary files.
@@ -179,8 +240,8 @@ OPTIONS
When the input file is UTF-16, and the option "-u" is used, an
UTF-16 BOM will be written.
- Never use this option when the output encoding is other than UTF-8
- or UTF-16. See also section UNICODE.
+ Never use this option when the output encoding is other than UTF-8,
+ UTF-16, or GB18030. See also section UNICODE.
-n, --newfile INFILE OUTFILE ...
New file mode. Convert file INFILE and write output to file OUTFILE.
@@ -403,6 +464,18 @@ UNICODE
Dos2unix and unix2dos write always a BOM when option "-m" is used.
+ Unicode file names on Windows
+ Dos2unix has optional support for reading and writing Unicode file names
+ in the Windows Command Prompt. That means that dos2unix can open files
+ that have characters in the name that are not part of the default system
+ ANSI code page. To see if dos2unix for Windows was built with Unicode
+ file name support type "dos2unix -V".
+
+ There are some issues with displaying Unicode file names in a Windows
+ console. See option "-D", "--display-enc". The file names may be
+ displayed wrongly in the console, but the files will be written with the
+ correct name.
+
Unicode examples
Convert from Windows UTF-16 (with BOM) to Unix UTF-8:
@@ -431,10 +504,9 @@ GB18030
as GBK.
On Unix/Linux UTF-16 files are converted to GB18030 when the locale
- encoding is set to GB18030. Note that this will only work if the
- location is set to China. E.g. in an English British locale setting
- "en_GB.GB18030" conversion of UTF-16 to GB18030 will not work, but in a
- Chinese "zh_CN.GB18030" locale setting it will work.
+ encoding is set to GB18030. Note that this will only work if the locale
+ is supported by the system. Use command "locale -a" to get the list of
+ supported locales.
On Windows you need to use option "-gb" to convert UTF-16 files to
GB18030.
@@ -503,7 +575,11 @@ RECURSIVE CONVERSION
instance to convert all .txt files in the directory tree under the
current directory type:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
LOCALIZATION
LANG
diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1
index ba76c3f..afdc0b0 100644
--- a/man/nl/man1/dos2unix.1
+++ b/man/nl/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -146,7 +146,7 @@ Alleen regeleindes converteren. Dit is de standaardconversiemodus.
.IP "\fB\-iso\fR" 4
.IX Item "-iso"
Conversie tussen de tekensets \s-1DOS\s0 en \s-1ISO\-8859\-1. \s0 Zie ook de sectie
-\&\s-1CONVERSIEMODI.\s0
+\&\fB\s-1CONVERSIEMODI\s0\fR.
.IP "\fB\-1252\fR" 4
.IX Item "-1252"
Windows-codetabel 1252 (West-Europees) gebruiken.
@@ -178,6 +178,67 @@ standaardgedrag bij conversie naar \s-1DOS. \s0 Zie ook optie \f(CW\*(C`\-r\*(C'
.IX Item "-c, --convmode CONVERSIEMODUS"
De te gebruiken conversiemodus. \s-1CONVERSIEMODUS\s0 kan zijn: \fIascii\fR, \fI7bit\fR,
\&\fIiso\fR, of \fImac\fR, waarbij ascii de standaardinstelling is.
+.IP "\fB\-D\fR, \fB\-\-display\-enc \s-1CODERING\s0\fR" 4
+.IX Item "-D, --display-enc CODERING"
+De te gebruiken tekencodering voor weergegeven tekst. \s-1CODERING\s0 kan zijn:
+\&\fIansii\fR, \fIunicode\fR, of \fIutf8\fR, waarbij ansi de standaardinstelling is.
+.Sp
+Deze optie is alleen beschikbaar in dos2unix voor Windows met
+Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op de
+gelezen en geschreven bestandsnamen, maar alleen op hoe deze weergegeven
+worden.
+.Sp
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
+system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
+Windows system code page.
+.Sp
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+.Sp
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+.Sp
+The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when you
+redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
+.Sp
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+.Sp
+In a ConEmu console the utf8 encoding method works well.
+.RE
+.RS 4
+.Sp
+The default encoding can be changed with environment variable
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f\fR, \fB\-\-force\fR" 4
.IX Item "-f, --force"
Conversie van binaire bestanden afdwingen.
@@ -295,8 +356,8 @@ wordt een \s-1UTF\-8\-BOM\s0 geschreven.
Als het invoerbestand in \s-1UTF\-16\s0 is, en de optie \f(CW\*(C`\-u\*(C'\fR is gegeven, dan wordt
een \s-1UTF\-16\-BOM\s0 geschreven.
.Sp
-Gebruik deze optie nooit als de codering van het uitvoerbestand niet \s-1UTF\-8\s0
-of \s-1UTF\-16\s0 is. Zie ook de sectie \s-1UNICODE.\s0
+Gebruik deze optie nooit als de codering van het uitvoerbestand niet \s-1UTF\-8,
+UTF\-16,\s0 of \s-1GB18030\s0 is. Zie ook de sectie \fB\s-1UNICODE\s0\fR.
.IP "\fB\-n\fR, \fB\-\-newfile \s-1INVOERBESTAND UITVOERBESTAND\s0\fR ..." 4
.IX Item "-n, --newfile INVOERBESTAND UITVOERBESTAND ..."
Nieuw-bestand-modus. Het bestand \s-1INVOERBESTAND\s0 converteren en naar bestand
@@ -325,7 +386,7 @@ personen voor wie het niet bestemd is. Behoud van eigenaar, groep en
lees/schrijf\-rechten wordt alleen ondersteund op Unix.
.IP "\fB\-q\fR, \fB\-\-quiet\fR" 4
.IX Item "-q, --quiet"
-Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde is nul,
+Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul,
behalve wanneer verkeerde opties worden gegeven.
.IP "\fB\-r\fR, \fB\-\-remove\-bom\fR" 4
.IX Item "-r, --remove-bom"
@@ -542,6 +603,19 @@ invoerbestand een \s-1BOM\s0 bevat. Gebruik optie \f(CW\*(C`\-r\*(C'\fR om de \
.PP
Dos2unix en unix2dos schrijven altijd een \s-1BOM\s0 wanneer optie \f(CW\*(C`\-m\*(C'\fR gebruikt
wordt.
+.SS "Unicode-bestandsnamen op Windows"
+.IX Subsection "Unicode-bestandsnamen op Windows"
+Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van
+Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat
+dos2unix bestanden kan openen waarvan de naam tekens bevat die niet
+voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor
+Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt
+u \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een
+Windows-console; zie bij optie \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. De bestandsnamen
+kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven
+worden met de correcte naam.
.SS "Unicode-voorbeelden"
.IX Subsection "Unicode-voorbeelden"
Omzetten van Windows \s-1UTF\-16 \s0(met \s-1BOM\s0) naar Unix \s-1UTF\-8:\s0
@@ -578,11 +652,10 @@ Unicodetransformatie beschouwd worden. Net als \s-1UTF\-8\s0 is \s-1GB18030\s0
met \s-1ASCII. GB18030\s0 is ook compatibel met Windows-codetabel 936 (ook wel \s-1GBK\s0
genoemd).
.PP
-Op Unix/Linux worden UTF\-16\-bestanden alleen naar \s-1GB18030\s0 geconverteerd
-wanneer de taalregio op China ingesteld is en de codering op \s-1GB18030.\s0
-Bijvoorbeeld, met de Britse taalregio-instelling \f(CW\*(C`en_GB.GB18030\*(C'\fR zal
-conversie van \s-1UTF\-16\s0 naar \s-1GB18030\s0 niet werken, maar met de Chinese
-instelling \f(CW\*(C`zh_CN.GB18030\*(C'\fR wel.
+Op Unix/Linux worden UTF\-16\-bestanden naar \s-1GB18030\s0 geconverteerd wanneer de
+taalregio-codering \s-1GB18030\s0 is. Merk op dat dit alleen werkt als deze
+taalregio-instelling door het systeem ondersteund wordt. Gebruik het
+commando \f(CW\*(C`locale \-a\*(C'\fR voor een overzicht van de beschikbare taalregio's.
.PP
Op Windows dient u de optie \f(CW\*(C`\-gb\*(C'\fR te gebruiken om UTF\-16\-bestanden naar
\&\s-1GB18030\s0 te converteren.
@@ -675,7 +748,13 @@ alle .txt\-bestanden in de mappenboom onder de huidige map te converteren,
typt u:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq | xargs dos2unix
+.Ve
+.PP
+In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "LOKALISATIE"
.IX Header "LOKALISATIE"
diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm
index 0062d84..d04476f 100644
--- a/man/nl/man1/dos2unix.htm
+++ b/man/nl/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title>
+<title>dos2unix 7.3 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Coderingen">Coderingen</a></li>
<li><a href="#Conversie">Conversie</a></li>
<li><a href="#Byte-Order-Mark">Byte-Order-Mark</a></li>
+ <li><a href="#Unicode-bestandsnamen-op-Windows">Unicode-bestandsnamen op Windows</a></li>
<li><a href="#Unicode-voorbeelden">Unicode-voorbeelden</a></li>
</ul>
</li>
@@ -86,7 +87,7 @@
<dt id="iso"><b>-iso</b></dt>
<dd>
-<p>Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie CONVERSIEMODI.</p>
+<p>Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie <b>CONVERSIEMODI</b>.</p>
</dd>
<dt id="pod-1252"><b>-1252</b></dt>
@@ -143,6 +144,50 @@
<p>De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, of <i>mac</i>, waarbij ascii de standaardinstelling is.</p>
</dd>
+<dt id="D---display-enc-CODERING"><b>-D</b>, <b>--display-enc CODERING</b></dt>
+<dd>
+
+<p>De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn: <i>ansii</i>, <i>unicode</i>, of <i>utf8</i>, waarbij ansi de standaardinstelling is.</p>
+
+<p>Deze optie is alleen beschikbaar in dos2unix voor Windows met Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op de gelezen en geschreven bestandsnamen, maar alleen op hoe deze weergegeven worden.</p>
+
+<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+
+<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+
+<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+
+<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+
+<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+
+<p>In a ConEmu console the utf8 encoding method works well.</p>
+
+</dd>
+</dl>
+
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f</b>, <b>--force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>Als het invoerbestand in UTF-16 is, en de optie <code>-u</code> is gegeven, dan wordt een UTF-16-BOM geschreven.</p>
-<p>Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8 of UTF-16 is. Zie ook de sectie UNICODE.</p>
+<p>Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8, UTF-16, of GB18030 is. Zie ook de sectie <b>UNICODE</b>.</p>
</dd>
<dt id="n---newfile-INVOERBESTAND-UITVOERBESTAND"><b>-n</b>, <b>--newfile INVOERBESTAND UITVOERBESTAND</b> ...</dt>
@@ -297,7 +342,7 @@
<dt id="q---quiet"><b>-q</b>, <b>--quiet</b></dt>
<dd>
-<p>Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde is nul, behalve wanneer verkeerde opties worden gegeven.</p>
+<p>Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven.</p>
</dd>
<dt id="r---remove-bom"><b>-r</b>, <b>--remove-bom</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix en unix2dos schrijven altijd een BOM wanneer optie <code>-m</code> gebruikt wordt.</p>
+<h2 id="Unicode-bestandsnamen-op-Windows">Unicode-bestandsnamen op Windows</h2>
+
+<p>Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat dos2unix bestanden kan openen waarvan de naam tekens bevat die niet voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt u <code>dos2unix -V</code>.</p>
+
+<p>Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een Windows-console; zie bij optie <code>-D</code>, <code>--display-enc</code>. De bestandsnamen kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven worden met de correcte naam.</p>
+
<h2 id="Unicode-voorbeelden">Unicode-voorbeelden</h2>
<p>Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:</p>
@@ -510,7 +561,7 @@
<p>GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd).</p>
-<p>Op Unix/Linux worden UTF-16-bestanden alleen naar GB18030 geconverteerd wanneer de taalregio op China ingesteld is en de codering op GB18030. Bijvoorbeeld, met de Britse taalregio-instelling <code>en_GB.GB18030</code> zal conversie van UTF-16 naar GB18030 niet werken, maar met de Chinese instelling <code>zh_CN.GB18030</code> wel.</p>
+<p>Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer de taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze taalregio-instelling door het systeem ondersteund wordt. Gebruik het commando <code>locale -a</code> voor een overzicht van de beschikbare taalregio&#39;s.</p>
<p>Op Windows dient u de optie <code>-gb</code> te gebruiken om UTF-16-bestanden naar GB18030 te converteren.</p>
@@ -574,7 +625,11 @@
<p>Gebruik dos2unix in combinatie met de opdrachten <b>find</b>(1) en <b>xargs</b>(1) om tekstbestanden in een mappenboom recursief om te zetten. Bijvoorbeeld om alle .txt-bestanden in de mappenboom onder de huidige map te converteren, typt u:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; | xargs dos2unix</code></pre>
+
+<p>In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="LOKALISATIE">LOKALISATIE</h1>
diff --git a/man/nl/man1/dos2unix.po b/man/nl/man1/dos2unix.po
index b1c33ec..ca5888d 100644
--- a/man/nl/man1/dos2unix.po
+++ b/man/nl/man1/dos2unix.po
@@ -1,5 +1,5 @@
# Dutch translations for the dos2unix man page.
-# Copyright (C) 2014 Erwin Waterlander (msgids)
+# Copyright (C) 2015 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
#
# “Hm! I can see those old men shake their heads.”
@@ -8,9 +8,9 @@
# Benno Schulenberg <benno@vertaalt.nl>, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-04 10:18+0100\n"
+"Project-Id-Version: dos2unix-man-7.3-beta9\n"
+"POT-Creation-Date: 2015-08-13 09:03+0200\n"
+"PO-Revision-Date: 2015-08-23 11:11+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
@@ -145,7 +145,7 @@ msgstr "B<-iso>"
#. type: textblock
#: dos2unix.pod:112
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
-msgstr "Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie CONVERSIEMODI."
+msgstr "Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie B<CONVERSIEMODI>."
#. type: =item
#: dos2unix.pod:115
@@ -239,56 +239,136 @@ msgstr "De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: I<ascii>, I<7b
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr "B<-D>, B<--display-enc CODERING>"
+
+#. type: textblock
+#: dos2unix.pod:157
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn: I<ansii>, I<unicode>, of I<utf8>, waarbij ansi de standaardinstelling is."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr "Deze optie is alleen beschikbaar in dos2unix voor Windows met Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op de gelezen en geschreven bestandsnamen, maar alleen op hoe deze weergegeven worden."
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr "B<ansi>"
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr "B<unicode>"
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr "B<utf8>"
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f>, B<--force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Conversie van binaire bestanden afdwingen."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb>, B<--gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "Op Windows worden UTF-16-bestanden standaard naar UTF-8 geconverteerd, ongeacht de ingestelde taalregio. Gebruik deze optie om UTF-16-bestanden naar GB18030 te converteren. Deze optie is alleen beschikbaar op Windows. Zie ook de sectie B<GB18030>."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h>, B<--help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Een hulptekst tonen."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i>[B<VLAGGEN>], B<--info>[B<=VLAGGEN>] B<BESTAND>..."
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Bestandsinformatie tonen. Er wordt niets geconverteerd."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "De volgende informatie wordt weergegeven, in deze volgorde: het aantal DOS-regeleindes, het aantal Unix-regeleindes, het aantal Mac-regeleindes, de Byte-Order-Mark, of het een tekst- of binair bestand is, en de bestandsnaam."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Voorbeelduitvoer:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -312,87 +392,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Het aantal DOS-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Het aantal Unix-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Het aantal Mac-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "De Byte-Order-Mark tonen."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Tonen of het bestand tekst is of binair."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Alleen de namen tonen van de bestanden die geconverteerd zouden worden."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Met de vlag C<c> toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Voorbeelden:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Informatie weergeven voor alle bestanden met de extensie 'txt':"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -402,12 +482,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Alleen de aantallen DOS-regeleindes en Unix-regeleindes tonen:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -417,12 +497,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Alleen de Byte-Order-Mark tonen:"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -432,12 +512,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "De bestanden opsommen die DOS-regeleindes bevatten:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -447,12 +527,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "De bestanden opsommen die Unix-regeleindes bevatten:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -462,307 +542,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k>, B<--keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "Het tijdsstempel van het invoerbestand behouden voor het uitvoerbestand."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L>, B<--license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "De softwarelicentie tonen."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l>, B<--newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Een extra regeleinde toevoegen."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: Alleen DOS-regeleindes worden omgezet naar twee Unix-regeleindes. In Mac-modus worden alleen Mac-regeleindes omgezet naar twee Unix-regeleindes."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: Alleen Unix-regeleindes worden omgezet naar twee DOS-regeleindes. In Mac-modus worden Unix-regeleindes omgezet naar twee Mac-regeleindes."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m>, B<--add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Een Byte-Order-Mark (BOM) naar het uitvoerbestand schrijven. Standaard wordt een UTF-8-BOM geschreven."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Als het invoerbestand in UTF-16 is, en de optie C<-u> is gegeven, dan wordt een UTF-16-BOM geschreven."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8 of UTF-16 is. Zie ook de sectie UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8, UTF-16, of GB18030 is. Zie ook de sectie B<UNICODE>."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n>, B<--newfile INVOERBESTAND UITVOERBESTAND> ..."
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar bestand UITVOERBESTAND schrijven. Bestandsnamen moeten opgegeven worden in paren. Jokertekens moeten I<niet>gebruikt worden, anders I<verlies> je de bestanden."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "De gebruiker die de conversie start in nieuw-bestand (gepaarde) modus wordt de eigenaar van het geconverteerde bestand. De lees/schrijf-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o>, B<--oldfile BESTAND> ..."
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit is de standaard modus. Jokertekens kunnen gebruikt worden."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "In oud-bestand (vervangende) modus krijgt het geconverteerde bestand dezelfde eigenaar, groep en lees/schrijf-rechten als het originele bestand. Ook wanneer het bestand wordt omgezet door een andere gebruiker die schrijfrechten heeft op het bestand (b.v. gebruiker root). De omzetting wordt afgebroken wanneer het niet mogelijk is de originele waardes te behouden. Verandering van eigenaar kan betekenen dat de originele eigenaar het bestand niet meer kan lezen. Verandering van groep zou een veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q>, B<--quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
-msgstr "Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde is nul, behalve wanneer verkeerde opties worden gegeven."
+msgstr "Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r>, B<--remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "Een Byte-Order-Mark (BOM) verwijderen. Er wordt geen BOM naar het uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar Unix. Zie ook optie C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s>, B<--safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Binaire bestanden overslaan (standaard)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u>, B<--keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "De originele UTF-16-codering van het invoerbestand behouden. Het uitvoerbestand wordt in dezelfde UTF-16-codering (little endian of big endian) geschreven als het invoerbestand. Dit voorkomt conversie naar UTF-8. Er wordt ook een corresponderende UTF-16-BOM geschreven. Deze optie kan uitgeschakeld worden met de optie C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul>, B<--assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16LE is."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Wanneer het invoerbestand een Byte-Order-Mark (BOM) bevat, dan gaat deze BOM vóór deze optie."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Wanneer een verkeerde aanname is gemaakt (het invoerbestand was geen UTF-16LE) en de conversie verliep met succes, dan krijgt u een UTF-8-bestand met verkeerde tekst. De verkeerde conversie kan ongedaan worden gemaakt door met iconv(1) het UTF-8-uitvoerbestand terug om te zetten naar UTF-16LE. Dit zal het originele bestand terug brengen."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "De aanname van UTF-16LE werkt als een I<conversiemodus>. Door de standaardmodus I<ascii> in te schakelen wordt de UTF-16LE-veronderstelling uitgeschakeld."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub>, B<--assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16BE is."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Deze optie werkt hetzelfde als optie C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v>, B<--verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Extra meldingen weergeven. Er wordt extra informatie getoond over Byte-Order-Marks en het aantal geconverteerde regeleindes."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F>, B<--follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Symbolische koppelingen volgen en de doelen converteren."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R>, B<--replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Symbolische koppelingen vervangen door geconverteerde bestanden (de originele doelbestanden blijven ongewijzigd)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S>, B<--skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Symbolische koppelingen en doelen ongewijzigd laten (standaard)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V>, B<--version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Versie-informatie tonen."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "MAC-MODUS"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Om in Mac-modus te draaien kunt u de opdrachtregeloptie C<-c mac> gebruiken, of de opdrachten C<mac2unix> of C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "CONVERSIEMODI"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "In modus C<ascii> worden alleen regeleindes omgezet. Dit is de standaardmodus."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "Alle 8-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7-bits spatie."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Tekens worden omgezet tussen een DOS-tekenset (codetabel) en de ISO-tekenset ISO-8859-1 (Latin-1) op Unix. DOS-tekens zonder een ISO-8859-1-equivalent, waarvoor dus geen omzetting mogelijk is, worden omgezet in een punt. Hetzelfde geldt voor ISO-8859-1-tekens zonder DOS-tegenhanger."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Wanneer alleen optie C<-iso> gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt codetabel CP437 gebruikt, die vooral in de VS gebruikt wordt. Om een bepaalde codetabel te forceren, kunt u de opties C<-850> (West-Europees), C<-860> (Portugees), C<-863> (Canadees Frans) of C<-865> (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie C<-1252>. Gebruik voor andere codetabellen dos2unix in combinatie met iconv(1). Iconv kan omzetten tussen een lange lijst tekensetcoderingen."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Gebruik ISO-conversie nooit op Unicode-tekstbestanden. Het zal UTF-8-gecodeerde bestanden beschadigen."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Enkele voorbeelden:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Omzetten van de standaard DOS-codetabel naar Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -772,12 +852,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Omzetten van DOS CP850 naar Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -787,12 +867,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Omzetten van Windows CP1252 naar Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -802,12 +882,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Omzetten van Windows CP1252 naar Unix UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -817,12 +897,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Omzetten van Unix Latin-1 naar de standaard DOS-codetabel:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -832,12 +912,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Omzetten van Unix Latin-1 naar DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -847,12 +927,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Omzetten van Unix Latin-1 naar Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -862,12 +942,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Omzetten van Unix UTF-8 (Unicode) naar Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -877,127 +957,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Zie ook L<http://czyborra.com/charsets/codepages.html> en L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Coderingen"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Er bestaan verschillende Unicode-coderingen. Op Unix en Linux zijn Unicode-bestanden typisch gecodeerd in UTF-8. Op Windows kunnen Unicode-tekstbestanden gecodeerd zijn in UTF-8, UTF-16 of UTF-16 big endian, maar ze zijn meestal gecodeerd in UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Conversie"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net als reguliere tekstbestanden."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix en unix2dos met Unicode UTF-16-ondersteuning kunnen little en big endian UTF-16-gecodeerde tekstbestanden lezen. Om er achter te komen of dos2unix gebouwd is met UTF-16- ondersteuning, typt u C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "Op Unix/Linux worden UTF-16-bestanden geconverteerd naar de codering van de ingestelde taalregio. Gebruik de opdracht B<locale>(1) om te zien wat de ingestelde codering is. Wanneer conversie niet mogelijk is, treedt er een fout op en wordt het bestand overgeslagen."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "Op Windows worden UTF-16-bestanden standaard naar UTF-8 geconverteerd. UTF-8-tekstbestanden worden alom goed ondersteund, zowel op Windows als Unix/Linux."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "De UTF-16- en UTF-8-coderingen zijn volledig compatibel, er gaat bij het converteren niets verloren. Als er tijdens de conversie van UTF-16 naar UTF-8 een fout optreedt, bijvoorbeeld omdat het UTF-16-invoerbestand een fout bevat, dan wordt het bestand overgeslagen."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Wanneer C<-u> gebruikt wordt, wordt het uitvoerbestand in dezelfde UTF-16-codering geschreven als het invoerbestand. Optie C<-u> voorkomt conversie naar UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te converteren."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "ISO- en 7-bits-conversie werken niet op UTF-16-bestanden."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Byte-Order-Mark"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "Op Windows bevatten Unicode-tekstbestanden gewoonlijk een Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief Kladblok) standaard een BOM toevoegen. Zie ook L<http://en.wikipedia.org/wiki/Byte_order_mark>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix kan alleen detecteren of een bestand in UTF-16-codering is als het bestand een BOM bevat. Wanneer een UTF-16-bestand geen BOM heeft, ziet dos2unix het bestand als een binair bestand."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Gebruik optie C<-ul> of C<-ub> om een UTF-16-bestand zonder BOM om te zetten."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie C<-b> schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het invoerbestand een BOM bevat. Gebruik optie C<-r> om de BOM te verwijderen."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt wordt."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr "Unicode-bestandsnamen op Windows"
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr "Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat dos2unix bestanden kan openen waarvan de naam tekens bevat die niet voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt u C<dos2unix -V>."
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr "Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een Windows-console; zie bij optie C<-D>, C<--display-enc>. De bestandsnamen kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven worden met de correcte naam."
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Unicode-voorbeelden"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1007,12 +1102,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Omzetten van Windows UTF-16LE (zonder BOM) naar Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1022,12 +1117,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Omzetten van Unix UTF-8 naar Windows UTF-8 met BOM:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1037,12 +1132,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Omzetten van Unix UTF-8 naar Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1052,47 +1147,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 is een standaard van de Chinese overheid. Een subset van de GB18030-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd)."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "Op Unix/Linux worden UTF-16-bestanden alleen naar GB18030 geconverteerd wanneer de taalregio op China ingesteld is en de codering op GB18030. Bijvoorbeeld, met de Britse taalregio-instelling C<en_GB.GB18030> zal conversie van UTF-16 naar GB18030 niet werken, maar met de Chinese instelling C<zh_CN.GB18030> wel."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer de taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze taalregio-instelling door het systeem ondersteund wordt. Gebruik het commando C<locale -a> voor een overzicht van de beschikbare taalregio's."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Op Windows dient u de optie C<-gb> te gebruiken om UTF-16-bestanden naar GB18030 te converteren."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "GB18030-bestanden kunnen een Byte-Order-Mark bevatten, net als Unicode-bestanden."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "VOORBEELDEN"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1104,12 +1199,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1121,12 +1216,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1136,12 +1231,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus; omzetten en vervangen van b.txt in 7-bits conversiemodus:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1155,12 +1250,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Omzetten van a.txt van Mac- naar Unix-indeling:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1172,12 +1267,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Omzetten van a.txt van Unix- naar Mac-indeling:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1189,12 +1284,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Omzetten en vervangen van a.txt met behoud van origineel tijdsstempel:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1206,12 +1301,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Omzetten van a.txt en resultaat naar e.txt schrijven:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1221,12 +1316,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Omzetten van a.txt en naar e.txt schrijven, met tijdsstempel van e.txt gelijk aan die van a.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1236,12 +1331,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Omzetten en vervangen van a.txt; omzetten van b.txt en naar e.txt schrijven:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1253,12 +1348,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Omzetten van c.txt en naar e.txt schrijven; omzetten en vervangen van a.txt; omzetten en vervangen van b.txt; omzetten van d.txt en naar f.txt schrijven."
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1268,42 +1363,57 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "RECURSIEVE CONVERSIE"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Gebruik dos2unix in combinatie met de opdrachten B<find>(1) en B<xargs>(1) om tekstbestanden in een mappenboom recursief om te zetten. Bijvoorbeeld om alle .txt-bestanden in de mappenboom onder de huidige map te converteren, typt u:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:690
#, no-wrap
msgid ""
-" find . -name *.txt |xargs dos2unix\n"
+" find . -name '*.txt' |xargs dos2unix\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" find . -name '*.txt' | xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr "In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:"
+
+#. type: verbatim
+#: dos2unix.pod:694
+#, no-wrap
+msgid ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
+msgstr ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "LOKALISATIE"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "De primaire taal wordt geselecteerd via de omgevingsvariabele LANG. De variabele LANG bestaat uit verschillende onderdelen. Het eerste deel is in kleine letters de taalcode. Het tweede deel is optioneel en is de landcode in hoofdletters, voorafgegaan door een liggend streepje. Er is ook een optioneel derde deel: de tekencodering, voorafgegaan door een punt. Enkele voorbeelden voor een POSIX-shell:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1325,47 +1435,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Voor een complete lijst van taal- en landcodes zie de gettext-handleiding: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "Op Unix-systemen kunt u de opdracht B<locale>(1) gebruiken om specifieke taalregio-informatie te verkrijgen."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst Nederlands en dan Duits: C<LANGUAGE=nl:de>. U moet eerst lokalisatie in werking stellen, door het instellen van LANG (of LC_ALL) op een waarde ongelijk aan \"C\", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Met de omgevingsvariabele DOS2UNIX_LOCALEDIR kan de LOCALEDIR die ingesteld werd tijdens compilatie worden overstemd. LOCALEDIR wordt gebruikt om de taalbestanden te vinden. De GNU standaardwaarde is C</usr/local/share/locale>. De optie B<--version> laat de gebruikte LOCALEDIR zien."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Voorbeeld (POSIX-shell):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1375,72 +1485,72 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "AFSLUITWAARDE"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "Bij succes wordt nul teruggegeven. Wanneer een systeemfout optreedt wordt het laatste systeemfoutnummer teruggegeven. Bij andere fouten wordt 1 teruggegeven."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "De afsluitwaarde is altijd nul in de stillewerkingsmodus, behalve wanneer verkeerde opties worden gegeven."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "STANDAARDEN"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://nl.wikipedia.org/wiki/Tekstbestand>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://nl.wikipedia.org/wiki/Carriage_Return>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://nl.wikipedia.org/wiki/Linefeed>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "<http://nl.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTEURS"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-modus) - <wuebben@kde.org>, Christian Wurll (toevoegen van extra regeleindes) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (beheerder)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Projectpagina: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge-pagina: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "ZIE OOK"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod
index 7b346fc..a920c11 100644
--- a/man/nl/man1/dos2unix.pod
+++ b/man/nl/man1/dos2unix.pod
@@ -86,7 +86,7 @@ Alleen regeleindes converteren. Dit is de standaardconversiemodus.
=item B<-iso>
Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie
-CONVERSIEMODI.
+B<CONVERSIEMODI>.
=item B<-1252>
@@ -128,6 +128,73 @@ standaardgedrag bij conversie naar DOS. Zie ook optie C<-r>.
De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: I<ascii>, I<7bit>,
I<iso>, of I<mac>, waarbij ascii de standaardinstelling is.
+=item B<-D>, B<--display-enc CODERING>
+
+De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn:
+I<ansii>, I<unicode>, of I<utf8>, waarbij ansi de standaardinstelling is.
+
+Deze optie is alleen beschikbaar in dos2unix voor Windows met
+Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op de
+gelezen en geschreven bestandsnamen, maar alleen op hoe deze weergegeven
+worden.
+
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix's default method is to use ANSI encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active DOS OEM code page to the Windows
+system ANSI code page using the C<chcp> command, because dos2unix uses the
+Windows system code page.
+
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is OK.
+
+=item B<unicode>
+
+The advantage of unicode (the Windows name for UTF-16) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+
+The disadvantage of unicode is that it is not compatible with ASCII. The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct UTF-16 file.
+
+=item B<utf8>
+
+The advantage of utf8 is that it is compatible with ASCII and when you
+redirect it to a file you get a proper UTF-8 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the C<unicode> encoding.
+
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+
+In a ConEmu console the utf8 encoding method works well.
+
+=back
+
+The default encoding can be changed with environment variable
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+
=item B<-f>, B<--force>
Conversie van binaire bestanden afdwingen.
@@ -246,8 +313,8 @@ wordt een UTF-8-BOM geschreven.
Als het invoerbestand in UTF-16 is, en de optie C<-u> is gegeven, dan wordt
een UTF-16-BOM geschreven.
-Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8
-of UTF-16 is. Zie ook de sectie UNICODE.
+Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8,
+UTF-16, of GB18030 is. Zie ook de sectie B<UNICODE>.
@@ -281,7 +348,7 @@ lees/schrijf-rechten wordt alleen ondersteund op Unix.
=item B<-q>, B<--quiet>
-Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde is nul,
+Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul,
behalve wanneer verkeerde opties worden gegeven.
=item B<-r>, B<--remove-bom>
@@ -506,6 +573,20 @@ invoerbestand een BOM bevat. Gebruik optie C<-r> om de BOM te verwijderen.
Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt
wordt.
+=head2 Unicode-bestandsnamen op Windows
+
+Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van
+Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat
+dos2unix bestanden kan openen waarvan de naam tekens bevat die niet
+voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor
+Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt
+u C<dos2unix -V>.
+
+Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een
+Windows-console; zie bij optie C<-D>, C<--display-enc>. De bestandsnamen
+kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven
+worden met de correcte naam.
+
=head2 Unicode-voorbeelden
Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:
@@ -535,11 +616,10 @@ Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel
met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK
genoemd).
-Op Unix/Linux worden UTF-16-bestanden alleen naar GB18030 geconverteerd
-wanneer de taalregio op China ingesteld is en de codering op GB18030.
-Bijvoorbeeld, met de Britse taalregio-instelling C<en_GB.GB18030> zal
-conversie van UTF-16 naar GB18030 niet werken, maar met de Chinese
-instelling C<zh_CN.GB18030> wel.
+Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer de
+taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze
+taalregio-instelling door het systeem ondersteund wordt. Gebruik het
+commando C<locale -a> voor een overzicht van de beschikbare taalregio's.
Op Windows dient u de optie C<-gb> te gebruiken om UTF-16-bestanden naar
GB18030 te converteren.
@@ -611,7 +691,11 @@ om tekstbestanden in een mappenboom recursief om te zetten. Bijvoorbeeld om
alle .txt-bestanden in de mappenboom onder de huidige map te converteren,
typt u:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' | xargs dos2unix
+
+In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 LOKALISATIE
diff --git a/man/nl/man1/dos2unix.txt b/man/nl/man1/dos2unix.txt
index ef9d8f5..0d989a8 100644
--- a/man/nl/man1/dos2unix.txt
+++ b/man/nl/man1/dos2unix.txt
@@ -91,6 +91,69 @@ OPTIES
De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: *ascii*,
*7bit*, *iso*, of *mac*, waarbij ascii de standaardinstelling is.
+ -D, --display-enc CODERING
+ De te gebruiken tekencodering voor weergegeven tekst. CODERING kan
+ zijn: *ansii*, *unicode*, of *utf8*, waarbij ansi de
+ standaardinstelling is.
+
+ Deze optie is alleen beschikbaar in dos2unix voor Windows met
+ Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op
+ de gelezen en geschreven bestandsnamen, maar alleen op hoe deze
+ weergegeven worden.
+
+ There are several methods for displaying text in a Windows console
+ based on the encoding of the text. They all have their own
+ advantages and disadvantages.
+
+ ansi
+ Dos2unix's default method is to use ANSI encoded text. The
+ advantage is that it is backwards compatible. It works with
+ raster and TrueType fonts. In some regions you may need to
+ change the active DOS OEM code page to the Windows system ANSI
+ code page using the "chcp" command, because dos2unix uses the
+ Windows system code page.
+
+ The disadvantage of ansi is that international file names with
+ characters not inside the system default code page are not
+ displayed properly. You will see a question mark, or a wrong
+ symbol instead. When you don't work with foreign file names this
+ method is OK.
+
+ unicode
+ The advantage of unicode (the Windows name for UTF-16) encoding
+ is that text is usually properly displayed. There is no need to
+ change the active code page. You may need to set the console's
+ font to a TrueType font to have international characters
+ displayed properly. When a character is not included in the
+ TrueType font you usually see a small square, sometimes with a
+ question mark in it.
+
+ When you use the ConEmu console all text is displayed properly,
+ because ConEmu automatically selects a good font.
+
+ The disadvantage of unicode is that it is not compatible with
+ ASCII. The output is not easy to handle when you redirect it to
+ another program or a file. Redirection to a file does not give a
+ correct UTF-16 file.
+
+ utf8
+ The advantage of utf8 is that it is compatible with ASCII and
+ when you redirect it to a file you get a proper UTF-8 file. You
+ need to set the console's font to a TrueType font. With a
+ TrueType font the text is displayed similar as with the
+ "unicode" encoding.
+
+ The disadvantage is that when you use the default raster font
+ all non-ASCII characters are displayed wrong. Not only unicode
+ file names, but also translated messages become unreadable. On
+ Windows configured for an East-Asian region you may see a lot of
+ flickering of the console when the messages are displayed.
+
+ In a ConEmu console the utf8 encoding method works well.
+
+ The default encoding can be changed with environment variable
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+
-f, --force
Conversie van binaire bestanden afdwingen.
@@ -190,7 +253,7 @@ OPTIES
wordt een UTF-16-BOM geschreven.
Gebruik deze optie nooit als de codering van het uitvoerbestand niet
- UTF-8 of UTF-16 is. Zie ook de sectie UNICODE.
+ UTF-8, UTF-16, of GB18030 is. Zie ook de sectie UNICODE.
-n, --newfile INVOERBESTAND UITVOERBESTAND ...
Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar
@@ -221,7 +284,7 @@ OPTIES
alleen ondersteund op Unix.
-q, --quiet
- Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde
+ Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde
is nul, behalve wanneer verkeerde opties worden gegeven.
-r, --remove-bom
@@ -425,6 +488,19 @@ UNICODE
Dos2unix en unix2dos schrijven altijd een BOM wanneer optie "-m"
gebruikt wordt.
+ Unicode-bestandsnamen op Windows
+ Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van
+ Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat
+ dos2unix bestanden kan openen waarvan de naam tekens bevat die niet
+ voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor
+ Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen,
+ typt u "dos2unix -V".
+
+ Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in
+ een Windows-console; zie bij optie "-D", "--display-enc". De
+ bestandsnamen kunnen verkeerd weergegeven worden, maar de bestanden
+ zullen geschreven worden met de correcte naam.
+
Unicode-voorbeelden
Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:
@@ -453,11 +529,10 @@ GB18030
compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel
936 (ook wel GBK genoemd).
- Op Unix/Linux worden UTF-16-bestanden alleen naar GB18030 geconverteerd
- wanneer de taalregio op China ingesteld is en de codering op GB18030.
- Bijvoorbeeld, met de Britse taalregio-instelling "en_GB.GB18030" zal
- conversie van UTF-16 naar GB18030 niet werken, maar met de Chinese
- instelling "zh_CN.GB18030" wel.
+ Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer
+ de taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze
+ taalregio-instelling door het systeem ondersteund wordt. Gebruik het
+ commando "locale -a" voor een overzicht van de beschikbare taalregio's.
Op Windows dient u de optie "-gb" te gebruiken om UTF-16-bestanden naar
GB18030 te converteren.
@@ -530,7 +605,11 @@ RECURSIEVE CONVERSIE
alle .txt-bestanden in de mappenboom onder de huidige map te
converteren, typt u:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' | xargs dos2unix
+
+ In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:
+
+ for /R %G in (*.txt) do dos2unix "%G"
LOKALISATIE
LANG
diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1
index 479335c..da3c48b 100644
--- a/man/pl/man1/dos2unix.1
+++ b/man/pl/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -174,6 +174,66 @@ konwersji na DOS-owe końce linii. P. także opcja \f(CW\*(C`\-r\*(C'\fR.
.IX Item "-c, --convmode TRYB_KONW"
Ustawienie trybu konwersji. \s-1TRYB_KONW\s0 to jeden z: \fIascii\fR, \fI7bit\fR, \fIiso\fR,
\&\fImac\fR, przy czym domyślny jest ascii.
+.IP "\fB\-D, \-\-display\-enc \s-1ENCODING\s0\fR" 4
+.IX Item "-D, --display-enc ENCODING"
+Set encoding of displayed text. Where \s-1ENCODING\s0 is one of: \fIansi\fR,
+\&\fIunicode\fR, \fIutf8\fR with ansi being the default.
+.Sp
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+.Sp
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
+system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
+Windows system code page.
+.Sp
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+.Sp
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+.Sp
+The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when you
+redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
+.Sp
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+.Sp
+In a ConEmu console the utf8 encoding method works well.
+.RE
+.RS 4
+.Sp
+The default encoding can be changed with environment variable
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Wymuszenie konwersji plików binarnych.
@@ -293,7 +353,7 @@ Jeśli plik wejściowy jest w kodowaniu \s-1UTF\-16\s0 i użyto opcji \f(CW\*(C`
zapisany \s-1BOM UTF\-16.\s0
.Sp
Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż
-\&\s-1UTF\-8\s0 lub \s-1UTF\-16.\s0 Więcej w sekcji \s-1UNICODE.\s0
+\&\s-1UTF\-8, UTF\-16\s0 lub \s-1GB18030.\s0 Więcej w sekcji \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1PLIK_WEJ PLIK_WYJ ...\s0\fR" 4
.IX Item "-n, --newfile PLIK_WEJ PLIK_WYJ ..."
Tryb nowego pliku. Konwersja \s-1PLIKU_WEJ\s0 z zapisem wyjścia do \s-1PLIKU_WYJ.\s0 Nazwy
@@ -538,6 +598,18 @@ wejściowy ma \s-1BOM.\s0 Aby usunąć \s-1BOM,\s0 można użyć opcji \f(CW\*(C
.PP
Dos2unix oraz unix2dos zawsze zapisują znaczniki \s-1BOM,\s0 jeśli użyta zostanie
opcja \f(CW\*(C`\-m\*(C'\fR.
+.SS "Unicode file names on Windows"
+.IX Subsection "Unicode file names on Windows"
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system \s-1ANSI\s0
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+There are some issues with displaying Unicode file names in a Windows
+console. See option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
.SS "Przykłady Unicode"
.IX Subsection "Przykłady Unicode"
Konwersja pliku \s-1UTF\-16 \s0(z \s-1BOM\s0) z formatu Windows do uniksowego \s-1UTF\-8:\s0
@@ -575,10 +647,8 @@ także zgodny ze stroną kodową Windows 936, znaną też jako \s-1GBK.\s0
.PP
Pod Uniksem/Linuksem pliki \s-1UTF\-16\s0 są konwertowane do \s-1GB18030,\s0 jeśli
kodowanie dla lokalizacji jest ustawione na \s-1GB18030.\s0 Uwaga: będzie to
-działać tylko dla lokalizacji chińskiej. W przypadku np. ustawienia
-lokalizacji angielskiej/brytyjskiej \f(CW\*(C`en_GB.GB18030\*(C'\fR konwersja \s-1UTF\-16\s0 do
-\&\s-1GB18030\s0 nie będzie działać, a dla lokalizacji chińskiej \f(CW\*(C`zh_CN.GB18030\*(C'\fR
-będzie.
+działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę
+obsługiwanych lokalizacji można sprawdzić poleceniem \f(CW\*(C`locale \-a\*(C'\fR.
.PP
Pod Windows w celu konwersji plików \s-1UTF\-16\s0 do \s-1GB18030\s0 należy użyć opcji
\&\f(CW\*(C`\-gb\*(C'\fR.
@@ -671,7 +741,13 @@ przykład, aby przekonwertować wszystkie pliki .txt w drzewie katalogów
poniżej katalogu bieżącego, należy napisać:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+In a Windows Command Prompt the following command can be used:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "LOKALIZACJA"
.IX Header "LOKALIZACJA"
diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm
index 0ffd0f4..0ca2733 100644
--- a/man/pl/man1/dos2unix.htm
+++ b/man/pl/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title>
+<title>dos2unix 7.3 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Kodowania">Kodowania</a></li>
<li><a href="#Konwersje">Konwersje</a></li>
<li><a href="#Znacznik-BOM">Znacznik BOM</a></li>
+ <li><a href="#Unicode-file-names-on-Windows">Unicode file names on Windows</a></li>
<li><a href="#Przykady-Unicode">Przyk&#x142;ady Unicode</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>Ustawienie trybu konwersji. TRYB_KONW to jeden z: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i>, przy czym domy&#x15B;lny jest ascii.</p>
</dd>
+<dt id="D---display-enc-ENCODING"><b>-D, --display-enc ENCODING</b></dt>
+<dd>
+
+<p>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> with ansi being the default.</p>
+
+<p>This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed.</p>
+
+<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+
+<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+
+<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+
+<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+
+<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+
+<p>In a ConEmu console the utf8 encoding method works well.</p>
+
+</dd>
+</dl>
+
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>Je&#x15B;li plik wej&#x15B;ciowy jest w kodowaniu UTF-16 i u&#x17C;yto opcji <code>-u</code>, zostanie zapisany BOM UTF-16.</p>
-<p>Nigdy nie nale&#x17C;y u&#x17C;ywa&#x107; tej opcji, je&#x15B;li kodowanie wyj&#x15B;ciowe jest inne ni&#x17C; UTF-8 lub UTF-16. Wi&#x119;cej w sekcji UNICODE.</p>
+<p>Nigdy nie nale&#x17C;y u&#x17C;ywa&#x107; tej opcji, je&#x15B;li kodowanie wyj&#x15B;ciowe jest inne ni&#x17C; UTF-8, UTF-16 lub GB18030. Wi&#x119;cej w sekcji UNICODE.</p>
</dd>
<dt id="n---newfile-PLIK_WEJ-PLIK_WYJ"><b>-n, --newfile PLIK_WEJ PLIK_WYJ ...</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix oraz unix2dos zawsze zapisuj&#x105; znaczniki BOM, je&#x15B;li u&#x17C;yta zostanie opcja <code>-m</code>.</p>
+<h2 id="Unicode-file-names-on-Windows">Unicode file names on Windows</h2>
+
+<p>Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type <code>dos2unix -V</code>.</p>
+
+<p>There are some issues with displaying Unicode file names in a Windows console. See option <code>-D</code>, <code>--display-enc</code>. The file names may be displayed wrongly in the console, but the files will be written with the correct name.</p>
+
<h2 id="Przykady-Unicode">Przyk&#x142;ady Unicode</h2>
<p>Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:</p>
@@ -510,7 +561,7 @@
<p>GB18030 jest w pe&#x142;ni zgodny z Unicode i mo&#x17C;e by&#x107; uwa&#x17C;any za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest tak&#x17C;e zgodny ze stron&#x105; kodow&#x105; Windows 936, znan&#x105; te&#x17C; jako GBK.</p>
-<p>Pod Uniksem/Linuksem pliki UTF-16 s&#x105; konwertowane do GB18030, je&#x15B;li kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: b&#x119;dzie to dzia&#x142;a&#x107; tylko dla lokalizacji chi&#x144;skiej. W przypadku np. ustawienia lokalizacji angielskiej/brytyjskiej <code>en_GB.GB18030</code> konwersja UTF-16 do GB18030 nie b&#x119;dzie dzia&#x142;a&#x107;, a dla lokalizacji chi&#x144;skiej <code>zh_CN.GB18030</code> b&#x119;dzie.</p>
+<p>Pod Uniksem/Linuksem pliki UTF-16 s&#x105; konwertowane do GB18030, je&#x15B;li kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: b&#x119;dzie to dzia&#x142;a&#x107; tylko, je&#x15B;li lokalizacja jest obs&#x142;ugiwana przez system. List&#x119; obs&#x142;ugiwanych lokalizacji mo&#x17C;na sprawdzi&#x107; poleceniem <code>locale -a</code>.</p>
<p>Pod Windows w celu konwersji plik&oacute;w UTF-16 do GB18030 nale&#x17C;y u&#x17C;y&#x107; opcji <code>-gb</code>.</p>
@@ -574,7 +625,11 @@
<p>Mo&#x17C;na u&#x17C;y&#x107; dos2unix w po&#x142;&#x105;czeniu z poleceniami find(1) i xargs(1) do rekurencyjnej konwersji plik&oacute;w tekstowych w strukturze drzewa katalog&oacute;w. Na przyk&#x142;ad, aby przekonwertowa&#x107; wszystkie pliki .txt w drzewie katalog&oacute;w poni&#x17C;ej katalogu bie&#x17C;&#x105;cego, nale&#x17C;y napisa&#x107;:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>In a Windows Command Prompt the following command can be used:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="LOKALIZACJA">LOKALIZACJA</h1>
diff --git a/man/pl/man1/dos2unix.po b/man/pl/man1/dos2unix.po
index 9fe6aa2..e648519 100644
--- a/man/pl/man1/dos2unix.po
+++ b/man/pl/man1/dos2unix.po
@@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-08 16:30+0100\n"
+"Project-Id-Version: dos2unix-man 7.2.1-beta1\n"
+"POT-Creation-Date: 2015-08-13 08:57+0300\n"
+"PO-Revision-Date: 2015-03-16 20:30+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -233,56 +233,138 @@ msgstr "Ustawienie trybu konwersji. TRYB_KONW to jeden z: I<ascii>, I<7bit>, I<i
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:157
+#, fuzzy
+#| msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Ustawienie trybu konwersji. TRYB_KONW to jeden z: I<ascii>, I<7bit>, I<iso>, I<mac>, przy czym domyślny jest ascii."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Wymuszenie konwersji plików binarnych."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "Pod Windows pliki w UTF-16 są domyślnie konwertowane do UTF-8, niezależnie od ustawienia lokalizacji. Ta opcja pozwala przekonwertować pliki w UTF-16 do GB18030. Opcja jest dostępna tylko pod Windows, więcej w sekcji dotyczącej GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Wyświetlenie opisu i zakończenie."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[FLAGI], --info[=FLAGI] PLIK ...>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Wyświetlenie informacji o pliku. Konwersja nie jest wykonywana."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "Wypisywane są następujące informacje, w tej kolejności: liczba DOS-owych końców linii, liczba uniksowych końców linii, liczba macowych końców linii, znacznik BOM, tekstowy lub binarny, nazwa pliku."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Przykładowe wyjście:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -306,87 +388,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Wypisanie liczby DOS-owych końców linii."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Wypisanie liczby uniksowych końców linii."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Wypisanie liczby macowych końców linii."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "Wypisanie znacznika BOM."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Wypisanie, czy plik jest tekstowy, czy binarny."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Wypisanie tylko plików, które zostałyby przekonwertowane."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Z flagą C<c> dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Przykłady:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Pokazanie informacji o wszystkich plikach *.txt:"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -396,12 +478,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Pokazanie tylko liczby DOS-owych i uniksowych końców linii:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -411,12 +493,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Pokazanie tylko znacznika BOM:"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -426,12 +508,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Wypisanie listy plików zawierających DOS-owe końce linii:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -441,12 +523,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Wypisanie listy plików zawierających uniksowe końce linii:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -456,307 +538,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "Zachowanie znacznika czasu pliku wyjściowego takiego samego, jak pliku wejściowego."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "Wyświetlenie licencji programu."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Dodanie dodatkowego znaku końca linii."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: tylko DOS-owe znaki końca linii są zamieniane na dwa uniksowe. W trybie Mac tylko macowe znaki końca linii są zamieniane na dwa uniksowe."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: tylko uniksowe znaki końca linii są zamieniane na dwa DOS-owe. W trybie Mac uniksowe znaki końca linii są zamieniane na dwa macowe."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjściowym. Domyślnie zapisywany jest BOM UTF-8."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Jeśli plik wejściowy jest w kodowaniu UTF-16 i użyto opcji C<-u>, zostanie zapisany BOM UTF-16."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8 lub UTF-16. Więcej w sekcji UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8, UTF-16 lub GB18030. Więcej w sekcji UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile PLIK_WEJ PLIK_WYJ ...>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjścia do PLIKU_WYJ. Nazwy plików muszą być podane parami, a masek I<nie> należy używać, gdyż I<spowoduje> to utratę plików."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "Osoba uruchamiająca konwersję w trybie nowego pliku (par) będzie właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile PLIK ...>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa domyślnie w tym trybie. Można używać masek."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "W trybie starego pliku (w miejscu) przekonwertowany plik otrzymuje tego samego właściciela, grupę oraz prawa odczytu/zapisu, jak plik oryginalny - także wtedy, gdy plik jest konwertowany przez innego użytkownika, mającego prawo zapisu do pliku (np. przez użytkownika root). Konwersja zostanie przerwana, jeśli nie będzie możliwe zachowanie oryginalnych wartości. Zmiana właściciela mogłaby oznaczać, że pierwotny właściciel nie może już odczytać pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby być czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem jest zero, chyba że podano błędne opcje linii poleceń."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "Usunięcie znaków BOM (Byte Order Mark). Bez zapisywania BOM do pliku wyjściowego. Jest to domyślne zachowanie przy konwersji na uniksowe końce linii. P. także opcja C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Pominięcie plików binarnych (domyślne)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "Zachowanie oryginalnego kodowania pliku wejściowego UTF-16. Plik wyjściowy zostanie zapisany w tym samym kodowaniu UTF-16 (little lub big endian), co plik wejściowy. Zapobiega to przekształceniu do UTF-8. Do pliku zostanie zapisany odpowiedni znacznik BOM UTF-16. Tę opcję można wyłączyć opcją C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Przyjęcie, że format pliku wejściowego to UTF-16LE."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Jeśli w pliku wejściowym jest znacznik BOM (Byte Order Mark), ma on priorytet nad tą opcją."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Jeśli przyjęto błędne założenie (plik wejściowy nie jest w formacie UTF-16LE), a konwersja się uda, wynikiem będzie plik wyjściowy UTF-8 ze złym tekstem. Konwersję tę można odwrócić przy użyciu polecenia iconv(1) do konwersji wyjścia UTF-8 z powrotem do UTF-16LE. Przywróci to plik oryginalny."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "Przyjęcie UTF-16LE działa jako I<tryb konwersji>. Przy przełączeniu na domyślny tryb I<ascii> przyjęcie UTF-16LE jest wyłączane."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Przyjęcie, że format pliku wejściowego to UTF-16BE."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Ta opcja działa analogicznie do C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Wyświetlanie szczegółowych komunikatów. Wyświetlane śa dodatkowe informacje o znacznikach BOM (Byte Order Mark) oraz liczbie przekonwertowanych końców linii."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Podążanie za dowiązaniami symbolicznymi i konwertowanie ich celów"
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Zastępowanie dowiązań symbolicznych przekonwertowanymi plikami (oryginalne pliki docelowe pozostają bez zmian)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Pozostawienie dowiązań symbolicznych i celów bez zmian (domyślne)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Wyświetlenie informacji o wersji i zakończenie."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "TRYB MAC"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu DOS nie są zmieniane."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Aby uruchomić program w trybie Mac, należy użyć opcji linii poleceń C<-c mac> albo użyć poleceń C<mac2unix> lub C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "TRYBY KONWERSJI"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "W trybie C<ascii> konwertowane są tylko końce linii. Jest to domyślny tryb konwersji."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode UTF-8."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "W tym trybie wszystkie znaki 8-bitowe spoza ASCII (o wartościach od 128 do 255) są konwertowane do przestrzeni 7-bitowej."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "W tym trybie znaki są konwertowane między zestawem znaków DOS (stroną kodową) a zestawem znaków ISO-8859-1 (Latin-1) używanym na Uniksie. Znaki DOS-owe nie mające odpowiednika w ISO-8859-1, których nie da się przekonwertować, są zamieniane na kropkę. To samo dotyczy znaków ISO-8859-1 bez odpowiednika w DOS-ie."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Jeśli używana jest tylko opcja C<-iso>, dos2unix próbuje wykryć aktywną stronę kodową. Jeśli nie jest to możliwe, dos2unix używa domyślnej strony kodowej CP437, stosowanej głównie w USA. Aby wymusić określoną stronę kodową, należy użyć opcji C<-437> (US), C<-850> (zachodnioeuropejska), C<-860> (portugalska), C<-863> (kanadyjska francuska) lub C<-865> (nordycka). Ponadto obsługiwana jest strona kodowa Windows CP1252 (zachodnioeuropejska) przy użyciu opcji C<-1252>. W przypadku innych stron kodowych można użyć narzędzia dos2unix wraz z iconv(1). Iconv potrafi konwertować między wieloma kodowaniami znaków."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Nigdy nie należy używać konwersji ISO na plikach tekstowych w Unicode. Uszkodziłaby pliki kodowane UTF-8."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Konwersja z domyślnej strony kodowej DOS do uniksowego Latin-1:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -766,12 +848,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Konwersja ze strony kodowej DOS CP850 do uniksowego Latin-1:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -781,12 +863,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego Latin-1:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -796,12 +878,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -811,12 +893,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Konwersa z uniksowego Latin-1 do domyślnej strony kodowej DOS:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -826,12 +908,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Konwersja z uniksowego Latin-1 do strony kodowej DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -841,12 +923,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Konwersja z uniksowego Latin-1 do strony kodowej Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -856,12 +938,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Konwersja z uniksowego UTF-8 (Unicode) do strony kodowej Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -871,127 +953,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Więcej pod adresem L<http://czyborra.com/charsets/codepages.html> oraz L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Kodowania"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Istnieją różne kodowania Unicode. Pod Uniksem i Linuksem pliki Unicode są zwykle kodowane z użyciem UTF-8. Pod Windows pliki tekstowe Unicode mogą być kodowane w UTF-8, UTF-16, UTF-16 big-endian, ale przeważnie są kodowane w UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Konwersje"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak zwykłe pliki tekstowe."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix i unix2dos z obsługą Unicode UTF-16 potrafią odczytywać pliki tekstowe kodowane UTF-16 little- oraz big-endian. Aby sprawdzić, czy dos2unix został zbudowany z obsługą UTF-16, należy napisać C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "Pod Uniksem/Linuksem pliki w kodowaniu UTF-16 są konwertowane do kodowania znaków ustawionej lokalizacji. Kodowanie znaków dla lokalizacji można sprawdzić poleceniem locale(1). Jeśli konwersja nie jest możliwa, wystąpi błąd, a plik zostanie pominięty."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "Pod Windows pliki UTF-16 są domyślnie konwertowane do UTF-8. Pliki tekstkowe w kodowaniu UTF-8 są dobrze obsługiwane zarówno pod Windows, jak i Uniksem/Linuksem."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Kodowania UTF-16 i UTF-8 są w pełni zgodne, konwersja nie spowoduje utraty żadnej części tekstu. W przypadku wystąpienia błędu konwersji, na przykład w przypadku błędu w pliku wejściowym UTF-16, plik zostanie pominięty."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "W przypadku użycia opcji C<-u>, plik wejściowy zostanie zapisany w tym samym kodowaniu UTF-16, co plik wejściowy. Opcja C<-u> zapobiega konwersji do UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix oraz unix2dos nie mają opcji pozwalającej na konwersję plików UTF-8 do UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Tryby konwersji ISO i 7-bit nie działają na plikach UTF-16."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Znacznik BOM"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L<http://pl.wikipedia.org/wiki/BOM_(informatyka)>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix potrafi wykryć tylko, czy plik jest w formacie UTF-16, jeśli zawiera znacznik BOM. Jeśli plik UTF-16 nie ma tego znacznika, dos2unix potraktuje plik jako binarny."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Do konwersji pliku UTF-16 bez znacznika BOM można użyć opcji C<-ul> lub C<-ub>."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2unix nie zapisuje domyślnie znaku BOM w pliku wyjściowym. Z opcją C<-b> Dos2unix zapisuje BOM, jeśli plik wejściowy zawiera BOM."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos domyślnie zapisuje znaczniki BOM w pliku wyjściowym, jeśli plik wejściowy ma BOM. Aby usunąć BOM, można użyć opcji C<-r>."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix oraz unix2dos zawsze zapisują znaczniki BOM, jeśli użyta zostanie opcja C<-m>."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr ""
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Przykłady Unicode"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1001,12 +1098,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Konwersja pliku UTF-16LE (bez BOM) z formatu Windows do uniksowego UTF-8:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1016,12 +1113,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Konwersja z uniksowego UTF-8 do UTF-8 z BOM dla Windows:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1031,12 +1128,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Konwersja z uniksowego UTF-8 do UTF-16 dla Windows:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1046,47 +1143,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest także zgodny ze stroną kodową Windows 936, znaną też jako GBK."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to działać tylko dla lokalizacji chińskiej. W przypadku np. ustawienia lokalizacji angielskiej/brytyjskiej C<en_GB.GB18030> konwersja UTF-16 do GB18030 nie będzie działać, a dla lokalizacji chińskiej C<zh_CN.GB18030> będzie."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę obsługiwanych lokalizacji można sprawdzić poleceniem C<locale -a>."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Pod Windows w celu konwersji plików UTF-16 do GB18030 należy użyć opcji C<-gb>."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "Pliki w kodowaniu GB18030 mogą mieć znacznik BOM, podobnie jak pliki w Unicode."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "PRZYKŁADY"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Odczyt ze standardowego wejścia i zapis na standardowe wyjście:"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1098,12 +1195,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1115,12 +1212,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Konwersja i zastąpienie a.txt w trybie ascii:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1130,12 +1227,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Konwersja i zastąpienie a.txt w trybie ascii; konwersja i zastąpienie b.txt w trybie 7-bitowym:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1149,12 +1246,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Konwersja a.txt z formatu Mac do formatu uniksowego:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1166,12 +1263,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Konwersja a.txt z formatu uniksowego do formatu Mac:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1183,12 +1280,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Konwersja i zastąpienie a.txt z zachowaniem oryginalnego znacznika czasu:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1200,12 +1297,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Konwersja a.txt i zapis do e.txt:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1215,12 +1312,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Konwersja a.txt i zapis do e.txt z zachowaniem znacznika czasu e.txt takiego, jak a.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1230,12 +1327,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Konwersja i zastąpienie a.txt; konwersja b.txt i zapis do e.txt:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1247,12 +1344,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Konwersja c.txt i zapis do e.txt; konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt; konwersja d.txt i zapis do f.txt:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1262,42 +1359,63 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "KONWERSJA REKURENCYJNA"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Można użyć dos2unix w połączeniu z poleceniami find(1) i xargs(1) do rekurencyjnej konwersji plików tekstowych w strukturze drzewa katalogów. Na przykład, aby przekonwertować wszystkie pliki .txt w drzewie katalogów poniżej katalogu bieżącego, należy napisać:"
#. type: verbatim
-#: dos2unix.pod:616
-#, no-wrap
+#: dos2unix.pod:690
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:694
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
+msgid ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "LOKALIZACJA"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "Główny język wybiera się zmienną środowiskową LANG. Zmienna LANG składa się z kilku części. Pierwsza część to małe litery oznaczające kod języka. Druga część jest opcjonalna i zawiera kod kraju pisany wielkimi literami, poprzedzony podkreśleniem. Jest także opcjonalna trzecia część: kodowanie znaków, poprzedzone kropką. Kilka przykładów dla powłok zgodnych ze standardem POSIX:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1319,47 +1437,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1)."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C<LANGUAGE=nl:de>. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż \"C\". Więcej informacji znajduje się w podręczniku do gettexta: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Przy użyciu zmiennej środowiskowej DOS2UNIX_LOCALEDIR, można nadpisać ustawienie LOCALEDIR z czasu kompilacji. LOCALEDIR to katalog używany do znalezienia plików lokalizacji. Domyślną wartością dla GNU jest C</usr/local/share/locale>. Opcja B<--version> wyświetla używaną wartość LOCALEDIR."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Przykład (dla powłoki POSIX):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1369,71 +1487,71 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "WARTOŚĆ ZWRACANA"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "W przypadku powodzenia zwracane jest zero. Jeśli wystąpi błąd systemowy, zwracany jest ostatni błąd systemowy. W przypadku innych błędów zwracane jest 1."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "Wartość zwracana w trybie cichym to zawsze zero, z wyjątkiem sytuacji podania błędnych opcji linii poleceń."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "STANDARDY"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://pl.wikipedia.org/wiki/Plik_tekstowy>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://pl.wikipedia.org/wiki/End-of-line>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://pl.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTORZY"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin <blin@socs.uts.edu.au>; Bernd Johannes Wuebben (tryb mac2unix) <wuebben@kde.org>; Christian Wurll (dodawanie dodatkowej nowej linii) <wurll@ira.uka.de>; Erwin Waterlander <waterlan@xs4all.nl> (prowadzący)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Strona projektu: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Strona SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "ZOBACZ TAKŻE"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/pl/man1/dos2unix.pod b/man/pl/man1/dos2unix.pod
index 17f9053..4c8ac57 100644
--- a/man/pl/man1/dos2unix.pod
+++ b/man/pl/man1/dos2unix.pod
@@ -124,6 +124,72 @@ konwersji na DOS-owe końce linii. P. także opcja C<-r>.
Ustawienie trybu konwersji. TRYB_KONW to jeden z: I<ascii>, I<7bit>, I<iso>,
I<mac>, przy czym domyślny jest ascii.
+=item B<-D, --display-enc ENCODING>
+
+Set encoding of displayed text. Where ENCODING is one of: I<ansi>,
+I<unicode>, I<utf8> with ansi being the default.
+
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix's default method is to use ANSI encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active DOS OEM code page to the Windows
+system ANSI code page using the C<chcp> command, because dos2unix uses the
+Windows system code page.
+
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is OK.
+
+=item B<unicode>
+
+The advantage of unicode (the Windows name for UTF-16) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+
+The disadvantage of unicode is that it is not compatible with ASCII. The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct UTF-16 file.
+
+=item B<utf8>
+
+The advantage of utf8 is that it is compatible with ASCII and when you
+redirect it to a file you get a proper UTF-8 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the C<unicode> encoding.
+
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+
+In a ConEmu console the utf8 encoding method works well.
+
+=back
+
+The default encoding can be changed with environment variable
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+
=item B<-f, --force>
Wymuszenie konwersji plików binarnych.
@@ -244,7 +310,7 @@ Jeśli plik wejściowy jest w kodowaniu UTF-16 i użyto opcji C<-u>, zostanie
zapisany BOM UTF-16.
Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż
-UTF-8 lub UTF-16. Więcej w sekcji UNICODE.
+UTF-8, UTF-16 lub GB18030. Więcej w sekcji UNICODE.
@@ -502,6 +568,19 @@ wejściowy ma BOM. Aby usunąć BOM, można użyć opcji C<-r>.
Dos2unix oraz unix2dos zawsze zapisują znaczniki BOM, jeśli użyta zostanie
opcja C<-m>.
+=head2 Unicode file names on Windows
+
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system ANSI
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type C<dos2unix -V>.
+
+There are some issues with displaying Unicode file names in a Windows
+console. See option C<-D>, C<--display-enc>. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
+
=head2 Przykłady Unicode
Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:
@@ -532,10 +611,8 @@ także zgodny ze stroną kodową Windows 936, znaną też jako GBK.
Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli
kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to
-działać tylko dla lokalizacji chińskiej. W przypadku np. ustawienia
-lokalizacji angielskiej/brytyjskiej C<en_GB.GB18030> konwersja UTF-16 do
-GB18030 nie będzie działać, a dla lokalizacji chińskiej C<zh_CN.GB18030>
-będzie.
+działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę
+obsługiwanych lokalizacji można sprawdzić poleceniem C<locale -a>.
Pod Windows w celu konwersji plików UTF-16 do GB18030 należy użyć opcji
C<-gb>.
@@ -607,7 +684,11 @@ rekurencyjnej konwersji plików tekstowych w strukturze drzewa katalogów. Na
przykład, aby przekonwertować wszystkie pliki .txt w drzewie katalogów
poniżej katalogu bieżącego, należy napisać:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 LOKALIZACJA
diff --git a/man/pl/man1/dos2unix.txt b/man/pl/man1/dos2unix.txt
index 324eeba..c978d1d 100644
--- a/man/pl/man1/dos2unix.txt
+++ b/man/pl/man1/dos2unix.txt
@@ -89,6 +89,67 @@ OPCJE
Ustawienie trybu konwersji. TRYB_KONW to jeden z: *ascii*, *7bit*,
*iso*, *mac*, przy czym domyślny jest ascii.
+ -D, --display-enc ENCODING
+ Set encoding of displayed text. Where ENCODING is one of: *ansi*,
+ *unicode*, *utf8* with ansi being the default.
+
+ This option is only available in dos2unix for Windows with Unicode
+ file name support. This option has no effect on the actual file
+ names read and written, only on how they are displayed.
+
+ There are several methods for displaying text in a Windows console
+ based on the encoding of the text. They all have their own
+ advantages and disadvantages.
+
+ ansi
+ Dos2unix's default method is to use ANSI encoded text. The
+ advantage is that it is backwards compatible. It works with
+ raster and TrueType fonts. In some regions you may need to
+ change the active DOS OEM code page to the Windows system ANSI
+ code page using the "chcp" command, because dos2unix uses the
+ Windows system code page.
+
+ The disadvantage of ansi is that international file names with
+ characters not inside the system default code page are not
+ displayed properly. You will see a question mark, or a wrong
+ symbol instead. When you don't work with foreign file names this
+ method is OK.
+
+ unicode
+ The advantage of unicode (the Windows name for UTF-16) encoding
+ is that text is usually properly displayed. There is no need to
+ change the active code page. You may need to set the console's
+ font to a TrueType font to have international characters
+ displayed properly. When a character is not included in the
+ TrueType font you usually see a small square, sometimes with a
+ question mark in it.
+
+ When you use the ConEmu console all text is displayed properly,
+ because ConEmu automatically selects a good font.
+
+ The disadvantage of unicode is that it is not compatible with
+ ASCII. The output is not easy to handle when you redirect it to
+ another program or a file. Redirection to a file does not give a
+ correct UTF-16 file.
+
+ utf8
+ The advantage of utf8 is that it is compatible with ASCII and
+ when you redirect it to a file you get a proper UTF-8 file. You
+ need to set the console's font to a TrueType font. With a
+ TrueType font the text is displayed similar as with the
+ "unicode" encoding.
+
+ The disadvantage is that when you use the default raster font
+ all non-ASCII characters are displayed wrong. Not only unicode
+ file names, but also translated messages become unreadable. On
+ Windows configured for an East-Asian region you may see a lot of
+ flickering of the console when the messages are displayed.
+
+ In a ConEmu console the utf8 encoding method works well.
+
+ The default encoding can be changed with environment variable
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+
-f, --force
Wymuszenie konwersji plików binarnych.
@@ -187,7 +248,7 @@ OPCJE
zostanie zapisany BOM UTF-16.
Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest
- inne niż UTF-8 lub UTF-16. Więcej w sekcji UNICODE.
+ inne niż UTF-8, UTF-16 lub GB18030. Więcej w sekcji UNICODE.
-n, --newfile PLIK_WEJ PLIK_WYJ ...
Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjścia do
@@ -421,6 +482,18 @@ UNICODE
Dos2unix oraz unix2dos zawsze zapisują znaczniki BOM, jeśli użyta
zostanie opcja "-m".
+ Unicode file names on Windows
+ Dos2unix has optional support for reading and writing Unicode file names
+ in the Windows Command Prompt. That means that dos2unix can open files
+ that have characters in the name that are not part of the default system
+ ANSI code page. To see if dos2unix for Windows was built with Unicode
+ file name support type "dos2unix -V".
+
+ There are some issues with displaying Unicode file names in a Windows
+ console. See option "-D", "--display-enc". The file names may be
+ displayed wrongly in the console, but the files will be written with the
+ correct name.
+
Przykłady Unicode
Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:
@@ -450,10 +523,8 @@ GB18030
Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli
kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to
- działać tylko dla lokalizacji chińskiej. W przypadku np. ustawienia
- lokalizacji angielskiej/brytyjskiej "en_GB.GB18030" konwersja UTF-16 do
- GB18030 nie będzie działać, a dla lokalizacji chińskiej "zh_CN.GB18030"
- będzie.
+ działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę
+ obsługiwanych lokalizacji można sprawdzić poleceniem "locale -a".
Pod Windows w celu konwersji plików UTF-16 do GB18030 należy użyć opcji
"-gb".
@@ -524,7 +595,11 @@ KONWERSJA REKURENCYJNA
Na przykład, aby przekonwertować wszystkie pliki .txt w drzewie
katalogów poniżej katalogu bieżącego, należy napisać:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
LOKALIZACJA
LANG
diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1
index e973175..6b61ea6 100644
--- a/man/pt_BR/man1/dos2unix.1
+++ b/man/pt_BR/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -175,6 +175,66 @@ converter para quebras de linha do \s-1DOS.\s0 Veja também a opção \f(CW\*(C`
.IX Item "-c, --convmode MODOCONV"
Define o modo de conversão, sendo \s-1MODOCONV\s0 um dentre: \fIascii\fR, \fI7bit\fR,
\&\fIiso\fR, \fImac\fR com ascii sendo o padrão.
+.IP "\fB\-D, \-\-display\-enc \s-1ENCODING\s0\fR" 4
+.IX Item "-D, --display-enc ENCODING"
+Set encoding of displayed text. Where \s-1ENCODING\s0 is one of: \fIansi\fR,
+\&\fIunicode\fR, \fIutf8\fR with ansi being the default.
+.Sp
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+.Sp
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
+system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
+Windows system code page.
+.Sp
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+.Sp
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+.Sp
+The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when you
+redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
+.Sp
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+.Sp
+In a ConEmu console the utf8 encoding method works well.
+.RE
+.RS 4
+.Sp
+The default encoding can be changed with environment variable
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Força a conversão de arquivos binários.
@@ -293,8 +353,8 @@ Escreve uma marca de ordem de byte (\s-1BOM\s0) no arquivo de saída. Por padrã
Quando o arquivo de entrada é \s-1UTF\-16,\s0 e a opção \f(CW\*(C`\-u\*(C'\fR é usada, um \s-1BOM UTF\-16\s0
será escrito.
.Sp
-Nunca use essa opção quando a codificação de saída é outra além de \s-1UTF\-8\s0 ou
-\&\s-1UTF\-16.\s0 Veja também a seção \s-1UNICODE.\s0
+Never use this option when the output encoding is other than \s-1UTF\-8, UTF\-16,\s0
+or \s-1GB18030.\s0 See also section \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1ARQENT\s0 ARQSAÍDA ...\fR" 4
.IX Item "-n, --newfile ARQENT ARQSAÍDA ..."
Modo de novo arquivo. Converte o arquivo \s-1ARQENT\s0 e escreve a saída para o
@@ -538,6 +598,18 @@ Unix2dos escreve por padrão um \s-1BOM\s0 no arquivo de saída quando o arquivo
entrada tem \s-1BOM.\s0 Use a opção \f(CW\*(C`\-m\*(C'\fR para remover \s-1BOM.\s0
.PP
Dos2unix e unix2dos sempre escrevem \s-1BOM\s0 quando a opção \f(CW\*(C`\-m\*(C'\fR é usada.
+.SS "Unicode file names on Windows"
+.IX Subsection "Unicode file names on Windows"
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system \s-1ANSI\s0
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+There are some issues with displaying Unicode file names in a Windows
+console. See option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
.SS "Exemplos de Unicode"
.IX Subsection "Exemplos de Unicode"
Conversão de \s-1UTF\-16\s0 do Windows (com \s-1BOM\s0) para \s-1UTF\-8\s0 do Unix:
@@ -574,12 +646,10 @@ formato de transformação de unicode. Assim como \s-1UTF\-8, GB18030\s0 é comp
com \s-1ASCII. GB18030\s0 também é compatível com a página de código 936 do
Windows, também conhecida como \s-1GBK.\s0
.PP
-No Unix/Linux, arquivos \s-1UTF\-16\s0 são convertidos para \s-1GB18030\s0 quando a
-codificação da localização é definida para \s-1GB18030.\s0 Note que isso vai
-funcionar apenas se a localização estiver definida para China. Por exemplo,
-em uma configuração de localização inglesa (Britânia) a conversão
-\&\f(CW\*(C`en_GB.GB18030\*(C'\fR de \s-1UTF\-16\s0 para \s-1GB18030\s0 não vai funcionar, mas em uma
-configuração de localização \f(CW\*(C`zh_CN.GB18030\*(C'\fR chinesa vai funcionar.
+On Unix/Linux \s-1UTF\-16\s0 files are converted to \s-1GB18030\s0 when the locale encoding
+is set to \s-1GB18030.\s0 Note that this will only work if the locale is supported
+by the system. Use command \f(CW\*(C`locale \-a\*(C'\fR to get the list of supported
+locales.
.PP
No Windows, você precisa usar a opção \f(CW\*(C`\-gb\*(C'\fR para converter arquivos \s-1UTF\-16\s0
para \s-1GB18030.\s0
@@ -672,7 +742,13 @@ exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o
diretório atual, digite:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+In a Windows Command Prompt the following command can be used:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "LOCALIZAÇÃO"
.IX Header "LOCALIZAÇÃO"
diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm
index b0df600..2fb4cb3 100644
--- a/man/pt_BR/man1/dos2unix.htm
+++ b/man/pt_BR/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title>
+<title>dos2unix 7.3 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#Codificaes">Codifica&ccedil;&otilde;es</a></li>
<li><a href="#Converso">Convers&atilde;o</a></li>
<li><a href="#Marca-de-ordem-de-byte">Marca de ordem de byte</a></li>
+ <li><a href="#Unicode-file-names-on-Windows">Unicode file names on Windows</a></li>
<li><a href="#Exemplos-de-Unicode">Exemplos de Unicode</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>Define o modo de convers&atilde;o, sendo MODOCONV um dentre: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> com ascii sendo o padr&atilde;o.</p>
</dd>
+<dt id="D---display-enc-ENCODING"><b>-D, --display-enc ENCODING</b></dt>
+<dd>
+
+<p>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> with ansi being the default.</p>
+
+<p>This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed.</p>
+
+<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+
+<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+
+<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+
+<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+
+<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+
+<p>In a ConEmu console the utf8 encoding method works well.</p>
+
+</dd>
+</dl>
+
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>Quando o arquivo de entrada &eacute; UTF-16, e a op&ccedil;&atilde;o <code>-u</code> &eacute; usada, um BOM UTF-16 ser&aacute; escrito.</p>
-<p>Nunca use essa op&ccedil;&atilde;o quando a codifica&ccedil;&atilde;o de sa&iacute;da &eacute; outra al&eacute;m de UTF-8 ou UTF-16. Veja tamb&eacute;m a se&ccedil;&atilde;o UNICODE.</p>
+<p>Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE.</p>
</dd>
<dt id="n---newfile-ARQENT-ARQSADA"><b>-n, --newfile ARQENT ARQSA&Iacute;DA ...</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix e unix2dos sempre escrevem BOM quando a op&ccedil;&atilde;o <code>-m</code> &eacute; usada.</p>
+<h2 id="Unicode-file-names-on-Windows">Unicode file names on Windows</h2>
+
+<p>Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type <code>dos2unix -V</code>.</p>
+
+<p>There are some issues with displaying Unicode file names in a Windows console. See option <code>-D</code>, <code>--display-enc</code>. The file names may be displayed wrongly in the console, but the files will be written with the correct name.</p>
+
<h2 id="Exemplos-de-Unicode">Exemplos de Unicode</h2>
<p>Convers&atilde;o de UTF-16 do Windows (com BOM) para UTF-8 do Unix:</p>
@@ -510,7 +561,7 @@
<p>GB18030 &eacute; completamente compat&iacute;vel com Unicode e pode ser considerado um formato de transforma&ccedil;&atilde;o de unicode. Assim como UTF-8, GB18030 &eacute; compat&iacute;vel com ASCII. GB18030 tamb&eacute;m &eacute; compat&iacute;vel com a p&aacute;gina de c&oacute;digo 936 do Windows, tamb&eacute;m conhecida como GBK.</p>
-<p>No Unix/Linux, arquivos UTF-16 s&atilde;o convertidos para GB18030 quando a codifica&ccedil;&atilde;o da localiza&ccedil;&atilde;o &eacute; definida para GB18030. Note que isso vai funcionar apenas se a localiza&ccedil;&atilde;o estiver definida para China. Por exemplo, em uma configura&ccedil;&atilde;o de localiza&ccedil;&atilde;o inglesa (Brit&acirc;nia) a convers&atilde;o <code>en_GB.GB18030</code> de UTF-16 para GB18030 n&atilde;o vai funcionar, mas em uma configura&ccedil;&atilde;o de localiza&ccedil;&atilde;o <code>zh_CN.GB18030</code> chinesa vai funcionar.</p>
+<p>On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command <code>locale -a</code> to get the list of supported locales.</p>
<p>No Windows, voc&ecirc; precisa usar a op&ccedil;&atilde;o <code>-gb</code> para converter arquivos UTF-16 para GB18030.</p>
@@ -574,7 +625,11 @@
<p>Use dos2unix em combina&ccedil;&atilde;o com os comandos find(1) e xargs(1) para converter recursivamente arquivos texto em uma estrutura de &aacute;rvore de diret&oacute;rios. Por exemplo, para converter todos os arquivos .txt na &aacute;rvore de diret&oacute;rios sob o diret&oacute;rio atual, digite:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>In a Windows Command Prompt the following command can be used:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="LOCALIZAO">LOCALIZA&Ccedil;&Atilde;O</h1>
diff --git a/man/pt_BR/man1/dos2unix.po b/man/pt_BR/man1/dos2unix.po
index b761025..8202aff 100644
--- a/man/pt_BR/man1/dos2unix.po
+++ b/man/pt_BR/man1/dos2unix.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix-man 7.2-beta4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
+"POT-Creation-Date: 2015-08-13 08:57+0300\n"
"PO-Revision-Date: 2015-01-03 17:19-0300\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
@@ -238,56 +238,138 @@ msgstr "Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:157
+#, fuzzy
+#| msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>, I<iso>, I<mac> com ascii sendo o padrão."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Força a conversão de arquivos binários."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "No Windows, arquivos UTF-16 são convertidos, por padrão, para UTF-8, independentemente da localização definida. Use esta opção para converter arquivos UTF-16 para GB18030. Essa opção está disponível apenas no Windows. Veja também a seção GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Exibe ajuda e sai."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[OPÇÕES], --info[=OPÇÕES] ARQUIVO ...>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Exibe informação do arquivo. Nenhuma conversão é feita."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "A seguinte informação é exibida, nesta ordem: número de quebras de linha do DOS, número de quebras de linha do Unix, número de quebras de linha do Mac, marca de ordem de byte, \"text\" ou \"binário\", nome de arquivo."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Saída de exemplo:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -311,87 +393,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Exibe o número de quebras de linhas do DOS."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Exibe o número de quebras de linhas do Unix."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Exibe o número de quebras de linhas do Mac."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "Exibe a marca de ordem de byte."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Exibe se arquivo é texto ou binário."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Exib apenas os arquivos que seriam convertidos."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Com a opção C<c>, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Exemplos:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Mostra informação sobre todos os arquivos *.txt:"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -401,12 +483,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Mostra apenas o número de quebras de linha DOS e Unix:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -416,12 +498,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Mostra apenas a marca de ordem de byte:"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -431,12 +513,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Lista os arquivos que possuem quebras de linha do DOS:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -446,12 +528,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Lista os arquivos que possuem quebras de linha do Unix:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -461,307 +543,309 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "Mantém a marca da data do arquivo de saída igual ao do arquivo de entrada."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "Exibe a licença do programa."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Adiciona nova linha adicional."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: Apenas quebras de linha do DOS são alteradas para duas quebras de linha do Unix. No modo Mac, apenas quebras de linha do Mac são alterados para duas quebras de linha do Unix."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: Apenas quebras de linha do Unix são alteradas para duas quebras de linha do DOS. No modo Mac, quebras de linha do Unix são alteradas para duas quebras de linha do Mac."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Escreve uma marca de ordem de byte (BOM) no arquivo de saída. Por padrão, um BOM UTF-8 é escrito."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16 será escrito."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
+#: dos2unix.pod:335
+#, fuzzy
+#| msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
msgstr "Nunca use essa opção quando a codificação de saída é outra além de UTF-8 ou UTF-16. Veja também a seção UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ARQENT ARQSAÍDA ...>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa I<não> deveriam ser usados ou você I<vai> perder seus arquivos."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ARQUIVO ...>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo dono, grupo e permissões de leitura/escrita que o arquivo original. Também, quando o arquivo é convertido por outro usuário que tenha permissões de escrita no arquivo (ex.: usuário root). A conversão será abortada quando não for possível preservar os valores originais. Alteração do dono pode significar que o dono original não é mais capaz de ler o arquivo. Alteração do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Modo quieto. Suprime todos os avios e mensagens. O valor retornado é zero. Exceto quando opções de linha de comando erradas forem usadas."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "remove marca de ordem de bytes (BOM). Não escreve um BOM no arquivo de saída. Esse é o comportamento padrão ao converter para quebras de linha Unix. Veja também a opção C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Ignora arquivo binários (padrão)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "Mantém a codificação UTF-16 original do arquivo de entrada. O arquivo de saída será escrito na mesma codificação UTF-16, em little ou big endian, como o arquivo de entrada. Isso evita transformação para UTF-8. Como consequência, um BOM UTF-16 será escrito. Essa opção pode ser desabilitada com a opção C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Presume que o formato de arquivo de entrada é UTF-16LE."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Quando há uma marca de ordem de byte no arquivo de entrada, esta tem prioridade sobre essa opção."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Quando você fizer uma presunção equivocada (o arquivo de entrada não estava no formato UTF-16LE) e a conversão funcionar, você terá um arquivo de saída UTF-8 com texto errado. Você pode desfazer a conversão errada com iconv(1) pela conversão do arquivo de saída UTF-8 de volta para UTF-16LE. Isso vai trazer de volta o arquivo para o original."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "A presunção de UTF-16LE funciona como um I<modo de conversão>. Ao alternara o modo I<ascii> padrão, a presunção de UTF-16LE é desativada."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Presume que o formato de arquivo de entrada é UTF-16BE."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Essa opção funciona o mesmo que a opção C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem de byte e a quantidade de quebras de linha convertidas."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Segue ligações simbólicas e converte os alvos."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Substitui ligações simbólicas com arquivos convertidos (arquivos alvo originais permanecem inalterados)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Mentém ligações simbólicas e alvos inalterados (padrão)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Exibe informação da versão e sai."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "MODO MAC"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "No modo normal, as quebras de linhas são convertidas de DOS para Unix e vice-versa. Quebras de linha do Mac não são convertidas."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Para executar no modo Mac, use a opção de linha de comando C<-c mac> ou use os comandos C<mac2unix> ou C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "MODOS DE CONVERSÃO"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "No modo C<ascii>, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bit, o modo é em verdade 8 bit. Sempre use este modo quando quiser converter arquivos Unicode UTF-8."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "Neste modo todos os caracteres não-ASCII de 8 bit (com valores entre 128 e 255) são convertidos para um espaço de 7 bit."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Caracteres são convertidos entre um conjunto de caracteres do DOS (página de código) e conjunto de caracteres ISO-8859-1 (Latin-1) no Unix. Caracteres de DOS sem um equivalente ISO-8859-1, para os quais a conversão não é possível, são convertidos para um ponto. O mesmo vale para caracteres ISO-8859-1 sem a contraparte DOS."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Quando apenas a opção C<-iso> for usada, dos2unix vai tentar determinar a página de código ativa. Quando isso não for possível, dos2unix vai usar a página de código padrão CP437, a qual é usada principalmente nos EUA. Para forçar uma página de código específica, use as opções C<-437> (EUA), C<-850> (Europeu oriental), C<-860> (Português), C<-863> (Franco-canadense) ou C<-865> (Nórdico). Também há suporte à página de código do Windows CP1252 (Europeu ocidental) com a opção C<-1252>. Para outras páginas de código, use dos2unix em combinação cm iconv(1). Iconv pode converter entre uma lista grande de codificações de caracteres."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Nunca use conversão ISO em arquivos textos Unicode. Isso vai corromper os arquivos codificados em UTF-8."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Conversão da página de código padrão do DOS para Latin-1 do Unix:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -771,12 +855,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Conversão da CP850 do DOS para Latin-1 do Unix:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -786,12 +870,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Conversão da CP1252 do Windows para Latin-1 do Unix:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -801,12 +885,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Conversão da CP1252 do Windows para UTF-8 (Unicode) do Unix:"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -816,12 +900,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Conversão de Latin-1 do Unix para página de código padrão do DOS:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -831,12 +915,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Conversão do Latin-1 do Unix para CP850 do DOS:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -846,12 +930,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Conversão do Latin-1 do unix para CP1252 do Windows:"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -861,12 +945,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Conversão do UTF-8 (Unicode) do Unix para CP1252 do Windows:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -876,127 +960,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Veja também L<http://czyborra.com/charsets/codepages.html> e L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Codificações"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Exitem codificações Unicode diferentes. No Unix e no Linux, arquivos Unicode são geralmente codificados em UTF-8. No Windows, arquivos texto Unicode podem ser codificados em UTF-8, UTF-16 ou UTF-16 big endian, mas na maioria das vezes são codificados no formato UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Conversão"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, como arquivos texto comuns."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade reversa com ASCII."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Dos2unix e unix2dos com suporte a Unicode UTF-16 podem ler arquivos texto codificados em little e big endian UTF-16. Para ver se dos2unix foi compilado com suporte a UTF-16, digite C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "No Unix/Linux, arquivos codificados em UTF-16 são convertidos para a codificação de caracteres do localização. Use o comando locale(1) para descobrir qual é a codificação de caracteres da localização. Quando a conversão não for possível, ocorrerá um erro e o arquivo será ignorado."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "No Windows, arquivos UTF-16 são convertidos, por padrão, para UTF-8. Arquivos texto formatados em UTF-8 possuem ótimo suporte em ambos Windows e Unix/Linux."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Codificações UTF-16 e UTF-8 são completamente compatíveis, não havendo qualquer perda de texto na conversão. Quando um erro de conversão UTF-16 para UTF-8 ocorre, por exemplo quando o arquivo de entrada UTF-16 contém um erro, o arquivo será ignorado."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Quando a opção C<-u> é usada, o arquivo de saída será escrito na mesma codificação UTF-16 que o arquivo de saída. A opção C<-u> evita conversão para UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Marca de ordem de byte"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona BOMs por padrão. Veja também L<http://en.wikipedia.org/wiki/Byte_order_mark>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da localização."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Dos2unix pode detectar apenas se um arquivo está no formato UTF-16 se o arquivo tiver BOM. Quando um arquivo UTF-16 não tiver BOM, dos2unix vai ver se o arquivo é um arquivo binário."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Use a opção C<-ul> ou C<-ub> para converter um arquivo UTF-16 sem BOM."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Dos2unix escreve por padrão nenhum BOM no arquivo de saída. Com a opção C<-b>, o Dos2unix escreve um BOM quando o arquivo de entrada possuir BOM."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Unix2dos escreve por padrão um BOM no arquivo de saída quando o arquivo de entrada tem BOM. Use a opção C<-m> para remover BOM."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr ""
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Exemplos de Unicode"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1006,12 +1105,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Conversão de UTF-16LE do Windows (sem BOM) para UTF-8 do Unix:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1021,12 +1120,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Conversão de UTF-8 Unix para UTF-8 do Windows com BOM:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1036,12 +1135,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Conversão de UTF-8 do Unix para UTF-16 do Windows:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1051,47 +1150,49 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do padrão GB18030 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível com ASCII. GB18030 também é compatível com a página de código 936 do Windows, também conhecida como GBK."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
+#: dos2unix.pod:620
+#, fuzzy
+#| msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
msgstr "No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a codificação da localização é definida para GB18030. Note que isso vai funcionar apenas se a localização estiver definida para China. Por exemplo, em uma configuração de localização inglesa (Britânia) a conversão C<en_GB.GB18030> de UTF-16 para GB18030 não vai funcionar, mas em uma configuração de localização C<zh_CN.GB18030> chinesa vai funcionar."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "No Windows, você precisa usar a opção C<-gb> para converter arquivos UTF-16 para GB18030."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "Arquivos codificados em GB18030 possuem uma marca de ordem de bytes, como arquivos Unicode."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "EXEMPLOS"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Lê a entrada da \"stdin\" e escreve a saída para \"stdout\":"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1103,12 +1204,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Converte e substitui a.txt. Converte e substitui b.txt:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1120,12 +1221,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Converte e substitui a.txt no modo de conversão ascii:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1135,12 +1236,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Converte e substitui a.txt no modo de conversão ascii. Converte e substitui b.txt no modo de conversão 7bit:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1154,12 +1255,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Converte a.txt do formato do Mac para Unix:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1171,12 +1272,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Converte a.txt do formato do Unix para Mac:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1188,12 +1289,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Converte e substitui a.txt enquanto mantém a marca de data original:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1205,12 +1306,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Converte a.txt e escreve para e.txt:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1220,12 +1321,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Converte a.txt e escreve para e.txt, mantém a marca de data de e.txt igual a a.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1235,12 +1336,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Converte e substitui a.txt. Converte b.txt e escreve para e.txt:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1252,12 +1353,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Converte c.txt e escreve para e.txt. Converte e substitui a.txt. Converte e substitui b.txt. Converte d.txt e escreve para f.txt:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1267,42 +1368,63 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "Conversão recursiva"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Use dos2unix em combinação com os comandos find(1) e xargs(1) para converter recursivamente arquivos texto em uma estrutura de árvore de diretórios. Por exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o diretório atual, digite:"
#. type: verbatim
-#: dos2unix.pod:616
-#, no-wrap
+#: dos2unix.pod:690
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:694
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
+msgid ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "LOCALIZAÇÃO"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "O idioma primário é selecionado com a variável de ambiente LANG. A variável LANG consiste em várias partes. A primeira parte está em letras pequenas no código do idioma. A segunda parte é opcional e é o código do país em letras maiúsculo, precedido de um ponto. Alguns exemplos para shells do tipo padrão POSIX:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1324,47 +1446,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Para a lista completa de códigos de idioma e país, veja o manual do gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "Com a variável de ambiente LANGUAGE, você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, então, alemão: C<LANGUAGE=nl:de>. Você primeiro tem que habilitar localização, definindo LANG (ou LC_ALL) para um valor diferente de \"C\", antes que você possa usar uma lista de prioridade de idioma por meio da variável LANGUAGE. Veja também o manual do gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão)."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Com a variável de ambiente DOS2UNIX_LOCALEDIR, o LOCALEDIR definido durante a compilação pode ser sobrescrito. LOCALEDIR é usada para localizar os arquivos de idioma. O valor padrão do GNU é C</usr/local/share/locale>. A opção B<--version> vai exibir o LOCALEDIR que é usado."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Exemplo (shell POSIX):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1374,72 +1496,72 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "VALOR RETORNADO"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "No sucesso, zero é retornado. Quando um erro de sistema ocorre, o último erro de sistema será retornado. Para outros erros, 1 é retornado."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "O valor retornado é sempre zero no modo quieto, exceto quando opções de linha de comando erradas são usadas."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "PADRÕES"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://en.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "AUTORES"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben (modo mac2unix) - <wuebben@kde.org>, Christian Wurll (adiciona nova linha extra) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (mantenedor)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Página do projeto: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Página do SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "Veja também"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod
index 9bc5ddd..5969f25 100644
--- a/man/pt_BR/man1/dos2unix.pod
+++ b/man/pt_BR/man1/dos2unix.pod
@@ -125,6 +125,72 @@ converter para quebras de linha do DOS. Veja também a opção C<-r>.
Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>,
I<iso>, I<mac> com ascii sendo o padrão.
+=item B<-D, --display-enc ENCODING>
+
+Set encoding of displayed text. Where ENCODING is one of: I<ansi>,
+I<unicode>, I<utf8> with ansi being the default.
+
+This option is only available in dos2unix for Windows with Unicode file name
+support. This option has no effect on the actual file names read and
+written, only on how they are displayed.
+
+There are several methods for displaying text in a Windows console based on
+the encoding of the text. They all have their own advantages and
+disadvantages.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix's default method is to use ANSI encoded text. The advantage is that
+it is backwards compatible. It works with raster and TrueType fonts. In some
+regions you may need to change the active DOS OEM code page to the Windows
+system ANSI code page using the C<chcp> command, because dos2unix uses the
+Windows system code page.
+
+The disadvantage of ansi is that international file names with characters
+not inside the system default code page are not displayed properly. You will
+see a question mark, or a wrong symbol instead. When you don't work with
+foreign file names this method is OK.
+
+=item B<unicode>
+
+The advantage of unicode (the Windows name for UTF-16) encoding is that text
+is usually properly displayed. There is no need to change the active code
+page. You may need to set the console's font to a TrueType font to have
+international characters displayed properly. When a character is not
+included in the TrueType font you usually see a small square, sometimes with
+a question mark in it.
+
+When you use the ConEmu console all text is displayed properly, because
+ConEmu automatically selects a good font.
+
+The disadvantage of unicode is that it is not compatible with ASCII. The
+output is not easy to handle when you redirect it to another program or a
+file. Redirection to a file does not give a correct UTF-16 file.
+
+=item B<utf8>
+
+The advantage of utf8 is that it is compatible with ASCII and when you
+redirect it to a file you get a proper UTF-8 file. You need to set the
+console's font to a TrueType font. With a TrueType font the text is
+displayed similar as with the C<unicode> encoding.
+
+The disadvantage is that when you use the default raster font all non-ASCII
+characters are displayed wrong. Not only unicode file names, but also
+translated messages become unreadable. On Windows configured for an
+East-Asian region you may see a lot of flickering of the console when the
+messages are displayed.
+
+In a ConEmu console the utf8 encoding method works well.
+
+=back
+
+The default encoding can be changed with environment variable
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+
=item B<-f, --force>
Força a conversão de arquivos binários.
@@ -244,8 +310,8 @@ BOM UTF-8 é escrito.
Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16
será escrito.
-Nunca use essa opção quando a codificação de saída é outra além de UTF-8 ou
-UTF-16. Veja também a seção UNICODE.
+Never use this option when the output encoding is other than UTF-8, UTF-16,
+or GB18030. See also section UNICODE.
@@ -502,6 +568,19 @@ entrada tem BOM. Use a opção C<-m> para remover BOM.
Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada.
+=head2 Unicode file names on Windows
+
+Dos2unix has optional support for reading and writing Unicode file names in
+the Windows Command Prompt. That means that dos2unix can open files that
+have characters in the name that are not part of the default system ANSI
+code page. To see if dos2unix for Windows was built with Unicode file name
+support type C<dos2unix -V>.
+
+There are some issues with displaying Unicode file names in a Windows
+console. See option C<-D>, C<--display-enc>. The file names may be
+displayed wrongly in the console, but the files will be written with the
+correct name.
+
=head2 Exemplos de Unicode
Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:
@@ -531,12 +610,10 @@ formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível
com ASCII. GB18030 também é compatível com a página de código 936 do
Windows, também conhecida como GBK.
-No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a
-codificação da localização é definida para GB18030. Note que isso vai
-funcionar apenas se a localização estiver definida para China. Por exemplo,
-em uma configuração de localização inglesa (Britânia) a conversão
-C<en_GB.GB18030> de UTF-16 para GB18030 não vai funcionar, mas em uma
-configuração de localização C<zh_CN.GB18030> chinesa vai funcionar.
+On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding
+is set to GB18030. Note that this will only work if the locale is supported
+by the system. Use command C<locale -a> to get the list of supported
+locales.
No Windows, você precisa usar a opção C<-gb> para converter arquivos UTF-16
para GB18030.
@@ -608,7 +685,11 @@ recursivamente arquivos texto em uma estrutura de árvore de diretórios. Por
exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o
diretório atual, digite:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 LOCALIZAÇÃO
diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt
index 9794016..559ab8a 100644
--- a/man/pt_BR/man1/dos2unix.txt
+++ b/man/pt_BR/man1/dos2unix.txt
@@ -92,6 +92,67 @@ OPÇÕES
Define o modo de conversão, sendo MODOCONV um dentre: *ascii*,
*7bit*, *iso*, *mac* com ascii sendo o padrão.
+ -D, --display-enc ENCODING
+ Set encoding of displayed text. Where ENCODING is one of: *ansi*,
+ *unicode*, *utf8* with ansi being the default.
+
+ This option is only available in dos2unix for Windows with Unicode
+ file name support. This option has no effect on the actual file
+ names read and written, only on how they are displayed.
+
+ There are several methods for displaying text in a Windows console
+ based on the encoding of the text. They all have their own
+ advantages and disadvantages.
+
+ ansi
+ Dos2unix's default method is to use ANSI encoded text. The
+ advantage is that it is backwards compatible. It works with
+ raster and TrueType fonts. In some regions you may need to
+ change the active DOS OEM code page to the Windows system ANSI
+ code page using the "chcp" command, because dos2unix uses the
+ Windows system code page.
+
+ The disadvantage of ansi is that international file names with
+ characters not inside the system default code page are not
+ displayed properly. You will see a question mark, or a wrong
+ symbol instead. When you don't work with foreign file names this
+ method is OK.
+
+ unicode
+ The advantage of unicode (the Windows name for UTF-16) encoding
+ is that text is usually properly displayed. There is no need to
+ change the active code page. You may need to set the console's
+ font to a TrueType font to have international characters
+ displayed properly. When a character is not included in the
+ TrueType font you usually see a small square, sometimes with a
+ question mark in it.
+
+ When you use the ConEmu console all text is displayed properly,
+ because ConEmu automatically selects a good font.
+
+ The disadvantage of unicode is that it is not compatible with
+ ASCII. The output is not easy to handle when you redirect it to
+ another program or a file. Redirection to a file does not give a
+ correct UTF-16 file.
+
+ utf8
+ The advantage of utf8 is that it is compatible with ASCII and
+ when you redirect it to a file you get a proper UTF-8 file. You
+ need to set the console's font to a TrueType font. With a
+ TrueType font the text is displayed similar as with the
+ "unicode" encoding.
+
+ The disadvantage is that when you use the default raster font
+ all non-ASCII characters are displayed wrong. Not only unicode
+ file names, but also translated messages become unreadable. On
+ Windows configured for an East-Asian region you may see a lot of
+ flickering of the console when the messages are displayed.
+
+ In a ConEmu console the utf8 encoding method works well.
+
+ The default encoding can be changed with environment variable
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+
-f, --force
Força a conversão de arquivos binários.
@@ -189,8 +250,8 @@ OPÇÕES
Quando o arquivo de entrada é UTF-16, e a opção "-u" é usada, um BOM
UTF-16 será escrito.
- Nunca use essa opção quando a codificação de saída é outra além de
- UTF-8 ou UTF-16. Veja também a seção UNICODE.
+ Never use this option when the output encoding is other than UTF-8,
+ UTF-16, or GB18030. See also section UNICODE.
-n, --newfile ARQENT ARQSAÍDA ...
Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída
@@ -423,6 +484,18 @@ UNICODE
Dos2unix e unix2dos sempre escrevem BOM quando a opção "-m" é usada.
+ Unicode file names on Windows
+ Dos2unix has optional support for reading and writing Unicode file names
+ in the Windows Command Prompt. That means that dos2unix can open files
+ that have characters in the name that are not part of the default system
+ ANSI code page. To see if dos2unix for Windows was built with Unicode
+ file name support type "dos2unix -V".
+
+ There are some issues with displaying Unicode file names in a Windows
+ console. See option "-D", "--display-enc". The file names may be
+ displayed wrongly in the console, but the files will be written with the
+ correct name.
+
Exemplos de Unicode
Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:
@@ -450,13 +523,10 @@ GB18030
compatível com ASCII. GB18030 também é compatível com a página de código
936 do Windows, também conhecida como GBK.
- No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a
- codificação da localização é definida para GB18030. Note que isso vai
- funcionar apenas se a localização estiver definida para China. Por
- exemplo, em uma configuração de localização inglesa (Britânia) a
- conversão "en_GB.GB18030" de UTF-16 para GB18030 não vai funcionar, mas
- em uma configuração de localização "zh_CN.GB18030" chinesa vai
- funcionar.
+ On Unix/Linux UTF-16 files are converted to GB18030 when the locale
+ encoding is set to GB18030. Note that this will only work if the locale
+ is supported by the system. Use command "locale -a" to get the list of
+ supported locales.
No Windows, você precisa usar a opção "-gb" para converter arquivos
UTF-16 para GB18030.
@@ -526,7 +596,11 @@ Conversão recursiva
diretórios. Por exemplo, para converter todos os arquivos .txt na árvore
de diretórios sob o diretório atual, digite:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ In a Windows Command Prompt the following command can be used:
+
+ for /R %G in (*.txt) do dos2unix "%G"
LOCALIZAÇÃO
LANG
diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1
index 1d26716..7e06ce2 100644
--- a/man/uk/man1/dos2unix.1
+++ b/man/uk/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-02-11" "dos2unix" "2015-02-11"
+.TH dos2unix 1 "2015-08-24" "dos2unix" "2015-08-24"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -178,6 +178,68 @@ SunOS/Solaris передбачено підтримку лише парного
.IX Item "-c, --convmode РЕЖИМ"
Встановити режим перетворення. Значенням аргументу РЕЖИМ може бути один з
таких рядків: \fIascii\fR, \fI7bit\fR, \fIiso\fR, \fImac\fR. Типовим є режим ascii.
+.IP "\fB\-D, \-\-display\-enc КОДУВАННЯ\fR" 4
+.IX Item "-D, --display-enc КОДУВАННЯ"
+Встановити кодування показаного тексту. Можливі варіанти значень параметра
+КОДУВАННЯ: \fIansi\fR, \fIunicode\fR, \fIutf8\fR, типовим є ansi.
+.Sp
+Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів
+у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів,
+лише на те, як буде показано ці назви.
+.Sp
+Існує декілька способів показу тексту у консолі Windows, заснованих на
+кодуванні тексту. Усі ці способи мають свої переваги і недоліки.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Типовим способом для dos2unix є кодування тексту у форматі \s-1ANSI.\s0 Перевагою є
+зворотна сумісність. Цей варіант працює з растровими шрифтами та шрифтами
+TrueType. У деяких регіонах, ймовірно, вам доведеться змінити активну кодову
+сторінку \s-1DOS OEM\s0 на системну кодову сторінку \s-1ANSI\s0 Windows за допомогою
+команди \f(CW\*(C`chcp\*(C'\fR, оскільки dos2unix використовує системну кодову сторінку
+Windows.
+.Sp
+Недоліком ansi є те, що назви файлів із символами, яких немає у типовому
+системному кодуванні, буде показано неправильно. Замість цих символів ви
+побачите знак питання або не той символ. Якщо у вашій системі немає файлів
+із назвами, які містять нетипові символи, можна скористатися цим варіантом.
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+Перевагою кодування unicode (назва у Windows кодування \s-1UTF\-16\s0) є те, що
+зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не
+потрібно. Ймовірно, вам потрібно встановити шрифт консолі TrueType для
+належного показу нестандартних символів. Якщо символ не передбачено у шрифті
+TrueType, зазвичай ви побачите невеличкий квадратик замість символу, іноді
+із знаком питання у ньому.
+.Sp
+Якщо ви користуєтеся консоллю ConEmu, весь текст буде показано належним
+чином, оскільки ConEmu автоматично вибирає належний шрифт.
+.Sp
+Недоліком unicode є те, що це кодування несумісне з \s-1ASCII.\s0 Обробка виведених
+даних є непростою, якщо ви передаватимете ці дані до іншої програми або
+файла. Переспрямовування даних до файла призведе до створення некоректного
+файла \s-1UTF\-16.\s0
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+Перевагою utf8 є те, що це кодування сумісне з \s-1ASCII\s0 і, якщо ви
+переспрямуєте дані до файла, буде створено коректний файл \s-1UTF\-8.\s0 Вам слід
+встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст
+буде показано подібно до того, як його показано, якщо визначено кодування
+\&\f(CW\*(C`unicode\*(C'\fR.
+.Sp
+Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі
+символи поза \s-1ASCII\s0 буде показано неправильно. Не лише назви файлів у
+unicode, а й перекладені повідомлення стануть непридатними до читання. У
+Windows, налаштованому на роботі у східно\-азійському регіоні, ви можете
+помітити значне блимання під час показу повідомлень.
+.Sp
+У консолі ConEmu добре працює спосіб кодування utf8.
+.RE
+.RS 4
+.Sp
+Типове кодування можна змінити за допомогою змінної середовища
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 встановленням для неї значення \f(CW\*(C`unicode\*(C'\fR або \f(CW\*(C`utf8\*(C'\fR.
+.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
Примусове перетворення двійкових файлів.
@@ -300,8 +362,8 @@ Unix:
Якщо дані початкового файла закодовано у \s-1UTF\-16\s0 і використано параметр
\&\f(CW\*(C`\-u\*(C'\fR, буде дописано позначку порядку байтів \s-1UTF\-16.\s0
.Sp
-Не використовуйте цей параметр для кодувань результатів, відмінних від \s-1UTF\-8\s0
-або \s-1UTF\-16.\s0 Див. також розділ щодо \s-1UNICODE.\s0
+Не використовуйте цей параметр для кодувань результатів, відмінних від
+\&\s-1UTF\-8, UTF\-16\s0 або \s-1GB18030.\s0 Див. також розділ щодо \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...\fR" 4
.IX Item "-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ..."
Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і записати
@@ -567,6 +629,18 @@ Notepad) додають таку позначку автоматично. Див
.PP
Dos2unix та unix2dos завжди записують до файла результатів позначку порядку
байтів (\s-1BOM\s0), якщо використано параметр \f(CW\*(C`\-m\*(C'\fR.
+.SS "Назви файлів у Unicode у Windows"
+.IX Subsection "Назви файлів у Unicode у Windows"
+У dos2unix передбачено підтримку читання і запису назв файлів Unicode у
+командному рядку Windows. Це означає, що dos2unix може відкривати файли, у
+назвах яких є символи, які не є частиною типової системної кодової сторінки
+\&\s-1ANSI.\s0 Щоб визначити, чи зібрано dos2unix для Windows з підтримкою назв
+файлів у кодуванні Unicode, скористайтеся командою \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано
+декілька проблем. Див. параметр \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. Назви файлів може
+бути некоректно показано у консолі, але запис цих назв відбуватиметься
+належним чином.
.SS "Приклади для Unicode"
.IX Subsection "Приклади для Unicode"
Перетворити дані з Windows \s-1UTF\-16 \s0(з позначкою порядку байтів (\s-1BOM\s0)) у
@@ -607,10 +681,9 @@ Dos2unix та unix2dos завжди записують до файла резу
називають \s-1GBK.\s0
.PP
У Unix/Linux файли \s-1UTF\-16\s0 буде перетворено до кодування \s-1GB18030,\s0 якщо
-кодуванням локалі є \s-1GB18030.\s0 Зауважте, що це спрацює, лише якщо встановлено
-значення країни КНР. Наприклад, у англійській локалі для Великоританії із
-встановленою локаллю \f(CW\*(C`en_GB.GB18030\*(C'\fR перетворення \s-1UTF\-16\s0 на \s-1GB18030\s0 не
-працюватиме, а у китайській локалі \f(CW\*(C`zh_CN.GB18030\*(C'\fR все працюватиме як слід.
+кодуванням локалі є \s-1GB18030.\s0 Зауважте, що це спрацює, лише якщо підтримку
+локалі передбачено у системі. Щоб отримати список підтримуваних локалей,
+скористайтеся командою \f(CW\*(C`locale \-a\*(C'\fR.
.PP
У Windows для перетворення файлів \s-1UTF\-16\s0 на файли \s-1GB18030\s0 слід вказати
параметр \f(CW\*(C`\-gb\*(C'\fR.
@@ -709,7 +782,13 @@ a.txt і замістити ними цей файл. Перетворити д
підкаталогів поточного каталогу, віддайте таку команду:
.PP
.Vb 1
-\& find . \-name *.txt |xargs dos2unix
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+У командному рядку Windows можна скористатися такою командою:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
.SH "ЛОКАЛІЗАЦІЯ"
.IX Header "ЛОКАЛІЗАЦІЯ"
diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm
index 58c82e7..55f58be 100644
--- a/man/uk/man1/dos2unix.htm
+++ b/man/uk/man1/dos2unix.htm
@@ -2,12 +2,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.2 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
+<title>dos2unix 7.3 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
-<body style="background-color: white">
+<body>
@@ -23,6 +23,7 @@
<li><a href="#5">&#x41A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F;</a></li>
<li><a href="#6">&#x41F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F;</a></li>
<li><a href="#7">&#x41F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x430; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432;</a></li>
+ <li><a href="#Unicode-Windows">&#x41D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; Unicode &#x443; Windows</a></li>
<li><a href="#Unicode">&#x41F;&#x440;&#x438;&#x43A;&#x43B;&#x430;&#x434;&#x438; &#x434;&#x43B;&#x44F; Unicode</a></li>
</ul>
</li>
@@ -143,6 +144,50 @@
<p>&#x412;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x438; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F;. &#x417;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44F;&#x43C; &#x430;&#x440;&#x433;&#x443;&#x43C;&#x435;&#x43D;&#x442;&#x443; &#x420;&#x415;&#x416;&#x418;&#x41C; &#x43C;&#x43E;&#x436;&#x435; &#x431;&#x443;&#x442;&#x438; &#x43E;&#x434;&#x438;&#x43D; &#x437; &#x442;&#x430;&#x43A;&#x438;&#x445; &#x440;&#x44F;&#x434;&#x43A;&#x456;&#x432;: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i>. &#x422;&#x438;&#x43F;&#x43E;&#x432;&#x438;&#x43C; &#x454; &#x440;&#x435;&#x436;&#x438;&#x43C; ascii.</p>
</dd>
+<dt id="D---display-enc"><b>-D, --display-enc &#x41A;&#x41E;&#x414;&#x423;&#x412;&#x410;&#x41D;&#x41D;&#x42F;</b></dt>
+<dd>
+
+<p>&#x412;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x438; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E;&#x433;&#x43E; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x443;. &#x41C;&#x43E;&#x436;&#x43B;&#x438;&#x432;&#x456; &#x432;&#x430;&#x440;&#x456;&#x430;&#x43D;&#x442;&#x438; &#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x44C; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440;&#x430; &#x41A;&#x41E;&#x414;&#x423;&#x412;&#x410;&#x41D;&#x41D;&#x42F;: <i>ansi</i>, <i>unicode</i>, <i>utf8</i>, &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x438;&#x43C; &#x454; ansi.</p>
+
+<p>&#x426;&#x435;&#x439; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; &#x434;&#x43E;&#x441;&#x442;&#x443;&#x43F;&#x43D;&#x438;&#x439; &#x43B;&#x438;&#x448;&#x435; &#x443; dos2unix &#x434;&#x43B;&#x44F; Windows &#x437; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x43E;&#x44E; &#x43D;&#x430;&#x437;&#x432; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; Unicode. &#x426;&#x435;&#x439; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; &#x43D;&#x435; &#x432;&#x43F;&#x43B;&#x438;&#x432;&#x430;&#x454; &#x43D;&#x430; &#x441;&#x43F;&#x440;&#x430;&#x432;&#x436;&#x43D;&#x454; &#x447;&#x438;&#x442;&#x430;&#x43D;&#x43D;&#x44F; &#x442;&#x430; &#x437;&#x430;&#x43F;&#x438;&#x441; &#x43D;&#x430;&#x437;&#x432; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;, &#x43B;&#x438;&#x448;&#x435; &#x43D;&#x430; &#x442;&#x435;, &#x44F;&#x43A; &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x446;&#x456; &#x43D;&#x430;&#x437;&#x432;&#x438;.</p>
+
+<p>&#x406;&#x441;&#x43D;&#x443;&#x454; &#x434;&#x435;&#x43A;&#x456;&#x43B;&#x44C;&#x43A;&#x430; &#x441;&#x43F;&#x43E;&#x441;&#x43E;&#x431;&#x456;&#x432; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x443; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x443; &#x443; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456; Windows, &#x437;&#x430;&#x441;&#x43D;&#x43E;&#x432;&#x430;&#x43D;&#x438;&#x445; &#x43D;&#x430; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x443;. &#x423;&#x441;&#x456; &#x446;&#x456; &#x441;&#x43F;&#x43E;&#x441;&#x43E;&#x431;&#x438; &#x43C;&#x430;&#x44E;&#x442;&#x44C; &#x441;&#x432;&#x43E;&#x457; &#x43F;&#x435;&#x440;&#x435;&#x432;&#x430;&#x433;&#x438; &#x456; &#x43D;&#x435;&#x434;&#x43E;&#x43B;&#x456;&#x43A;&#x438;.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>&#x422;&#x438;&#x43F;&#x43E;&#x432;&#x438;&#x43C; &#x441;&#x43F;&#x43E;&#x441;&#x43E;&#x431;&#x43E;&#x43C; &#x434;&#x43B;&#x44F; dos2unix &#x454; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x443; &#x443; &#x444;&#x43E;&#x440;&#x43C;&#x430;&#x442;&#x456; ANSI. &#x41F;&#x435;&#x440;&#x435;&#x432;&#x430;&#x433;&#x43E;&#x44E; &#x454; &#x437;&#x432;&#x43E;&#x440;&#x43E;&#x442;&#x43D;&#x430; &#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x456;&#x441;&#x442;&#x44C;. &#x426;&#x435;&#x439; &#x432;&#x430;&#x440;&#x456;&#x430;&#x43D;&#x442; &#x43F;&#x440;&#x430;&#x446;&#x44E;&#x454; &#x437; &#x440;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x432;&#x438;&#x43C;&#x438; &#x448;&#x440;&#x438;&#x444;&#x442;&#x430;&#x43C;&#x438; &#x442;&#x430; &#x448;&#x440;&#x438;&#x444;&#x442;&#x430;&#x43C;&#x438; TrueType. &#x423; &#x434;&#x435;&#x44F;&#x43A;&#x438;&#x445; &#x440;&#x435;&#x433;&#x456;&#x43E;&#x43D;&#x430;&#x445;, &#x439;&#x43C;&#x43E;&#x432;&#x456;&#x440;&#x43D;&#x43E;, &#x432;&#x430;&#x43C; &#x434;&#x43E;&#x432;&#x435;&#x434;&#x435;&#x442;&#x44C;&#x441;&#x44F; &#x437;&#x43C;&#x456;&#x43D;&#x438;&#x442;&#x438; &#x430;&#x43A;&#x442;&#x438;&#x432;&#x43D;&#x443; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x443; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x443; DOS OEM &#x43D;&#x430; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x43D;&#x443; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x443; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x443; ANSI Windows &#x437;&#x430; &#x434;&#x43E;&#x43F;&#x43E;&#x43C;&#x43E;&#x433;&#x43E;&#x44E; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x438; <code>chcp</code>, &#x43E;&#x441;&#x43A;&#x456;&#x43B;&#x44C;&#x43A;&#x438; dos2unix &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x454; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x43D;&#x443; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x443; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x443; Windows.</p>
+
+<p>&#x41D;&#x435;&#x434;&#x43E;&#x43B;&#x456;&#x43A;&#x43E;&#x43C; ansi &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x43D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x456;&#x437; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x430;&#x43C;&#x438;, &#x44F;&#x43A;&#x438;&#x445; &#x43D;&#x435;&#x43C;&#x430;&#x454; &#x443; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E;&#x43C;&#x443; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x43D;&#x43E;&#x43C;&#x443; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456;, &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x43D;&#x435;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x44C;&#x43D;&#x43E;. &#x417;&#x430;&#x43C;&#x456;&#x441;&#x442;&#x44C; &#x446;&#x438;&#x445; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x432; &#x432;&#x438; &#x43F;&#x43E;&#x431;&#x430;&#x447;&#x438;&#x442;&#x435; &#x437;&#x43D;&#x430;&#x43A; &#x43F;&#x438;&#x442;&#x430;&#x43D;&#x43D;&#x44F; &#x430;&#x431;&#x43E; &#x43D;&#x435; &#x442;&#x43E;&#x439; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;. &#x42F;&#x43A;&#x449;&#x43E; &#x443; &#x432;&#x430;&#x448;&#x456;&#x439; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x456; &#x43D;&#x435;&#x43C;&#x430;&#x454; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x456;&#x437; &#x43D;&#x430;&#x437;&#x432;&#x430;&#x43C;&#x438;, &#x44F;&#x43A;&#x456; &#x43C;&#x456;&#x441;&#x442;&#x44F;&#x442;&#x44C; &#x43D;&#x435;&#x442;&#x438;&#x43F;&#x43E;&#x432;&#x456; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x438;, &#x43C;&#x43E;&#x436;&#x43D;&#x430; &#x441;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x442;&#x438;&#x441;&#x44F; &#x446;&#x438;&#x43C; &#x432;&#x430;&#x440;&#x456;&#x430;&#x43D;&#x442;&#x43E;&#x43C;.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>&#x41F;&#x435;&#x440;&#x435;&#x432;&#x430;&#x433;&#x43E;&#x44E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; unicode (&#x43D;&#x430;&#x437;&#x432;&#x430; &#x443; Windows &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; UTF-16) &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x437;&#x430;&#x437;&#x432;&#x438;&#x447;&#x430;&#x439; &#x442;&#x435;&#x43A;&#x441;&#x442; &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x44C;&#x43D;&#x43E;. &#x417;&#x43C;&#x456;&#x43D;&#x44E;&#x432;&#x430;&#x442;&#x438; &#x430;&#x43A;&#x442;&#x438;&#x432;&#x43D;&#x443; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x443; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x443; &#x43D;&#x435; &#x43F;&#x43E;&#x442;&#x440;&#x456;&#x431;&#x43D;&#x43E;. &#x419;&#x43C;&#x43E;&#x432;&#x456;&#x440;&#x43D;&#x43E;, &#x432;&#x430;&#x43C; &#x43F;&#x43E;&#x442;&#x440;&#x456;&#x431;&#x43D;&#x43E; &#x432;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x438; &#x448;&#x440;&#x438;&#x444;&#x442; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456; TrueType &#x434;&#x43B;&#x44F; &#x43D;&#x430;&#x43B;&#x435;&#x436;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x443; &#x43D;&#x435;&#x441;&#x442;&#x430;&#x43D;&#x434;&#x430;&#x440;&#x442;&#x43D;&#x438;&#x445; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x432;. &#x42F;&#x43A;&#x449;&#x43E; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B; &#x43D;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x443; &#x448;&#x440;&#x438;&#x444;&#x442;&#x456; TrueType, &#x437;&#x430;&#x437;&#x432;&#x438;&#x447;&#x430;&#x439; &#x432;&#x438; &#x43F;&#x43E;&#x431;&#x430;&#x447;&#x438;&#x442;&#x435; &#x43D;&#x435;&#x432;&#x435;&#x43B;&#x438;&#x447;&#x43A;&#x438;&#x439; &#x43A;&#x432;&#x430;&#x434;&#x440;&#x430;&#x442;&#x438;&#x43A; &#x437;&#x430;&#x43C;&#x456;&#x441;&#x442;&#x44C; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x443;, &#x456;&#x43D;&#x43E;&#x434;&#x456; &#x456;&#x437; &#x437;&#x43D;&#x430;&#x43A;&#x43E;&#x43C; &#x43F;&#x438;&#x442;&#x430;&#x43D;&#x43D;&#x44F; &#x443; &#x43D;&#x44C;&#x43E;&#x43C;&#x443;.</p>
+
+<p>&#x42F;&#x43A;&#x449;&#x43E; &#x432;&#x438; &#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x443;&#x454;&#x442;&#x435;&#x441;&#x44F; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x43B;&#x44E; ConEmu, &#x432;&#x435;&#x441;&#x44C; &#x442;&#x435;&#x43A;&#x441;&#x442; &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x43D;&#x430;&#x43B;&#x435;&#x436;&#x43D;&#x438;&#x43C; &#x447;&#x438;&#x43D;&#x43E;&#x43C;, &#x43E;&#x441;&#x43A;&#x456;&#x43B;&#x44C;&#x43A;&#x438; ConEmu &#x430;&#x432;&#x442;&#x43E;&#x43C;&#x430;&#x442;&#x438;&#x447;&#x43D;&#x43E; &#x432;&#x438;&#x431;&#x438;&#x440;&#x430;&#x454; &#x43D;&#x430;&#x43B;&#x435;&#x436;&#x43D;&#x438;&#x439; &#x448;&#x440;&#x438;&#x444;&#x442;.</p>
+
+<p>&#x41D;&#x435;&#x434;&#x43E;&#x43B;&#x456;&#x43A;&#x43E;&#x43C; unicode &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x446;&#x435; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x43D;&#x435;&#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x435; &#x437; ASCII. &#x41E;&#x431;&#x440;&#x43E;&#x431;&#x43A;&#x430; &#x432;&#x438;&#x432;&#x435;&#x434;&#x435;&#x43D;&#x438;&#x445; &#x434;&#x430;&#x43D;&#x438;&#x445; &#x454; &#x43D;&#x435;&#x43F;&#x440;&#x43E;&#x441;&#x442;&#x43E;&#x44E;, &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x438; &#x43F;&#x435;&#x440;&#x435;&#x434;&#x430;&#x432;&#x430;&#x442;&#x438;&#x43C;&#x435;&#x442;&#x435; &#x446;&#x456; &#x434;&#x430;&#x43D;&#x456; &#x434;&#x43E; &#x456;&#x43D;&#x448;&#x43E;&#x457; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x438; &#x430;&#x431;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430;. &#x41F;&#x435;&#x440;&#x435;&#x441;&#x43F;&#x440;&#x44F;&#x43C;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x434;&#x430;&#x43D;&#x438;&#x445; &#x434;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430; &#x43F;&#x440;&#x438;&#x437;&#x432;&#x435;&#x434;&#x435; &#x434;&#x43E; &#x441;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; &#x43D;&#x435;&#x43A;&#x43E;&#x440;&#x435;&#x43A;&#x442;&#x43D;&#x43E;&#x433;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430; UTF-16.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>&#x41F;&#x435;&#x440;&#x435;&#x432;&#x430;&#x433;&#x43E;&#x44E; utf8 &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x446;&#x435; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x435; &#x437; ASCII &#x456;, &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x438; &#x43F;&#x435;&#x440;&#x435;&#x441;&#x43F;&#x440;&#x44F;&#x43C;&#x443;&#x454;&#x442;&#x435; &#x434;&#x430;&#x43D;&#x456; &#x434;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430;, &#x431;&#x443;&#x434;&#x435; &#x441;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43E; &#x43A;&#x43E;&#x440;&#x435;&#x43A;&#x442;&#x43D;&#x438;&#x439; &#x444;&#x430;&#x439;&#x43B; UTF-8. &#x412;&#x430;&#x43C; &#x441;&#x43B;&#x456;&#x434; &#x432;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x438;&#x442;&#x438; &#x448;&#x440;&#x438;&#x444;&#x442; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456; TrueType. &#x42F;&#x43A;&#x449;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x43D;&#x43E; &#x448;&#x440;&#x438;&#x444;&#x442; TrueType, &#x442;&#x435;&#x43A;&#x441;&#x442; &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x43F;&#x43E;&#x434;&#x456;&#x431;&#x43D;&#x43E; &#x434;&#x43E; &#x442;&#x43E;&#x433;&#x43E;, &#x44F;&#x43A; &#x439;&#x43E;&#x433;&#x43E; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E;, &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x438;&#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; <code>unicode</code>.</p>
+
+<p>&#x41D;&#x435;&#x434;&#x43E;&#x43B;&#x456;&#x43A;&#x43E;&#x43C; &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x438; &#x441;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x454;&#x442;&#x435;&#x441;&#x44F; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x438;&#x43C; &#x440;&#x430;&#x441;&#x442;&#x440;&#x43E;&#x432;&#x438;&#x43C; &#x448;&#x440;&#x438;&#x444;&#x442;&#x43E;&#x43C;, &#x443;&#x441;&#x456; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x438; &#x43F;&#x43E;&#x437;&#x430; ASCII &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x43D;&#x435;&#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x44C;&#x43D;&#x43E;. &#x41D;&#x435; &#x43B;&#x438;&#x448;&#x435; &#x43D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; unicode, &#x430; &#x439; &#x43F;&#x435;&#x440;&#x435;&#x43A;&#x43B;&#x430;&#x434;&#x435;&#x43D;&#x456; &#x43F;&#x43E;&#x432;&#x456;&#x434;&#x43E;&#x43C;&#x43B;&#x435;&#x43D;&#x43D;&#x44F; &#x441;&#x442;&#x430;&#x43D;&#x443;&#x442;&#x44C; &#x43D;&#x435;&#x43F;&#x440;&#x438;&#x434;&#x430;&#x442;&#x43D;&#x438;&#x43C;&#x438; &#x434;&#x43E; &#x447;&#x438;&#x442;&#x430;&#x43D;&#x43D;&#x44F;. &#x423; Windows, &#x43D;&#x430;&#x43B;&#x430;&#x448;&#x442;&#x43E;&#x432;&#x430;&#x43D;&#x43E;&#x43C;&#x443; &#x43D;&#x430; &#x440;&#x43E;&#x431;&#x43E;&#x442;&#x456; &#x443; &#x441;&#x445;&#x456;&#x434;&#x43D;&#x43E;-&#x430;&#x437;&#x456;&#x439;&#x441;&#x44C;&#x43A;&#x43E;&#x43C;&#x443; &#x440;&#x435;&#x433;&#x456;&#x43E;&#x43D;&#x456;, &#x432;&#x438; &#x43C;&#x43E;&#x436;&#x435;&#x442;&#x435; &#x43F;&#x43E;&#x43C;&#x456;&#x442;&#x438;&#x442;&#x438; &#x437;&#x43D;&#x430;&#x447;&#x43D;&#x435; &#x431;&#x43B;&#x438;&#x43C;&#x430;&#x43D;&#x43D;&#x44F; &#x43F;&#x456;&#x434; &#x447;&#x430;&#x441; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x443; &#x43F;&#x43E;&#x432;&#x456;&#x434;&#x43E;&#x43C;&#x43B;&#x435;&#x43D;&#x44C;.</p>
+
+<p>&#x423; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456; ConEmu &#x434;&#x43E;&#x431;&#x440;&#x435; &#x43F;&#x440;&#x430;&#x446;&#x44E;&#x454; &#x441;&#x43F;&#x43E;&#x441;&#x456;&#x431; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; utf8.</p>
+
+</dd>
+</dl>
+
+<p>&#x422;&#x438;&#x43F;&#x43E;&#x432;&#x435; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x43C;&#x43E;&#x436;&#x43D;&#x430; &#x437;&#x43C;&#x456;&#x43D;&#x438;&#x442;&#x438; &#x437;&#x430; &#x434;&#x43E;&#x43F;&#x43E;&#x43C;&#x43E;&#x433;&#x43E;&#x44E; &#x437;&#x43C;&#x456;&#x43D;&#x43D;&#x43E;&#x457; &#x441;&#x435;&#x440;&#x435;&#x434;&#x43E;&#x432;&#x438;&#x449;&#x430; DOS2UNIX_DISPLAY_ENC &#x432;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x43D;&#x44F;&#x43C; &#x434;&#x43B;&#x44F; &#x43D;&#x435;&#x457; &#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44F; <code>unicode</code> &#x430;&#x431;&#x43E; <code>utf8</code>.</p>
+
+</dd>
<dt id="f---force"><b>-f, --force</b></dt>
<dd>
@@ -275,7 +320,7 @@
<p>&#x42F;&#x43A;&#x449;&#x43E; &#x434;&#x430;&#x43D;&#x456; &#x43F;&#x43E;&#x447;&#x430;&#x442;&#x43A;&#x43E;&#x432;&#x43E;&#x433;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430; &#x437;&#x430;&#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x430;&#x43D;&#x43E; &#x443; UTF-16 &#x456; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x43D;&#x43E; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; <code>-u</code>, &#x431;&#x443;&#x434;&#x435; &#x434;&#x43E;&#x43F;&#x438;&#x441;&#x430;&#x43D;&#x43E; &#x43F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x443; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432; UTF-16.</p>
-<p>&#x41D;&#x435; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x439;&#x442;&#x435; &#x446;&#x435;&#x439; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; &#x434;&#x43B;&#x44F; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x44C; &#x440;&#x435;&#x437;&#x443;&#x43B;&#x44C;&#x442;&#x430;&#x442;&#x456;&#x432;, &#x432;&#x456;&#x434;&#x43C;&#x456;&#x43D;&#x43D;&#x438;&#x445; &#x432;&#x456;&#x434; UTF-8 &#x430;&#x431;&#x43E; UTF-16. &#x414;&#x438;&#x432;. &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x440;&#x43E;&#x437;&#x434;&#x456;&#x43B; &#x449;&#x43E;&#x434;&#x43E; UNICODE.</p>
+<p>&#x41D;&#x435; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x439;&#x442;&#x435; &#x446;&#x435;&#x439; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; &#x434;&#x43B;&#x44F; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x44C; &#x440;&#x435;&#x437;&#x443;&#x43B;&#x44C;&#x442;&#x430;&#x442;&#x456;&#x432;, &#x432;&#x456;&#x434;&#x43C;&#x456;&#x43D;&#x43D;&#x438;&#x445; &#x432;&#x456;&#x434; UTF-8, UTF-16 &#x430;&#x431;&#x43E; GB18030. &#x414;&#x438;&#x432;. &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x440;&#x43E;&#x437;&#x434;&#x456;&#x43B; &#x449;&#x43E;&#x434;&#x43E; UNICODE.</p>
</dd>
<dt id="n---newfile-_-_"><b>-n, --newfile &#x412;&#x425;&#x406;&#x414;&#x41D;&#x418;&#x419;_&#x424;&#x410;&#x419;&#x41B; &#x412;&#x418;&#x425;&#x406;&#x414;&#x41D;&#x418;&#x419;_&#x424;&#x410;&#x419;&#x41B; ...</b></dt>
@@ -486,6 +531,12 @@
<p>Dos2unix &#x442;&#x430; unix2dos &#x437;&#x430;&#x432;&#x436;&#x434;&#x438; &#x437;&#x430;&#x43F;&#x438;&#x441;&#x443;&#x44E;&#x442;&#x44C; &#x434;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430; &#x440;&#x435;&#x437;&#x443;&#x43B;&#x44C;&#x442;&#x430;&#x442;&#x456;&#x432; &#x43F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x443; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432; (BOM), &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x43D;&#x43E; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; <code>-m</code>.</p>
+<h2 id="Unicode-Windows">&#x41D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; Unicode &#x443; Windows</h2>
+
+<p>&#x423; dos2unix &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x443; &#x447;&#x438;&#x442;&#x430;&#x43D;&#x43D;&#x44F; &#x456; &#x437;&#x430;&#x43F;&#x438;&#x441;&#x443; &#x43D;&#x430;&#x437;&#x432; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; Unicode &#x443; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x43D;&#x43E;&#x43C;&#x443; &#x440;&#x44F;&#x434;&#x43A;&#x443; Windows. &#x426;&#x435; &#x43E;&#x437;&#x43D;&#x430;&#x447;&#x430;&#x454;, &#x449;&#x43E; dos2unix &#x43C;&#x43E;&#x436;&#x435; &#x432;&#x456;&#x434;&#x43A;&#x440;&#x438;&#x432;&#x430;&#x442;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x438;, &#x443; &#x43D;&#x430;&#x437;&#x432;&#x430;&#x445; &#x44F;&#x43A;&#x438;&#x445; &#x454; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x438;, &#x44F;&#x43A;&#x456; &#x43D;&#x435; &#x454; &#x447;&#x430;&#x441;&#x442;&#x438;&#x43D;&#x43E;&#x44E; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E;&#x457; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x43D;&#x43E;&#x457; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x43E;&#x457; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x438; ANSI. &#x429;&#x43E;&#x431; &#x432;&#x438;&#x437;&#x43D;&#x430;&#x447;&#x438;&#x442;&#x438;, &#x447;&#x438; &#x437;&#x456;&#x431;&#x440;&#x430;&#x43D;&#x43E; dos2unix &#x434;&#x43B;&#x44F; Windows &#x437; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x43E;&#x44E; &#x43D;&#x430;&#x437;&#x432; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456; Unicode, &#x441;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x439;&#x442;&#x435;&#x441;&#x44F; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x43E;&#x44E; <code>dos2unix -V</code>.</p>
+
+<p>&#x406;&#x437; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x43E;&#x43C; &#x43D;&#x430;&#x437;&#x432; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456; Unicode &#x443; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456; Windows &#x43F;&#x43E;&#x432;&rsquo;&#x44F;&#x437;&#x430;&#x43D;&#x43E; &#x434;&#x435;&#x43A;&#x456;&#x43B;&#x44C;&#x43A;&#x430; &#x43F;&#x440;&#x43E;&#x431;&#x43B;&#x435;&#x43C;. &#x414;&#x438;&#x432;. &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; <code>-D</code>, <code>--display-enc</code>. &#x41D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x43C;&#x43E;&#x436;&#x435; &#x431;&#x443;&#x442;&#x438; &#x43D;&#x435;&#x43A;&#x43E;&#x440;&#x435;&#x43A;&#x442;&#x43D;&#x43E; &#x43F;&#x43E;&#x43A;&#x430;&#x437;&#x430;&#x43D;&#x43E; &#x443; &#x43A;&#x43E;&#x43D;&#x441;&#x43E;&#x43B;&#x456;, &#x430;&#x43B;&#x435; &#x437;&#x430;&#x43F;&#x438;&#x441; &#x446;&#x438;&#x445; &#x43D;&#x430;&#x437;&#x432; &#x432;&#x456;&#x434;&#x431;&#x443;&#x432;&#x430;&#x442;&#x438;&#x43C;&#x435;&#x442;&#x44C;&#x441;&#x44F; &#x43D;&#x430;&#x43B;&#x435;&#x436;&#x43D;&#x438;&#x43C; &#x447;&#x438;&#x43D;&#x43E;&#x43C;.</p>
+
<h2 id="Unicode">&#x41F;&#x440;&#x438;&#x43A;&#x43B;&#x430;&#x434;&#x438; &#x434;&#x43B;&#x44F; Unicode</h2>
<p>&#x41F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x438;&#x442;&#x438; &#x434;&#x430;&#x43D;&#x456; &#x437; Windows UTF-16 (&#x437; &#x43F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x43E;&#x44E; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432; (BOM)) &#x443; &#x444;&#x43E;&#x440;&#x43C;&#x430;&#x442; Unix UTF-8:</p>
@@ -510,7 +561,7 @@
<p>&#x41A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; GB18030 &#x454; &#x43F;&#x43E;&#x432;&#x43D;&#x456;&#x441;&#x442;&#x44E; &#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x438;&#x43C; &#x456;&#x437; Unicode. &#x419;&#x43E;&#x433;&#x43E; &#x43C;&#x43E;&#x436;&#x43D;&#x430; &#x440;&#x43E;&#x437;&#x433;&#x43B;&#x44F;&#x434;&#x430;&#x442;&#x438; &#x44F;&#x43A; &#x444;&#x43E;&#x440;&#x43C;&#x430;&#x442; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; unicode. &#x41F;&#x43E;&#x434;&#x456;&#x431;&#x43D;&#x43E; &#x434;&#x43E; UTF-8, GB18030 &#x454; &#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x438;&#x43C; &#x456;&#x437; ASCII. GB18030 &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x454; &#x441;&#x443;&#x43C;&#x456;&#x441;&#x43D;&#x438;&#x43C; &#x456;&#x437; &#x43A;&#x43E;&#x434;&#x43E;&#x432;&#x43E;&#x44E; &#x441;&#x442;&#x43E;&#x440;&#x456;&#x43D;&#x43A;&#x43E;&#x44E; Windows 936, &#x44F;&#x43A;&#x443; &#x449;&#x435; &#x43D;&#x430;&#x437;&#x438;&#x432;&#x430;&#x44E;&#x442;&#x44C; GBK.</p>
-<p>&#x423; Unix/Linux &#x444;&#x430;&#x439;&#x43B;&#x438; UTF-16 &#x431;&#x443;&#x434;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43E; &#x434;&#x43E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; GB18030, &#x44F;&#x43A;&#x449;&#x43E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F;&#x43C; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x456; &#x454; GB18030. &#x417;&#x430;&#x443;&#x432;&#x430;&#x436;&#x442;&#x435;, &#x449;&#x43E; &#x446;&#x435; &#x441;&#x43F;&#x440;&#x430;&#x446;&#x44E;&#x454;, &#x43B;&#x438;&#x448;&#x435; &#x44F;&#x43A;&#x449;&#x43E; &#x432;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x43E; &#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44F; &#x43A;&#x440;&#x430;&#x457;&#x43D;&#x438; &#x41A;&#x41D;&#x420;. &#x41D;&#x430;&#x43F;&#x440;&#x438;&#x43A;&#x43B;&#x430;&#x434;, &#x443; &#x430;&#x43D;&#x433;&#x43B;&#x456;&#x439;&#x441;&#x44C;&#x43A;&#x456;&#x439; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x456; &#x434;&#x43B;&#x44F; &#x412;&#x435;&#x43B;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x442;&#x430;&#x43D;&#x456;&#x457; &#x456;&#x437; &#x432;&#x441;&#x442;&#x430;&#x43D;&#x43E;&#x432;&#x43B;&#x435;&#x43D;&#x43E;&#x44E; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x43B;&#x44E; <code>en_GB.GB18030</code> &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; UTF-16 &#x43D;&#x430; GB18030 &#x43D;&#x435; &#x43F;&#x440;&#x430;&#x446;&#x44E;&#x432;&#x430;&#x442;&#x438;&#x43C;&#x435;, &#x430; &#x443; &#x43A;&#x438;&#x442;&#x430;&#x439;&#x441;&#x44C;&#x43A;&#x456;&#x439; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x456; <code>zh_CN.GB18030</code> &#x432;&#x441;&#x435; &#x43F;&#x440;&#x430;&#x446;&#x44E;&#x432;&#x430;&#x442;&#x438;&#x43C;&#x435; &#x44F;&#x43A; &#x441;&#x43B;&#x456;&#x434;.</p>
+<p>&#x423; Unix/Linux &#x444;&#x430;&#x439;&#x43B;&#x438; UTF-16 &#x431;&#x443;&#x434;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43E; &#x434;&#x43E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; GB18030, &#x44F;&#x43A;&#x449;&#x43E; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F;&#x43C; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x456; &#x454; GB18030. &#x417;&#x430;&#x443;&#x432;&#x430;&#x436;&#x442;&#x435;, &#x449;&#x43E; &#x446;&#x435; &#x441;&#x43F;&#x440;&#x430;&#x446;&#x44E;&#x454;, &#x43B;&#x438;&#x448;&#x435; &#x44F;&#x43A;&#x449;&#x43E; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x443; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x456; &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x443; &#x441;&#x438;&#x441;&#x442;&#x435;&#x43C;&#x456;. &#x429;&#x43E;&#x431; &#x43E;&#x442;&#x440;&#x438;&#x43C;&#x430;&#x442;&#x438; &#x441;&#x43F;&#x438;&#x441;&#x43E;&#x43A; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x443;&#x432;&#x430;&#x43D;&#x438;&#x445; &#x43B;&#x43E;&#x43A;&#x430;&#x43B;&#x435;&#x439;, &#x441;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x439;&#x442;&#x435;&#x441;&#x44F; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x43E;&#x44E; <code>locale -a</code>.</p>
<p>&#x423; Windows &#x434;&#x43B;&#x44F; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; UTF-16 &#x43D;&#x430; &#x444;&#x430;&#x439;&#x43B;&#x438; GB18030 &#x441;&#x43B;&#x456;&#x434; &#x432;&#x43A;&#x430;&#x437;&#x430;&#x442;&#x438; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; <code>-gb</code>.</p>
@@ -574,7 +625,11 @@
<p>&#x414;&#x43B;&#x44F; &#x440;&#x435;&#x43A;&#x443;&#x440;&#x441;&#x438;&#x432;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x43E;&#x432;&#x438;&#x445; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x443; &#x456;&#x454;&#x440;&#x430;&#x440;&#x445;&#x456;&#x457; &#x43A;&#x430;&#x442;&#x430;&#x43B;&#x43E;&#x433;&#x456;&#x432; &#x441;&#x43B;&#x456;&#x434; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x442;&#x438; dos2unix &#x443; &#x43F;&#x43E;&#x454;&#x434;&#x43D;&#x430;&#x43D;&#x43D;&#x456; &#x437; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x430;&#x43C;&#x438; find(1) &#x442;&#x430; xargs(1). &#x41D;&#x430;&#x43F;&#x440;&#x438;&#x43A;&#x43B;&#x430;&#x434;, &#x449;&#x43E;&#x431; &#x432;&#x438;&#x43A;&#x43E;&#x43D;&#x430;&#x442;&#x438; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; &#x443;&#x441;&#x456;&#x445; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; .txt &#x443; &#x441;&#x442;&#x440;&#x443;&#x43A;&#x442;&#x443;&#x440;&#x456; &#x43F;&#x456;&#x434;&#x43A;&#x430;&#x442;&#x430;&#x43B;&#x43E;&#x433;&#x456;&#x432; &#x43F;&#x43E;&#x442;&#x43E;&#x447;&#x43D;&#x43E;&#x433;&#x43E; &#x43A;&#x430;&#x442;&#x430;&#x43B;&#x43E;&#x433;&#x443;, &#x432;&#x456;&#x434;&#x434;&#x430;&#x439;&#x442;&#x435; &#x442;&#x430;&#x43A;&#x443; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x443;:</p>
-<pre><code> find . -name *.txt |xargs dos2unix</code></pre>
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>&#x423; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x43D;&#x43E;&#x43C;&#x443; &#x440;&#x44F;&#x434;&#x43A;&#x443; Windows &#x43C;&#x43E;&#x436;&#x43D;&#x430; &#x441;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x430;&#x442;&#x438;&#x441;&#x44F; &#x442;&#x430;&#x43A;&#x43E;&#x44E; &#x43A;&#x43E;&#x43C;&#x430;&#x43D;&#x434;&#x43E;&#x44E;:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
<h1 id="10">&#x41B;&#x41E;&#x41A;&#x410;&#x41B;&#x406;&#x417;&#x410;&#x426;&#x406;&#x42F;</h1>
diff --git a/man/uk/man1/dos2unix.po b/man/uk/man1/dos2unix.po
index 50179f9..3dc2153 100644
--- a/man/uk/man1/dos2unix.po
+++ b/man/uk/man1/dos2unix.po
@@ -6,9 +6,9 @@
# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.2-beta4\n"
-"POT-Creation-Date: 2015-01-03 13:05+0100\n"
-"PO-Revision-Date: 2015-01-03 17:21+0200\n"
+"Project-Id-Version: dos2unix-man 7.3-beta9\n"
+"POT-Creation-Date: 2015-08-13 09:03+0200\n"
+"PO-Revision-Date: 2015-08-14 10:42+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -237,56 +237,136 @@ msgstr "Встановити режим перетворення. Значенн
#. type: =item
#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr "B<-D, --display-enc КОДУВАННЯ>"
+
+#. type: textblock
+#: dos2unix.pod:157
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Встановити кодування показаного тексту. Можливі варіанти значень параметра КОДУВАННЯ: I<ansi>, I<unicode>, I<utf8>, типовим є ansi."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr "Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів, лише на те, як буде показано ці назви."
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr "Існує декілька способів показу тексту у консолі Windows, заснованих на кодуванні тексту. Усі ці способи мають свої переваги і недоліки."
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr "B<ansi>"
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr "Типовим способом для dos2unix є кодування тексту у форматі ANSI. Перевагою є зворотна сумісність. Цей варіант працює з растровими шрифтами та шрифтами TrueType. У деяких регіонах, ймовірно, вам доведеться змінити активну кодову сторінку DOS OEM на системну кодову сторінку ANSI Windows за допомогою команди C<chcp>, оскільки dos2unix використовує системну кодову сторінку Windows."
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr "Недоліком ansi є те, що назви файлів із символами, яких немає у типовому системному кодуванні, буде показано неправильно. Замість цих символів ви побачите знак питання або не той символ. Якщо у вашій системі немає файлів із назвами, які містять нетипові символи, можна скористатися цим варіантом."
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr "B<unicode>"
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr "Перевагою кодування unicode (назва у Windows кодування UTF-16) є те, що зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не потрібно. Ймовірно, вам потрібно встановити шрифт консолі TrueType для належного показу нестандартних символів. Якщо символ не передбачено у шрифті TrueType, зазвичай ви побачите невеличкий квадратик замість символу, іноді із знаком питання у ньому."
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr "Якщо ви користуєтеся консоллю ConEmu, весь текст буде показано належним чином, оскільки ConEmu автоматично вибирає належний шрифт."
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr "Недоліком unicode є те, що це кодування несумісне з ASCII. Обробка виведених даних є непростою, якщо ви передаватимете ці дані до іншої програми або файла. Переспрямовування даних до файла призведе до створення некоректного файла UTF-16."
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr "B<utf8>"
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr "Перевагою utf8 є те, що це кодування сумісне з ASCII і, якщо ви переспрямуєте дані до файла, буде створено коректний файл UTF-8. Вам слід встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст буде показано подібно до того, як його показано, якщо визначено кодування C<unicode>."
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr "Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі символи поза ASCII буде показано неправильно. Не лише назви файлів у unicode, а й перекладені повідомлення стануть непридатними до читання. У Windows, налаштованому на роботі у східно-азійському регіоні, ви можете помітити значне блимання під час показу повідомлень."
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr "У консолі ConEmu добре працює спосіб кодування utf8."
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr "Типове кодування можна змінити за допомогою змінної середовища DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode> або C<utf8>."
+
+#. type: =item
+#: dos2unix.pod:219
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:221
msgid "Force conversion of binary files."
msgstr "Примусове перетворення двійкових файлів."
#. type: =item
-#: dos2unix.pod:159
+#: dos2unix.pod:223
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:225
msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
msgstr "У Windows файли в UTF-16 типово перетворюються на файли в UTF-8, незалежно від встановленої локалі. За допомогою цього параметра ви можете наказати програмі перетворювати файли в UTF-16 на файли у GB18030. Цим параметром можна скористатися лише у Windows. Див. також розділ, присвячений GB18030."
#. type: =item
-#: dos2unix.pod:165
+#: dos2unix.pod:229
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:167
+#: dos2unix.pod:231
msgid "Display help and exit."
msgstr "Показати довідкові дані і завершити роботу."
#. type: =item
-#: dos2unix.pod:169
+#: dos2unix.pod:233
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[ПРАПОРЦІ], --info[=ПРАПОРЦІ] ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:171
+#: dos2unix.pod:235
msgid "Display file information. No conversion is done."
msgstr "Вивести дані щодо файла. Не виконувати перетворення."
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:237
msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
msgstr "Буде виведено такі дані, у вказаному порядку: кількість розривів рядків у форматі DOS, кількість розривів рядків у форматі Unix, кількість розривів рядків у форматі Mac, позначка порядку байтів, текстовим чи бінарним є файл та назву файла."
#. type: textblock
-#: dos2unix.pod:177
+#: dos2unix.pod:241
msgid "Example output:"
msgstr "Приклад результатів:"
#. type: verbatim
-#: dos2unix.pod:179
+#: dos2unix.pod:243
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -310,87 +390,87 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:188
+#: dos2unix.pod:252
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців."
#. type: =item
-#: dos2unix.pod:193
+#: dos2unix.pod:257
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:195
+#: dos2unix.pod:259
msgid "Print number of DOS line breaks."
msgstr "Вивести кількість символів розривів рядка DOS."
#. type: =item
-#: dos2unix.pod:197
+#: dos2unix.pod:261
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:199
+#: dos2unix.pod:263
msgid "Print number of Unix line breaks."
msgstr "Вивести кількість символів розривів рядка Unix."
#. type: =item
-#: dos2unix.pod:201
+#: dos2unix.pod:265
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:203
+#: dos2unix.pod:267
msgid "Print number of Mac line breaks."
msgstr "Вивести кількість символів розривів рядка Mac."
#. type: =item
-#: dos2unix.pod:205
+#: dos2unix.pod:269
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:207
+#: dos2unix.pod:271
msgid "Print the byte order mark."
msgstr "Вивести позначку порядку байтів."
#. type: =item
-#: dos2unix.pod:209
+#: dos2unix.pod:273
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:211
+#: dos2unix.pod:275
msgid "Print if file is text or binary."
msgstr "Вивести дані щодо того, є файл текстовим чи бінарним."
#. type: =item
-#: dos2unix.pod:213
+#: dos2unix.pod:277
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:215
+#: dos2unix.pod:279
msgid "Print only the files that would be converted."
msgstr "Вивести дані лише тих файлів, які було б перетворено."
#. type: textblock
-#: dos2unix.pod:217
+#: dos2unix.pod:281
msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
msgstr "Із прапорцем C<c> dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix."
#. type: textblock
-#: dos2unix.pod:222
+#: dos2unix.pod:286
msgid "Examples:"
msgstr "Приклади:"
#. type: textblock
-#: dos2unix.pod:224
+#: dos2unix.pod:288
msgid "Show information for all *.txt files:"
msgstr "Вивести дані щодо усіх файлів *.txt:"
#. type: verbatim
-#: dos2unix.pod:226
+#: dos2unix.pod:290
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -400,12 +480,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:228
+#: dos2unix.pod:292
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Вивести кількість розривів рядків у форматі DOS і розривів рядків у форматі Unix:"
#. type: verbatim
-#: dos2unix.pod:230
+#: dos2unix.pod:294
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -415,12 +495,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:232
+#: dos2unix.pod:296
msgid "Show only the byte order mark:"
msgstr "Вивести лише позначку порядку байтів:"
#. type: verbatim
-#: dos2unix.pod:234
+#: dos2unix.pod:298
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -430,12 +510,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:236
+#: dos2unix.pod:300
msgid "List the files that have DOS line breaks:"
msgstr "Вивести список файлів, у яких є символи розриву рядків DOS:"
#. type: verbatim
-#: dos2unix.pod:238
+#: dos2unix.pod:302
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -445,12 +525,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:240
+#: dos2unix.pod:304
msgid "List the files that have Unix line breaks:"
msgstr "Вивести список файлів, у яких використано символи розриву рядків Unix:"
#. type: verbatim
-#: dos2unix.pod:242
+#: dos2unix.pod:306
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -460,307 +540,307 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:244
+#: dos2unix.pod:308
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:246
+#: dos2unix.pod:310
msgid "Keep the date stamp of output file same as input file."
msgstr "Зберегти часову позначку файла вхідних даних у файлі результатів перетворення."
#. type: =item
-#: dos2unix.pod:248
+#: dos2unix.pod:312
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:250
+#: dos2unix.pod:314
msgid "Display program's license."
msgstr "Вивести умови ліцензування програми."
#. type: =item
-#: dos2unix.pod:252
+#: dos2unix.pod:316
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:254
+#: dos2unix.pod:318
msgid "Add additional newline."
msgstr "Вставити додатковий символ розриву рядка."
#. type: textblock
-#: dos2unix.pod:256
+#: dos2unix.pod:320
msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
msgstr "B<dos2unix>: перетворення на два символи розриву рядків Unix відбуватиметься лише для комбінацій розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Unix лише символів розриву рядків Mac."
#. type: textblock
-#: dos2unix.pod:260
+#: dos2unix.pod:324
msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
msgstr "B<unix2dos>: перетворення на дві комбінації розриву рядків DOS відбуватиметься лише для символів розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Mac лише символів розриву рядків Unix."
#. type: =item
-#: dos2unix.pod:263
+#: dos2unix.pod:327
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:265
+#: dos2unix.pod:329
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Записати до файла результатів позначку порядку байтів (BOM). Типово буде записано позначку порядку байтів UTF-8."
#. type: textblock
-#: dos2unix.pod:268
+#: dos2unix.pod:332
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "Якщо дані початкового файла закодовано у UTF-16 і використано параметр C<-u>, буде дописано позначку порядку байтів UTF-16."
#. type: textblock
-#: dos2unix.pod:271
-msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
-msgstr "Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8 або UTF-16. Див. також розділ щодо UNICODE."
+#: dos2unix.pod:335
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE."
#. type: =item
-#: dos2unix.pod:275
+#: dos2unix.pod:339
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:277
+#: dos2unix.pod:341
msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
msgstr "Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і записати результати до файла ВИХІДНИЙ_ФАЙЛ. Назви файлів слід вказувати парами, I<не слід> використовувати шаблони заміни, інакше вміст файлів I<буде втрачено>."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:345
msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
msgstr "Власником перетвореного файла буде призначено користувача, яким було розпочато перетворення у режимі нового файла (парному режимі). Права доступу на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення."
#. type: =item
-#: dos2unix.pod:286
+#: dos2unix.pod:350
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:352
msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
msgstr "Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати його вміст. Типово, програма працює у цьому режимі. Можна використовувати шаблони заміни."
#. type: textblock
-#: dos2unix.pod:291
+#: dos2unix.pod:355
msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
msgstr "У застарілому режимі (режимі заміщення) перетворений файл належатиме тому самому власнику і групі і матиме ті самі права доступу на читання або запис, що і початковий файл. Крім того, якщо перетворення файла виконується іншим користувачем, який має права доступу на запис до файла (наприклад користувачем root), перетворення буде перервано, якщо зберегти початкові значення не вдасться. Зміна власника може означати неможливість читання файла для його початкового власника. Зміна групи може призвести до проблем із безпекою, оскільки файл може стати доступним для читання користувачам, які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix."
#. type: =item
-#: dos2unix.pod:300
+#: dos2unix.pod:364
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:302
+#: dos2unix.pod:366
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Режим без виведення повідомлень. Програма не виводитиме жодних попереджень або повідомлень про помилки. Повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка."
#. type: =item
-#: dos2unix.pod:305
+#: dos2unix.pod:369
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:307
+#: dos2unix.pod:371
msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
msgstr "Вилучити позначку порядку байтів (BOM). Не записувати BOM до файла результатів. Це типова поведінка під час перетворення файлів з форматом розриву рядків Unix. Див. також параметр C<-b>."
#. type: =item
-#: dos2unix.pod:311
+#: dos2unix.pod:375
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:313
+#: dos2unix.pod:377
msgid "Skip binary files (default)."
msgstr "Пропускати двійкові файли (типово)."
#. type: =item
-#: dos2unix.pod:315
+#: dos2unix.pod:379
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:317
+#: dos2unix.pod:381
msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
msgstr "Зберегти початкове кодування UTF-16. Файл результатів буде записано у тому самому кодуванні UTF-16, із прямим або зворотним порядком байтів, що і початковий файл. Таким чином можна запобігти перетворенню даних у кодування UTF-8. До файла буде записано відповідну позначку порядку байтів UTF-16. Вимкнути цей параметр можна за допомогою параметра C<-ascii>."
#. type: =item
-#: dos2unix.pod:322
+#: dos2unix.pod:386
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:324
+#: dos2unix.pod:388
msgid "Assume that the input file format is UTF-16LE."
msgstr "Припускати, що кодуванням вхідних файлів є UTF-16LE."
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:390
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "Якщо у початковому файлі є позначка порядку байтів (BOM), її буде використано у файлі-результаті, незалежно від використання цього параметра."
#. type: textblock
-#: dos2unix.pod:329
+#: dos2unix.pod:393
msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
msgstr "Якщо вами було зроблено помилкове припущення щодо формату файла (файл вхідних даних насправді не є файлом у форматі UTF-16LE), і дані вдасться успішно перетворити, ви отримаєте файл у кодуванні UTF-8 з помилковим вмістом. Скасувати таке помилкове перетворення можна за допомогою зворотного перетворення iconv(1) з даних у форматі UTF-8 на дані у форматі UTF-16LE. Таким чином ви повернетеся до початкового кодування даних у файлі."
#. type: textblock
-#: dos2unix.pod:334
+#: dos2unix.pod:398
msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
msgstr "Припущення щодо форматування UTF-16LE працює як визначення I<режиму перетворення>. Перемиканням на типовий режим I<ascii> можна вимкнути припущення щодо форматування UTF-16LE."
#. type: =item
-#: dos2unix.pod:337
+#: dos2unix.pod:401
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:339
+#: dos2unix.pod:403
msgid "Assume that the input file format is UTF-16BE."
msgstr "Припускати, що вхідним форматом є UTF-16BE."
#. type: textblock
-#: dos2unix.pod:341
+#: dos2unix.pod:405
msgid "This option works the same as option C<-ul>."
msgstr "Цей параметр працює у спосіб, тотожний до параметра C<-ul>."
#. type: =item
-#: dos2unix.pod:343
+#: dos2unix.pod:407
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:345
+#: dos2unix.pod:409
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Виводити докладні повідомлення. Буде показано додаткові дані щодо позначок порядку байтів та кількості перетворених символів розриву рядків."
#. type: =item
-#: dos2unix.pod:348
+#: dos2unix.pod:412
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:350
+#: dos2unix.pod:414
msgid "Follow symbolic links and convert the targets."
msgstr "Переходити за символічними посиланням і перетворювати файли, на які вони вказують."
#. type: =item
-#: dos2unix.pod:352
+#: dos2unix.pod:416
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:354
+#: dos2unix.pod:418
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Замінити символічні посилання перетвореними файлами (початкові файли, на які вони вказують, змінено не буде)."
#. type: =item
-#: dos2unix.pod:357
+#: dos2unix.pod:421
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:359
+#: dos2unix.pod:423
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Не змінювати символічні посилання та файли, на які вони посилаються (типово)."
#. type: =item
-#: dos2unix.pod:361
+#: dos2unix.pod:425
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:427
msgid "Display version information and exit."
msgstr "Вивести дані щодо версії і завершити роботу."
#. type: =head1
-#: dos2unix.pod:367
+#: dos2unix.pod:431
msgid "MAC MODE"
msgstr "РЕЖИМ MAC"
#. type: textblock
-#: dos2unix.pod:369
+#: dos2unix.pod:433
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "У звичайному режимі розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають."
#. type: textblock
-#: dos2unix.pod:372
+#: dos2unix.pod:436
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають."
#. type: textblock
-#: dos2unix.pod:375
+#: dos2unix.pod:439
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "Щоб запустити програму у режимі перетворення Mac, скористайтеся параметром командного рядка C<-c mac> або програмами C<mac2unix> та C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:378
+#: dos2unix.pod:442
msgid "CONVERSION MODES"
msgstr "РЕЖИМИ ПЕРЕТВОРЕННЯ"
#. type: =item
-#: dos2unix.pod:382
+#: dos2unix.pod:446
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:384
+#: dos2unix.pod:448
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "У режимі C<ascii> виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення."
#. type: textblock
-#: dos2unix.pod:387
+#: dos2unix.pod:451
msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
msgstr "Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode)."
#. type: =item
-#: dos2unix.pod:391
+#: dos2unix.pod:455
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:393
+#: dos2unix.pod:457
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "У цьому режимі усі 8-бітові символи, які не є частиною ASCII, (з номерами від 128 до 255) буде перетворено на відповідні 7-бітові символи."
#. type: =item
-#: dos2unix.pod:396
+#: dos2unix.pod:460
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:462
msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
msgstr "Перетворення символів буде виконано з кодування (кодової сторінки) DOS до кодування ISO-8859-1 (Latin-1) у Unix. Символи DOS, які не мають еквівалентів у ISO-8859-1 і перетворення яких неможливе, буде перетворено на символ крапки. Те саме стосується символів ISO-8859-1, які не мають еквівалентів у DOS."
#. type: textblock
-#: dos2unix.pod:403
+#: dos2unix.pod:467
msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
msgstr "Якщо буде використано лише параметр C<-iso>, програма dos2unix спробує визначити активне кодування. Якщо це виявиться неможливим, dos2unix використає типове кодування CP437, яке здебільшого використовується у США. Щоб примусово визначити кодування, скористайтеся параметром C<-437> (США), C<-850> (західноєвропейські мови), C<-860> (португальська), C<-863> (канадська французька) або C<-865> (скандинавські мови). Використати кодування Windows CP1252 (західноєвропейські мови) можна за допомогою параметра C<-1252>. Для інших кодувань використовуйте поєднання dos2unix з iconv(1). Програма iconv здатна виконувати перетворення даних у доволі широкому спектрі кодувань символів."
#. type: textblock
-#: dos2unix.pod:412
+#: dos2unix.pod:476
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Ніколи не користуйтеся перетворенням ISO для текстових файлів у форматі Unicode. Використання подібного перетворення призведе до ушкодження вмісту файлів у кодуванні UTF-8."
#. type: textblock
-#: dos2unix.pod:414
+#: dos2unix.pod:478
msgid "Some examples:"
msgstr "Декілька прикладів:"
#. type: textblock
-#: dos2unix.pod:416
+#: dos2unix.pod:480
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:418
+#: dos2unix.pod:482
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -770,12 +850,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:420
+#: dos2unix.pod:484
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:422
+#: dos2unix.pod:486
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -785,12 +865,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:424
+#: dos2unix.pod:488
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:426
+#: dos2unix.pod:490
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -800,12 +880,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:428
+#: dos2unix.pod:492
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix (Unicode):"
#. type: verbatim
-#: dos2unix.pod:430
+#: dos2unix.pod:494
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -815,12 +895,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:432
+#: dos2unix.pod:496
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS:"
#. type: verbatim
-#: dos2unix.pod:434
+#: dos2unix.pod:498
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -830,12 +910,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:436
+#: dos2unix.pod:500
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:438
+#: dos2unix.pod:502
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -845,12 +925,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:440
+#: dos2unix.pod:504
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:442
+#: dos2unix.pod:506
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -860,12 +940,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:508
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:446
+#: dos2unix.pod:510
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -875,127 +955,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:448
+#: dos2unix.pod:512
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Див. також L<http://czyborra.com/charsets/codepages.html> та L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:453
+#: dos2unix.pod:517
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:455
+#: dos2unix.pod:519
msgid "Encodings"
msgstr "Кодування"
#. type: textblock
-#: dos2unix.pod:457
+#: dos2unix.pod:521
msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
msgstr "Існує декілька різних кодувань Unicode. У Unix та Linux у файлах Unicode здебільшого використовується кодування UTF-8. У Windows для текстових файлів Unicode може бути використано кодування UTF-8, UTF-16 або UTF-16 зі зворотним порядком байтів. Втім, здебільшого, використовується формат UTF-16."
#. type: =head2
-#: dos2unix.pod:462
+#: dos2unix.pod:526
msgid "Conversion"
msgstr "Перетворення"
#. type: textblock
-#: dos2unix.pod:464
+#: dos2unix.pod:528
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків DOS, Unix або Mac."
#. type: textblock
-#: dos2unix.pod:467
+#: dos2unix.pod:531
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні UTF-8, оскільки UTF-8 було розроблено так, що зворотну сумісність з ASCII збережено."
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:534
msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
msgstr "Програми dos2unix та unix2dos, зібрані з підтримкою Unicode UTF-16, можуть читати текстові файли у кодуванні UTF-16 з прямим та зворотним порядком байтів. Щоб дізнатися про те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:474
+#: dos2unix.pod:538
msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
msgstr "У Unix/Linux файли у кодуванні UTF-16 перетворюються на файли у кодуванні локалі. Для визначення поточного кодування символів локалі скористайтеся командою locale(1). Якщо перетворення виявиться неможливим, програма повідомить про помилку перетворення і пропустить відповідний файл."
#. type: textblock
-#: dos2unix.pod:479
+#: dos2unix.pod:543
msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
msgstr "У Windows файли UTF-16 типово буде перетворено на файли UTF-8. Обидва типи систем, Windows та Unix/Linux, мають непогані можливості з підтримки файлів у форматуванні UTF-8."
#. type: textblock
-#: dos2unix.pod:482
+#: dos2unix.pod:546
msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
msgstr "Кодування UTF-16 та UTF-8 є повністю сумісними. Під час перетворення не буде втрачено жодної інформації. Якщо під час перетворення даних у кодуванні UTF-16 на дані у кодуванні UTF-8 трапиться помилка, наприклад, якщо у вхідному файлі UTF-16 міститиметься якась помилка, файл буде пропущено."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:550
msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
msgstr "Якщо використано параметр C<-u>, файл результатів буде записано у тому самому кодуванні UTF-16, що і початковий файл. Використання параметра Option C<-u> запобігає перетворенню даних у кодування UTF-8."
#. type: textblock
-#: dos2unix.pod:489
+#: dos2unix.pod:553
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "У dos2unix та unix2dos не передбачено параметра для перетворення даних у кодуванні UTF-8 на дані у кодуванні UTF-16."
#. type: textblock
-#: dos2unix.pod:491
+#: dos2unix.pod:555
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Режим перетворення ISO та 7-бітовий режим не працюють для файлів UTF-16."
#. type: =head2
-#: dos2unix.pod:493
+#: dos2unix.pod:557
msgid "Byte Order Mark"
msgstr "Позначка порядку байтів"
#. type: textblock
-#: dos2unix.pod:495
+#: dos2unix.pod:559
msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
msgstr "У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L<http://en.wikipedia.org/wiki/Byte_order_mark>."
#. type: textblock
-#: dos2unix.pod:499
+#: dos2unix.pod:563
msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
msgstr "У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю."
#. type: textblock
-#: dos2unix.pod:502
+#: dos2unix.pod:566
msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
msgstr "Програма dos2unix може визначити, чи є кодуванням файла UTF-16, лише якщо у файлі міститься позначка порядку байтів. Якщо у файлі, де використано кодування UTF-16, немає такої позначки, dos2unix вважатиме такий файл двійковим (бінарним)."
#. type: textblock
-#: dos2unix.pod:506
+#: dos2unix.pod:570
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Для перетворення файлів UTF-16 без позначки порядку байтів скористайтеся параметром C<-ul> або C<-ub>."
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:572
msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
msgstr "Типово dos2unix не записує до файлів результатів перетворення позначки порядку байтів (BOM). Якщо використано параметр C<-b>, dos2unix запише до файла результатів BOM, якщо BOM була у файлі початкових даних."
#. type: textblock
-#: dos2unix.pod:511
+#: dos2unix.pod:575
msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
msgstr "Типово unix2dos записує позначку порядку байтів (BOM) до файла результатів, якщо BOM є у початковому файлі. Скористайтеся параметром C<-r>, щоб вилучити BOM."
#. type: textblock
-#: dos2unix.pod:514
+#: dos2unix.pod:578
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix та unix2dos завжди записують до файла результатів позначку порядку байтів (BOM), якщо використано параметр C<-m>."
#. type: =head2
-#: dos2unix.pod:516
+#: dos2unix.pod:580
+msgid "Unicode file names on Windows"
+msgstr "Назви файлів у Unicode у Windows"
+
+#. type: textblock
+#: dos2unix.pod:582
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr "У dos2unix передбачено підтримку читання і запису назв файлів Unicode у командному рядку Windows. Це означає, що dos2unix може відкривати файли, у назвах яких є символи, які не є частиною типової системної кодової сторінки ANSI. Щоб визначити, чи зібрано dos2unix для Windows з підтримкою назв файлів у кодуванні Unicode, скористайтеся командою C<dos2unix -V>."
+
+#. type: textblock
+#: dos2unix.pod:588
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr "Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано декілька проблем. Див. параметр C<-D>, C<--display-enc>. Назви файлів може бути некоректно показано у консолі, але запис цих назв відбуватиметься належним чином."
+
+#. type: =head2
+#: dos2unix.pod:592
msgid "Unicode examples"
msgstr "Приклади для Unicode"
#. type: textblock
-#: dos2unix.pod:518
+#: dos2unix.pod:594
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у формат Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:520
+#: dos2unix.pod:596
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1005,12 +1100,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:522
+#: dos2unix.pod:598
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі UTF-8 Unix:"
#. type: verbatim
-#: dos2unix.pod:524
+#: dos2unix.pod:600
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1020,12 +1115,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:526
+#: dos2unix.pod:602
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 без BOM:"
#. type: verbatim
-#: dos2unix.pod:528
+#: dos2unix.pod:604
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1035,12 +1130,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:530
+#: dos2unix.pod:606
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:532
+#: dos2unix.pod:608
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1050,47 +1145,47 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:534
+#: dos2unix.pod:610
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:612
msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
msgstr "GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:540
+#: dos2unix.pod:616
msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
msgstr "Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із ASCII. GB18030 також є сумісним із кодовою сторінкою Windows 936, яку ще називають GBK."
#. type: textblock
-#: dos2unix.pod:544
-msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
-msgstr "У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо встановлено значення країни КНР. Наприклад, у англійській локалі для Великоританії із встановленою локаллю C<en_GB.GB18030> перетворення UTF-16 на GB18030 не працюватиме, а у китайській локалі C<zh_CN.GB18030> все працюватиме як слід."
+#: dos2unix.pod:620
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо підтримку локалі передбачено у системі. Щоб отримати список підтримуваних локалей, скористайтеся командою C<locale -a>."
#. type: textblock
-#: dos2unix.pod:550
+#: dos2unix.pod:624
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "У Windows для перетворення файлів UTF-16 на файли GB18030 слід вказати параметр C<-gb>."
#. type: textblock
-#: dos2unix.pod:552
+#: dos2unix.pod:626
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "У файлах у кодуванні GB18030 може міститися позначка порядку байтів, так само, як у файлах у кодуванні Unicode."
#. type: =head1
-#: dos2unix.pod:554
+#: dos2unix.pod:628
msgid "EXAMPLES"
msgstr "ПРИКЛАДИ"
#. type: textblock
-#: dos2unix.pod:556
+#: dos2unix.pod:630
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Прочитати вхідні дані зі стандартного джерела (stdin) і записати результат до стандартного виведення (stdout):"
#. type: verbatim
-#: dos2unix.pod:558
+#: dos2unix.pod:632
#, no-wrap
msgid ""
" dos2unix\n"
@@ -1102,12 +1197,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:635
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і замістити цей файл:"
#. type: verbatim
-#: dos2unix.pod:563
+#: dos2unix.pod:637
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1119,12 +1214,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:566
+#: dos2unix.pod:640
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii:"
#. type: verbatim
-#: dos2unix.pod:568
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1134,12 +1229,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:570
+#: dos2unix.pod:644
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii. Перетворити дані у b.txt і замістити цей файл у режимі 7-бітового перетворення:"
#. type: verbatim
-#: dos2unix.pod:573
+#: dos2unix.pod:647
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1153,12 +1248,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:577
+#: dos2unix.pod:651
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Перетворити файл a.txt з формату Mac на формат Unix:"
#. type: verbatim
-#: dos2unix.pod:579
+#: dos2unix.pod:653
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1170,12 +1265,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:582
+#: dos2unix.pod:656
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Перетворити файл a.txt з формату Unix на формат Mac:"
#. type: verbatim
-#: dos2unix.pod:584
+#: dos2unix.pod:658
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1187,12 +1282,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:587
+#: dos2unix.pod:661
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Перетворити дані у a.txt, замістити цей файл і зберегти часову позначку початкового файла:"
#. type: verbatim
-#: dos2unix.pod:589
+#: dos2unix.pod:663
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1204,12 +1299,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:592
+#: dos2unix.pod:666
msgid "Convert a.txt and write to e.txt:"
msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt:"
#. type: verbatim
-#: dos2unix.pod:594
+#: dos2unix.pod:668
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1219,12 +1314,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:670
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt. Скопіювати часову позначку файла a.txt для файла e.txt:"
#. type: verbatim
-#: dos2unix.pod:598
+#: dos2unix.pod:672
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1234,12 +1329,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:600
+#: dos2unix.pod:674
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і записати результат до e.txt:"
#. type: verbatim
-#: dos2unix.pod:602
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1251,12 +1346,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:605
+#: dos2unix.pod:679
msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
msgstr "Перетворити дані у c.txt і записати результати до e.txt. Перетворити дані у a.txt і замістити ними цей файл. Перетворити дані у b.txt і замістити ними цей файл. Перетворити дані у d.txt і записати результати до f.txt:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:682
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1266,42 +1361,57 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:610
+#: dos2unix.pod:684
msgid "RECURSIVE CONVERSION"
msgstr "РЕКУРСИВНЕ ПЕРЕТВОРЕННЯ"
#. type: textblock
-#: dos2unix.pod:612
+#: dos2unix.pod:686
msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
msgstr "Для рекурсивного перетворення текстових файлів у ієрархії каталогів слід використовувати dos2unix у поєднанні з програмами find(1) та xargs(1). Наприклад, щоб виконати перетворення усіх файлів .txt у структурі підкаталогів поточного каталогу, віддайте таку команду:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:690
+#, no-wrap
+msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:692
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr "У командному рядку Windows можна скористатися такою командою:"
+
+#. type: verbatim
+#: dos2unix.pod:694
#, no-wrap
msgid ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:696
msgid "LOCALIZATION"
msgstr "ЛОКАЛІЗАЦІЯ"
#. type: =item
-#: dos2unix.pod:622
+#: dos2unix.pod:700
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:702
msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
msgstr "Основна мова визначається за допомогою змінної середовища LANG. Значення змінної LANG складається з декількох частин. Перша частина записується малими літерами і визначає код мови. Друга частина є необов’язковою, визначає код країни і записується прописними літерами, відокремлюється від першої частини символом підкреслювання. Передбачено також необов’язкову третю частину: кодування. Ця частина відокремлюється від другої частини крапкою. Ось декілька прикладів для командних оболонок стандартного типу POSIX:"
#. type: verbatim
-#: dos2unix.pod:631
+#: dos2unix.pod:709
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1323,47 +1433,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:639
+#: dos2unix.pod:717
msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
msgstr "Повний список мов та кодів країн наведено у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:642
+#: dos2unix.pod:720
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1)."
#. type: =item
-#: dos2unix.pod:645
+#: dos2unix.pod:723
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:647
+#: dos2unix.pod:725
msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
msgstr "За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C<LANGUAGE=nl:de>. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:655
+#: dos2unix.pod:733
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою."
#. type: =item
-#: dos2unix.pod:659
+#: dos2unix.pod:737
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:661
+#: dos2unix.pod:739
msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
msgstr "Змінну LOCALEDIR, встановлену під час збирання програми, можна змінити за допомогою змінної середовища DOS2UNIX_LOCALEDIR. LOCALEDIR використовується для пошуку файлів перекладів. Типовим значенням у системах GNU є C</usr/local/share/locale>. Переглянути поточне значення змінної LOCALEDIR можна переглянути за допомогою параметра B<--version>."
#. type: textblock
-#: dos2unix.pod:666
+#: dos2unix.pod:744
msgid "Example (POSIX shell):"
msgstr "Приклад (командна оболонка POSIX):"
#. type: verbatim
-#: dos2unix.pod:668
+#: dos2unix.pod:746
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1373,72 +1483,72 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:673
+#: dos2unix.pod:751
msgid "RETURN VALUE"
msgstr "ПОВЕРНУТЕ ЗНАЧЕННЯ"
#. type: textblock
-#: dos2unix.pod:675
+#: dos2unix.pod:753
msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
msgstr "Якщо завдання вдасться успішно виконати, програма поверне нульовий код виходу. Якщо станеться системна помилка, буде повернуто код цієї помилки. Якщо станеться якась інша помилка, буде повернуто код 1."
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:756
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "У режимі без повідомлень повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка."
#. type: =head1
-#: dos2unix.pod:681
+#: dos2unix.pod:759
msgid "STANDARDS"
msgstr "СТАНДАРТИ"
#. type: textblock
-#: dos2unix.pod:683
+#: dos2unix.pod:761
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:685
+#: dos2unix.pod:763
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://uk.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:765
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://uk.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:689
+#: dos2unix.pod:767
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://uk.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:691
+#: dos2unix.pod:769
msgid "AUTHORS"
msgstr "АВТОРИ"
#. type: textblock
-#: dos2unix.pod:693
+#: dos2unix.pod:771
msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (режим mac2unix) - <wuebben@kde.org>, Christian Wurll (додатковий новий рядок) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (супровідник)"
#. type: textblock
-#: dos2unix.pod:698
+#: dos2unix.pod:776
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Сторінка проекту: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:778
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Сторінка на SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:702
+#: dos2unix.pod:780
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
#. type: textblock
-#: dos2unix.pod:704
+#: dos2unix.pod:782
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/uk/man1/dos2unix.pod b/man/uk/man1/dos2unix.pod
index 716e8dc..a44eb37 100644
--- a/man/uk/man1/dos2unix.pod
+++ b/man/uk/man1/dos2unix.pod
@@ -128,6 +128,74 @@ SunOS/Solaris передбачено підтримку лише парного
Встановити режим перетворення. Значенням аргументу РЕЖИМ може бути один з
таких рядків: I<ascii>, I<7bit>, I<iso>, I<mac>. Типовим є режим ascii.
+=item B<-D, --display-enc КОДУВАННЯ>
+
+Встановити кодування показаного тексту. Можливі варіанти значень параметра
+КОДУВАННЯ: I<ansi>, I<unicode>, I<utf8>, типовим є ansi.
+
+Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів
+у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів,
+лише на те, як буде показано ці назви.
+
+Існує декілька способів показу тексту у консолі Windows, заснованих на
+кодуванні тексту. Усі ці способи мають свої переваги і недоліки.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Типовим способом для dos2unix є кодування тексту у форматі ANSI. Перевагою є
+зворотна сумісність. Цей варіант працює з растровими шрифтами та шрифтами
+TrueType. У деяких регіонах, ймовірно, вам доведеться змінити активну кодову
+сторінку DOS OEM на системну кодову сторінку ANSI Windows за допомогою
+команди C<chcp>, оскільки dos2unix використовує системну кодову сторінку
+Windows.
+
+Недоліком ansi є те, що назви файлів із символами, яких немає у типовому
+системному кодуванні, буде показано неправильно. Замість цих символів ви
+побачите знак питання або не той символ. Якщо у вашій системі немає файлів
+із назвами, які містять нетипові символи, можна скористатися цим варіантом.
+
+=item B<unicode>
+
+Перевагою кодування unicode (назва у Windows кодування UTF-16) є те, що
+зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не
+потрібно. Ймовірно, вам потрібно встановити шрифт консолі TrueType для
+належного показу нестандартних символів. Якщо символ не передбачено у шрифті
+TrueType, зазвичай ви побачите невеличкий квадратик замість символу, іноді
+із знаком питання у ньому.
+
+Якщо ви користуєтеся консоллю ConEmu, весь текст буде показано належним
+чином, оскільки ConEmu автоматично вибирає належний шрифт.
+
+Недоліком unicode є те, що це кодування несумісне з ASCII. Обробка виведених
+даних є непростою, якщо ви передаватимете ці дані до іншої програми або
+файла. Переспрямовування даних до файла призведе до створення некоректного
+файла UTF-16.
+
+=item B<utf8>
+
+Перевагою utf8 є те, що це кодування сумісне з ASCII і, якщо ви
+переспрямуєте дані до файла, буде створено коректний файл UTF-8. Вам слід
+встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст
+буде показано подібно до того, як його показано, якщо визначено кодування
+C<unicode>.
+
+Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі
+символи поза ASCII буде показано неправильно. Не лише назви файлів у
+unicode, а й перекладені повідомлення стануть непридатними до читання. У
+Windows, налаштованому на роботі у східно-азійському регіоні, ви можете
+помітити значне блимання під час показу повідомлень.
+
+У консолі ConEmu добре працює спосіб кодування utf8.
+
+=back
+
+Типове кодування можна змінити за допомогою змінної середовища
+DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode> або C<utf8>.
+
=item B<-f, --force>
Примусове перетворення двійкових файлів.
@@ -251,8 +319,8 @@ B<unix2dos>: перетворення на дві комбінації розр
Якщо дані початкового файла закодовано у UTF-16 і використано параметр
C<-u>, буде дописано позначку порядку байтів UTF-16.
-Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8
-або UTF-16. Див. також розділ щодо UNICODE.
+Не використовуйте цей параметр для кодувань результатів, відмінних від
+UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE.
@@ -531,6 +599,19 @@ BOM.
Dos2unix та unix2dos завжди записують до файла результатів позначку порядку
байтів (BOM), якщо використано параметр C<-m>.
+=head2 Назви файлів у Unicode у Windows
+
+У dos2unix передбачено підтримку читання і запису назв файлів Unicode у
+командному рядку Windows. Це означає, що dos2unix може відкривати файли, у
+назвах яких є символи, які не є частиною типової системної кодової сторінки
+ANSI. Щоб визначити, чи зібрано dos2unix для Windows з підтримкою назв
+файлів у кодуванні Unicode, скористайтеся командою C<dos2unix -V>.
+
+Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано
+декілька проблем. Див. параметр C<-D>, C<--display-enc>. Назви файлів може
+бути некоректно показано у консолі, але запис цих назв відбуватиметься
+належним чином.
+
=head2 Приклади для Unicode
Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у
@@ -564,10 +645,9 @@ ASCII. GB18030 також є сумісним із кодовою сторінк
називають GBK.
У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо
-кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо встановлено
-значення країни КНР. Наприклад, у англійській локалі для Великоританії із
-встановленою локаллю C<en_GB.GB18030> перетворення UTF-16 на GB18030 не
-працюватиме, а у китайській локалі C<zh_CN.GB18030> все працюватиме як слід.
+кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо підтримку
+локалі передбачено у системі. Щоб отримати список підтримуваних локалей,
+скористайтеся командою C<locale -a>.
У Windows для перетворення файлів UTF-16 на файли GB18030 слід вказати
параметр C<-gb>.
@@ -645,7 +725,11 @@ a.txt і замістити ними цей файл. Перетворити д
xargs(1). Наприклад, щоб виконати перетворення усіх файлів .txt у структурі
підкаталогів поточного каталогу, віддайте таку команду:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+У командному рядку Windows можна скористатися такою командою:
+
+ for /R %G in (*.txt) do dos2unix "%G"
=head1 ЛОКАЛІЗАЦІЯ
diff --git a/man/uk/man1/dos2unix.txt b/man/uk/man1/dos2unix.txt
index db9f45f..e06ad22 100644
--- a/man/uk/man1/dos2unix.txt
+++ b/man/uk/man1/dos2unix.txt
@@ -95,6 +95,69 @@
один з таких рядків: *ascii*, *7bit*, *iso*, *mac*. Типовим є режим
ascii.
+ -D, --display-enc КОДУВАННЯ
+ Встановити кодування показаного тексту. Можливі варіанти значень
+ параметра КОДУВАННЯ: *ansi*, *unicode*, *utf8*, типовим є ansi.
+
+ Цей параметр доступний лише у dos2unix для Windows з підтримкою назв
+ файлів у Unicode. Цей параметр не впливає на справжнє читання та
+ запис назв файлів, лише на те, як буде показано ці назви.
+
+ Існує декілька способів показу тексту у консолі Windows, заснованих
+ на кодуванні тексту. Усі ці способи мають свої переваги і недоліки.
+
+ ansi
+ Типовим способом для dos2unix є кодування тексту у форматі ANSI.
+ Перевагою є зворотна сумісність. Цей варіант працює з растровими
+ шрифтами та шрифтами TrueType. У деяких регіонах, ймовірно, вам
+ доведеться змінити активну кодову сторінку DOS OEM на системну
+ кодову сторінку ANSI Windows за допомогою команди "chcp",
+ оскільки dos2unix використовує системну кодову сторінку Windows.
+
+ Недоліком ansi є те, що назви файлів із символами, яких немає у
+ типовому системному кодуванні, буде показано неправильно.
+ Замість цих символів ви побачите знак питання або не той символ.
+ Якщо у вашій системі немає файлів із назвами, які містять
+ нетипові символи, можна скористатися цим варіантом.
+
+ unicode
+ Перевагою кодування unicode (назва у Windows кодування UTF-16) є
+ те, що зазвичай текст буде показано правильно. Змінювати активну
+ кодову сторінку не потрібно. Ймовірно, вам потрібно встановити
+ шрифт консолі TrueType для належного показу нестандартних
+ символів. Якщо символ не передбачено у шрифті TrueType, зазвичай
+ ви побачите невеличкий квадратик замість символу, іноді із
+ знаком питання у ньому.
+
+ Якщо ви користуєтеся консоллю ConEmu, весь текст буде показано
+ належним чином, оскільки ConEmu автоматично вибирає належний
+ шрифт.
+
+ Недоліком unicode є те, що це кодування несумісне з ASCII.
+ Обробка виведених даних є непростою, якщо ви передаватимете ці
+ дані до іншої програми або файла. Переспрямовування даних до
+ файла призведе до створення некоректного файла UTF-16.
+
+ utf8
+ Перевагою utf8 є те, що це кодування сумісне з ASCII і, якщо ви
+ переспрямуєте дані до файла, буде створено коректний файл UTF-8.
+ Вам слід встановити шрифт консолі TrueType. Якщо використано
+ шрифт TrueType, текст буде показано подібно до того, як його
+ показано, якщо визначено кодування "unicode".
+
+ Недоліком є те, що якщо ви скористаєтеся типовим растровим
+ шрифтом, усі символи поза ASCII буде показано неправильно. Не
+ лише назви файлів у unicode, а й перекладені повідомлення
+ стануть непридатними до читання. У Windows, налаштованому на
+ роботі у східно-азійському регіоні, ви можете помітити значне
+ блимання під час показу повідомлень.
+
+ У консолі ConEmu добре працює спосіб кодування utf8.
+
+ Типове кодування можна змінити за допомогою змінної середовища
+ DOS2UNIX_DISPLAY_ENC встановленням для неї значення "unicode" або
+ "utf8".
+
-f, --force
Примусове перетворення двійкових файлів.
@@ -199,7 +262,7 @@
параметр "-u", буде дописано позначку порядку байтів UTF-16.
Не використовуйте цей параметр для кодувань результатів, відмінних
- від UTF-8 або UTF-16. Див. також розділ щодо UNICODE.
+ від UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE.
-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...
Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і
@@ -464,6 +527,19 @@ UNICODE
Dos2unix та unix2dos завжди записують до файла результатів позначку
порядку байтів (BOM), якщо використано параметр "-m".
+ Назви файлів у Unicode у Windows
+ У dos2unix передбачено підтримку читання і запису назв файлів Unicode у
+ командному рядку Windows. Це означає, що dos2unix може відкривати файли,
+ у назвах яких є символи, які не є частиною типової системної кодової
+ сторінки ANSI. Щоб визначити, чи зібрано dos2unix для Windows з
+ підтримкою назв файлів у кодуванні Unicode, скористайтеся командою
+ "dos2unix -V".
+
+ Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано
+ декілька проблем. Див. параметр "-D", "--display-enc". Назви файлів може
+ бути некоректно показано у консолі, але запис цих назв відбуватиметься
+ належним чином.
+
Приклади для Unicode
Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у
формат Unix UTF-8:
@@ -498,10 +574,8 @@ GB18030
У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо
кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо
- встановлено значення країни КНР. Наприклад, у англійській локалі для
- Великоританії із встановленою локаллю "en_GB.GB18030" перетворення
- UTF-16 на GB18030 не працюватиме, а у китайській локалі "zh_CN.GB18030"
- все працюватиме як слід.
+ підтримку локалі передбачено у системі. Щоб отримати список
+ підтримуваних локалей, скористайтеся командою "locale -a".
У Windows для перетворення файлів UTF-16 на файли GB18030 слід вказати
параметр "-gb".
@@ -578,7 +652,11 @@ GB18030
Наприклад, щоб виконати перетворення усіх файлів .txt у структурі
підкаталогів поточного каталогу, віддайте таку команду:
- find . -name *.txt |xargs dos2unix
+ find . -name '*.txt' |xargs dos2unix
+
+ У командному рядку Windows можна скористатися такою командою:
+
+ for /R %G in (*.txt) do dos2unix "%G"
ЛОКАЛІЗАЦІЯ
LANG