summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:30:01 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:30:04 +0900
commitff02b77ca132c1ed60c503dceda5305738128bf2 (patch)
treea96ffc97fc12318d39f0883c9303a5d0324385b5
parent844262890797f165a0497afdcc1ad8f5caec971d (diff)
downloaddos2unix-ff02b77ca132c1ed60c503dceda5305738128bf2.tar.gz
dos2unix-ff02b77ca132c1ed60c503dceda5305738128bf2.tar.bz2
dos2unix-ff02b77ca132c1ed60c503dceda5305738128bf2.zip
Imported Upstream version 7.3.3
Change-Id: I19b8eba9412d6377bfa3daa54e965fbed99940b2 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r--COPYING.txt2
-rw-r--r--ChangeLog.txt99
-rw-r--r--DEVEL.txt98
-rw-r--r--INSTALL.txt66
-rw-r--r--Makefile164
-rw-r--r--NEWS.txt8
-rw-r--r--README.txt46
-rw-r--r--common.c811
-rw-r--r--common.h22
-rw-r--r--dos2unix.c64
-rw-r--r--man/de/man1/dos2unix.171
-rw-r--r--man/de/man1/dos2unix.htm44
-rw-r--r--man/de/man1/dos2unix.pod71
-rw-r--r--man/de/man1/dos2unix.txt63
-rw-r--r--man/es/man1/dos2unix.169
-rw-r--r--man/es/man1/dos2unix.htm44
-rw-r--r--man/es/man1/dos2unix.pod69
-rw-r--r--man/es/man1/dos2unix.txt59
-rw-r--r--man/fr/man1/dos2unix.171
-rw-r--r--man/fr/man1/dos2unix.htm44
-rw-r--r--man/fr/man1/dos2unix.pod71
-rw-r--r--man/fr/man1/dos2unix.txt63
-rw-r--r--man/man1/Makefile16
-rw-r--r--man/man1/dos2unix.156
-rw-r--r--man/man1/dos2unix.htm44
-rw-r--r--man/man1/dos2unix.pod55
-rw-r--r--man/man1/dos2unix.txt50
-rw-r--r--man/nl/man1/dos2unix.164
-rw-r--r--man/nl/man1/dos2unix.htm44
-rw-r--r--man/nl/man1/dos2unix.pod64
-rw-r--r--man/nl/man1/dos2unix.txt53
-rw-r--r--man/pl/man1/dos2unix.160
-rw-r--r--man/pl/man1/dos2unix.htm44
-rw-r--r--man/pl/man1/dos2unix.pod60
-rw-r--r--man/pl/man1/dos2unix.txt56
-rw-r--r--man/pt_BR/man1/dos2unix.194
-rw-r--r--man/pt_BR/man1/dos2unix.htm68
-rw-r--r--man/pt_BR/man1/dos2unix.pod90
-rw-r--r--man/pt_BR/man1/dos2unix.txt87
-rw-r--r--man/sv/man1/dos2unix.181
-rw-r--r--man/sv/man1/dos2unix.htm66
-rw-r--r--man/sv/man1/dos2unix.pod79
-rw-r--r--man/sv/man1/dos2unix.txt83
-rw-r--r--man/uk/man1/dos2unix.166
-rw-r--r--man/uk/man1/dos2unix.htm44
-rw-r--r--man/uk/man1/dos2unix.pod66
-rw-r--r--man/uk/man1/dos2unix.txt61
-rw-r--r--man/zh_CN/man1/dos2unix.150
-rw-r--r--man/zh_CN/man1/dos2unix.htm44
-rw-r--r--man/zh_CN/man1/dos2unix.pod50
-rw-r--r--man/zh_CN/man1/dos2unix.txt45
-rw-r--r--mingw.mak45
-rw-r--r--mingw32.mak53
-rw-r--r--mingw64.mak55
-rw-r--r--po-man/de.po (renamed from man/de/man1/dos2unix.po)622
-rw-r--r--po-man/dos2unix-man.pot (renamed from man/man1/dos2unix-man.pot)602
-rw-r--r--po-man/es.po (renamed from man/es/man1/dos2unix.po)600
-rw-r--r--po-man/fr.po (renamed from man/fr/man1/dos2unix.po)622
-rw-r--r--po-man/nl.po (renamed from man/nl/man1/dos2unix.po)614
-rw-r--r--po-man/pl.po (renamed from man/pl/man1/dos2unix.po)620
-rw-r--r--po-man/pt_BR.po (renamed from man/pt_BR/man1/dos2unix.po)645
-rw-r--r--po-man/sv.po (renamed from man/sv/man1/dos2unix.po)644
-rw-r--r--po-man/uk.po (renamed from man/uk/man1/dos2unix.po)620
-rw-r--r--po-man/zh_CN.po (renamed from man/zh_CN/man1/dos2unix.po)624
-rw-r--r--po/da.po279
-rw-r--r--po/de.po265
-rw-r--r--po/dos2unix.pot265
-rw-r--r--po/eo.po265
-rw-r--r--po/es.po265
-rw-r--r--po/fr.po275
-rw-r--r--po/hu.po266
-rw-r--r--po/ja.po266
-rw-r--r--po/nb.po275
-rw-r--r--po/nl.po265
-rw-r--r--po/pl.po275
-rw-r--r--po/pt_BR.po279
-rw-r--r--po/ru.po275
-rw-r--r--po/sr.po325
-rw-r--r--po/sv.po291
-rw-r--r--po/uk.po275
-rw-r--r--po/vi.po275
-rw-r--r--po/zh_CN.po279
-rw-r--r--po/zh_TW.po272
-rw-r--r--[-rwxr-xr-x]test/Makefile0
-rw-r--r--[-rwxr-xr-x]test/chard7.txt0
-rw-r--r--[-rwxr-xr-x]test/chardos.txt0
-rw-r--r--[-rwxr-xr-x]test/charu7.txt0
-rw-r--r--[-rwxr-xr-x]test/dos_bin.txtbin144 -> 144 bytes
-rw-r--r--[-rwxr-xr-x]test/gb18030.txt0
-rw-r--r--[-rwxr-xr-x]test/gb18030b.txt0
-rw-r--r--[-rwxr-xr-x]test/gb18030u.txt0
-rw-r--r--[-rwxr-xr-x]test/invalhig.txtbin30 -> 30 bytes
-rw-r--r--[-rwxr-xr-x]test/invallow.txtbin30 -> 30 bytes
-rw-r--r--test/setlocale.c89
-rw-r--r--test/setlocale.pngbin0 -> 18506 bytes
-rwxr-xr-xtest/testcmd.bat2
-rwxr-xr-xtest/testps16.ps1bin846 -> 840 bytes
-rwxr-xr-xtest/testps8.ps17
-rw-r--r--[-rwxr-xr-x]test/testu16.c37
-rw-r--r--[-rwxr-xr-x]test/uni_nl_ëäï.txt0
-rw-r--r--[-rwxr-xr-x]test/unix_bin.txtbin136 -> 136 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16.txtbin66 -> 66 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16be.txtbin1926 -> 1926 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16bin.txtbin290 -> 290 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16le.txtbin1926 -> 1926 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16m.txtbin54 -> 54 bytes
-rw-r--r--[-rwxr-xr-x]test/utf16u.txtbin54 -> 54 bytes
-rw-r--r--[-rwxr-xr-x]test/utf8dos.txt0
-rw-r--r--[-rwxr-xr-x]test/utf8dosn.txt0
-rw-r--r--[-rwxr-xr-x]test/utf8unix.txt0
-rw-r--r--[-rwxr-xr-x]test/utf8unxb.txt0
-rw-r--r--unix2dos.c64
-rw-r--r--version.mk6
-rw-r--r--[-rwxr-xr-x]wcc.mif0
114 files changed, 8570 insertions, 7092 deletions
diff --git a/COPYING.txt b/COPYING.txt
index 093cb43..a9c67e3 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -2,7 +2,7 @@ The dos2unix package is distributed under FreeBSD style license.
See also http://www.freebsd.org/copyright/freebsd-license.html
--------
-Copyright (C) 2009-2015 Erwin Waterlander
+Copyright (C) 2009-2016 Erwin Waterlander
Copyright (C) 1998 Christian Wurll
Copyright (C) 1998 Bernd Johannes Wuebben
Copyright (C) 1994-1995 Benjamin Lin.
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4414530..904ba5a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,102 @@
+2016-02-13 Erwin Waterlander <waterlan@xs4all.nl>
+ * Version 7.3.3
+
+2016-02-10 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Don't print FILE column of header in stdio mode.
+
+2016-02-05 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Fix. Dos2unix was not quiet in all cases when
+ option -q was used.
+
+2016-02-04 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Changed header for column text/binary to TXTBIN.
+
+2016-02-02 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: New flags for options -i, --info.
+ Flag h : print a header.
+ Flag p : show file names without path.
+ Thanks to Alan S. Jones.
+
+2016-01-31 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Don't package international man pages
+ when ENABLE_NLS is empty.
+
+2016-01-29 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Don't install international man pages when ENABLE_NLS
+ is empty. Thanks to anonymous.
+
+2016-01-28 Erwin Waterlander <waterlan@xs4all.nl>
+ * man/*/man1/dos2unix.po: Moved all manual .po file to directory
+ po-man/. The .po files now have their original name.
+ * Makefile, man/man1/Makefile: Build international manuals from
+ the .po files in folder po-man/.
+
+2016-01-20 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Fixed printing text in unicode UTF-16 mode on Windows,
+ so that when it is redirected to a file, a correct UTF-16 file
+ is created. Thanks to Hans Passant.
+ * common.c: Added display encoding methods "unicodebom" and "utf8bom". These
+ methods add a BOM to stdout, which is required for correct redirection
+ in PowerShell.
+ * man/man1/dos2unix.pod: Updated manual for option -D.
+ * test/testps16.ps1, test/testps8.ps1: Fixed select-string test.
+
+2016-01-16 Erwin Waterlander <waterlan@xs4all.nl>
+ * *.c: Fixed printing of East-Asian ANSI multi-byte encoded text on Windows
+ with an East-Asian regional setting.
+ It appears that when setlocale() sets the locale to "" in the beginning
+ of main(), which is done for gettext translations, multi-byte ANSI is
+ printed wrongly. On windows we need to set the locale to "C" to make East-
+ Asian text printed correctly. On Unix setting the locale to "C" would
+ disable the gettext translations, but on Windows it keeps working.
+ * test/setlocale.c: New test program that proves that setlocale(LC_ALL, "")
+ breaks printf() on Windows for Chinese CP936 encoded text in a CP936
+ regional setting, and for UTF-8 text.
+ * test/setlocale.png: Example output of the test program.
+ * common.h, *.c: Created macro D2U_FPRINTF, for correct printing of text
+ when Unicode file names support is disabled.
+
+2016-01-13 Erwin Waterlander <waterlan@xs4all.nl>
+ * *.c: Use d2u_ansi_fprintf() for printing the help text, version
+ information and license. It appears that printing Chinese text
+ properly in a Windows Command Prompt in a Chinese regional setting
+ requires the Unicode method. I would expect that standard printf()
+ would work for ANSI CP936 encoded text. My tests show that I need to
+ use option "-D unicode" to get proper output. When I use the ansi method
+ I get wrong output, but when I redirect that to a text file, I get
+ proper CP936 output in the text file.
+
+ PS:
+ See change of 2016-01-16 above. The cause of the problem was setlocale().
+
+2016-01-02 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Compilation for mingw, mingw32-w64, and mingw64-w64
+ works out of the box.
+ * mingw*.mak: Deleted.
+
+2015-12-27 Erwin Waterlander <waterlan@xs4all.nl>
+ * man/man1/dos2unix.pod: Manual update. Binary file detection is not
+ foolproof.
+ * Moved Git repository:
+ git clone git://git.code.sf.net/p/dos2unix/dos2unix
+
+2015-12-22 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Split DEBUG=1 into DEBUG=1 and DEBUGMSG=1.
+ DEBUG=1 will add option -g to CFLAGS for debugging with gdb.
+ DEBUGMSG=1 makes dos2unix print extra messages about accessing the
+ file system.
+ * Makefile: Use GNU standard variables INSTALL_DATA and INSTALL_PROGRAM
+ for installation.
+
+2015-12-20 Erwin Waterlander <waterlan@xs4all.nl>
+ * Moved Subversion repository to Git repository.
+ git clone git://git.code.sf.net/p/dos2unix/gitcode dos2unix-gitcode
+ * Removed execution permission from text and source files.
+
+2015-12-08 Erwin Waterlander <waterlan@xs4all.nl>
+ * DEVEL.txt: New text file with information about why dos2unix is made
+ like it is.
+
2015-11-20 Erwin Waterlander <waterlan@xs4all.nl>
* Version 7.3.2
* Makefile: Automatically detect if we are on MSYS 1 or 2.
diff --git a/DEVEL.txt b/DEVEL.txt
new file mode 100644
index 0000000..46a5ed2
--- /dev/null
+++ b/DEVEL.txt
@@ -0,0 +1,98 @@
+Information about dos2unix' implementation choices.
+
+1. Smart conversion
+===================
+
+ There are some dos2unix implementations that automatically convert all type of
+line breaks. For instance converting both DOS and Mac linebreaks to Unix line
+breaks at once. Or automatically detect the line break type and convert to the
+other side.
+
+ Smart conversions could lead to unexpected behaviour. For instance when a
+dos2unix is run on a file with only Unix line breaks and the line breaks are
+flipped to the other side. This dos2unix implementation does exactly what you
+tell it to do. When you run 'dos2unix' only DOS line breaks are converted to
+Unix line breaks. Unix line breaks stay in the file. Seen from a DOS or Unix
+perspective, a Mac line break is not a line break, so also Mac line breaks stay
+untouched. The same applies for mac2unix. Mac2unix leaves Unix and DOS line
+breaks untouched.
+
+
+2. Unix filter
+==============
+
+ When a standard Unix filter, e.g. sed or tr, reads input from a file it sends
+its output by default to standard out. This implementation of dos2unix does by
+default in-place conversion (overwriting the input file), which seems not in line.
+
+ Dos2unix is not part of the Unix standard. Most Unixes have their
+own implementation of dos2unix. There is a lot of variation in command names,
+options, and behavior. The SunOS version of dos2unix, after which this version was
+modeled, does by default paired conversion.
+ This implementation of dos2unix has too much legacy to change the current behaviour.
+Changing it would have more disadvantages than advantages. Most people expect
+dos2unix to do in-place conversion. The majority of other open source implementations
+also convert by default in-place. In-place conversion has the advantage that it is
+very easy to convert multiple files by using wild cards.
+ This implementation of dos2unix does send the output to standard-out when the
+input comes from standard-in. So you can use it as filter. Note that dos2unix/
+unix2dos is also used a lot on non-Unix operating systems where the filter idea
+is less known.
+
+
+3. Recursive conversion of files
+================================
+
+ There are implementations that have builtin functionality to do recursive
+conversion of all files in a directory tree.
+
+ This functionality is not needed in dos2unix. By using an external program,
+like Unix 'find', you can do recursive conversion of directory trees. There is
+no need to duplicate this.
+
+
+4. Encoding conversion
+======================
+
+ Dos2unix can do several encoding conversions. First there are the conversions
+of several DOS code pages to and from ISO-8859-1. These conversions are also
+part of the SunOS dos2unix implementation after which this implementation has
+been modeled. Although these conversions are not much used these days they have
+been added for the sake completeness. Conversion of CP1252 was added, because
+it is used a lot in the Western world. It's almost identical to ISO-8859-1. There
+is no intention to add other conversions to and from ISO-8859-1.
+
+ Conversion from UTF-16 was added, because the world is moving towards
+Unicode. Microsoft Windows uses by default UTF-16 format for Unicode. UTF-16
+is part of Windows' core design for historical reasons. Microsoft standardized
+on UCS-2, a predecessor of UTF-16, in a time when UTF-8 did not exist yet.
+However a lot of Windows software is able to read UTF-8 files. In Windows
+"Unicode" means usually UTF-16. For instance saving a file with Notepad in
+"Unicode" encoding means in UTF-16 encoding. When you work in PowerShell and
+echo some text to a file you get an UTF-16 encoded text file. UTF-16 is there
+to stay, although many people would like to see otherwise and are dreaming of
+an UTF-8 only world. The Unix/Linux world is moving towards UTF-8 encoding,
+because it's backwards compatible with ASCII. Unix programs typically do not
+support UTF-16.
+
+ One end of the encoding spectrum is an ASCII only world, where the only
+differences between DOS and Unix text files are line breaks. In English
+speaking regions this is a good working environment, because ASCII is in
+practice sufficient for English language. Diacritics are hardly used and can be
+omitted. The other end of the spectrum is an Unicode only world. All languages
+of the world are supported. Dos2unix aims to support these two ends of the
+spectrum: ASCII and Unicode. The Chinese GB18030 encoding is also seen as an
+Unicode transformation format. UTF-32 is not supported, because this is
+practically only used as an internal format. Other encoding transformations
+are left to specialized programs like iconv and recode. The few conversion
+modes to and from ISO-8859-1 are only there for legacy reasons.
+
+ In the ASCII days DOS to Unix text file conversion, and vice versa, was only
+converting line breaks. In the Unicode era it is not only line break
+conversion, but also Unicode transformation format conversion (e.g. UTF-16 to
+UTF-8), and Byte Order Mark (BOM) removal or addition.
+
+ Conversion towards UTF-16 is not supported and there is no intention to support
+it in the future. UTF-8 encoded files are well supported on Windows, so
+conversion to UTF-16 is not needed. And we keep on dreaming of an UTF-8 only
+world...
diff --git a/INSTALL.txt b/INSTALL.txt
index fbe7a19..e82c4d6 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -101,8 +101,18 @@ DEBUG
make clean install DEBUG=1
- With debug enabled dos2unix will print extra information
- and you can debug the source code in gdb.
+ With debug enabled you can debug the source code in gdb.
+
+
+DEBUG MESSAGES
+
+ Extra debug messages can be enabled by adding DEBUGMSG=1
+ to the make command. Example:
+
+ make clean install DEBUGMSG=1
+
+ With debug messages enabled dos2unix will print extra information
+ about accessing the file system.
NATIVE LANGUAGE SUPPORT
@@ -221,30 +231,38 @@ DOCUMENTATION
WINDOWS 32 BIT PORT
- Using Mingw compiler <http://www.mingw.org>:
-
- make -f mingw.mak clean
- make -f mingw.mak
- make -f mingw.mak strip
- make -f mingw.mak install
+ Using Mingw <http://www.mingw.org>, or MinGW-w64
+ <http://mingw-w64.sourceforge.net>.
+
+ I advise to use mingw-w64, because mingw-w64 has support for
+ Large File Support (LFS), and mingw doesn't. LFS is the ability to
+ read/write files larger than 2GB or 4GB on a 32 bit operation system.
+ LFS also makes processing files on network drives more reliable. I have
+ had a problem report that output files were not always written when files
+ on a network drive were concurrently processed. By switching from
+ mingw to mingw-w64 the problem was solved.
+ Earlier I got a problem report of accessing small files on a Windows
+ network drive from Debian Linux. Here also the solution was LFS.
+ Since dos2unix 6.0.4 (2013-12-30) I build the binary win32 packages
+ with mingw-w64.
- Using MinGW-w64 compiler <http://mingw-w64.sourceforge.net>:
I am using the MSYS2 project <http://sourceforge.net/projects/msys2/>
- which includes the MinGW-w64 compiler and an updated MSYS shell based
- on Cygwin 1.7.
+ which includes the MinGW-w64 compiler.
- make -f mingw32.mak clean
- make -f mingw32.mak
- make -f mingw32.mak strip
- make -f mingw32.mak install
+ Type these commands to build with mingw(-w64):
+
+ make clean
+ make
+ make strip
+ make install
- Or use Open Watcom and type:
+ Using Open Watcom:
wmake -f wccwin32.mak clean
wmake -f wccwin32.mak
wmake -f wccwin32.mak install
- Or use Microsoft Visual C++ and type:
+ Using Microsoft Visual C++:
nmake /f vc.mak clean
nmake /f vc.mak
@@ -261,15 +279,14 @@ WINDOWS 32 BIT PORT
WINDOWS 64 BIT PORT
To compile a version for 64 bit Windows, get the Mingw-w64 compiler
- <http://mingw-w64.sourceforge.net>, and use makefile mingw64.mak:
+ <http://mingw-w64.sourceforge.net>.
I am using the MSYS2 project <http://sourceforge.net/projects/msys2/>
- which includes the MinGW-w64 compiler and an updated MSYS shell based
- on Cygwin 1.7.
+ which includes the MinGW-w64 compiler.
- make -f mingw64.mak clean
- make -f mingw64.mak
- make -f mingw64.mak strip
- make -f mingw64.mak install
+ make clean
+ make
+ make strip
+ make install
Or use Microsoft Visual C++. Visual Studio Express supports
out of the box C/C++ compilation for 64-bit applications since
@@ -332,4 +349,3 @@ OS/2 PORT
wmake -f wccos2.mak clean
wmake -f wccos2.mak
wmake -f wccos2.mak install
-
diff --git a/Makefile b/Makefile
index 651e6d5..b155d31 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Author: Erwin Waterlander
#
-# Copyright (C) 2009-2015 Erwin Waterlander
+# Copyright (C) 2009-2016 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,12 @@ UNIX2MAC = unix2mac
ENABLE_NLS = 1
# Large File Support (LFS)
LFS = 1
+# DEBUG=1 adds the -g option to CFLAGS, for adding debug symbols.
DEBUG = 0
+# DEBUGMSG=1 adds -DDEBUG=1 to CFLAGS, for extra verbose messages.
+DEBUGMSG = 0
UCS = 1
+DIST_TARGET = dist-tgz
EXE=
@@ -95,9 +99,11 @@ HTMLEXT = htm
DOCFILES = man/man1/$(PACKAGE).txt man/man1/$(PACKAGE).$(HTMLEXT)
INSTALL_OBJS_DOC = README.txt INSTALL.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
-MANPOTFILE = man/man1/dos2unix-man.pot
-MANPOFILES = $(wildcard man/*/man1/dos2unix.po)
-PODFILES = $(patsubst %.po,%.pod,$(MANPOFILES))
+ifdef ENABLE_NLS
+ MANPOTFILE = po-man/dos2unix-man.pot
+ MANPOFILES = $(wildcard po-man/*.po)
+ PODFILES = $(patsubst po-man/%.po,man/%/man1/dos2unix.pod,$(MANPOFILES))
+endif
PODFILES_ALL = man/man1/dos2unix.pod $(PODFILES)
MANFILES = $(patsubst %.pod,%.1,$(PODFILES))
TXTFILES = $(patsubst %.pod,%.txt,$(PODFILES_ALL))
@@ -107,6 +113,8 @@ PDFFILES = $(patsubst %.pod,%.pdf,$(PODFILES_ALL))
# On some systems (e.g. FreeBSD 4.10) GNU install is installed as `ginstall'.
INSTALL = install
+INSTALL_PROGRAM = $(INSTALL) -m 755
+INSTALL_DATA = $(INSTALL) -m 644
# On some systems (e.g. GNU Win32) GNU mkdir is installed as `gmkdir'.
MKDIR = mkdir
@@ -140,6 +148,12 @@ endif
endif
ifndef D2U_OS
+ifeq ($(findstring MINGW64,$(d2u_os)),MINGW64)
+ D2U_OS = mingw64
+endif
+endif
+
+ifndef D2U_OS
ifneq ($(DJGPP),)
D2U_OS = msdos
endif
@@ -172,16 +186,20 @@ endif
# Cygwin packaging standard avoids version numbers on
# documentation directories.
docsubdir = $(PACKAGE)
- VERSIONSUFFIX = -cygwin
+ MACHINE := $(subst -pc-cygwin,,$(shell gcc -dumpmachine))
+ VERSIONSUFFIX = -cygwin-$(MACHINE)
endif
ifeq (msys,$(D2U_OS))
CC=gcc
EXE = .exe
- VERSIONSUFFIX = -msys
+ MACHINE := $(subst -pc-msys,,$(shell gcc -dumpmachine))
# MSYS 1 does not support locales and no Unicode.
ifeq ($(shell ./test/chk_loc.sh en_US.utf8),no)
-UCS =
+ UCS =
+ VERSIONSUFFIX = -msys1-$(MACHINE)
+else
+ VERSIONSUFFIX = -msys2-$(MACHINE)
endif
ifdef ENABLE_NLS
LIBS_EXTRA = -lintl -liconv
@@ -189,17 +207,46 @@ endif
endif
ifeq (mingw32,$(D2U_OS))
+ CC=gcc
prefix=c:/usr/local
EXE = .exe
- VERSIONSUFFIX = -win32
+ VERSIONSUFFIX = -win32
LINK = cp -f
+ UNIFILE=1
+ DIST_TARGET = dist-zip
ifdef ENABLE_NLS
LIBS_EXTRA = -lintl -liconv
ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
endif
ifeq ($(findstring w64-mingw32,$(shell gcc -dumpmachine)),w64-mingw32)
+# Mingw-w64
CFLAGS_COMPILER = -DD2U_COMPILER=MINGW32_W64
+ifdef ENABLE_NLS
+ ZIPOBJ_EXTRA += bin/libgcc_s_dw2-1.dll bin/libwinpthread-1.dll
+endif
+ CRT_GLOB_OBJ = /mingw32/i686-w64-mingw32/lib/CRT_glob.o
+ LIBS_EXTRA += $(CRT_GLOB_OBJ)
+ CFLAGS_OS=-I/mingw32/include
+else
+ CFLAGS_OS=-D_O_U16TEXT=0x20000
+endif
+endif
+
+ifeq (mingw64,$(D2U_OS))
+ CC=gcc
+ prefix=c:/usr/local64
+ EXE = .exe
+ VERSIONSUFFIX = -win64
+ LINK = cp -f
+ UNIFILE=1
+ DIST_TARGET = dist-zip
+ifdef ENABLE_NLS
+ LIBS_EXTRA = -lintl -liconv
+ ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
endif
+ CRT_GLOB_OBJ = /mingw64/x86_64-w64-mingw32/lib/CRT_glob.o
+ LIBS_EXTRA += $(CRT_GLOB_OBJ)
+ CFLAGS_OS=-I/mingw64/include
endif
ifeq (msdos,$(D2U_OS))
@@ -222,6 +269,7 @@ ifeq (os/2,$(D2U_OS))
LINK_MAN = cp -f
UCS =
LDFLAGS_EXTRA = -Zargs-wild
+ DIST_TARGET = dist-zip
ifdef ENABLE_NLS
LIBS_EXTRA += -lintl -liconv
endif
@@ -278,7 +326,7 @@ CFLAGS += -Wall -Wextra -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER
EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
-DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \
- -DDEBUG=$(DEBUG) \
+ -DDEBUG=$(DEBUGMSG) \
$(CFLAGS_OS) \
$(CFLAGS_COMPILER)
@@ -346,7 +394,7 @@ $(UNIX2MAC_BIN) : $(UNIX2DOS_BIN)
$(LINK) $< $@
$(MANPOTFILE) : man/man1/dos2unix.pod
- $(MAKE) -C man/man1 $(notdir $@)
+ $(MAKE) -C man/man1 ../../po-man/$(notdir $@)
# WARNING: Backward-incompatibility since GNU make 3.82.
# The pattern-specific variables and pattern rules are now applied in the
@@ -362,9 +410,9 @@ po/%.po : $(POT)
touch $@
%.po : man/man1/dos2unix.pod
- $(MAKE) -C man/man1 $(subst man/,../,$@)
+ $(MAKE) -C man/man1 $(subst po-man/,../../po-man/,$@)
-%.pod : %.po
+man/%/man1/dos2unix.pod : po-man/%.po
$(MAKE) -C man/man1 $(subst man/,../,$@)
# empty recipe to break circular dependency
@@ -396,7 +444,7 @@ getpo:
rsync -Lrtvz translationproject.org::tp/latest/dos2unix/ po/incoming/
getpoman:
- rsync -Lrtvz translationproject.org::tp/latest/dos2unix-man/ man/incoming/
+ rsync -Lrtvz translationproject.org::tp/latest/dos2unix-man/ po-man/incoming/
%.mo : %.po
msgfmt -c $< -o $@
@@ -464,35 +512,35 @@ check: test
install: all
$(MKDIR) -p -m 755 $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(BIN) $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(UNIX2DOS_BIN) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(UNIX2DOS_BIN) $(DESTDIR)$(bindir)
ifeq ($(LINK),cp -f)
- $(INSTALL) -m 755 $(MAC2UNIX_BIN) $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(UNIX2MAC_BIN) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(MAC2UNIX_BIN) $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(UNIX2MAC_BIN) $(DESTDIR)$(bindir)
else
cd $(DESTDIR)$(bindir); $(LINK) $(BIN) $(MAC2UNIX_BIN)
cd $(DESTDIR)$(bindir); $(LINK) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN)
endif
$(MKDIR) -p -m 755 $(DESTDIR)$(man1dir)
- $(INSTALL) -m 644 man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)
+ $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)
ifeq ($(LINK_MAN),cp -f)
- $(INSTALL) -m 644 man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(MAC2UNIX).1
- $(INSTALL) -m 644 man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2DOS).1
- $(INSTALL) -m 644 man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2MAC).1
+ $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(MAC2UNIX).1
+ $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2DOS).1
+ $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2MAC).1
else
cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1
cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1
cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1
endif
+ifdef ENABLE_NLS
$(foreach manfile, $(MANFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
- $(foreach manfile, $(MANFILES), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
+ $(foreach manfile, $(MANFILES), $(INSTALL_DATA) $(manfile) $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ;)
$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;)
$(foreach manfile, $(MANFILES), cd $(DESTDIR)$(datarootdir)/$(dir $(manfile)) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2MAC).1 ;)
-ifdef ENABLE_NLS
@echo "-- install-mo"
$(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;)
- $(foreach mofile, $(MOFILES), $(INSTALL) -m 644 $(mofile) $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
+ $(foreach mofile, $(MOFILES), $(INSTALL_DATA) $(mofile) $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
endif
# Run a new instance of 'make' otherwise the $$(wildcard ) function my not have been expanded,
# because the files may not have been there when make was started.
@@ -502,18 +550,20 @@ endif
install-doc: $(INSTALL_OBJS_DOC)
@echo "-- install-doc"
$(MKDIR) -p -m 755 $(DESTDIR)$(docdir)
- $(INSTALL) -m 644 $(INSTALL_OBJS_DOC) $(DESTDIR)$(docdir)
+ $(INSTALL_DATA) $(INSTALL_OBJS_DOC) $(DESTDIR)$(docdir)
+ $(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL_DATA) $(pdffile) $(DESTDIR)$(docdir) ;)
+ $(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL_DATA) $(psfile) $(DESTDIR)$(docdir) ;)
+ifdef ENABLE_NLS
# Install translated manuals when they have been generated.
$(foreach txtfile, $(wildcard man/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
- $(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
+ $(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL_DATA) $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
$(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
- $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL) -m 644 $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
+ $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL_DATA) $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
$(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
- $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
- $(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir) ;)
+ $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL_DATA) $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
$(foreach psfile, $(wildcard man/*/man1/*.ps), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
- $(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
- $(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir) ;)
+ $(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL_DATA) $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
+endif
uninstall:
@echo "-- target: uninstall"
@@ -521,15 +571,18 @@ uninstall:
-rm -f $(DESTDIR)$(bindir)/$(MAC2UNIX_BIN)
-rm -f $(DESTDIR)$(bindir)/$(UNIX2DOS_BIN)
-rm -f $(DESTDIR)$(bindir)/$(UNIX2MAC_BIN)
-ifdef ENABLE_NLS
- $(foreach mofile, $(MOFILES), rm -f $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
-endif
-rm -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
-rm -f $(DESTDIR)$(mandir)/man1/$(MAC2UNIX).1
-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2DOS).1
-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2MAC).1
- $(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(manfile) ;)
-rm -rf $(DESTDIR)$(docdir)
+ifdef ENABLE_NLS
+ $(foreach mofile, $(MOFILES), rm -f $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
+ $(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(manfile) ;)
+ $(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(dir $(manfile))$(MAC2UNIX).1 ;)
+ $(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(dir $(manfile))$(UNIX2DOS).1 ;)
+ $(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(dir $(manfile))$(UNIX2MAC).1 ;)
+endif
mostlyclean:
rm -f *.o
@@ -572,7 +625,7 @@ maintainer-clean: distclean
rm -f man/man1/*.1
rm -f man/man1/*.txt
rm -f man/man1/*.$(HTMLEXT)
- rm -f man/man1/dos2unix-man.pot
+ rm -f po-man/dos2unix-man.pot
rm -f man/*/man1/*.1
rm -f man/*/man1/*.txt
rm -f man/*/man1/*.pod
@@ -589,45 +642,46 @@ ZIPOBJ = bin/$(BIN) \
share/man/man1/$(MAC2UNIX).1 \
share/man/man1/$(UNIX2DOS).1 \
share/man/man1/$(UNIX2MAC).1 \
- share/man/*/man1/$(PACKAGE).1 \
- share/man/*/man1/$(MAC2UNIX).1 \
- share/man/*/man1/$(UNIX2DOS).1 \
- share/man/*/man1/$(UNIX2MAC).1 \
- share/doc/$(docsubdir) \
+ share/doc/$(docsubdir)/*.* \
$(ZIPOBJ_EXTRA)
ifdef ENABLE_NLS
ZIPOBJ += share/locale/*/LC_MESSAGES/$(PACKAGE).mo
+ZIPOBJ += share/man/*/man1/$(PACKAGE).1 \
+ share/man/*/man1/$(MAC2UNIX).1 \
+ share/man/*/man1/$(UNIX2DOS).1 \
+ share/man/*/man1/$(UNIX2MAC).1
+ZIPOBJ += share/doc/$(docsubdir)/*/*
endif
ZIPFILE = $(PACKAGE)-$(DOS2UNIX_VERSION)$(VERSIONSUFFIX)$(NLSSUFFIX).zip
TGZFILE = $(PACKAGE)-$(DOS2UNIX_VERSION)$(VERSIONSUFFIX)$(NLSSUFFIX).tar.gz
TBZFILE = $(PACKAGE)-$(DOS2UNIX_VERSION)$(VERSIONSUFFIX)$(NLSSUFFIX).tar.bz2
-dist-zip:
+dist-convert/%:
rm -f $(prefix)/$(ZIPFILE)
- cd $(prefix) ; unix2dos --keepdate share/man/man1/*.1 share/man/*/man1/*.1
- -cd $(prefix) ; unix2dos --keepdate --add-bom share/doc/$(docsubdir)/*.txt share/doc/$(docsubdir)/*/*.txt
- -cd $(prefix) ; unix2dos --keepdate share/doc/$(docsubdir)/*.$(HTMLEXT) share/doc/$(docsubdir)/*/*.$(HTMLEXT)
- cd $(prefix) ; unix2dos --keepdate share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
+ cd $(prefix) ; $* --keepdate share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
+ cd $(prefix) ; $* --keepdate --add-bom share/doc/$(docsubdir)/*.txt
+ cd $(prefix) ; $* --keepdate share/doc/$(docsubdir)/*.$(HTMLEXT)
+ifdef ENABLE_NLS
+ cd $(prefix) ; $* --keepdate share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
+ cd $(prefix) ; $* --keepdate --add-bom share/doc/$(docsubdir)/*/*.txt
+ cd $(prefix) ; $* --keepdate share/doc/$(docsubdir)/*/*.$(HTMLEXT)
+endif
+
+dist-zip: dist-convert/unix2dos
cd $(prefix) ; zip -r $(ZIPFILE) $(ZIPOBJ)
mv -f $(prefix)/$(ZIPFILE) ..
-dist-tgz:
- cd $(prefix) ; dos2unix --keepdate share/man/man1/*.1 share/man/*/man1/*.1
- -cd $(prefix) ; dos2unix --keepdate share/doc/$(docsubdir)/*.txt share/doc/$(docsubdir)/*/*.txt
- -cd $(prefix) ; dos2unix --keepdate share/doc/$(docsubdir)/*.$(HTMLEXT) share/doc/$(docsubdir)/*/*.$(HTMLEXT)
+dist-tgz: dist-convert/dos2unix
cd $(prefix) ; tar cvzf $(TGZFILE) $(ZIPOBJ)
mv $(prefix)/$(TGZFILE) ..
-dist-tbz:
- cd $(prefix) ; dos2unix --keepdate share/man/man1/*.1 share/man/*/man1/*.1
- -cd $(prefix) ; dos2unix --keepdate share/doc/$(docsubdir)/*.txt dos2unix share/doc/$(docsubdir)/*/*.txt
- -cd $(prefix) ; dos2unix --keepdate share/doc/$(docsubdir)/*.$(HTMLEXT) dos2unix share/doc/$(docsubdir)/*/*.$(HTMLEXT)
+dist-tbz: dist-convert/dos2unix
cd $(prefix) ; tar cvjf $(TBZFILE) $(ZIPOBJ)
mv $(prefix)/$(TBZFILE) ..
-dist: dist-tgz
+dist: $(DIST_TARGET)
strip:
$(STRIP) $(BIN)
diff --git a/NEWS.txt b/NEWS.txt
index 91ab125..9160593 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,11 @@
+2016-02-13: Version 7.3.3
+ * Fixed printing of East-Asian text on Windows with an East-Asian regional
+ setting.
+ * Fixed printing text in unicode UTF-16 mode on Windows, so that when
+ it is redirected to a file, a correct UTF-16 file is created.
+ * New flags h (print header) and p (show file names without path) for
+ option -i, --info
+
2015-11-20: Version 7.3.2
* New: Swedish translation of messages and manual.
diff --git a/README.txt b/README.txt
index 6b3a8f8..309cebb 100644
--- a/README.txt
+++ b/README.txt
@@ -11,6 +11,7 @@ FILE LIST
ChangeLog.txt : Detailed change log for programmers.
TODO.txt : Things to do.
BUGS.txt : Known bugs and instructions on reporting new ones.
+ DEVEL.txt : Information about dos2unix' implementation choices.
man/man1/dos2unix.txt : Dos2unix manual, text format.
man/man1/dos2unix.htm : Dos2unix manual, HTML format.
@@ -57,7 +58,7 @@ HISTORY
AUTHORS
- Erwin Waterlander version 3.2-7.3.2 2009-2015
+ Erwin Waterlander version 3.2-7.3.3 2009-2016
Christian Wurll version 3.1 1998
Bernd Johannes Wuebben version 3.0 1998
Benjamin Lin version 1.1-2.3 1994-1995
@@ -73,48 +74,48 @@ TRANSLATORS
Brazilian Portuguese Enrico Nicoletto Version 6.0.5
Brazilian Portuguese Rafael Ferreira Version 6.0.6 - 7.2
- Brazilian Portuguese Rafael Fontenelle Version 7.3.2
- Chinese (simplified) zwpwjwtz Version 7.3.1
+ Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.3
+ Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.3
Chinese (traditional) mail6543210 Version 6.0.5
Danish Thomas Pryds Version 6.0.5 - 6.0.6
- Danish Joe Hansen Version 7.2.3 - 7.3.2
+ Danish Joe Hansen Version 7.2.3 - 7.3.3
Dutch Erwin Waterlander Version 4.0 - 6.0.4
Dutch Benno Schulenberg Version 6.0.5 - 7.3.1
Esperanto Rugxulo Version 5.1 - 6.0.4
Esperanto Benno Schulenberg Version 6.0.5 - 7.3
- French Frédéric Marchal Version 6.0.5 - 7.3.1
+ French Frédéric Marchal Version 6.0.5 - 7.3.3
German Philipp Thomas Version 5.0 - 6.0.3, 7.0,
7.2.2 - 7.3.1
German Lars Wendler Version 6.0.4
German Mario Blättermann Version 6.0.6, 7.1 - 7.2
Hungarian Balázs Úr Version 6.0.5 - 7.2.3
Japanese Yasuaki Taniguchi Version 7.1.1
- Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.3.1
- Polish Jakub Bogusz Version 6.0.5 - 7.3.1
+ Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.3.3
+ Polish Jakub Bogusz Version 6.0.5 - 7.3.3
Russian Андрей Углик (Andrei Uhlik) Version 6.0.4
- Russian Yuri Kozlov Version 6.0.6 - 7.3.1
- Serbian Мирослав Николић Version 6.0.5 - 7.2.2
+ Russian Yuri Kozlov Version 6.0.6 - 7.3.3
+ Serbian Мирослав Николић Version 6.0.5 - 7.3.3
Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4
Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.3.1
- Swedish Sebastian Rasmussen Version 7.3.2
- Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.1
- Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.1
+ Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.3
+ Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.3
+ Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.3
Translation of the manual.
See http://translationproject.org/domain/dos2unix-man.html
Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 7.2
- Brazilian Portuguese Rafael Fontenelle Version 7.3.2
- Chinese (simplified) zwpwjwtz Version 7.3.1
+ Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.3
+ Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.3
Dutch Erwin Waterlander Version 5.1.1 - 6.0.4
- Dutch Benno Schulenberg Version 6.0.5 - 7.3.1
- French Frédéric Marchal Version 6.0.5 - 7.3.1
- German Mario Blättermann Version 6.0.5 - 7.3.1
- Polish Jakub Bogusz Version 6.0.5 - 7.3.1
+ Dutch Benno Schulenberg Version 6.0.5 - 7.3.3
+ French Frédéric Marchal Version 6.0.5 - 7.3.3
+ German Mario Blättermann Version 6.0.5 - 7.3.3
+ Polish Jakub Bogusz Version 6.0.5 - 7.3.3
Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4
Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.2.1
- Swedish Sebastian Rasmussen Version 7.3.2
- Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.1
+ Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.3
+ Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.3
ACKNOWLEDGEMENTS
@@ -158,6 +159,11 @@ ACKNOWLEDGEMENTS
when Unicode support is disabled.
Ulf-Dietrich Braumann Reported that the -iso option was misinterpreted
as a corrupted -i option.
+ Hans Passant Correct redirection of unicode UTF-16 screen output.
+ anonymous Don't install international man pages when NLS
+ is disabled.
+ Alan S. Jones New flags h (print header) and p (show file names
+ without path) for option -i, --info
FINDUTILS
diff --git a/common.c b/common.c
index 21c83ca..b96a8aa 100644
--- a/common.c
+++ b/common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2015 Erwin Waterlander
+ * Copyright (C) 2009-2016 Erwin Waterlander
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,10 +52,11 @@
# endif
#endif
-/* global variable */
+/* global variables */
#ifdef D2U_UNIFILE
int d2u_display_encoding = D2U_DISPLAY_ANSI ;
#endif
+int header_done = 0;
/*
* Print last system error on Windows.
@@ -84,8 +85,8 @@ void d2u_PrintLastError(const char *progname)
/* Display the error message */
/* MessageBox(NULL, (LPCTSTR)lpMsgBuf, TEXT("Error"), MB_OK); */
- fprintf(stderr, "%s: ",progname);
-#ifdef D2U_UNIFILE
+ D2U_UTF8_FPRINTF(stderr, "%s: ",progname);
+#ifdef _UNICODE
fwprintf(stderr, L"%ls\n",(LPCTSTR)lpMsgBuf);
#else
fprintf(stderr, "%s\n",(LPCTSTR)lpMsgBuf);
@@ -116,8 +117,9 @@ int d2u_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
#endif
+#ifdef D2U_UNIFILE
/*
- * d2u_fprintf() : printf wrapper, print in Windows Command Prompt in Unicode
+ * d2u_utf8_fprintf() : printf wrapper, print in Windows Command Prompt in Unicode
* mode, to have consistent output. Regardless of active code page.
*
* On Windows the file system uses always Unicode UTF-16 encoding, regardless
@@ -133,31 +135,29 @@ int d2u_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
* can be translated with gettext. Gettext/libintl recodes messages (format) to
* the system default ANSI code page.
*
- * d2u_fprintf() on Windows assumes that:
+ * d2u_utf8_fprintf() on Windows assumes that:
* - The format string is encoded in the system default ANSI code page.
* - The arguments are encoded in UTF-8.
*
* There are several methods for printing Unicode in the Windows Console, but
* none of them is perfect. There are so many issues that I decided to go back
* to ANSI by default.
+ *
+ * The use of setlocale() has influence on this function when ANSI or UTF-8 is
+ * printed. See also dos2unix.c and unix2dos.c and test/setlocale.c and
+ * test/setlocale.png.
*/
-void d2u_fprintf( FILE *stream, const char* format, ... ) {
+void d2u_utf8_fprintf( FILE *stream, const char* format, ... ) {
va_list args;
-#ifdef D2U_UNIFILE
char buf[D2U_MAX_PATH];
char formatmbs[D2U_MAX_PATH];
wchar_t formatwcs[D2U_MAX_PATH];
UINT outputCP;
wchar_t wstr[D2U_MAX_PATH];
int prevmode;
-/* HANDLE out_handle;
+ static int BOM_printed = 0;
- if (stream == stderr)
- out_handle =GetStdHandle(STD_ERROR_HANDLE);
- else
- out_handle =GetStdHandle(STD_OUTPUT_HANDLE);
-*/
va_start(args, format);
/* The format string is encoded in the system default
@@ -172,69 +172,52 @@ void d2u_fprintf( FILE *stream, const char* format, ... ) {
* Print to buffer (UTF-8) */
vsnprintf(buf, sizeof(buf), formatmbs, args);
- if (d2u_display_encoding == D2U_DISPLAY_UTF8) {
+ if ((d2u_display_encoding == D2U_DISPLAY_UTF8) || (d2u_display_encoding == D2U_DISPLAY_UTF8BOM)) {
- /* Using UTF-8 has my preference. The following method works fine when NLS is
- disabled. But when I enable NLS (ENABLE_NLS=1) all non-ASCII characters are
- printed as a square with a question mark in it. This will make the screen
- output of dos2unix for most languages unreadable.
- When I redirect the output to a file, the output is correct UTF-8. I don't
- know why NLS causes wrong printed text in the console. I just turn NLS off.
- A disadvantage of this method is that all non-ASCII characters are printed
+ /* A disadvantage of this method is that all non-ASCII characters are printed
wrongly when the console uses raster font (which is the default).
- I tried on a Chinese Windows 7 (code page 936) and then all non-ASCII
- is printed wrongly, using raster and TrueType font. Only in ConEmu I
- get correct output. I'm afraid that most people use the default Command Prompt
- and PowerShell consolse, so for many people the text will be unreadable.
- On a Chinese Windows there was a lot of flickering during the printing of the
- lines of text. This is not acceptable, but I'm not sure it this was because the
- Windows Command Prompt was broken. It sometimes crashes.
- */
-#ifdef ENABLE_NLS
- /* temporarely disable NLS */
- setlocale (LC_ALL, "C");
-#endif
+ When I switch the system ANSI code page to 936 (Simplified Chinese) or 932 (Japanese)
+ I see lot of flickering in the console when I print UTF-8.
+ The cause could be that I have a Dutch Windows installation, and when the console is
+ switched to UTF-8 mode (CP65001) the font is switched back to Western font (Lucida Console,
+ Consolas). These are the only fonts which I can select when I set the code page in the
+ console to 65001 with chcp, while the system ANSI code is 936 or 932.
+ */
/* print UTF-8 buffer to console in UTF-8 mode */
outputCP = GetConsoleOutputCP();
SetConsoleOutputCP(CP_UTF8);
+ if (! BOM_printed) {
+ if (d2u_display_encoding == D2U_DISPLAY_UTF8BOM)
+ fwprintf(stream, L"%S","\xEF\xBB\xBF");
+ BOM_printed = 1;
+ }
fwprintf(stream,L"%S",buf);
SetConsoleOutputCP(outputCP);
-#ifdef ENABLE_NLS
- /* re-enable NLS */
- setlocale (LC_ALL, "");
-#endif
/* The following UTF-8 method does not give correct output. I don't know why. */
- //prevmode = _setmode(_fileno(stream), _O_U8TEXT);
- //fwprintf(stream,L"%S",buf);
- //_setmode(_fileno(stream), prevmode);
-
- } else if (d2u_display_encoding == D2U_DISPLAY_UNICODE) {
-
- /* Another method for printing Unicode is using WriteConsoleW().
- WriteConsoleW always prints output correct in the console. Even when
- using raster font WriteConsoleW prints correctly when possible.
- WriteConsoleW has one big disadvantage: The output of WriteConsoleW
- can't be redirected. The output can't be piped to a log file. */
- /* Convert UTF-8 buffer to wide characters. */
- //d2u_MultiByteToWideChar(CP_UTF8,0, buf, -1, wstr, D2U_MAX_PATH);
- //WriteConsoleW(out_handle, wstr, wcslen(wstr), NULL, NULL);
-
- /* Printing UTF-16 works correctly like WriteConsoleW, with and without NLS enabled.
- Works also good with raster fonts. In a Chinese CP936 locale it works correctly
- in the Windows Command Prompt. The downside is that it is UTF-16. When this is
- redirected to a file it gives a big mess. It is not compatible with ASCII. So
- even a simple ASCII grep on the screen output will not work.
- When the output is redirected in a Windows Command Prompt to a file all line breaks end up as
- 0d0a 00 (instead of 0d00 0a00), which makes it a corrupt UTF-16 file.
- In PowerShell you get correct line breaks 0d00 0a00 when you redirect to a file, but there are
- null characters (0000) inserted, as if it is UTF-32 with UTF-16 BOM and UTF-16 line breaks.
- See also test/testu16.c. */
+ /*prevmode = _setmode(_fileno(stream), _O_U8TEXT);
+ fwprintf(stream,L"%S",buf);
+ _setmode(_fileno(stream), prevmode); */
+
+ } else if ((d2u_display_encoding == D2U_DISPLAY_UNICODE) || (d2u_display_encoding == D2U_DISPLAY_UNICODEBOM)) {
+
+ /* Printing UTF-16 works correctly. Works also good with raster fonts.
+ No need to change the OEM code page to the system ANSI code page.
+ */
d2u_MultiByteToWideChar(CP_UTF8,0, buf, -1, wstr, D2U_MAX_PATH);
prevmode = _setmode(_fileno(stream), _O_U16TEXT);
+ if (! BOM_printed) {
+ /* For correct redirection in PowerShell we need to print a BOM */
+ if (d2u_display_encoding == D2U_DISPLAY_UNICODEBOM)
+ fwprintf(stream, L"\xfeff");
+ BOM_printed = 1;
+ }
fwprintf(stream,L"%ls",wstr);
+ fflush(stream); /* Flushing is required to get correct UTF-16 when stdout is redirected. */
_setmode(_fileno(stream), prevmode);
+
} else { /* ANSI */
+
d2u_MultiByteToWideChar(CP_UTF8,0, buf, -1, wstr, D2U_MAX_PATH);
/* Convert the whole message to ANSI, some Unicode characters may fail to translate to ANSI.
They will be displayed as a question mark. */
@@ -242,10 +225,6 @@ void d2u_fprintf( FILE *stream, const char* format, ... ) {
fprintf(stream,"%s",buf);
}
-#else
- va_start(args, format);
- vfprintf(stream, format, args);
-#endif
va_end( args );
}
@@ -253,14 +232,14 @@ void d2u_fprintf( FILE *stream, const char* format, ... ) {
fprintf wrapper for Windows console.
Format and arguments are in ANSI format.
- Redirect the printing to d2u_fprintf such that the output
+ Redirect the printing to d2u_utf8_fprintf such that the output
format is consistent. To prevent a mix of ANSI/UTF-8/UTF-16
- encodings in the print output.
+ encodings in the print output. Mixed format printing may get the whole
+ console mixed up.
*/
void d2u_ansi_fprintf( FILE *stream, const char* format, ... ) {
va_list args;
-#ifdef D2U_UNIFILE
char buf[D2U_MAX_PATH]; /* ANSI encoded string */
char bufmbs[D2U_MAX_PATH]; /* UTF-8 encoded string */
wchar_t bufwcs[D2U_MAX_PATH]; /* Wide encoded string */
@@ -275,14 +254,11 @@ void d2u_ansi_fprintf( FILE *stream, const char* format, ... ) {
/* then convert the format string to UTF-8 */
d2u_WideCharToMultiByte(CP_UTF8, 0, bufwcs, -1, bufmbs, D2U_MAX_PATH, NULL, NULL);
- d2u_fprintf(stream, "%s",bufmbs);
+ d2u_utf8_fprintf(stream, "%s",bufmbs);
-#else
- va_start(args, format);
- vfprintf(stream, format, args);
-#endif
va_end( args );
}
+#endif
/* d2u_rename
* wrapper for rename().
@@ -398,29 +374,29 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname)
if (STAT(path, &buf) == 0) {
#endif
#if DEBUG
- d2u_fprintf(stderr, "%s: %s", progname, path);
- d2u_fprintf(stderr, " MODE 0%o ", buf.st_mode);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s", progname, path);
+ D2U_UTF8_FPRINTF(stderr, " MODE 0%o ", buf.st_mode);
#ifdef S_ISSOCK
if (S_ISSOCK(buf.st_mode))
- d2u_fprintf(stderr, " (socket)");
+ D2U_UTF8_FPRINTF(stderr, " (socket)");
#endif
#ifdef S_ISLNK
if (S_ISLNK(buf.st_mode))
- d2u_fprintf(stderr, " (symbolic link)");
+ D2U_UTF8_FPRINTF(stderr, " (symbolic link)");
#endif
if (S_ISREG(buf.st_mode))
- d2u_fprintf(stderr, " (regular file)");
+ D2U_UTF8_FPRINTF(stderr, " (regular file)");
#ifdef S_ISBLK
if (S_ISBLK(buf.st_mode))
- d2u_fprintf(stderr, " (block device)");
+ D2U_UTF8_FPRINTF(stderr, " (block device)");
#endif
if (S_ISDIR(buf.st_mode))
- d2u_fprintf(stderr, " (directory)");
+ D2U_UTF8_FPRINTF(stderr, " (directory)");
if (S_ISCHR(buf.st_mode))
- d2u_fprintf(stderr, " (character device)");
+ D2U_UTF8_FPRINTF(stderr, " (character device)");
if (S_ISFIFO(buf.st_mode))
- d2u_fprintf(stderr, " (FIFO)");
- d2u_fprintf(stderr, "\n");
+ D2U_UTF8_FPRINTF(stderr, " (FIFO)");
+ D2U_UTF8_FPRINTF(stderr, "\n");
#endif
if ((S_ISREG(buf.st_mode))
#ifdef S_ISLNK
@@ -435,8 +411,8 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname)
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, path);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, path);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
return(-1);
}
@@ -476,8 +452,8 @@ int regfile_target(char *path, CFlag *ipFlag, const char *progname)
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, path);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, path);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
return(-1);
}
@@ -581,17 +557,19 @@ int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const cha
return ++argc_glob;
glob_failed:
- ipFlag->error = errno;
- errstr = strerror(errno);
- d2u_fprintf(stderr, "%s:", progname);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ if (ipFlag->verbose) {
+ ipFlag->error = errno;
+ errstr = strerror(errno);
+ D2U_UTF8_FPRINTF(stderr, "%s:", progname);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
+ }
return -1;
}
#endif
void PrintBSDLicense(void)
{
- printf("%s", _("\
+ D2U_ANSI_FPRINTF(stdout,"%s", _("\
Redistribution and use in source and binary forms, with or without\n\
modification, are permitted provided that the following conditions\n\
are met:\n\
@@ -601,7 +579,7 @@ are met:\n\
notice in the documentation and/or other materials provided with\n\
the distribution.\n\n\
"));
- printf("%s", _("\
+ D2U_ANSI_FPRINTF(stdout,"%s", _("\
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n\
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n\
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n\
@@ -626,130 +604,130 @@ int is_dos2unix(const char *progname)
void PrintUsage(const char *progname)
{
- printf(_("Usage: %s [options] [file ...] [-n infile outfile ...]\n"), progname);
- printf(_(" -ascii convert only line breaks (default)\n"));
- printf(_(" -iso conversion between DOS and ISO-8859-1 character set\n"));
- printf(_(" -1252 use Windows code page 1252 (Western European)\n"));
- printf(_(" -437 use DOS code page 437 (US) (default)\n"));
- printf(_(" -850 use DOS code page 850 (Western European)\n"));
- printf(_(" -860 use DOS code page 860 (Portuguese)\n"));
- printf(_(" -863 use DOS code page 863 (French Canadian)\n"));
- printf(_(" -865 use DOS code page 865 (Nordic)\n"));
- printf(_(" -7 convert 8 bit characters to 7 bit space\n"));
+ D2U_ANSI_FPRINTF(stdout,_("Usage: %s [options] [file ...] [-n infile outfile ...]\n"), progname);
+ D2U_ANSI_FPRINTF(stdout,_(" -ascii convert only line breaks (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -iso conversion between DOS and ISO-8859-1 character set\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -1252 use Windows code page 1252 (Western European)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -437 use DOS code page 437 (US) (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -850 use DOS code page 850 (Western European)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -860 use DOS code page 860 (Portuguese)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -863 use DOS code page 863 (French Canadian)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -865 use DOS code page 865 (Nordic)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -7 convert 8 bit characters to 7 bit space\n"));
if (is_dos2unix(progname))
- printf(_(" -b, --keep-bom keep Byte Order Mark\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -b, --keep-bom keep Byte Order Mark\n"));
else
- printf(_(" -b, --keep-bom keep Byte Order Mark (default)\n"));
- printf(_(" -c, --convmode conversion mode\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -b, --keep-bom keep Byte Order Mark (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -c, --convmode conversion mode\n\
convmode ascii, 7bit, iso, mac, default to ascii\n"));
#ifdef D2U_UNIFILE
- printf(_(" -D, --display-enc set encoding of displayed text messages\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -D, --display-enc set encoding of displayed text messages\n\
encoding ansi, unicode, utf8, default to ansi\n"));
#endif
- printf(_(" -f, --force force conversion of binary files\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -f, --force force conversion of binary files\n"));
#ifdef D2U_UNICODE
#if (defined(_WIN32) && !defined(__CYGWIN__))
- printf(_(" -gb, --gb18030 convert UTF-16 to GB18030\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -gb, --gb18030 convert UTF-16 to GB18030\n"));
#endif
#endif
- printf(_(" -h, --help display this help text\n"));
- printf(_(" -i, --info[=FLAGS] display file information\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -h, --help display this help text\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -i, --info[=FLAGS] display file information\n\
file ... files to analyze\n"));
- printf(_(" -k, --keepdate keep output file date\n"));
- printf(_(" -L, --license display software license\n"));
- printf(_(" -l, --newline add additional newline\n"));
- printf(_(" -m, --add-bom add Byte Order Mark (default UTF-8)\n"));
- printf(_(" -n, --newfile write to new file\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -k, --keepdate keep output file date\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -L, --license display software license\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -l, --newline add additional newline\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -m, --add-bom add Byte Order Mark (default UTF-8)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -n, --newfile write to new file\n\
infile original file in new-file mode\n\
outfile output file in new-file mode\n"));
- printf(_(" -o, --oldfile write to old file (default)\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -o, --oldfile write to old file (default)\n\
file ... files to convert in old-file mode\n"));
- printf(_(" -q, --quiet quiet mode, suppress all warnings\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -q, --quiet quiet mode, suppress all warnings\n"));
if (is_dos2unix(progname))
- printf(_(" -r, --remove-bom remove Byte Order Mark (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -r, --remove-bom remove Byte Order Mark (default)\n"));
else
- printf(_(" -r, --remove-bom remove Byte Order Mark\n"));
- printf(_(" -s, --safe skip binary files (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -r, --remove-bom remove Byte Order Mark\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -s, --safe skip binary files (default)\n"));
#ifdef D2U_UNICODE
- printf(_(" -u, --keep-utf16 keep UTF-16 encoding\n"));
- printf(_(" -ul, --assume-utf16le assume that the input format is UTF-16LE\n"));
- printf(_(" -ub, --assume-utf16be assume that the input format is UTF-16BE\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -u, --keep-utf16 keep UTF-16 encoding\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -ul, --assume-utf16le assume that the input format is UTF-16LE\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -ub, --assume-utf16be assume that the input format is UTF-16BE\n"));
#endif
- printf(_(" -v, --verbose verbose operation\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -v, --verbose verbose operation\n"));
#ifdef S_ISLNK
- printf(_(" -F, --follow-symlink follow symbolic links and convert the targets\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -F, --follow-symlink follow symbolic links and convert the targets\n"));
#endif
#if defined(S_ISLNK) || (defined(_WIN32) && !defined(__CYGWIN__))
- printf(_(" -R, --replace-symlink replace symbolic links with converted files\n\
+ D2U_ANSI_FPRINTF(stdout,_(" -R, --replace-symlink replace symbolic links with converted files\n\
(original target files remain unchanged)\n"));
- printf(_(" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"));
#endif
- printf(_(" -V, --version display version number\n"));
+ D2U_ANSI_FPRINTF(stdout,_(" -V, --version display version number\n"));
}
#define MINGW32_W64 1
void PrintVersion(const char *progname, const char *localedir)
{
- printf("%s %s (%s)\n", progname, VER_REVISION, VER_DATE);
+ D2U_ANSI_FPRINTF(stdout,"%s %s (%s)\n", progname, VER_REVISION, VER_DATE);
#if DEBUG
- printf("VER_AUTHOR: %s\n", VER_AUTHOR);
+ D2U_ANSI_FPRINTF(stdout,"VER_AUTHOR: %s\n", VER_AUTHOR);
#endif
#if defined(__WATCOMC__) && defined(__I86__)
- printf("%s", _("DOS 16 bit version (WATCOMC).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("DOS 16 bit version (WATCOMC).\n"));
#elif defined(__TURBOC__) && defined(__MSDOS__)
- printf("%s", _("DOS 16 bit version (TURBOC).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("DOS 16 bit version (TURBOC).\n"));
#elif defined(__WATCOMC__) && defined(__DOS__)
- printf("%s", _("DOS 32 bit version (WATCOMC).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("DOS 32 bit version (WATCOMC).\n"));
#elif defined(__DJGPP__)
- printf("%s", _("DOS 32 bit version (DJGPP).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("DOS 32 bit version (DJGPP).\n"));
#elif defined(__MSYS__)
- printf("%s", _("MSYS version.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("MSYS version.\n"));
#elif defined(__CYGWIN__)
- printf("%s", _("Cygwin version.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Cygwin version.\n"));
#elif defined(__WIN64__) && defined(__MINGW64__)
- printf("%s", _("Windows 64 bit version (MinGW-w64).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Windows 64 bit version (MinGW-w64).\n"));
#elif defined(__WATCOMC__) && defined(__NT__)
- printf("%s", _("Windows 32 bit version (WATCOMC).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Windows 32 bit version (WATCOMC).\n"));
#elif defined(_WIN32) && defined(__MINGW32__) && (D2U_COMPILER == MINGW32_W64)
- printf("%s", _("Windows 32 bit version (MinGW-w64).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Windows 32 bit version (MinGW-w64).\n"));
#elif defined(_WIN32) && defined(__MINGW32__)
- printf("%s", _("Windows 32 bit version (MinGW).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Windows 32 bit version (MinGW).\n"));
#elif defined(_WIN64) && defined(_MSC_VER)
- printf(_("Windows 64 bit version (MSVC %d).\n"),_MSC_VER);
+ D2U_ANSI_FPRINTF(stdout,_("Windows 64 bit version (MSVC %d).\n"),_MSC_VER);
#elif defined(_WIN32) && defined(_MSC_VER)
- printf(_("Windows 32 bit version (MSVC %d).\n"),_MSC_VER);
+ D2U_ANSI_FPRINTF(stdout,_("Windows 32 bit version (MSVC %d).\n"),_MSC_VER);
#elif defined (__OS2__) && defined(__WATCOMC__) /* OS/2 Warp */
- printf("%s", _("OS/2 version (WATCOMC).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("OS/2 version (WATCOMC).\n"));
#elif defined (__OS2__) && defined(__EMX__) /* OS/2 Warp */
- printf("%s", _("OS/2 version (EMX).\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("OS/2 version (EMX).\n"));
#elif defined(__OS)
- printf(_("%s version.\n"), __OS);
+ D2U_ANSI_FPRINTF(stdout,_("%s version.\n"), __OS);
#endif
#if defined(_WIN32) && defined(WINVER)
- printf("WINVER 0x%X\n",WINVER);
+ D2U_ANSI_FPRINTF(stdout,"WINVER 0x%X\n",WINVER);
#endif
#ifdef D2U_UNICODE
- printf("%s", _("With Unicode UTF-16 support.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("With Unicode UTF-16 support.\n"));
#else
- printf("%s", _("Without Unicode UTF-16 support.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Without Unicode UTF-16 support.\n"));
#endif
#ifdef _WIN32
#ifdef D2U_UNIFILE
- printf("%s", _("With Unicode file name support.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("With Unicode file name support.\n"));
#else
- printf("%s", _("Without Unicode file name support.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("Without Unicode file name support.\n"));
#endif
#endif
#ifdef ENABLE_NLS
- printf("%s", _("With native language support.\n"));
+ D2U_ANSI_FPRINTF(stdout,"%s", _("With native language support.\n"));
#else
- printf("%s", "Without native language support.\n");
+ D2U_ANSI_FPRINTF(stdout,"%s", "Without native language support.\n");
#endif
#ifdef ENABLE_NLS
- printf("LOCALEDIR: %s\n", localedir);
+ D2U_ANSI_FPRINTF(stdout,"LOCALEDIR: %s\n", localedir);
#endif
- printf("http://waterlan.home.xs4all.nl/dos2unix.html\n");
+ D2U_ANSI_FPRINTF(stdout,"http://waterlan.home.xs4all.nl/dos2unix.html\n");
}
@@ -890,8 +868,8 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progna
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, lFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, lFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -902,8 +880,8 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progna
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, lFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, lFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -920,8 +898,8 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progna
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, lFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, lFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -932,8 +910,8 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progna
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, lFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, lFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
free(targetFN);
RetVal = -1;
@@ -1046,29 +1024,29 @@ FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname)
case FILE_UTF16LE: /* UTF-16 Little Endian */
if (fprintf(f, "%s", "\xFF\xFE") < 0) return NULL;
if (ipFlag->verbose > 1) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("UTF-16LE"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("UTF-16LE"));
}
break;
case FILE_UTF16BE: /* UTF-16 Big Endian */
if (fprintf(f, "%s", "\xFE\xFF") < 0) return NULL;
if (ipFlag->verbose > 1) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("UTF-16BE"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("UTF-16BE"));
}
break;
case FILE_GB18030: /* GB18030 */
if (fprintf(f, "%s", "\x84\x31\x95\x33") < 0) return NULL;
if (ipFlag->verbose > 1) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("GB18030"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("GB18030"));
}
break;
default: /* UTF-8 */
if (fprintf(f, "%s", "\xEF\xBB\xBF") < 0) return NULL;
if (ipFlag->verbose > 1) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("UTF-8"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("UTF-8"));
}
;
}
@@ -1079,15 +1057,15 @@ FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname)
if (fprintf(f, "%s", "\x84\x31\x95\x33") < 0) return NULL; /* GB18030 */
if (ipFlag->verbose > 1)
{
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("GB18030"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("GB18030"));
}
} else {
if (fprintf(f, "%s", "\xEF\xBB\xBF") < 0) return NULL; /* UTF-8 */
if (ipFlag->verbose > 1)
{
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Writing %s BOM.\n"), _("UTF-8"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Writing %s BOM.\n"), _("UTF-8"));
}
}
}
@@ -1121,7 +1099,7 @@ void print_bom (const int bomtype, const char *filename, const char *progname)
if (bomtype > 0) {
informat[sizeof(informat)-1] = '\0';
-/* Change informat to UTF-8 for d2u_fprintf. */
+/* Change informat to UTF-8 for d2u_utf8_fprintf. */
# ifdef D2U_UNIFILE
/* The format string is encoded in the system default
* Windows ANSI code page. May have been translated
@@ -1131,8 +1109,8 @@ void print_bom (const int bomtype, const char *filename, const char *progname)
d2u_WideCharToMultiByte(CP_UTF8, 0, informatw, -1, informat, sizeof(informat), NULL, NULL);
#endif
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Input file %s has %s BOM.\n"), filename, informat);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Input file %s has %s BOM.\n"), filename, informat);
}
}
@@ -1143,19 +1121,19 @@ void print_bom_info (const int bomtype)
that process the output may not work in other than English locales. */
switch (bomtype) {
case FILE_UTF16LE: /* UTF-16 Little Endian */
- d2u_fprintf(stdout, " UTF-16LE");
+ D2U_UTF8_FPRINTF(stdout, " UTF-16LE");
break;
case FILE_UTF16BE: /* UTF-16 Big Endian */
- d2u_fprintf(stdout, " UTF-16BE");
+ D2U_UTF8_FPRINTF(stdout, " UTF-16BE");
break;
case FILE_UTF8: /* UTF-8 */
- d2u_fprintf(stdout, " UTF-8 ");
+ D2U_UTF8_FPRINTF(stdout, " UTF-8 ");
break;
case FILE_GB18030: /* GB18030 */
- d2u_fprintf(stdout, " GB18030 ");
+ D2U_UTF8_FPRINTF(stdout, " GB18030 ");
break;
default:
- d2u_fprintf(stdout, " no_bom ");
+ D2U_UTF8_FPRINTF(stdout, " no_bom ");
;
}
}
@@ -1167,12 +1145,12 @@ int check_unicode_info(FILE *InF, CFlag *ipFlag, const char *progname, int *bomt
#ifdef D2U_UNICODE
if (ipFlag->verbose > 1) {
if (ipFlag->ConvMode == CONVMODE_UTF16LE) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Assuming UTF-16LE encoding.\n") );
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Assuming UTF-16LE encoding.\n") );
}
if (ipFlag->ConvMode == CONVMODE_UTF16BE) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Assuming UTF-16BE encoding.\n") );
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Assuming UTF-16BE encoding.\n") );
}
}
#endif
@@ -1210,12 +1188,12 @@ int check_unicode(FILE *InF, FILE *TempF, CFlag *ipFlag, const char *ipInFN, co
#ifdef D2U_UNICODE
if (ipFlag->verbose > 1) {
if (ipFlag->ConvMode == CONVMODE_UTF16LE) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Assuming UTF-16LE encoding.\n") );
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Assuming UTF-16LE encoding.\n") );
}
if (ipFlag->ConvMode == CONVMODE_UTF16BE) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Assuming UTF-16BE encoding.\n") );
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Assuming UTF-16BE encoding.\n") );
}
}
#endif
@@ -1340,8 +1318,8 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, ipInFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, ipInFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1354,25 +1332,27 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("Failed to open temporary output file: %s\n"), errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("Failed to open temporary output file: %s\n"), errstr);
}
RetVal = -1;
}
#if DEBUG
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("using %s as temporary file\n"), TempPath);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("using %s as temporary file\n"), TempPath);
#endif
/* can open in file? */
if (!RetVal) {
InF=OpenInFile(ipInFN);
if (InF == NULL) {
- ipFlag->error = errno;
- errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, ipInFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ if (ipFlag->verbose) {
+ ipFlag->error = errno;
+ errstr = strerror(errno);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, ipInFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
+ }
RetVal = -1;
}
}
@@ -1383,10 +1363,12 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if ((TempF=fd) == NULL) {
#else
if ((TempF=OpenOutFile(fd)) == NULL) {
- ipFlag->error = errno;
- errstr = strerror(errno);
- d2u_fprintf(stderr, "%s:", progname);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ if (ipFlag->verbose) {
+ ipFlag->error = errno;
+ errstr = strerror(errno);
+ D2U_UTF8_FPRINTF(stderr, "%s:", progname);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
+ }
#endif
fclose (InF);
InF = NULL;
@@ -1426,9 +1408,9 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Failed to write to temporary output file %s:"), TempPath);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Failed to write to temporary output file %s:"), TempPath);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1457,9 +1439,9 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Failed to change the permissions of temporary output file %s:"), TempPath);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Failed to change the permissions of temporary output file %s:"), TempPath);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
}
}
@@ -1474,9 +1456,9 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Failed to change the owner and group of temporary output file %s:"), TempPath);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Failed to change the owner and group of temporary output file %s:"), TempPath);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1492,8 +1474,8 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, TempPath);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, TempPath);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1505,8 +1487,8 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, TempPath);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, TempPath);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1521,9 +1503,9 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
ResolveSymlinkResult = ResolveSymbolicLink(ipOutFN, &TargetFN, ipFlag, progname);
if (ResolveSymlinkResult < 0) {
if (ipFlag->verbose) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN);
- d2u_fprintf(stderr, _(" output file remains in '%s'\n"), TempPath);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN);
+ D2U_UTF8_FPRINTF(stderr, _(" output file remains in '%s'\n"), TempPath);
}
RetVal = -1;
}
@@ -1537,8 +1519,8 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s:", progname, TargetFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, TargetFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
RetVal = -1;
}
@@ -1548,14 +1530,14 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn
if (ipFlag->verbose) {
ipFlag->error = errno;
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("problems renaming '%s' to '%s':"), TempPath, TargetFN);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("problems renaming '%s' to '%s':"), TempPath, TargetFN);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
#ifdef S_ISLNK
if (ResolveSymlinkResult > 0)
- d2u_fprintf(stderr, _(" which is the target of symbolic link '%s'\n"), ipOutFN);
+ D2U_UTF8_FPRINTF(stderr, _(" which is the target of symbolic link '%s'\n"), ipOutFN);
#endif
- d2u_fprintf(stderr, _(" output file remains in '%s'\n"), TempPath);
+ D2U_UTF8_FPRINTF(stderr, _(" output file remains in '%s'\n"), TempPath);
}
RetVal = -1;
}
@@ -1615,22 +1597,22 @@ int ConvertStdio(CFlag *ipFlag, const char *progname,
void print_messages_stdio(const CFlag *pFlag, const char *progname)
{
if (pFlag->status & BINARY_FILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping binary file %s\n"), "stdin");
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping binary file %s\n"), "stdin");
} else if (pFlag->status & WRONG_CODEPAGE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
#ifdef D2U_UNICODE
} else if (pFlag->status & WCHAR_T_TOO_SMALL) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), "stdin", (int)sizeof(wchar_t));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), "stdin", (int)sizeof(wchar_t));
} else if (pFlag->status & UNICODE_CONVERSION_ERROR) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), "stdin", pFlag->line_nr);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), "stdin", pFlag->line_nr);
#else
} else if (pFlag->status & UNICODE_NOT_SUPPORTED) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), "stdin", progname);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), "stdin", progname);
#endif
}
}
@@ -1682,7 +1664,7 @@ void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *
print_format(pFlag, informat, outformat, sizeof(informat), sizeof(outformat));
-/* Change informat and outformat to UTF-8 for d2u_fprintf. */
+/* Change informat and outformat to UTF-8 for d2u_utf8_fprintf. */
# ifdef D2U_UNIFILE
/* The format string is encoded in the system default
* Windows ANSI code page. May have been translated
@@ -1695,45 +1677,45 @@ void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *
#endif
if (pFlag->status & NO_REGFILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping %s, not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping %s, not a regular file.\n"), infile);
} else if (pFlag->status & OUTPUTFILE_SYMLINK) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), infile, outfile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), infile, outfile);
} else if (pFlag->status & INPUT_TARGET_NO_REGFILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
} else if (pFlag->status & OUTPUT_TARGET_NO_REGFILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), infile, outfile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), infile, outfile);
} else if (pFlag->status & BINARY_FILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping binary file %s\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping binary file %s\n"), infile);
} else if (pFlag->status & WRONG_CODEPAGE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
#ifdef D2U_UNICODE
} else if (pFlag->status & WCHAR_T_TOO_SMALL) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
} else if (pFlag->status & UNICODE_CONVERSION_ERROR) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr);
#else
} else if (pFlag->status & UNICODE_NOT_SUPPORTED) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname);
#endif
} else {
- d2u_fprintf(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
if (informat[0] == '\0') {
if (is_dos2unix(progname)) {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to file %s in Unix format...\n"), infile, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Unix format...\n"), infile, outfile);
} else {
if (pFlag->FromToMode == FROMTO_UNIX2MAC) {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to file %s in Mac format...\n"), infile, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Mac format...\n"), infile, outfile);
} else {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to file %s in DOS format...\n"), infile, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in DOS format...\n"), infile, outfile);
}
}
} else {
@@ -1744,18 +1726,18 @@ void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *
3rd %s is encoding of output file.
4th %s is name of output file.
E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... */
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s file %s in Unix format...\n"), informat, infile, outformat, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Unix format...\n"), informat, infile, outformat, outfile);
} else {
if (pFlag->FromToMode == FROMTO_UNIX2MAC) {
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s file %s in Mac format...\n"), informat, infile, outformat, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Mac format...\n"), informat, infile, outformat, outfile);
} else {
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s file %s in DOS format...\n"), informat, infile, outformat, outfile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in DOS format...\n"), informat, infile, outformat, outfile);
}
}
}
if (RetVal) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("problems converting file %s to file %s\n"), infile, outfile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("problems converting file %s to file %s\n"), infile, outfile);
}
}
}
@@ -1771,7 +1753,7 @@ void print_messages_oldfile(const CFlag *pFlag, const char *infile, const char *
print_format(pFlag, informat, outformat, sizeof(informat), sizeof(outformat));
-/* Change informat and outformat to UTF-8 for d2u_fprintf. */
+/* Change informat and outformat to UTF-8 for d2u_utf8_fprintf. */
# ifdef D2U_UNIFILE
/* The format string is encoded in the system default
* Windows ANSI code page. May have been translated
@@ -1784,42 +1766,42 @@ void print_messages_oldfile(const CFlag *pFlag, const char *infile, const char *
#endif
if (pFlag->status & NO_REGFILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping %s, not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping %s, not a regular file.\n"), infile);
} else if (pFlag->status & OUTPUTFILE_SYMLINK) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping symbolic link %s.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s.\n"), infile);
} else if (pFlag->status & INPUT_TARGET_NO_REGFILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
} else if (pFlag->status & BINARY_FILE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping binary file %s\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping binary file %s\n"), infile);
} else if (pFlag->status & WRONG_CODEPAGE) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode);
#ifdef D2U_UNICODE
} else if (pFlag->status & WCHAR_T_TOO_SMALL) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
} else if (pFlag->status & UNICODE_CONVERSION_ERROR) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr);
#else
} else if (pFlag->status & UNICODE_NOT_SUPPORTED) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname);
#endif
} else {
- d2u_fprintf(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
if (informat[0] == '\0') {
if (is_dos2unix(progname)) {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to Unix format...\n"), infile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to Unix format...\n"), infile);
} else {
if (pFlag->FromToMode == FROMTO_UNIX2MAC) {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to Mac format...\n"), infile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to Mac format...\n"), infile);
} else {
- if (!RetVal) d2u_fprintf(stderr, _("converting file %s to DOS format...\n"), infile);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to DOS format...\n"), infile);
}
}
} else {
@@ -1829,18 +1811,18 @@ void print_messages_oldfile(const CFlag *pFlag, const char *infile, const char *
2nd %s is name of input file.
3rd %s is encoding of output (input file is overwritten).
E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... */
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s Unix format...\n"), informat, infile, outformat);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Unix format...\n"), informat, infile, outformat);
} else {
if (pFlag->FromToMode == FROMTO_UNIX2MAC) {
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s Mac format...\n"), informat, infile, outformat);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Mac format...\n"), informat, infile, outformat);
} else {
- if (!RetVal) d2u_fprintf(stderr, _("converting %s file %s to %s DOS format...\n"), informat, infile, outformat);
+ if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s DOS format...\n"), informat, infile, outformat);
}
}
}
if (RetVal) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("problems converting file %s\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("problems converting file %s\n"), infile);
}
}
}
@@ -1849,24 +1831,80 @@ void print_messages_info(const CFlag *pFlag, const char *infile, const char *pro
{
if (pFlag->status & NO_REGFILE) {
if (pFlag->verbose) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping %s, not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping %s, not a regular file.\n"), infile);
}
} else if (pFlag->status & INPUT_TARGET_NO_REGFILE) {
if (pFlag->verbose) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile);
}
#ifdef D2U_UNICODE
} else if (pFlag->status & WCHAR_T_TOO_SMALL) {
if (pFlag->verbose) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t));
}
#endif
}
}
+void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb_dos, unsigned int lb_unix, unsigned int lb_mac)
+{
+ const char *ptr;
+
+ if (ipFlag->file_info & INFO_CONVERT) {
+ if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0))
+ return;
+ if (((ipFlag->FromToMode == FROMTO_UNIX2DOS)||(ipFlag->FromToMode == FROMTO_UNIX2MAC)) && (lb_unix == 0))
+ return;
+ if ((ipFlag->FromToMode == FROMTO_MAC2UNIX) && (lb_mac == 0))
+ return;
+ if ((ipFlag->Force == 0) && (ipFlag->status & BINARY_FILE))
+ return;
+ }
+
+ if ((ipFlag->file_info & INFO_HEADER) && (! header_done)) {
+ if (ipFlag->file_info & INFO_DOS)
+ D2U_UTF8_FPRINTF(stdout, " DOS");
+ if (ipFlag->file_info & INFO_UNIX)
+ D2U_UTF8_FPRINTF(stdout, " UNIX");
+ if (ipFlag->file_info & INFO_MAC)
+ D2U_UTF8_FPRINTF(stdout, " MAC");
+ if (ipFlag->file_info & INFO_BOM)
+ D2U_UTF8_FPRINTF(stdout, " BOM ");
+ if (ipFlag->file_info & INFO_TEXT)
+ D2U_UTF8_FPRINTF(stdout, " TXTBIN");
+ if (*filename != '\0')
+ D2U_UTF8_FPRINTF(stdout, " FILE");
+ D2U_UTF8_FPRINTF(stdout, "\n");
+ header_done = 1;
+ }
+
+ if (ipFlag->file_info & INFO_DOS)
+ D2U_UTF8_FPRINTF(stdout, " %6u", lb_dos);
+ if (ipFlag->file_info & INFO_UNIX)
+ D2U_UTF8_FPRINTF(stdout, " %6u", lb_unix);
+ if (ipFlag->file_info & INFO_MAC)
+ D2U_UTF8_FPRINTF(stdout, " %6u", lb_mac);
+ if (ipFlag->file_info & INFO_BOM)
+ print_bom_info(bomtype);
+ if (ipFlag->file_info & INFO_TEXT) {
+ if (ipFlag->status & BINARY_FILE)
+ D2U_UTF8_FPRINTF(stdout, " binary");
+ else
+ D2U_UTF8_FPRINTF(stdout, " text ");
+ }
+ if (*filename != '\0') {
+ if ((ipFlag->file_info & INFO_NOPATH) && (((ptr=strrchr(filename,'/')) != NULL) || ((ptr=strrchr(filename,'\\')) != NULL)) )
+ ptr++;
+ else
+ ptr = filename;
+ D2U_UTF8_FPRINTF(stdout, " %s",ptr);
+ }
+ D2U_UTF8_FPRINTF(stdout, "\n");
+}
+
#ifdef D2U_UNICODE
void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, const char *progname)
{
@@ -1907,40 +1945,15 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co
ipFlag->error = errno;
if (ipFlag->verbose) {
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("can not read from input file %s:"), filename);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("can not read from input file %s:"), filename);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
return;
}
- if (ipFlag->file_info & INFO_CONVERT) {
- if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0))
- return;
- if (((ipFlag->FromToMode == FROMTO_UNIX2DOS)||(ipFlag->FromToMode == FROMTO_UNIX2MAC)) && (lb_unix == 0))
- return;
- if ((ipFlag->FromToMode == FROMTO_MAC2UNIX) && (lb_mac == 0))
- return;
- if ((ipFlag->Force == 0) && (ipFlag->status & BINARY_FILE))
- return;
- }
+ printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac);
- if (ipFlag->file_info & INFO_DOS)
- d2u_fprintf(stdout, " %6u", lb_dos);
- if (ipFlag->file_info & INFO_UNIX)
- d2u_fprintf(stdout, " %6u", lb_unix);
- if (ipFlag->file_info & INFO_MAC)
- d2u_fprintf(stdout, " %6u", lb_mac);
- if (ipFlag->file_info & INFO_BOM)
- print_bom_info(bomtype);
- if (ipFlag->file_info & INFO_TEXT) {
- if (ipFlag->status & BINARY_FILE)
- d2u_fprintf(stdout, " binary");
- else
- d2u_fprintf(stdout, " text ");
- }
- d2u_fprintf(stdout, " %s",filename);
- d2u_fprintf(stdout, "\n");
}
#endif
@@ -1984,41 +1997,14 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con
ipFlag->error = errno;
if (ipFlag->verbose) {
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("can not read from input file %s:"), filename);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("can not read from input file %s:"), filename);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
}
return;
}
-
- if (ipFlag->file_info & INFO_CONVERT) {
- if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0))
- return;
- if (((ipFlag->FromToMode == FROMTO_UNIX2DOS)||(ipFlag->FromToMode == FROMTO_UNIX2MAC)) && (lb_unix == 0))
- return;
- if ((ipFlag->FromToMode == FROMTO_MAC2UNIX) && (lb_mac == 0))
- return;
- if ((ipFlag->Force == 0) && (ipFlag->status & BINARY_FILE))
- return;
- }
-
- if (ipFlag->file_info & INFO_DOS)
- d2u_fprintf(stdout, " %6u", lb_dos);
- if (ipFlag->file_info & INFO_UNIX)
- d2u_fprintf(stdout, " %6u", lb_unix);
- if (ipFlag->file_info & INFO_MAC)
- d2u_fprintf(stdout, " %6u", lb_mac);
- if (ipFlag->file_info & INFO_BOM)
- print_bom_info(bomtype);
- if (ipFlag->file_info & INFO_TEXT) {
- if (ipFlag->status & BINARY_FILE)
- d2u_fprintf(stdout, " binary");
- else
- d2u_fprintf(stdout, " text ");
- }
- d2u_fprintf(stdout, " %s",filename);
- d2u_fprintf(stdout, "\n");
+ printInfo(ipFlag, filename, bomtype, lb_dos, lb_unix, lb_mac);
}
int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname)
@@ -2048,10 +2034,12 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname)
/* can open in file? */
InF=OpenInFile(ipInFN);
if (InF == NULL) {
- ipFlag->error = errno;
- errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: %s: ", progname, ipInFN);
- d2u_ansi_fprintf(stderr, "%s\n", errstr);
+ if (ipFlag->verbose) {
+ ipFlag->error = errno;
+ errstr = strerror(errno);
+ D2U_UTF8_FPRINTF(stderr, "%s: %s: ", progname, ipInFN);
+ D2U_ANSI_FPRINTF(stderr, "%s\n", errstr);
+ }
RetVal = -1;
}
@@ -2126,6 +2114,7 @@ int GetFileInfoStdio(CFlag *ipFlag, const char *progname)
void get_info_options(char *option, CFlag *pFlag, const char *progname)
{
char *ptr;
+ int default_info = 1;
ptr = option;
@@ -2138,32 +2127,46 @@ void get_info_options(char *option, CFlag *pFlag, const char *progname)
switch (*ptr) {
case 'd': /* Print nr of DOS line breaks. */
pFlag->file_info |= INFO_DOS;
+ default_info = 0;
break;
case 'u': /* Print nr of Unix line breaks. */
pFlag->file_info |= INFO_UNIX;
+ default_info = 0;
break;
case 'm': /* Print nr of Mac line breaks. */
pFlag->file_info |= INFO_MAC;
+ default_info = 0;
break;
case 'b': /* Print BOM. */
pFlag->file_info |= INFO_BOM;
+ default_info = 0;
break;
case 't': /* Text or binary. */
pFlag->file_info |= INFO_TEXT;
+ default_info = 0;
break;
case 'c': /* Print only files that would be converted. */
pFlag->file_info |= INFO_CONVERT;
+ default_info = 0;
+ break;
+ case 'h': /* Print a header. */
+ pFlag->file_info |= INFO_HEADER;
+ break;
+ case 'p': /* Remove path from file names. */
+ pFlag->file_info |= INFO_NOPATH;
break;
default:
/* Terminate the program on a wrong option. If pFlag->file_info is
zero and the program goes on, it may do unwanted conversions. */
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr,_("wrong flag '%c' for option -i or --info\n"), *ptr);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,_("wrong flag '%c' for option -i or --info\n"), *ptr);
exit(1);
;
}
ptr++;
}
+ if (default_info)
+ pFlag->file_info |= INFO_DEFAULT;
}
int parse_options(int argc, char *argv[],
@@ -2208,8 +2211,12 @@ int parse_options(int argc, char *argv[],
d2u_display_encoding = D2U_DISPLAY_ANSI;
else if (strncmp(ptr, "unicode", sizeof("unicode")) == 0)
d2u_display_encoding = D2U_DISPLAY_UNICODE;
+ else if (strncmp(ptr, "unicodebom", sizeof("unicodebom")) == 0)
+ d2u_display_encoding = D2U_DISPLAY_UNICODEBOM;
else if (strncmp(ptr, "utf8", sizeof("utf8")) == 0)
d2u_display_encoding = D2U_DISPLAY_UTF8;
+ else if (strncmp(ptr, "utf8bom", sizeof("utf8bom")) == 0)
+ d2u_display_encoding = D2U_DISPLAY_UTF8BOM;
}
#endif
@@ -2276,8 +2283,8 @@ int parse_options(int argc, char *argv[],
else if (strcmp(argv[ArgIdx],"-iso") == 0) {
pFlag->ConvMode = (int)query_con_codepage();
if (pFlag->verbose) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,_("active code page: %d\n"), pFlag->ConvMode);
}
if (pFlag->ConvMode < 2)
pFlag->ConvMode = CONVMODE_437;
@@ -2319,8 +2326,8 @@ int parse_options(int argc, char *argv[],
else if (strcmpi(argv[ArgIdx], "iso") == 0) {
pFlag->ConvMode = (int)query_con_codepage();
if (pFlag->verbose) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,_("active code page: %d\n"), pFlag->ConvMode);
}
if (pFlag->ConvMode < 2)
pFlag->ConvMode = CONVMODE_437;
@@ -2331,16 +2338,16 @@ int parse_options(int argc, char *argv[],
else
pFlag->FromToMode = FROMTO_UNIX2MAC;
} else {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("invalid %s conversion mode specified\n"),argv[ArgIdx]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("invalid %s conversion mode specified\n"),argv[ArgIdx]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
}
} else {
ArgIdx--;
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
@@ -2354,19 +2361,23 @@ int parse_options(int argc, char *argv[],
d2u_display_encoding = D2U_DISPLAY_ANSI;
else if (strcmpi(argv[ArgIdx], "unicode") == 0)
d2u_display_encoding = D2U_DISPLAY_UNICODE;
- else if (strcmpi(argv[ArgIdx], "utf8") == 0) {
+ else if (strcmpi(argv[ArgIdx], "unicodebom") == 0)
+ d2u_display_encoding = D2U_DISPLAY_UNICODEBOM;
+ else if (strcmpi(argv[ArgIdx], "utf8") == 0)
d2u_display_encoding = D2U_DISPLAY_UTF8;
+ else if (strcmpi(argv[ArgIdx], "utf8bom") == 0) {
+ d2u_display_encoding = D2U_DISPLAY_UTF8BOM;
} else {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("invalid %s display encoding specified\n"),argv[ArgIdx]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("invalid %s display encoding specified\n"),argv[ArgIdx]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
}
} else {
ArgIdx--;
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
@@ -2377,8 +2388,8 @@ int parse_options(int argc, char *argv[],
else if ((strcmp(argv[ArgIdx],"-o") == 0) || (strcmp(argv[ArgIdx],"--oldfile") == 0)) {
/* last convert not paired */
if (!CanSwitchFileMode) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
@@ -2390,8 +2401,8 @@ int parse_options(int argc, char *argv[],
else if ((strcmp(argv[ArgIdx],"-n") == 0) || (strcmp(argv[ArgIdx],"--newfile") == 0)) {
/* last convert not paired */
if (!CanSwitchFileMode) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
pFlag->error = 1;
ShouldExit = 1;
pFlag->stdio_mode = 0;
@@ -2456,8 +2467,8 @@ int parse_options(int argc, char *argv[],
}
if (!CanSwitchFileMode) {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_UTF8_FPRINTF(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]);
pFlag->error = 1;
}
return pFlag->error;
@@ -2470,8 +2481,8 @@ void d2u_getc_error(CFlag *ipFlag, const char *progname)
ipFlag->error = errno;
if (ipFlag->verbose) {
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("can not read from input file: %s\n"), errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("can not read from input file: %s\n"), errstr);
}
}
@@ -2482,8 +2493,8 @@ void d2u_putc_error(CFlag *ipFlag, const char *progname)
ipFlag->error = errno;
if (ipFlag->verbose) {
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("can not write to output file: %s\n"), errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("can not write to output file: %s\n"), errstr);
}
}
@@ -2496,8 +2507,8 @@ void d2u_putwc_error(CFlag *ipFlag, const char *progname)
ipFlag->error = errno;
if (ipFlag->verbose) {
errstr = strerror(errno);
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_ansi_fprintf(stderr, _("can not write to output file: %s\n"), errstr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_ANSI_FPRINTF(stderr, _("can not write to output file: %s\n"), errstr);
}
}
}
@@ -2573,8 +2584,8 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname)
/* check for lead without a trail */
if ((lead >= 0xd800) && (lead < 0xdc00) && ((wc < 0xdc00) || (wc >= 0xe000))) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("error: Invalid surrogate pair. Missing low surrogate.\n"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("error: Invalid surrogate pair. Missing low surrogate.\n"));
ipFlag->status |= UNICODE_CONVERSION_ERROR ;
return(WEOF);
}
@@ -2588,8 +2599,8 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname)
/* check for trail without a lead */
if ((lead < 0xd800) || (lead >= 0xdc00)) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("error: Invalid surrogate pair. Missing high surrogate.\n"));
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("error: Invalid surrogate pair. Missing high surrogate.\n"));
ipFlag->status |= UNICODE_CONVERSION_ERROR ;
return(WEOF);
}
@@ -2666,13 +2677,15 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname)
if ( len == (size_t)(-1) ) {
/* Stop when there is a conversion error */
/* On Windows we convert UTF-16 always to UTF-8 or GB18030 */
+ if (ipFlag->verbose) {
#if (defined(_WIN32) && !defined(__CYGWIN__))
- d2u_PrintLastError(progname);
+ d2u_PrintLastError(progname);
#else
- errstr = strerror(errno);
- d2u_fprintf(stderr, "%s:", progname);
- d2u_ansi_fprintf(stderr, " %s\n", errstr);
+ errstr = strerror(errno);
+ D2U_UTF8_FPRINTF(stderr, "%s:", progname);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", errstr);
#endif
+ }
ipFlag->status |= UNICODE_CONVERSION_ERROR ;
return(WEOF);
} else {
diff --git a/common.h b/common.h
index e87f036..48858ee 100644
--- a/common.h
+++ b/common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2014 Erwin Waterlander
+ * Copyright (C) 2009-2016 Erwin Waterlander
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -196,6 +196,8 @@
#define INFO_TEXT 0x10
#define INFO_DEFAULT 0x1F
#define INFO_CONVERT 0x20
+#define INFO_HEADER 0x40
+#define INFO_NOPATH 0x80
#define SYMLINK_SKIP 0
#define SYMLINK_FOLLOW 1
@@ -207,9 +209,11 @@
#define FILE_UTF8 3 /* UTF-8 */
#define FILE_GB18030 4 /* GB18030 */
-#define D2U_DISPLAY_ANSI 0
-#define D2U_DISPLAY_UNICODE 1
-#define D2U_DISPLAY_UTF8 2
+#define D2U_DISPLAY_ANSI 0
+#define D2U_DISPLAY_UNICODE 1
+#define D2U_DISPLAY_UNICODEBOM 2
+#define D2U_DISPLAY_UTF8 3
+#define D2U_DISPLAY_UTF8BOM 4
/* locale conversion targets */
#define TARGET_UTF8 0
@@ -294,12 +298,18 @@ wint_t d2u_getwc(FILE *f, int bomtype);
wint_t d2u_ungetwc(wint_t wc, FILE *f, int bomtype);
wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname);
#endif
-void d2u_fprintf( FILE *stream, const char* format, ... );
-void d2u_ansi_fprintf( FILE *stream, const char* format, ... );
+
#ifdef D2U_UNIFILE
#define UNICODE
#define _UNICODE
+#define D2U_UTF8_FPRINTF d2u_utf8_fprintf
+#define D2U_ANSI_FPRINTF d2u_ansi_fprintf
+void d2u_utf8_fprintf( FILE *stream, const char* format, ... );
+void d2u_ansi_fprintf( FILE *stream, const char* format, ... );
int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const char *progname);
+#else
+#define D2U_UTF8_FPRINTF fprintf
+#define D2U_ANSI_FPRINTF fprintf
#endif
#endif
diff --git a/dos2unix.c b/dos2unix.c
index 54c4752..6409408 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -7,7 +7,7 @@
* See also http://www.freebsd.org/copyright/freebsd-license.html
* --------
*
- * Copyright (C) 2009-2015 Erwin Waterlander
+ * Copyright (C) 2009-2016 Erwin Waterlander
* Copyright (C) 1998 Christian Wurll
* Copyright (C) 1998 Bernd Johannes Wuebben
* Copyright (C) 1994-1995 Benjamin Lin.
@@ -76,12 +76,12 @@
void PrintLicense(void)
{
- printf("%s", _("\
-Copyright (C) 2009-2015 Erwin Waterlander\n\
+ D2U_ANSI_FPRINTF(stdout,_("\
+Copyright (C) 2009-%d Erwin Waterlander\n\
Copyright (C) 1998 Christian Wurll (Version 3.1)\n\
Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n\
Copyright (C) 1994-1995 Benjamin Lin\n\
-All rights reserved.\n\n"));
+All rights reserved.\n\n"),2016);
PrintBSDLicense();
}
@@ -208,8 +208,8 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x00%02X found at line %u\n"),TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x00%02X found at line %u\n"),TempChar, line_nr);
}
break;
}
@@ -245,8 +245,8 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
}
break;
}
@@ -301,16 +301,16 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
default: /* unknown FromToMode */
;
#if DEBUG
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
exit(1);
#endif
}
if (ipFlag->status & UNICODE_CONVERSION_ERROR)
ipFlag->line_nr = line_nr;
if ((RetVal == 0) && (ipFlag->verbose > 1)) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
}
return RetVal;
}
@@ -367,8 +367,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ConvTable = D2UAsciiTable;
if ((ipFlag->ConvMode > CONVMODE_7BIT) && (ipFlag->verbose)) { /* not ascii or 7bit */
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("using code page %d.\n"), ipFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("using code page %d.\n"), ipFlag->ConvMode);
}
/* CR-LF -> LF */
@@ -391,8 +391,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x%02X found at line %u\n"),TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x%02X found at line %u\n"),TempChar, line_nr);
}
break;
}
@@ -428,8 +428,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x%02X found at line %u\n"),TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x%02X found at line %u\n"),TempChar, line_nr);
}
break;
}
@@ -484,14 +484,14 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
default: /* unknown FromToMode */
;
#if DEBUG
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
exit(1);
#endif
}
if ((RetVal == 0) && (ipFlag->verbose > 1)) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Converted %u out of %u line breaks.\n"),converted, line_nr -1);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Converted %u out of %u line breaks.\n"),converted, line_nr -1);
}
return RetVal;
}
@@ -521,8 +521,8 @@ int main (int argc, char *argv[])
if (strlen(ptr) < sizeof(localedir))
strcpy(localedir,ptr);
else {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_ansi_fprintf(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_ANSI_FPRINTF(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"));
strcpy(localedir,LOCALEDIR);
}
}
@@ -530,8 +530,16 @@ int main (int argc, char *argv[])
#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__))
/* setlocale() is also needed for nl_langinfo() */
+#if (defined(_WIN32) && !defined(__CYGWIN__))
+/* When the locale is set to "" on Windows all East-Asian multi-byte ANSI encoded text is printed
+ wrongly when you use standard printf(). Also UTF-8 code is printed wrongly. See also test/setlocale.c.
+ When we set the locale to "C" gettext still translates the messages on Windows. On Unix this would disable
+ gettext. */
+ setlocale (LC_ALL, "C");
+#else
setlocale (LC_ALL, "");
#endif
+#endif
#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, localedir);
@@ -542,8 +550,8 @@ int main (int argc, char *argv[])
/* variable initialisations */
pFlag = (CFlag*)malloc(sizeof(CFlag));
if (pFlag == NULL) {
- d2u_fprintf(stderr, "dos2unix:");
- d2u_ansi_fprintf(stderr, " %s\n", strerror(errno));
+ D2U_UTF8_FPRINTF(stderr, "dos2unix:");
+ D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno));
return errno;
}
pFlag->FromToMode = FROMTO_DOS2UNIX; /* default dos2unix */
@@ -569,8 +577,8 @@ int main (int argc, char *argv[])
argv_glob = (char ***)malloc(sizeof(char***));
if (argv_glob == NULL) {
- d2u_fprintf(stderr, "%s:", progname);
- d2u_ansi_fprintf(stderr, " %s\n", strerror(errno));
+ D2U_UTF8_FPRINTF(stderr, "%s:", progname);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno));
return errno;
}
/* Glob the arguments and convert them to UTF-8 */
diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1
index 3955b65..453947b 100644
--- a/man/de/man1/dos2unix.1
+++ b/man/de/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -117,10 +117,13 @@ wird in das Ziel des symbolischen Links geschrieben. Unter Windows wird das
Schreiben in das Ziel eines symbolischen Links nicht unterstützt.
.PP
Dos2unix wurde nach dem Vorbild der dos2unix\-Version unter SunOS/Solaris
-entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version
-ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während
-unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus)
-unterstützt wird. Siehe dazu die Optionen \f(CW\*(C`\-o\*(C'\fR und \f(CW\*(C`\-n\*(C'\fR.
+entwickelt, doch es gibt einen wesentlichen Unterschied zum Original: Diese
+Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus),
+während unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus)
+unterstützt wird. Siehe dazu die Optionen \f(CW\*(C`\-o\*(C'\fR und \f(CW\*(C`\-n\*(C'\fR. Ein weiterer
+Unterschied ist, dass die SunOS/Solaris\-Version in der Voreinstellung die
+Umwandlung im \fIiso\fR\-Modus vornimmt, während diese Version den
+\&\fIascii\fR\-Modus verwendet.
.SH "OPTIONEN"
.IX Header "OPTIONEN"
.IP "\fB\-\-\fR" 4
@@ -181,7 +184,8 @@ legt den Umwandlungsmodus fest. \s-1UMWANDLUNGSMODUS\s0 kann \fIascii\fR, \fI7bi
.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.
+\&\fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR oder <utf8bom> 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
@@ -205,8 +209,8 @@ 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"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
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
@@ -220,14 +224,16 @@ 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.
+eine Datei weitergeleitet wird.
+.Sp
+Wenn die Methode \f(CW\*(C`unicodebom\*(C'\fR verwendet wird, dann wird dem Unicode-Text
+eine \s-1BOM \s0(Markierung der Bytereihenfolge) vorangestellt. Eine \s-1BOM\s0 ist ist
+für korrekte um\- oder Weiterleitung in der PowerShell notwendig.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+Der Vorteil von \s-1UTF\-8\s0 ist die ASCII\-Kompatibilität. 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
@@ -236,11 +242,16 @@ 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.
+.Sp
+Wenn die Methode \f(CW\*(C`utf8bom\*(C'\fR verwendet wird, dann wird dem UTF\-8\-Text eine
+\&\s-1BOM \s0(Markierung der Bytereihenfolge) vorangestellt. Eine \s-1BOM\s0 ist ist für
+korrekte um\- oder Weiterleitung in der PowerShell notwendig.
.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.
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 auf \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR oder \f(CW\*(C`utf8\*(C'\fR
+geändert werden.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -276,6 +287,9 @@ Beispielausgabe:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei
+erkannt wird. Siehe auch Option \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe
anzupassen. Einer oder mehrere Schalter können hinzugefügt werden.
.RS 4
@@ -301,6 +315,12 @@ gibt nur die Dateien aus, die umgewandelt werden würden.
Mit dem Schalter \f(CW\*(C`c\*(C'\fR gibt dos2unix nur die Dateien aus, die
DOS\-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit
Unix\-Zeilenumbrüchen.
+.IP "\fBh\fR" 4
+.IX Item "h"
+gibt eine Kopfzeile aus.
+.IP "\fBp\fR" 4
+.IX Item "p"
+zeigt Dateinamen ohne Pfade an.
.RE
.RS 4
.Sp
@@ -418,6 +438,13 @@ Unix\-Zeilenumbrüchen. Siehe auch die Option \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
überspringt Binärdateien (Vorgabe).
+.Sp
+Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten
+vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher
+funktioniert. Die übergebenen Dateien werden auf Binärsymbole überprüft, die
+typischerweise in Textdateien nicht vorkommen. Es ist jedoch möglich, dass
+eine Binärdatei ausschließlich gewöhnliche Textzeichen enthält. Eine solche
+Binärdatei wird dann fälschlicherweise als Textdatei angesehen.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
erhält die originale UTF\-16\-Kodierung der Eingabedatei. Die Ausgabedatei
@@ -699,8 +726,8 @@ Bytereihenfolge (\s-1BOM\s0).
Aus der Standardeingabe lesen und in die Standardausgabe schreiben:
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:
@@ -790,6 +817,12 @@ In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+In der Windows PowerShell können Sie folgenden Befehl verwenden:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOKALISIERUNG"
.IX Header "LOKALISIERUNG"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm
index 50313a8..e7c9f96 100644
--- a/man/de/man1/dos2unix.htm
+++ b/man/de/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Symbolische Links und deren Ziele werden per Vorgabe unver&auml;ndert belassen. Symbolische Links k&ouml;nnen optional ersetzt werden, oder die Ausgabe wird in das Ziel des symbolischen Links geschrieben. Unter Windows wird das Schreiben in das Ziel eines symbolischen Links nicht unterst&uuml;tzt.</p>
-<p>Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), w&auml;hrend unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) unterst&uuml;tzt wird. Siehe dazu die Optionen <code>-o</code> und <code>-n</code>.</p>
+<p>Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris entwickelt, doch es gibt einen wesentlichen Unterschied zum Original: Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), w&auml;hrend unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) unterst&uuml;tzt wird. Siehe dazu die Optionen <code>-o</code> und <code>-n</code>. Ein weiterer Unterschied ist, dass die SunOS/Solaris-Version in der Voreinstellung die Umwandlung im <i>iso</i>-Modus vornimmt, w&auml;hrend diese Version den <i>ascii</i>-Modus verwendet.</p>
<h1 id="OPTIONEN">OPTIONEN</h1>
@@ -147,7 +147,7 @@
<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>legt die Kodierung des angezeigten Texts fest. KODIERUNG kann <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i> oder &lt;utf8bom&gt; 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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</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>
+<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.</p>
+
+<p>Wenn die Methode <code>unicodebom</code> verwendet wird, dann wird dem Unicode-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist f&uuml;r korrekte um- oder Weiterleitung in der PowerShell notwendig.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</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 Vorteil von UTF-8 ist die ASCII-Kompatibilit&auml;t. 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>
+<p>Wenn die Methode <code>utf8bom</code> verwendet wird, dann wird dem UTF-8-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist f&uuml;r korrekte um- oder Weiterleitung in der PowerShell notwendig.</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>
+<p>Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_ENC auf <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code> oder <code>utf8</code> ge&auml;ndert werden.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Beachten sie, dass manchmal eine Bin&auml;rdatei f&auml;lschlicherweise als Textdatei erkannt wird. Siehe auch Option <code>-s</code>.</p>
+
<p>Optionale zus&auml;tzliche Schalter k&ouml;nnen gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter k&ouml;nnen hinzugef&uuml;gt werden.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Mit dem Schalter <code>c</code> gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbr&uuml;che enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbr&uuml;chen.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>gibt eine Kopfzeile aus.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>zeigt Dateinamen ohne Pfade an.</p>
+
+</dd>
</dl>
<p>Beispiele:</p>
@@ -364,6 +382,8 @@
<p>&uuml;berspringt Bin&auml;rdateien (Vorgabe).</p>
+<p>Bin&auml;rdateien werden &uuml;bersprungen, damit unerw&uuml;nschtes Fehlverhalten vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher funktioniert. Die &uuml;bergebenen Dateien werden auf Bin&auml;rsymbole &uuml;berpr&uuml;ft, die typischerweise in Textdateien nicht vorkommen. Es ist jedoch m&ouml;glich, dass eine Bin&auml;rdatei ausschlie&szlig;lich gew&ouml;hnliche Textzeichen enth&auml;lt. Eine solche Bin&auml;rdatei wird dann f&auml;lschlicherweise als Textdatei angesehen.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Aus der Standardeingabe lesen und in die Standardausgabe schreiben:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>In der Windows PowerShell k&ouml;nnen Sie folgenden Befehl verwenden:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOKALISIERUNG">LOKALISIERUNG</h1>
<dl>
diff --git a/man/de/man1/dos2unix.pod b/man/de/man1/dos2unix.pod
index 4287b54..35d6d73 100644
--- a/man/de/man1/dos2unix.pod
+++ b/man/de/man1/dos2unix.pod
@@ -56,10 +56,13 @@ wird in das Ziel des symbolischen Links geschrieben. Unter Windows wird das
Schreiben in das Ziel eines symbolischen Links nicht unterstützt.
Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris
-entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version
-ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während
-unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus)
-unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>.
+entwickelt, doch es gibt einen wesentlichen Unterschied zum Original: Diese
+Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus),
+während unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus)
+unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>. Ein weiterer
+Unterschied ist, dass die SunOS/Solaris-Version in der Voreinstellung die
+Umwandlung im I<iso>-Modus vornimmt, während diese Version den
+I<ascii>-Modus verwendet.
=head1 OPTIONEN
@@ -131,7 +134,8 @@ 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.
+I<unicode>, I<unicodebom>, I<utf8> oder <utf8bom> 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
@@ -160,7 +164,7 @@ 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>
+=item B<unicode, unicodebom>
Der Vorteil von Unicode (dem Windows-Namen für UTF-16) ist die üblicherweise
korrekte Textdarstellung. Eine Änderung der aktiven Codepage ist nicht
@@ -175,15 +179,19 @@ 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.
+eine Datei weitergeleitet wird.
-=item B<utf8>
+Wenn die Methode C<unicodebom> verwendet wird, dann wird dem Unicode-Text
+eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist
+für korrekte um- oder Weiterleitung in der PowerShell notwendig.
-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.
+
+
+=item B<utf8, utf8bom>
+
+Der Vorteil von UTF-8 ist die ASCII-Kompatibilität. 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
@@ -193,10 +201,17 @@ Anzeige von Meldungen deutlich flackern.
In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut.
+Wenn die Methode C<utf8bom> verwendet wird, dann wird dem UTF-8-Text eine
+BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist für
+korrekte um- oder Weiterleitung in der PowerShell notwendig.
+
+
+
=back
Die Standardkodierung kann durch Setzen der Umgebungsvariable
-DOS2UNIX_DISPLAY_ENC auf C<unicode> oder C<utf8> geändert werden.
+DOS2UNIX_DISPLAY_ENC auf C<unicode>, C<unicodebom>, C<utf8> oder C<utf8>
+geändert werden.
=item B<-f, --force>
@@ -233,6 +248,9 @@ Beispielausgabe:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei
+erkannt wird. Siehe auch Option C<-s>.
+
Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe
anzupassen. Einer oder mehrere Schalter können hinzugefügt werden.
@@ -266,6 +284,14 @@ Mit dem Schalter C<c> gibt dos2unix nur die Dateien aus, die
DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit
Unix-Zeilenumbrüchen.
+=item B<h>
+
+gibt eine Kopfzeile aus.
+
+=item B<p>
+
+zeigt Dateinamen ohne Pfade an.
+
=back
Beispiele:
@@ -379,6 +405,13 @@ Unix-Zeilenumbrüchen. Siehe auch die Option C<-b>.
überspringt Binärdateien (Vorgabe).
+Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten
+vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher
+funktioniert. Die übergebenen Dateien werden auf Binärsymbole überprüft, die
+typischerweise in Textdateien nicht vorkommen. Es ist jedoch möglich, dass
+eine Binärdatei ausschließlich gewöhnliche Textzeichen enthält. Eine solche
+Binärdatei wird dann fälschlicherweise als Textdatei angesehen.
+
=item B<-u, --keep-utf16>
erhält die originale UTF-16-Kodierung der Eingabedatei. Die Ausgabedatei
@@ -659,8 +692,8 @@ Bytereihenfolge (BOM).
Aus der Standardeingabe lesen und in die Standardausgabe schreiben:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:
@@ -727,6 +760,12 @@ In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:
for /R %G in (*.txt) do dos2unix "%G"
+In der Windows PowerShell können Sie folgenden Befehl verwenden:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 LOKALISIERUNG
=over 4
diff --git a/man/de/man1/dos2unix.txt b/man/de/man1/dos2unix.txt
index 106a65b..ed47f9b 100644
--- a/man/de/man1/dos2unix.txt
+++ b/man/de/man1/dos2unix.txt
@@ -37,11 +37,13 @@ BESCHREIBUNG
unterstützt.
Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris
- entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese
- Version ersetzt per Vorgabe Dateien bei der Umwandlung
+ entwickelt, doch es gibt einen wesentlichen Unterschied zum Original:
+ Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung
(Alte-Datei-Modus), während unter SunOS/Solaris nur die paarweise
Umwandlung (Neue-Datei-Modus) unterstützt wird. Siehe dazu die Optionen
- "-o" und "-n".
+ "-o" und "-n". Ein weiterer Unterschied ist, dass die
+ SunOS/Solaris-Version in der Voreinstellung die Umwandlung im
+ *iso*-Modus vornimmt, während diese Version den *ascii*-Modus verwendet.
OPTIONEN
-- nimmt alle folgenden Optionen als Dateinamen an. Verwenden Sie diese
@@ -96,7 +98,8 @@ OPTIONEN
-D, --display-enc KODIERUNG
legt die Kodierung des angezeigten Texts fest. KODIERUNG kann
- *ansi*, *unicode* oder *utf8* sein, wobei *ansi* die Vorgabe ist.
+ *ansi*, *unicode*, *unicodebom*, *utf8* oder <utf8bom> 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
@@ -123,7 +126,7 @@ OPTIONEN
falsches Zeichen angezeigt. Sofern Sie nicht mit fremden
Dateinamen arbeiten, ist diese Methode in Ordnung.
- unicode
+ unicode, unicodebom
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
@@ -139,15 +142,18 @@ OPTIONEN
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.
+ anderes Programm oder eine Datei weitergeleitet wird.
- 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.
+ Wenn die Methode "unicodebom" verwendet wird, dann wird dem
+ Unicode-Text eine BOM (Markierung der Bytereihenfolge)
+ vorangestellt. Eine BOM ist ist für korrekte um- oder
+ Weiterleitung in der PowerShell notwendig.
+
+ utf8, utf8bom
+ Der Vorteil von UTF-8 ist die ASCII-Kompatibilität. 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
@@ -158,8 +164,14 @@ OPTIONEN
In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut.
+ Wenn die Methode "utf8bom" verwendet wird, dann wird dem
+ UTF-8-Text eine BOM (Markierung der Bytereihenfolge)
+ vorangestellt. Eine BOM ist ist für korrekte um- oder
+ Weiterleitung in der PowerShell notwendig.
+
Die Standardkodierung kann durch Setzen der Umgebungsvariable
- DOS2UNIX_DISPLAY_ENC auf "unicode" oder "utf8" geändert werden.
+ DOS2UNIX_DISPLAY_ENC auf "unicode", "unicodebom", "utf8" oder "utf8"
+ geändert werden.
-f, --force
erzwingt die Umwandlung von Binärdateien.
@@ -192,6 +204,9 @@ OPTIONEN
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als
+ Textdatei erkannt wird. Siehe auch Option "-s".
+
Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe
anzupassen. Einer oder mehrere Schalter können hinzugefügt werden.
@@ -211,6 +226,10 @@ OPTIONEN
DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit
Unix-Zeilenumbrüchen.
+ h gibt eine Kopfzeile aus.
+
+ p zeigt Dateinamen ohne Pfade an.
+
Beispiele:
Informationen zu allen *.txt-Dateien anzeigen:
@@ -314,6 +333,14 @@ OPTIONEN
-s, --safe
überspringt Binärdateien (Vorgabe).
+ Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten
+ vermieden wird. Denken Sie daran, dass die Erkennung nicht 100%
+ sicher funktioniert. Die übergebenen Dateien werden auf Binärsymbole
+ überprüft, die typischerweise in Textdateien nicht vorkommen. Es ist
+ jedoch möglich, dass eine Binärdatei ausschließlich gewöhnliche
+ Textzeichen enthält. Eine solche Binärdatei wird dann
+ fälschlicherweise als Textdatei angesehen.
+
-u, --keep-utf16
erhält die originale UTF-16-Kodierung der Eingabedatei. Die
Ausgabedatei wird in der gleichen UTF-16-Kodierung geschrieben
@@ -573,8 +600,8 @@ GB18030
BEISPIELE
Aus der Standardeingabe lesen und in die Standardausgabe schreiben:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:
@@ -640,6 +667,10 @@ REKURSIVE UMWANDLUNG
for /R %G in (*.txt) do dos2unix "%G"
+ In der Windows PowerShell können Sie folgenden Befehl verwenden:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOKALISIERUNG
LANG
Die primäre Sprache wird durch die Umgebungsvariable LANG
diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1
index 1272850..30df5a9 100644
--- a/man/es/man1/dos2unix.1
+++ b/man/es/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -115,12 +115,13 @@ enlaces simbólicos pueden opcionalmente ser reemplazados, o la salida puede
ser escrita al destino simbólico del enlace. En Windows no está soportada la
escritura a enlaces simbólicos.
.PP
-Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una
-importante diferencia respecto a la versión original SunOS/Solaris. Esta
-versión hace, por defecto, la conversión en el mismo archivo (modo de
-archivo antiguo), mientras que la versión original de SunOS/Solaris sólo es
-compatible con la conversión en archivo emparejado (modo de archivo
-nuevo). Véanse las opciones \f(CW\*(C`\-o\*(C'\fR y \f(CW\*(C`\-n\*(C'\fR.
+Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one
+important difference with the original SunOS/Solaris version. This version
+does by default in-place conversion (old file mode), while the original
+SunOS/Solaris version only supports paired conversion (new file mode). See
+also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. Another difference is that the SunOS/Solaris
+version uses by default \fIiso\fR mode conversion while this version uses by
+default \fIascii\fR mode conversion.
.SH "PARÁMETROS"
.IX Header "PARÁMETROS"
.IP "\fB\-\-\fR" 4
@@ -182,7 +183,7 @@ Establece el modo de conversión, Donde \s-1CONVMODE\s0 puede ser: \fIascii\fR,
.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.
+\&\fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\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
@@ -204,8 +205,8 @@ 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"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
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
@@ -217,13 +218,15 @@ 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
+output is not easy to handle when you redirect it to another program.
+.Sp
+When method \f(CW\*(C`unicodebom\*(C'\fR is used the Unicode text will be preceded with a
+\&\s-1BOM \s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping
+in PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+The advantage of utf8 is that it is compatible with \s-1ASCII.\s0 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
@@ -233,11 +236,16 @@ 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.
+.Sp
+When method \f(CW\*(C`utf8bom\*(C'\fR is used the \s-1UTF\-8\s0 text will be preceded with a \s-1BOM
+\&\s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping in
+PowerShell.
.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.
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR, or
+\&\f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -272,6 +280,9 @@ Ejemplo de salida:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Note that sometimes a binary file can be mistaken for a text file. See also
+option \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Se pueden utilizar marcas extras opcionales para modificar la salida. Se
pueden añadir una o más marcas.
.RS 4
@@ -297,6 +308,12 @@ Muestra sólo los archivos que pueden ser convertidos.
Con la marca \f(CW\*(C`c\*(C'\fR dos2unix sólo mostrará los archivos que contengan saltos
de línea \s-1DOS,\s0 unix2dos sólo mostrará los nombres de archivo que tengan
saltos de línea Unix.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Print a header.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Show file names without path.
.RE
.RS 4
.Sp
@@ -410,6 +427,12 @@ Unix. Vea también la opción \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Ignora los archivos binarios (por defecto).
+.Sp
+The skipping of binary files is done to avoid accidental mistakes. Be aware
+that the detection of binary files is not 100% foolproof. Input files are
+scanned for binary symbols which are typically not found in text files. It
+is possible that a binary file contains only normal text characters. Such a
+binary file will mistakenly be seen as a text file.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Mantiene la codificación original \s-1UTF\-16\s0 en el archivo de entrada. El
@@ -681,8 +704,8 @@ Bytes, como ocurre con los archivos Unicode.
Lee la entrada desde 'stdin' y escribe la salida a 'stdout':
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:
@@ -770,6 +793,12 @@ In a Windows Command Prompt the following command can be used:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+PowerShell users can use the following command in Windows PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "INTERNACIONALIZACIÓN"
.IX Header "INTERNACIONALIZACIÓN"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm
index 163ce50..4c1f94c 100644
--- a/man/es/man1/dos2unix.htm
+++ b/man/es/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Los enlaces simb&oacute;licos y sus destinos no son modificados por defecto. Los enlaces simb&oacute;licos pueden opcionalmente ser reemplazados, o la salida puede ser escrita al destino simb&oacute;lico del enlace. En Windows no est&aacute; soportada la escritura a enlaces simb&oacute;licos.</p>
-<p>Dos2unix fue modelado despu&eacute;s de dos2unix bajo SunOS/Solaris. Hay una importante diferencia respecto a la versi&oacute;n original SunOS/Solaris. Esta versi&oacute;n hace, por defecto, la conversi&oacute;n en el mismo archivo (modo de archivo antiguo), mientras que la versi&oacute;n original de SunOS/Solaris s&oacute;lo es compatible con la conversi&oacute;n en archivo emparejado (modo de archivo nuevo). V&eacute;anse las opciones <code>-o</code> y <code>-n</code>.</p>
+<p>Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options <code>-o</code> and <code>-n</code>. Another difference is that the SunOS/Solaris version uses by default <i>iso</i> mode conversion while this version uses by default <i>ascii</i> mode conversion.</p>
<h1 id="PARMETROS">PAR&Aacute;METROS</h1>
@@ -147,7 +147,7 @@
<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>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, <i>utf8bom</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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</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>
+<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.</p>
+
+<p>When method <code>unicodebom</code> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</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 advantage of utf8 is that it is compatible with ASCII. 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>
+<p>When method <code>utf8bom</code> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</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>
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code>, or <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Note that sometimes a binary file can be mistaken for a text file. See also option <code>-s</code>.</p>
+
<p>Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden a&ntilde;adir una o m&aacute;s marcas.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Con la marca <code>c</code> dos2unix s&oacute;lo mostrar&aacute; los archivos que contengan saltos de l&iacute;nea DOS, unix2dos s&oacute;lo mostrar&aacute; los nombres de archivo que tengan saltos de l&iacute;nea Unix.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Print a header.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Show file names without path.</p>
+
+</dd>
</dl>
<p>Ejemplos:</p>
@@ -364,6 +382,8 @@
<p>Ignora los archivos binarios (por defecto).</p>
+<p>The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Lee la entrada desde &#39;stdin&#39; y escribe la salida a &#39;stdout&#39;:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>PowerShell users can use the following command in Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="INTERNACIONALIZACIN">INTERNACIONALIZACI&Oacute;N</h1>
<dl>
diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod
index d126c80..b10c122 100644
--- a/man/es/man1/dos2unix.pod
+++ b/man/es/man1/dos2unix.pod
@@ -54,12 +54,13 @@ enlaces simbólicos pueden opcionalmente ser reemplazados, o la salida puede
ser escrita al destino simbólico del enlace. En Windows no está soportada la
escritura a enlaces simbólicos.
-Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una
-importante diferencia respecto a la versión original SunOS/Solaris. Esta
-versión hace, por defecto, la conversión en el mismo archivo (modo de
-archivo antiguo), mientras que la versión original de SunOS/Solaris sólo es
-compatible con la conversión en archivo emparejado (modo de archivo
-nuevo). Véanse las opciones C<-o> y C<-n>.
+Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one
+important difference with the original SunOS/Solaris version. This version
+does by default in-place conversion (old file mode), while the original
+SunOS/Solaris version only supports paired conversion (new file mode). See
+also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris
+version uses by default I<iso> mode conversion while this version uses by
+default I<ascii> mode conversion.
=head1 PARÁMETROS
@@ -132,7 +133,7 @@ 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.
+I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> 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
@@ -159,7 +160,7 @@ 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>
+=item B<unicode, unicodebom>
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
@@ -172,14 +173,18 @@ 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.
+output is not easy to handle when you redirect it to another program.
-=item B<utf8>
+When method C<unicodebom> is used the Unicode text will be preceded with a
+BOM (Byte Order Mark). A BOM is required for correct redirection or piping
+in PowerShell.
-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
+
+
+=item B<utf8, utf8bom>
+
+The advantage of utf8 is that it is compatible with ASCII. 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
@@ -190,10 +195,17 @@ messages are displayed.
In a ConEmu console the utf8 encoding method works well.
+When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM
+(Byte Order Mark). A BOM is required for correct redirection or piping in
+PowerShell.
+
+
+
=back
The default encoding can be changed with environment variable
-DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or
+C<utf8bom>.
=item B<-f, --force>
@@ -229,6 +241,9 @@ Ejemplo de salida:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Note that sometimes a binary file can be mistaken for a text file. See also
+option C<-s>.
+
Se pueden utilizar marcas extras opcionales para modificar la salida. Se
pueden añadir una o más marcas.
@@ -262,6 +277,14 @@ 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.
+=item B<h>
+
+Print a header.
+
+=item B<p>
+
+Show file names without path.
+
=back
Ejemplos:
@@ -371,6 +394,12 @@ Unix. Vea también la opción C<-b>.
Ignora los archivos binarios (por defecto).
+The skipping of binary files is done to avoid accidental mistakes. Be aware
+that the detection of binary files is not 100% foolproof. Input files are
+scanned for binary symbols which are typically not found in text files. It
+is possible that a binary file contains only normal text characters. Such a
+binary file will mistakenly be seen as a text file.
+
=item B<-u, --keep-utf16>
Mantiene la codificación original UTF-16 en el archivo de entrada. El
@@ -641,8 +670,8 @@ Bytes, como ocurre con los archivos Unicode.
Lee la entrada desde 'stdin' y escribe la salida a 'stdout':
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:
@@ -707,6 +736,12 @@ In a Windows Command Prompt the following command can be used:
for /R %G in (*.txt) do dos2unix "%G"
+PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 INTERNACIONALIZACIÓN
=over 4
diff --git a/man/es/man1/dos2unix.txt b/man/es/man1/dos2unix.txt
index 72718ea..3d5a378 100644
--- a/man/es/man1/dos2unix.txt
+++ b/man/es/man1/dos2unix.txt
@@ -35,12 +35,13 @@ DESCRIPCIÓN
salida puede ser escrita al destino simbólico del enlace. En Windows no
está soportada la escritura a enlaces simbólicos.
- Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una
- importante diferencia respecto a la versión original SunOS/Solaris. Esta
- versión hace, por defecto, la conversión en el mismo archivo (modo de
- archivo antiguo), mientras que la versión original de SunOS/Solaris sólo
- es compatible con la conversión en archivo emparejado (modo de archivo
- nuevo). Véanse las opciones "-o" y "-n".
+ Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one
+ important difference with the original SunOS/Solaris version. This
+ version does by default in-place conversion (old file mode), while the
+ original SunOS/Solaris version only supports paired conversion (new file
+ mode). See also options "-o" and "-n". Another difference is that the
+ SunOS/Solaris version uses by default *iso* mode conversion while this
+ version uses by default *ascii* mode conversion.
PARÁMETROS
-- Todos los parámetros siguientes son tratados como nombres de
@@ -95,7 +96,8 @@ PARÁMETROS
-D, --display-enc ENCODING
Set encoding of displayed text. Where ENCODING is one of: *ansi*,
- *unicode*, *utf8* with ansi being the default.
+ *unicode*, *unicodebom*, *utf8*, *utf8bom* 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
@@ -119,7 +121,7 @@ PARÁMETROS
symbol instead. When you don't work with foreign file names this
method is OK.
- unicode
+ unicode, unicodebom
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
@@ -133,12 +135,14 @@ PARÁMETROS
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.
+ another program.
- 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
+ When method "unicodebom" is used the Unicode text will be
+ preceded with a BOM (Byte Order Mark). A BOM is required for
+ correct redirection or piping in PowerShell.
+
+ utf8, utf8bom
+ The advantage of utf8 is that it is compatible with ASCII. 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.
@@ -151,8 +155,13 @@ PARÁMETROS
In a ConEmu console the utf8 encoding method works well.
+ When method "utf8bom" is used the UTF-8 text will be preceded
+ with a BOM (Byte Order Mark). A BOM is required for correct
+ redirection or piping in PowerShell.
+
The default encoding can be changed with environment variable
- DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode", "unicodebom",
+ "utf8", or "utf8bom".
-f, --force
Fuerza la conversión de archivos binarios.
@@ -186,6 +195,9 @@ PARÁMETROS
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Note that sometimes a binary file can be mistaken for a text file.
+ See also option "-s".
+
Se pueden utilizar marcas extras opcionales para modificar la
salida. Se pueden añadir una o más marcas.
@@ -205,6 +217,10 @@ PARÁMETROS
contengan saltos de línea DOS, unix2dos sólo mostrará los
nombres de archivo que tengan saltos de línea Unix.
+ h Print a header.
+
+ p Show file names without path.
+
Ejemplos:
Muestra información para todos los archivos *.txt:
@@ -305,6 +321,13 @@ PARÁMETROS
-s, --safe
Ignora los archivos binarios (por defecto).
+ The skipping of binary files is done to avoid accidental mistakes.
+ Be aware that the detection of binary files is not 100% foolproof.
+ Input files are scanned for binary symbols which are typically not
+ found in text files. It is possible that a binary file contains only
+ normal text characters. Such a binary file will mistakenly be seen
+ as a text file.
+
-u, --keep-utf16
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,
@@ -554,8 +577,8 @@ GB18030
EJEMPLOS
Lee la entrada desde 'stdin' y escribe la salida a 'stdout':
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:
@@ -619,6 +642,10 @@ CONVERSIÓN RECURSIVA
for /R %G in (*.txt) do dos2unix "%G"
+ PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
INTERNACIONALIZACIÓN
LANG
El idioma principal se selecciona con la variable de entorno LANG.
diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1
index 5e32603..0e8691d 100644
--- a/man/fr/man1/dos2unix.1
+++ b/man/fr/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -117,9 +117,12 @@ symbolique n'est pas supporté sous Windows.
.PP
Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une
différence importante avec la version originale de SunOS/Solaris. Cette
-version effectue les conversions en place (ancien mode de fichiers) tandis
+version effectue les conversions en place (ancien mode de fichier) tandis
que la version originale de SunOS/Solaris ne supporte que la conversion par
-paire (nouveau mode de fichier). Voyez aussi les options \f(CW\*(C`\-o\*(C'\fR et \f(CW\*(C`\-n\*(C'\fR.
+paire (nouveau mode de fichier). Voyez aussi les options \f(CW\*(C`\-o\*(C'\fR et \f(CW\*(C`\-n\*(C'\fR. Une
+autre différence est que SunOS/Solaris utilise par défaut le mode de
+conversion \fIiso\fR tandis que cette version utilise par défaut le mode de
+conversion \fIascii\fR.
.SH "OPTIONS"
.IX Header "OPTIONS"
.IP "\fB\-\-\fR" 4
@@ -181,7 +184,8 @@ Change le mode de conversion. \s-1MODE_CONV\s0 prend l'une des valeurs: \fIascii
.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.
+\&\fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\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
@@ -205,8 +209,8 @@ 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"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
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
@@ -220,14 +224,16 @@ 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.
+programme.
+.Sp
+Quand la méthode \f(CW\*(C`unicodebom\*(C'\fR est utilisée, le texte Unicode est précédé
+d'une \s-1BOM \s0(Byte Order Mark=marque d'ordre des octets). Une \s-1BOM\s0 est
+nécessaire pour la redirection correcte ou le pipelining dans PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+L'avantage de utf8 est qu'il est compatible avec \s-1ASCII.\s0 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
@@ -237,11 +243,16 @@ Windows configuré pour une région de l'est de l'Asie, vous pouvez observer
affichés.
.Sp
Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+.Sp
+Quand la méthode \f(CW\*(C`utf8bom\*(C'\fR est utilisée, le texte \s-1UTF\-8\s0 est précédé d'une
+\&\s-1BOM \s0(Byte Order Mark=marque d'ordre des octets). Une \s-1BOM\s0 est nécessaire pour
+la redirection correcte ou le pipelining dans PowerShell.
.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
+L'encodage par défaut peut être changé en assignant la valeur \f(CW\*(C`unicode\*(C'\fR,
+\&\f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR ou \f(CW\*(C`utf8bom\*(C'\fR à la variable d'environnement
+\&\s-1DOS2UNIX_DISPLAY_ENC.\s0
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -276,6 +287,9 @@ Exemple de sortie :
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Notez qu'un fichier binaire peut parfois être considéré à tord comme un
+fichier texte. Voyez aussi l'option \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou
plusieurs fanions peuvent être ajoutés.
.RS 4
@@ -301,6 +315,12 @@ Affiche uniquement les fichiers qui seraient convertis.
Avec le fanion \f(CW\*(C`c\*(C'\fR, dos2unix n'affichera que les fichiers contenant des
sauts de ligne \s-1DOS\s0 alors que unix2dos n'affichera que les noms des fichiers
aillant des sauts de ligne Unix.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Afficher un en\-tête.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Montrer les noms des fichiers sans le chemin.
.RE
.RS 4
.Sp
@@ -417,6 +437,14 @@ lignes sont convertis au format Unix. Consultez aussi l'option \f(CW\*(C`\-b\*(C
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Ignore les fichiers binaires (par défaut).
+.Sp
+Ignorer les fichiers binaires sert à éviter les erreurs
+accidentelles. Attention que la détection de fichiers binaires n'est pas
+fiable à 100%. Les fichiers en entrée sont analysés pour y trouver des
+symboles binaires qui ne sont habituellement pas rencontrés dans des
+fichiers textes. Il est cependant possible qu'un fichier binaire ne
+contienne que des caractères textes normaux. Un tel fichier serait
+erronément traité comme un fichier texte.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Conserve l'encodage \s-1UTF\-16\s0 original du fichier d'entrée. Le fichier de
@@ -697,8 +725,8 @@ comme les fichiers Unicode.
Lire l'entrée depuis « stdin » et écrire la sortie vers « stdout » :
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Convertir et remplacer a.txt. Convertir et remplace b.txt :
@@ -787,6 +815,13 @@ 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
.Ve
+.PP
+Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le
+PowerShell de Windows :
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "PARAMÈTRES LINGUISTIQUES"
.IX Header "PARAMÈTRES LINGUISTIQUES"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm
index bd1eb01..a83842b 100644
--- a/man/fr/man1/dos2unix.htm
+++ b/man/fr/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Les liens symboliques et leur cible sont, par d&eacute;faut, inchang&eacute;s. En option, les liens symboliques peuvent &ecirc;tre remplac&eacute;s ou, au choix, la sortie peut &ecirc;tre &eacute;crite dans la cible du lien symbolique. &Eacute;crire dans la cible d&#39;un lien symbolique n&#39;est pas support&eacute; sous Windows.</p>
-<p>Dos2unix a &eacute;t&eacute; con&ccedil;u comme dos2unix sous SunOS/Solaris. Il y a une diff&eacute;rence importante avec la version originale de SunOS/Solaris. Cette version effectue les conversions en place (ancien mode de fichiers) tandis que la version originale de SunOS/Solaris ne supporte que la conversion par paire (nouveau mode de fichier). Voyez aussi les options <code>-o</code> et <code>-n</code>.</p>
+<p>Dos2unix a &eacute;t&eacute; con&ccedil;u comme dos2unix sous SunOS/Solaris. Il y a une diff&eacute;rence importante avec la version originale de SunOS/Solaris. Cette version effectue les conversions en place (ancien mode de fichier) tandis que la version originale de SunOS/Solaris ne supporte que la conversion par paire (nouveau mode de fichier). Voyez aussi les options <code>-o</code> et <code>-n</code>. Une autre diff&eacute;rence est que SunOS/Solaris utilise par d&eacute;faut le mode de conversion <i>iso</i> tandis que cette version utilise par d&eacute;faut le mode de conversion <i>ascii</i>.</p>
<h1 id="OPTIONS">OPTIONS</h1>
@@ -147,7 +147,7 @@
<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>Choisi l&#39;encodage des textes affich&eacute;s. L&#39;ENCODAGE peut &ecirc;tre : <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, <i>utf8bom</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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</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>
+<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.</p>
+
+<p>Quand la m&eacute;thode <code>unicodebom</code> est utilis&eacute;e, le texte Unicode est pr&eacute;c&eacute;d&eacute; d&#39;une BOM (Byte Order Mark=marque d&#39;ordre des octets). Une BOM est n&eacute;cessaire pour la redirection correcte ou le pipelining dans PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</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>L&#39;avantage de utf8 est qu&#39;il est compatible avec ASCII. 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>
+<p>Quand la m&eacute;thode <code>utf8bom</code> est utilis&eacute;e, le texte UTF-8 est pr&eacute;c&eacute;d&eacute; d&#39;une BOM (Byte Order Mark=marque d&#39;ordre des octets). Une BOM est n&eacute;cessaire pour la redirection correcte ou le pipelining dans PowerShell.</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>
+<p>L&#39;encodage par d&eacute;faut peut &ecirc;tre chang&eacute; en assignant la valeur <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code> ou <code>utf8bom</code> &agrave; la variable d&#39;environnement DOS2UNIX_DISPLAY_ENC.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Notez qu&#39;un fichier binaire peut parfois &ecirc;tre consid&eacute;r&eacute; &agrave; tord comme un fichier texte. Voyez aussi l&#39;option <code>-s</code>.</p>
+
<p>Des fanions facultatifs peuvent &ecirc;tre ajout&eacute;s pour changer la sortie. Un ou plusieurs fanions peuvent &ecirc;tre ajout&eacute;s.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Avec le fanion <code>c</code>, dos2unix n&#39;affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n&#39;affichera que les noms des fichiers aillant des sauts de ligne Unix.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Afficher un en-t&ecirc;te.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Montrer les noms des fichiers sans le chemin.</p>
+
+</dd>
</dl>
<p>Exemples:</p>
@@ -364,6 +382,8 @@
<p>Ignore les fichiers binaires (par d&eacute;faut).</p>
+<p>Ignorer les fichiers binaires sert &agrave; &eacute;viter les erreurs accidentelles. Attention que la d&eacute;tection de fichiers binaires n&#39;est pas fiable &agrave; 100%. Les fichiers en entr&eacute;e sont analys&eacute;s pour y trouver des symboles binaires qui ne sont habituellement pas rencontr&eacute;s dans des fichiers textes. Il est cependant possible qu&#39;un fichier binaire ne contienne que des caract&egrave;res textes normaux. Un tel fichier serait erron&eacute;ment trait&eacute; comme un fichier texte.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Lire l&#39;entr&eacute;e depuis <span style="white-space: nowrap;">&laquo; stdin &raquo;</span> et &eacute;crire la sortie vers <span style="white-space: nowrap;">&laquo; stdout &raquo; :</span></p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Convertir et remplacer a.txt. Convertir et remplace b.txt :</p>
@@ -640,6 +660,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;
find /R %G in </code></pre>
+<p>Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le PowerShell de Windows :</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="PARAMTRES-LINGUISTIQUES">PARAM&Egrave;TRES LINGUISTIQUES</h1>
<dl>
diff --git a/man/fr/man1/dos2unix.pod b/man/fr/man1/dos2unix.pod
index 5d7123b..4781fed 100644
--- a/man/fr/man1/dos2unix.pod
+++ b/man/fr/man1/dos2unix.pod
@@ -56,9 +56,12 @@ symbolique n'est pas supporté sous Windows.
Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une
différence importante avec la version originale de SunOS/Solaris. Cette
-version effectue les conversions en place (ancien mode de fichiers) tandis
+version effectue les conversions en place (ancien mode de fichier) tandis
que la version originale de SunOS/Solaris ne supporte que la conversion par
-paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>.
+paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>. Une
+autre différence est que SunOS/Solaris utilise par défaut le mode de
+conversion I<iso> tandis que cette version utilise par défaut le mode de
+conversion I<ascii>.
=head1 OPTIONS
@@ -131,7 +134,8 @@ 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.
+I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>. 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
@@ -160,7 +164,7 @@ 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>
+=item B<unicode, unicodebom>
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
@@ -175,15 +179,19 @@ 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.
+programme.
-=item B<utf8>
+Quand la méthode C<unicodebom> est utilisée, le texte Unicode est précédé
+d'une BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est
+nécessaire pour la redirection correcte ou le pipelining dans PowerShell.
-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>.
+
+
+=item B<utf8, utf8bom>
+
+L'avantage de utf8 est qu'il est compatible avec ASCII. 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
@@ -194,10 +202,17 @@ affichés.
Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+Quand la méthode C<utf8bom> est utilisée, le texte UTF-8 est précédé d'une
+BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est nécessaire pour
+la redirection correcte ou le pipelining dans PowerShell.
+
+
+
=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.
+L'encodage par défaut peut être changé en assignant la valeur C<unicode>,
+C<unicodebom>, C<utf8> ou C<utf8bom> à la variable d'environnement
+DOS2UNIX_DISPLAY_ENC.
=item B<-f, --force>
@@ -233,6 +248,9 @@ Exemple de S<sortie :>
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Notez qu'un fichier binaire peut parfois être considéré à tord comme un
+fichier texte. Voyez aussi l'option C<-s>.
+
Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou
plusieurs fanions peuvent être ajoutés.
@@ -266,6 +284,14 @@ 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.
+=item B<h>
+
+Afficher un en-tête.
+
+=item B<p>
+
+Montrer les noms des fichiers sans le chemin.
+
=back
Exemples:
@@ -378,6 +404,14 @@ lignes sont convertis au format Unix. Consultez aussi l'option C<-b>.
Ignore les fichiers binaires (par défaut).
+Ignorer les fichiers binaires sert à éviter les erreurs
+accidentelles. Attention que la détection de fichiers binaires n'est pas
+fiable à 100%. Les fichiers en entrée sont analysés pour y trouver des
+symboles binaires qui ne sont habituellement pas rencontrés dans des
+fichiers textes. Il est cependant possible qu'un fichier binaire ne
+contienne que des caractères textes normaux. Un tel fichier serait
+erronément traité comme un fichier texte.
+
=item B<-u, --keep-utf16>
Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier de
@@ -657,8 +691,8 @@ comme les fichiers Unicode.
Lire l'entrée depuis S<« stdin »> et écrire la sortie vers S<« stdout » :>
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convertir et remplacer a.txt. Convertir et remplace b.txt :
@@ -725,6 +759,13 @@ En ligne de commande sous Windows, la commande suivante peut être utilisée :
find /R %G in
+Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le
+PowerShell de Windows :
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 PARAMÈTRES LINGUISTIQUES
=over 4
diff --git a/man/fr/man1/dos2unix.txt b/man/fr/man1/dos2unix.txt
index ab35fe3..6d07674 100644
--- a/man/fr/man1/dos2unix.txt
+++ b/man/fr/man1/dos2unix.txt
@@ -36,10 +36,12 @@ DESCRIPTION
Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une
différence importante avec la version originale de SunOS/Solaris. Cette
- version effectue les conversions en place (ancien mode de fichiers)
+ version effectue les conversions en place (ancien mode de fichier)
tandis que la version originale de SunOS/Solaris ne supporte que la
conversion par paire (nouveau mode de fichier). Voyez aussi les options
- "-o" et "-n".
+ "-o" et "-n". Une autre différence est que SunOS/Solaris utilise par
+ défaut le mode de conversion *iso* tandis que cette version utilise par
+ défaut le mode de conversion *ascii*.
OPTIONS
-- Traites toutes les options à sa suite comme étant des noms de
@@ -95,7 +97,8 @@ OPTIONS
-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.
+ *ansi*, *unicode*, *unicodebom*, *utf8*, *utf8bom*. 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
@@ -122,7 +125,7 @@ OPTIONS
place. Cette méthode est acceptable si vous ne travaillez pas
avec des noms de fichiers étrangers.
- unicode
+ unicode, unicodebom
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
@@ -138,15 +141,18 @@ OPTIONS
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.
+ redirigez vers un autre programme.
- 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".
+ Quand la méthode "unicodebom" est utilisée, le texte Unicode est
+ précédé d'une BOM (Byte Order Mark=marque d'ordre des octets).
+ Une BOM est nécessaire pour la redirection correcte ou le
+ pipelining dans PowerShell.
+
+ utf8, utf8bom
+ L'avantage de utf8 est qu'il est compatible avec ASCII. 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
@@ -157,9 +163,14 @@ OPTIONS
Dans une console ConEmu, l'encodage utf8 fonctionne bien.
+ Quand la méthode "utf8bom" est utilisée, le texte UTF-8 est
+ précédé d'une BOM (Byte Order Mark=marque d'ordre des octets).
+ Une BOM est nécessaire pour la redirection correcte ou le
+ pipelining dans PowerShell.
+
L'encodage par défaut peut être changé en assignant la valeur
- "unicode" ou "utf8" à la variable d'environnement
- DOS2UNIX_DISPLAY_ENC.
+ "unicode", "unicodebom", "utf8" ou "utf8bom" à la variable
+ d'environnement DOS2UNIX_DISPLAY_ENC.
-f, --force
Force la conversion de fichiers binaires.
@@ -193,6 +204,9 @@ OPTIONS
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Notez qu'un fichier binaire peut parfois être considéré à tord comme
+ un fichier texte. Voyez aussi l'option "-s".
+
Des fanions facultatifs peuvent être ajoutés pour changer la sortie.
Un ou plusieurs fanions peuvent être ajoutés.
@@ -212,6 +226,10 @@ OPTIONS
contenant des sauts de ligne DOS alors que unix2dos n'affichera
que les noms des fichiers aillant des sauts de ligne Unix.
+ h Afficher un en-tête.
+
+ p Montrer les noms des fichiers sans le chemin.
+
Exemples:
Afficher les informations pour tous les fichier *.txt :
@@ -316,6 +334,14 @@ OPTIONS
-s, --safe
Ignore les fichiers binaires (par défaut).
+ Ignorer les fichiers binaires sert à éviter les erreurs
+ accidentelles. Attention que la détection de fichiers binaires n'est
+ pas fiable à 100%. Les fichiers en entrée sont analysés pour y
+ trouver des symboles binaires qui ne sont habituellement pas
+ rencontrés dans des fichiers textes. Il est cependant possible qu'un
+ fichier binaire ne contienne que des caractères textes normaux. Un
+ tel fichier serait erronément traité comme un fichier texte.
+
-u, --keep-utf16
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
@@ -570,8 +596,8 @@ GB18030
EXEMPLES
Lire l'entrée depuis « stdin » et écrire la sortie vers « stdout » :
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convertir et remplacer a.txt. Convertir et remplace b.txt :
@@ -637,6 +663,11 @@ CONVERSIONS RÉCURSIVES
for /R %G in (*.txt) do dos2unix "%G"
find /R %G in
+ Les utilisateurs de PowerShell peuvent utiliser la commande suivante
+ dans le PowerShell de Windows :
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
PARAMÈTRES LINGUISTIQUES
LANG
La langue principale est sélectionnée par la variable
diff --git a/man/man1/Makefile b/man/man1/Makefile
index 96011fb..940939a 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -3,7 +3,7 @@
# Copyright information
#
# Copyright (C) 2010 Jari Aalto
-# Copyright (C) 2010-2015 Erwin Waterlander
+# Copyright (C) 2010-2016 Erwin Waterlander
#
# License
#
@@ -68,12 +68,13 @@ MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT)
POD2MAN = pod2man
POD2MAN_FLAGS =
-POFILES = $(wildcard ../*/man1/dos2unix.po)
-PODFILES = $(patsubst %.po,%.pod,$(POFILES))
+POFILES = $(wildcard ../../po-man/*.po)
+PODFILES = $(patsubst ../../po-man/%.po,../%/man1/dos2unix.pod,$(POFILES))
MAN_OBJECTS = dos2unix.1 $(patsubst %.pod,%.1,$(PODFILES))
-all: $(MAN_OBJECTS) dos2unix-man.pot
+MKDIR = mkdir
+all: $(MAN_OBJECTS) ../../po-man/dos2unix-man.pot
# Issues:
@@ -85,7 +86,7 @@ all: $(MAN_OBJECTS) dos2unix-man.pot
# Dos2unix 6.0.5: Forget Latin-1, we do now only UTF-8.
-dos2unix-man.pot : dos2unix.pod
+../../po-man/dos2unix-man.pot : dos2unix.pod
po4a-updatepo -f pod -m $< -p $@ --msgmerge-opt --no-wrap
%.po : dos2unix.pod
@@ -95,7 +96,8 @@ dos2unix-man.pot : dos2unix.pod
# Create pod files from po.
# Fix problem that =encoding is before =pod command.
-%.pod : %.po
+../%/man1/dos2unix.pod : ../../po-man/%.po
+ $(MKDIR) -p $(dir $@)
po4a-translate -f pod -m dos2unix.pod -k 70 -p $< > $@
perl -ni.bak -e 'print unless /=encoding UTF-8/' $@
perl -pli.bak -e 's/=pod/=pod\n\n=encoding UTF-8/' $@
@@ -120,7 +122,7 @@ dos2unix.pod : ;
clean:
rm -f $(MAN_OBJECTS)
- rm -f dos2unix-man.pot
+ rm -f ../../po-man/dos2unix-man.pot
rm -f $(PODFILES)
# End of of Makefile part
diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1
index ec28d79..4a83ac2 100644
--- a/man/man1/dos2unix.1
+++ b/man/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-23" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -111,7 +111,9 @@ Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one
important difference with the original SunOS/Solaris version. This version does
by default in-place conversion (old file mode), while the original
SunOS/Solaris version only supports paired conversion (new file mode). See also
-options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR.
+options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. Another difference is that the SunOS/Solaris version
+uses by default \fIiso\fR mode conversion while this version uses by default \fIascii\fR
+mode conversion.
.SH "OPTIONS"
.IX Header "OPTIONS"
.IP "\fB\-\-\fR" 4
@@ -170,7 +172,7 @@ 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
+\&\fIansi\fR, \fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\fR
with ansi being the default.
.Sp
This option is only available in dos2unix for Windows with Unicode
@@ -192,8 +194,8 @@ 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"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
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
@@ -204,12 +206,14 @@ 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
+is not easy to handle when you redirect it to another program.
+.Sp
+When method \f(CW\*(C`unicodebom\*(C'\fR is used the Unicode text will be preceded with a \s-1BOM
+\&\s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping in
+PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+The advantage of utf8 is that it is compatible with \s-1ASCII.\s0 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
@@ -220,11 +224,15 @@ 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.
+.Sp
+When method \f(CW\*(C`utf8bom\*(C'\fR is used the \s-1UTF\-8\s0 text will be preceded with a \s-1BOM
+\&\s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping in
+PowerShell.
.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.
+by setting it to \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR, or \f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -258,6 +266,8 @@ Example output:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Note that sometimes a binary file can be mistaken for a text file. See also option \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Optionally extra flags can be set to change the output. One or more flags
can be added.
.RS 4
@@ -282,6 +292,12 @@ Print only the files that would be converted.
.Sp
With the \f(CW\*(C`c\*(C'\fR flag dos2unix will print only the files that contain \s-1DOS\s0 line breaks,
unix2dos will print only file names that have Unix line breaks.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Print a header.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Show file names without path.
.RE
.RS 4
.Sp
@@ -390,6 +406,12 @@ See also option \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Skip binary files (default).
+.Sp
+The skipping of binary files is done to avoid accidental mistakes. Be aware
+that the detection of binary files is not 100% foolproof. Input files are
+scanned for binary symbols which are typically not found in text files. It is
+possible that a binary file contains only normal text characters. Such a binary
+file will mistakenly be seen as a text file.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Keep the original \s-1UTF\-16\s0 encoding of the input file. The output file will be
@@ -644,8 +666,8 @@ On Windows you need to use option \f(CW\*(C`\-gb\*(C'\fR to convert \s-1UTF\-16\
Read input from 'stdin' and write output to 'stdout':
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Convert and replace a.txt. Convert and replace b.txt:
@@ -731,6 +753,12 @@ In a Windows Command Prompt the following command can be used:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+PowerShell users can use the following command in Windows PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOCALIZATION"
.IX Header "LOCALIZATION"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm
index 14df349..4c53109 100644
--- a/man/man1/dos2unix.htm
+++ b/man/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - DOS/MAC to UNIX and vice versa text file format converter</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows.</p>
-<p>Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options <code>-o</code> and <code>-n</code>.</p>
+<p>Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options <code>-o</code> and <code>-n</code>. Another difference is that the SunOS/Solaris version uses by default <i>iso</i> mode conversion while this version uses by default <i>ascii</i> mode conversion.</p>
<h1 id="OPTIONS">OPTIONS</h1>
@@ -147,7 +147,7 @@
<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>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, <i>utf8bom</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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</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>
+<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.</p>
+
+<p>When method <code>unicodebom</code> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</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 advantage of utf8 is that it is compatible with ASCII. 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>
+<p>When method <code>utf8bom</code> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</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>
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code>, or <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Note that sometimes a binary file can be mistaken for a text file. See also option <code>-s</code>.</p>
+
<p>Optionally extra flags can be set to change the output. One or more flags can be added.</p>
<dl>
@@ -266,6 +272,18 @@
<p>With the <code>c</code> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Print a header.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Show file names without path.</p>
+
+</dd>
</dl>
<p>Examples:</p>
@@ -364,6 +382,8 @@
<p>Skip binary files (default).</p>
+<p>The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Read input from &#39;stdin&#39; and write output to &#39;stdout&#39;:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Convert and replace a.txt. Convert and replace b.txt:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>PowerShell users can use the following command in Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOCALIZATION">LOCALIZATION</h1>
<dl>
diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod
index c0e2a2d..ed9151d 100644
--- a/man/man1/dos2unix.pod
+++ b/man/man1/dos2unix.pod
@@ -1,7 +1,7 @@
/*
# Copyright and License
#
-# Copyright (C) 2009-2015 Erwin Waterlander
+# Copyright (C) 2009-2016 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,9 @@ Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one
important difference with the original SunOS/Solaris version. This version does
by default in-place conversion (old file mode), while the original
SunOS/Solaris version only supports paired conversion (new file mode). See also
-options C<-o> and C<-n>.
+options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version
+uses by default I<iso> mode conversion while this version uses by default I<ascii>
+mode conversion.
=head1 OPTIONS
@@ -155,7 +157,7 @@ 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>
+I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>
with ansi being the default.
This option is only available in dos2unix for Windows with Unicode
@@ -181,7 +183,7 @@ 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>
+=item B<unicode, unicodebom>
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.
@@ -193,13 +195,16 @@ 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.
+is not easy to handle when you redirect it to another program.
-=item B<utf8>
+When method C<unicodebom> is used the Unicode text will be preceded with a BOM
+(Byte Order Mark). A BOM is required for correct redirection or piping in
+PowerShell.
-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
+
+=item B<utf8, utf8bom>
+
+The advantage of utf8 is that it is compatible with ASCII. 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.
@@ -211,10 +216,15 @@ displayed.
In a ConEmu console the utf8 encoding method works well.
+When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM
+(Byte Order Mark). A BOM is required for correct redirection or piping in
+PowerShell.
+
+
=back
The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC
-by setting it to C<unicode> or C<utf8>.
+by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>.
=item B<-f, --force>
@@ -249,6 +259,8 @@ Example output:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>.
+
Optionally extra flags can be set to change the output. One or more flags
can be added.
@@ -281,6 +293,14 @@ Print only the files that would be converted.
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.
+=item B<h>
+
+Print a header.
+
+=item B<p>
+
+Show file names without path.
+
=back
Examples:
@@ -384,6 +404,12 @@ See also option C<-b>.
Skip binary files (default).
+The skipping of binary files is done to avoid accidental mistakes. Be aware
+that the detection of binary files is not 100% foolproof. Input files are
+scanned for binary symbols which are typically not found in text files. It is
+possible that a binary file contains only normal text characters. Such a binary
+file will mistakenly be seen as a text file.
+
=item B<-u, --keep-utf16>
Keep the original UTF-16 encoding of the input file. The output file will be
@@ -637,8 +663,8 @@ GB18030 encoded files can have a Byte Order Mark, like Unicode files.
Read input from 'stdin' and write output to 'stdout':
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convert and replace a.txt. Convert and replace b.txt:
@@ -701,6 +727,11 @@ In a Windows Command Prompt the following command can be used:
for /R %G in (*.txt) do dos2unix "%G"
+PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
=head1 LOCALIZATION
=over 4
diff --git a/man/man1/dos2unix.txt b/man/man1/dos2unix.txt
index 3c07750..3ce9952 100644
--- a/man/man1/dos2unix.txt
+++ b/man/man1/dos2unix.txt
@@ -35,7 +35,9 @@ DESCRIPTION
important difference with the original SunOS/Solaris version. This
version does by default in-place conversion (old file mode), while the
original SunOS/Solaris version only supports paired conversion (new file
- mode). See also options "-o" and "-n".
+ mode). See also options "-o" and "-n". Another difference is that the
+ SunOS/Solaris version uses by default *iso* mode conversion while this
+ version uses by default *ascii* mode conversion.
OPTIONS
-- Treat all following options as file names. Use this option if you
@@ -87,7 +89,8 @@ OPTIONS
-D, --display-enc ENCODING
Set encoding of displayed text. Where ENCODING is one of: *ansi*,
- *unicode*, *utf8* with ansi being the default.
+ *unicode*, *unicodebom*, *utf8*, *utf8bom* 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
@@ -111,7 +114,7 @@ OPTIONS
symbol instead. When you don't work with foreign file names this
method is OK.
- unicode
+ unicode, unicodebom
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
@@ -125,12 +128,14 @@ OPTIONS
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.
+ another program.
- 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
+ When method "unicodebom" is used the Unicode text will be
+ preceded with a BOM (Byte Order Mark). A BOM is required for
+ correct redirection or piping in PowerShell.
+
+ utf8, utf8bom
+ The advantage of utf8 is that it is compatible with ASCII. 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.
@@ -143,8 +148,13 @@ OPTIONS
In a ConEmu console the utf8 encoding method works well.
+ When method "utf8bom" is used the UTF-8 text will be preceded
+ with a BOM (Byte Order Mark). A BOM is required for correct
+ redirection or piping in PowerShell.
+
The default encoding can be changed with environment variable
- DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode", "unicodebom",
+ "utf8", or "utf8bom".
-f, --force
Force conversion of binary files.
@@ -176,6 +186,9 @@ OPTIONS
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Note that sometimes a binary file can be mistaken for a text file.
+ See also option "-s".
+
Optionally extra flags can be set to change the output. One or more
flags can be added.
@@ -195,6 +208,10 @@ OPTIONS
contain DOS line breaks, unix2dos will print only file names
that have Unix line breaks.
+ h Print a header.
+
+ p Show file names without path.
+
Examples:
Show information for all *.txt files:
@@ -288,6 +305,13 @@ OPTIONS
-s, --safe
Skip binary files (default).
+ The skipping of binary files is done to avoid accidental mistakes.
+ Be aware that the detection of binary files is not 100% foolproof.
+ Input files are scanned for binary symbols which are typically not
+ found in text files. It is possible that a binary file contains only
+ normal text characters. Such a binary file will mistakenly be seen
+ as a text file.
+
-u, --keep-utf16
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,
@@ -525,8 +549,8 @@ GB18030
EXAMPLES
Read input from 'stdin' and write output to 'stdout':
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Convert and replace a.txt. Convert and replace b.txt:
@@ -590,6 +614,10 @@ RECURSIVE CONVERSION
for /R %G in (*.txt) do dos2unix "%G"
+ PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOCALIZATION
LANG
The primary language is selected with the environment variable LANG.
diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1
index 2622b80..9ecf630 100644
--- a/man/nl/man1/dos2unix.1
+++ b/man/nl/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -117,11 +117,13 @@ naar het doel van de symbolische koppeling worden geschreven. Op Windows
wordt het schrijven naar het doel van een symbolische koppeling niet
ondersteund.
.PP
-Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is één
+Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is een
belangrijk verschil: deze versie van dos2unix voert standaard een
vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke
SunOS/Solaris\-versie alleen de gepaarde conversie (nieuw-bestand-modus)
-kent. Zie ook de opties \f(CW\*(C`\-o\*(C'\fR en \f(CW\*(C`\-n\*(C'\fR.
+kent. Zie ook de opties \f(CW\*(C`\-o\*(C'\fR en \f(CW\*(C`\-n\*(C'\fR. Een ander verschil is dat de
+SunOS/Solaris\-versie standaard een conversie in \fIiso\fR\-modus doet terwijl
+deze versie standaard \fIascii\fR\-modus gebruikt.
.SH "OPTIES"
.IX Header "OPTIES"
.IP "\fB\-\-\fR" 4
@@ -181,7 +183,8 @@ De te gebruiken conversiemodus. \s-1CONVERSIEMODUS\s0 kan zijn: \fIascii\fR, \f
.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.
+\&\fIansi\fR, \fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, of \fIutf8bom\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
@@ -204,8 +207,8 @@ 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"
+.IP "\fBunicode\fR, \fBunicodebom\fR" 4
+.IX Item "unicode, unicodebom"
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
@@ -217,13 +220,15 @@ 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
+output is not easy to handle when you redirect it to another program.
+.Sp
+When method \f(CW\*(C`unicodebom\*(C'\fR is used the Unicode text will be preceded with a
+\&\s-1BOM \s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping
+in PowerShell.
+.IP "\fButf8\fR, \fButf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+The advantage of utf8 is that it is compatible with \s-1ASCII.\s0 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
@@ -233,11 +238,16 @@ 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.
+.Sp
+When method \f(CW\*(C`utf8bom\*(C'\fR is used the \s-1UTF\-8\s0 text will be preceded with a \s-1BOM
+\&\s0(Byte Order Mark). A \s-1BOM\s0 is required for correct redirection or piping in
+PowerShell.
.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.
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR, or
+\&\f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f\fR, \fB\-\-force\fR" 4
.IX Item "-f, --force"
@@ -272,6 +282,9 @@ Voorbeelduitvoer:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Merk op dat een binair bestand soms voor een tekstbestand aangezien kan
+worden. Zie ook optie \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te
beperken.
.RS 4
@@ -296,6 +309,12 @@ Alleen de namen tonen van de bestanden die geconverteerd zouden worden.
.Sp
Met de vlag \f(CW\*(C`c\*(C'\fR toont dos2unix alleen de bestanden die DOS-regeleindes
bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Een kopregel printen.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Bestandsnamen tonen zonder pad.
.RE
.RS 4
.Sp
@@ -409,6 +428,13 @@ Unix. Zie ook optie \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s\fR, \fB\-\-safe\fR" 4
.IX Item "-s, --safe"
Binaire bestanden overslaan (standaard).
+.Sp
+Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het
+detecteren van binaire bestanden is echter niet 100% betrouwbaar.
+Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in
+tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel
+normale teksttekens bevat. Zo'n binair bestand zal dan foutief als een
+tekstbestand gezien worden.
.IP "\fB\-u\fR, \fB\-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
De originele UTF\-16\-codering van het invoerbestand behouden. Het
@@ -680,8 +706,8 @@ Unicode-bestanden.
Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:
@@ -769,6 +795,12 @@ In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+PowerShell users can use the following command in Windows PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOKALISATIE"
.IX Header "LOKALISATIE"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm
index fb6c152..13b45b7 100644
--- a/man/nl/man1/dos2unix.htm
+++ b/man/nl/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Symbolische koppelingen en hun doelen blijven standaard onaangeroerd. Optioneel kunnen symbolische koppelingen worden vervangen, of de uitvoer kan naar het doel van de symbolische koppeling worden geschreven. Op Windows wordt het schrijven naar het doel van een symbolische koppeling niet ondersteund.</p>
-<p>Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is &eacute;&eacute;n belangrijk verschil: deze versie van dos2unix voert standaard een vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus) kent. Zie ook de opties <code>-o</code> en <code>-n</code>.</p>
+<p>Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is een belangrijk verschil: deze versie van dos2unix voert standaard een vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus) kent. Zie ook de opties <code>-o</code> en <code>-n</code>. Een ander verschil is dat de SunOS/Solaris-versie standaard een conversie in <i>iso</i>-modus doet terwijl deze versie standaard <i>ascii</i>-modus gebruikt.</p>
<h1 id="OPTIES">OPTIES</h1>
@@ -147,7 +147,7 @@
<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>De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn: <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, of <i>utf8bom</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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode</b>, <b>unicodebom</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>
+<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.</p>
+
+<p>When method <code>unicodebom</code> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8</b>, <b>utf8bom</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 advantage of utf8 is that it is compatible with ASCII. 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>
+<p>When method <code>utf8bom</code> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell.</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>
+<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code>, or <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f</b>, <b>--force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie <code>-s</code>.</p>
+
<p>Bij de optie kunnen &eacute;&eacute;n of meer vlaggen meegegeven worden om de uitvoer te beperken.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Met de vlag <code>c</code> toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Een kopregel printen.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Bestandsnamen tonen zonder pad.</p>
+
+</dd>
</dl>
<p>Voorbeelden:</p>
@@ -364,6 +382,8 @@
<p>Binaire bestanden overslaan (standaard).</p>
+<p>Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het detecteren van binaire bestanden is echter niet 100% betrouwbaar. Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel normale teksttekens bevat. Zo&#39;n binair bestand zal dan foutief als een tekstbestand gezien worden.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u</b>, <b>--keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>PowerShell users can use the following command in Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOKALISATIE">LOKALISATIE</h1>
<dl>
diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod
index 5c4290c..9e6e62d 100644
--- a/man/nl/man1/dos2unix.pod
+++ b/man/nl/man1/dos2unix.pod
@@ -56,11 +56,13 @@ naar het doel van de symbolische koppeling worden geschreven. Op Windows
wordt het schrijven naar het doel van een symbolische koppeling niet
ondersteund.
-Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is één
+Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is een
belangrijk verschil: deze versie van dos2unix voert standaard een
vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke
SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus)
-kent. Zie ook de opties C<-o> en C<-n>.
+kent. Zie ook de opties C<-o> en C<-n>. Een ander verschil is dat de
+SunOS/Solaris-versie standaard een conversie in I<iso>-modus doet terwijl
+deze versie standaard I<ascii>-modus gebruikt.
=head1 OPTIES
@@ -131,7 +133,8 @@ 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.
+I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, of I<utf8bom>, 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
@@ -159,7 +162,7 @@ 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>
+=item B<unicode>, B<unicodebom>
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
@@ -172,14 +175,18 @@ 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.
+output is not easy to handle when you redirect it to another program.
-=item B<utf8>
+When method C<unicodebom> is used the Unicode text will be preceded with a
+BOM (Byte Order Mark). A BOM is required for correct redirection or piping
+in PowerShell.
-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
+
+
+=item B<utf8>, B<utf8bom>
+
+The advantage of utf8 is that it is compatible with ASCII. 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
@@ -190,10 +197,17 @@ messages are displayed.
In a ConEmu console the utf8 encoding method works well.
+When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM
+(Byte Order Mark). A BOM is required for correct redirection or piping in
+PowerShell.
+
+
+
=back
The default encoding can be changed with environment variable
-DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or
+C<utf8bom>.
=item B<-f>, B<--force>
@@ -229,6 +243,9 @@ Voorbeelduitvoer:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Merk op dat een binair bestand soms voor een tekstbestand aangezien kan
+worden. Zie ook optie C<-s>.
+
Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te
beperken.
@@ -261,6 +278,14 @@ Alleen de namen tonen van de bestanden die geconverteerd zouden worden.
Met de vlag C<c> toont dos2unix alleen de bestanden die DOS-regeleindes
bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten.
+=item B<h>
+
+Een kopregel printen.
+
+=item B<p>
+
+Bestandsnamen tonen zonder pad.
+
=back
Voorbeelden:
@@ -370,6 +395,13 @@ Unix. Zie ook optie C<-b>.
Binaire bestanden overslaan (standaard).
+Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het
+detecteren van binaire bestanden is echter niet 100% betrouwbaar.
+Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in
+tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel
+normale teksttekens bevat. Zo'n binair bestand zal dan foutief als een
+tekstbestand gezien worden.
+
=item B<-u>, B<--keep-utf16>
De originele UTF-16-codering van het invoerbestand behouden. Het
@@ -640,8 +672,8 @@ Unicode-bestanden.
Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:
@@ -706,6 +738,12 @@ In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:
for /R %G in (*.txt) do dos2unix "%G"
+PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 LOKALISATIE
=over 4
diff --git a/man/nl/man1/dos2unix.txt b/man/nl/man1/dos2unix.txt
index 2d02130..45aa224 100644
--- a/man/nl/man1/dos2unix.txt
+++ b/man/nl/man1/dos2unix.txt
@@ -36,11 +36,13 @@ BESCHRIJVING
Windows wordt het schrijven naar het doel van een symbolische koppeling
niet ondersteund.
- Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is één
+ Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is een
belangrijk verschil: deze versie van dos2unix voert standaard een
vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke
SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus)
- kent. Zie ook de opties "-o" en "-n".
+ kent. Zie ook de opties "-o" en "-n". Een ander verschil is dat de
+ SunOS/Solaris-versie standaard een conversie in *iso*-modus doet terwijl
+ deze versie standaard *ascii*-modus gebruikt.
OPTIES
-- Alle volgende opties als bestandsnamen behandelen. Gebruik deze
@@ -93,8 +95,8 @@ OPTIES
-D, --display-enc CODERING
De te gebruiken tekencodering voor weergegeven tekst. CODERING kan
- zijn: *ansii*, *unicode*, of *utf8*, waarbij ansi de
- standaardinstelling is.
+ zijn: *ansi*, *unicode*, *unicodebom*, *utf8*, of *utf8bom*, waarbij
+ ansi de standaardinstelling is.
Deze optie is alleen beschikbaar in dos2unix voor Windows met
Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op
@@ -119,7 +121,7 @@ OPTIES
symbol instead. When you don't work with foreign file names this
method is OK.
- unicode
+ unicode, unicodebom
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
@@ -133,12 +135,14 @@ OPTIES
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.
+ another program.
- 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
+ When method "unicodebom" is used the Unicode text will be
+ preceded with a BOM (Byte Order Mark). A BOM is required for
+ correct redirection or piping in PowerShell.
+
+ utf8, utf8bom
+ The advantage of utf8 is that it is compatible with ASCII. 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.
@@ -151,8 +155,13 @@ OPTIES
In a ConEmu console the utf8 encoding method works well.
+ When method "utf8bom" is used the UTF-8 text will be preceded
+ with a BOM (Byte Order Mark). A BOM is required for correct
+ redirection or piping in PowerShell.
+
The default encoding can be changed with environment variable
- DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+ DOS2UNIX_DISPLAY_ENC by setting it to "unicode", "unicodebom",
+ "utf8", or "utf8bom".
-f, --force
Conversie van binaire bestanden afdwingen.
@@ -185,6 +194,9 @@ OPTIES
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Merk op dat een binair bestand soms voor een tekstbestand aangezien
+ kan worden. Zie ook optie "-s".
+
Bij de optie kunnen één of meer vlaggen meegegeven worden om de
uitvoer te beperken.
@@ -205,6 +217,10 @@ OPTIES
DOS-regeleindes bevatten, en unix2dos alleen de bestanden die
Unix-regeleindes bevatten.
+ h Een kopregel printen.
+
+ p Bestandsnamen tonen zonder pad.
+
Voorbeelden:
Informatie weergeven voor alle bestanden met de extensie 'txt':
@@ -304,6 +320,13 @@ OPTIES
-s, --safe
Binaire bestanden overslaan (standaard).
+ Binaire bestanden worden overgeslagen om vergissingen te voorkomen.
+ Het detecteren van binaire bestanden is echter niet 100%
+ betrouwbaar. Invoerbestanden worden gescand op binaire tekens die
+ gewoonlijk niet in tekstbestanden voorkomen. Maar het is mogelijk
+ dat een binair bestand enkel normale teksttekens bevat. Zo'n binair
+ bestand zal dan foutief als een tekstbestand gezien worden.
+
-u, --keep-utf16
De originele UTF-16-codering van het invoerbestand behouden. Het
uitvoerbestand wordt in dezelfde UTF-16-codering (little endian of
@@ -553,8 +576,8 @@ VOORBEELDEN
Invoer lezen van standaardinvoer en uitvoer schrijven naar
standaarduitvoer:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:
@@ -620,6 +643,10 @@ RECURSIEVE CONVERSIE
for /R %G in (*.txt) do dos2unix "%G"
+ PowerShell users can use the following command in Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOKALISATIE
LANG
De primaire taal wordt geselecteerd via de omgevingsvariabele LANG.
diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1
index e2b0dc5..de962a7 100644
--- a/man/pl/man1/dos2unix.1
+++ b/man/pl/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -117,7 +117,9 @@ Dos2unix powstał na podstawie narzędzia dos2unix z systemu
SunOS/Solaris. Jest jedna istotna różnica w stosunku do oryginalnej wersji z
SunOS\-a/Solarisa: ta wersja domyślnie wykonuje konwersję w miejscu (tryb
starego pliku), podczas gdy oryginalna obsługiwała tylko konwersję parami
-(tryb nowego pliku) \- p. także opcje \f(CW\*(C`\-o\*(C'\fR i \f(CW\*(C`\-n\*(C'\fR.
+(tryb nowego pliku) \- p. także opcje \f(CW\*(C`\-o\*(C'\fR i \f(CW\*(C`\-n\*(C'\fR. Ponadto wersja z
+SunOS\-a/Solarisa domyślnie wykonuje konwersję w trybie \fIiso\fR, podczas gdy
+ta wersja domyślnie wykonuje konwersję w trybie \fIascii\fR.
.SH "OPCJE"
.IX Header "OPCJE"
.IP "\fB\-\-\fR" 4
@@ -177,7 +179,7 @@ Ustawienie trybu konwersji. \s-1TRYB_KONW\s0 to jeden z: \fIascii\fR, \fI7bit\fR
.IP "\fB\-D, \-\-display\-enc \s-1KODOWANIE\s0\fR" 4
.IX Item "-D, --display-enc KODOWANIE"
Ustawienie kodowania wyświetlanego tekstu. \s-1KODOWANIE\s0 to jedno z: \fIansi\fR,
-\&\fIunicode\fR, \fIutf8\fR, przy czym domyślne to ansi.
+\&\fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\fR, przy czym domyślne to ansi.
.Sp
Ta opcja jest dostępna wyłączenie w programie dos2unix dla Windows z obsługą
nazw plików Unicode. Nie ma wpływu na same nawy odczytywanych i zapisywanych
@@ -200,8 +202,8 @@ spoza domyślnej systemowej strony kodowej nie są wyświetlane
właściwie. Można zamiast tego zobaczyć znak zapytania albo niewłaściwy
symbol. Jeżeli nie pracujemy z obcymi nazwami plików, ta metoda jest
poprawna.
-.IP "\fBunicode\fR" 4
-.IX Item "unicode"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
Zaletą kodowania unicode (windowsową nazwą dla \s-1UTF\-16\s0) jest (zwykle)
właściwe wyświetlanie tekstu. Nie ma potrzeby zmiany aktywnej strony
kodowej. Może być potrzeba zmiany fontu konsoli na font TrueType, aby znaki
@@ -213,12 +215,14 @@ W przypadku używania konsoli ConEmu cały tekst jest wyświetlany poprawnie,
ponieważ ConEmu automatycznie wybiera dobry font.
.Sp
Wadą kodowania unicode jest niezgodność z \s-1ASCII.\s0 Wyjście nie jest łatwe do
-obsłużenia w przypadku przekierowania do innego programu lub
-pliku. Przekierowanie do pliku nie generuje poprawnego pliku w \s-1UTF\-16.\s0
-.IP "\fButf8\fR" 4
-.IX Item "utf8"
-Zaletą kodowania utf8 jest zgodność z \s-1ASCII\s0; kiedy przekierowuje się wyjście
-do pliku, uzyskuje się właściwy plik w \s-1UTF\-8.\s0 Trzeba ustawić font konsoli na
+obsłużenia w przypadku przekierowania do innego programu lub pliku.
+.Sp
+W przypadku użycia metody \f(CW\*(C`unicodebom\*(C'\fR, tekst w unikodzie jest poprzedzony
+znakiem \s-1BOM \s0(Byte Order Mark). \s-1BOM\s0 jest wymagany do poprawnego
+przekierowania lub przekazywania przez potok w powłoce PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+Zaletą kodowania utf8 jest zgodność z \s-1ASCII.\s0 Trzeba ustawić font konsoli na
font TrueType. Przy użyciu fontu TrueType tekst jest wyświetlany podobnie do
kodowania \f(CW\*(C`unicode\*(C'\fR.
.Sp
@@ -229,11 +233,16 @@ Windows skonfigurowanym dla rejonu Azji Wschodniej widać dużo migotania
konsoli w trakcie wyświetlania komunikatów.
.Sp
W konsoli ConEmu metoda kodowania utf8 działa dobrze.
+.Sp
+W przypadku użycia metody \f(CW\*(C`utf8bom\*(C'\fR, tekst w \s-1UTF\-8\s0 jest poprzedzony znakiem
+\&\s-1BOM \s0(Byte Order Mark). \s-1BOM\s0 jest wymagany do poprawnego przekierowania lub
+przekazywania przez potok w powłoce PowerShell.
.RE
.RS 4
.Sp
Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej
-\&\s-1DOS2UNIX_DISPLAY_ENC,\s0 ustawiając ją na \f(CW\*(C`unicode\*(C'\fR lub \f(CW\*(C`utf8\*(C'\fR.
+\&\s-1DOS2UNIX_DISPLAY_ENC,\s0 ustawiając ją na \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR
+lub \f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -268,6 +277,9 @@ Przykładowe wyjście:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Uwaga: czasami plik binarny może być błędnie rozpoznany jako
+tekstowy. P. także opcja \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać
jedną lub więcej flag.
.RS 4
@@ -292,6 +304,12 @@ Wypisanie tylko plików, które zostałyby przekonwertowane.
.Sp
Z flagą \f(CW\*(C`c\*(C'\fR dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a
unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Wypisanie nagłówka.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Wyświetlanie nazw plików bez ścieżki.
.RE
.RS 4
.Sp
@@ -404,6 +422,13 @@ linii. P. także opcja \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Pominięcie plików binarnych (domyślne).
+.Sp
+Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym
+błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne na
+błędy. Pliki wejściowe są przeszukiwane pod kątem symboli binarnych, które
+zwykle nie występują w plikach tekstowych. Może się zdarzyć, że plik binarny
+zawiera tylko zwykłe znaki tekstowe. Taki plik binarny będzie błędnie
+widziany jako plik tekstowy.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Zachowanie oryginalnego kodowania pliku wejściowego \s-1UTF\-16.\s0 Plik wyjściowy
@@ -674,8 +699,8 @@ Unicode.
Odczyt ze standardowego wejścia i zapis na standardowe wyjście:
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:
@@ -763,6 +788,13 @@ Z poziomu linii poleceń Windows można użyć następującego polecenia:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w Windows
+PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOKALIZACJA"
.IX Header "LOKALIZACJA"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm
index b005f3f..787e964 100644
--- a/man/pl/man1/dos2unix.htm
+++ b/man/pl/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>Dowi&#x105;zania symboliczne i ich cele s&#x105; domy&#x15B;lnie pozostawiane bez zmian. Dowi&#x105;zania symboliczne mog&#x105; by&#x107; opcjonalnie zast&#x119;powane, albo wyj&#x15B;cie mo&#x17C;e by&#x107; zapisywane do celu dowi&#x105;zania. Zapis do celu dowi&#x105;zania symbolicznego nie jest obs&#x142;ugiwane pod Windows.</p>
-<p>Dos2unix powsta&#x142; na podstawie narz&#x119;dzia dos2unix z systemu SunOS/Solaris. Jest jedna istotna r&oacute;&#x17C;nica w stosunku do oryginalnej wersji z SunOS-a/Solarisa: ta wersja domy&#x15B;lnie wykonuje konwersj&#x119; w miejscu (tryb starego pliku), podczas gdy oryginalna obs&#x142;ugiwa&#x142;a tylko konwersj&#x119; parami (tryb nowego pliku) - p. tak&#x17C;e opcje <code>-o</code> i <code>-n</code>.</p>
+<p>Dos2unix powsta&#x142; na podstawie narz&#x119;dzia dos2unix z systemu SunOS/Solaris. Jest jedna istotna r&oacute;&#x17C;nica w stosunku do oryginalnej wersji z SunOS-a/Solarisa: ta wersja domy&#x15B;lnie wykonuje konwersj&#x119; w miejscu (tryb starego pliku), podczas gdy oryginalna obs&#x142;ugiwa&#x142;a tylko konwersj&#x119; parami (tryb nowego pliku) - p. tak&#x17C;e opcje <code>-o</code> i <code>-n</code>. Ponadto wersja z SunOS-a/Solarisa domy&#x15B;lnie wykonuje konwersj&#x119; w trybie <i>iso</i>, podczas gdy ta wersja domy&#x15B;lnie wykonuje konwersj&#x119; w trybie <i>ascii</i>.</p>
<h1 id="OPCJE">OPCJE</h1>
@@ -147,7 +147,7 @@
<dt id="D---display-enc-KODOWANIE"><b>-D, --display-enc KODOWANIE</b></dt>
<dd>
-<p>Ustawienie kodowania wy&#x15B;wietlanego tekstu. KODOWANIE to jedno z: <i>ansi</i>, <i>unicode</i>, <i>utf8</i>, przy czym domy&#x15B;lne to ansi.</p>
+<p>Ustawienie kodowania wy&#x15B;wietlanego tekstu. KODOWANIE to jedno z: <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, <i>utf8bom</i>, przy czym domy&#x15B;lne to ansi.</p>
<p>Ta opcja jest dost&#x119;pna wy&#x142;&#x105;czenie w programie dos2unix dla Windows z obs&#x142;ug&#x105; nazw plik&oacute;w Unicode. Nie ma wp&#x142;ywu na same nawy odczytywanych i zapisywanych plik&oacute;w, a jedynie na spos&oacute;b ich wy&#x15B;wietlania.</p>
@@ -163,29 +163,33 @@
<p>Wad&#x105; kodowania ansi jest fakt, &#x17C;e mi&#x119;dzynarodowe nazwy plik&oacute;w ze znakami spoza domy&#x15B;lnej systemowej strony kodowej nie s&#x105; wy&#x15B;wietlane w&#x142;a&#x15B;ciwie. Mo&#x17C;na zamiast tego zobaczy&#x107; znak zapytania albo niew&#x142;a&#x15B;ciwy symbol. Je&#x17C;eli nie pracujemy z obcymi nazwami plik&oacute;w, ta metoda jest poprawna.</p>
</dd>
-<dt id="unicode"><b>unicode</b></dt>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</b></dt>
<dd>
<p>Zalet&#x105; kodowania unicode (windowsow&#x105; nazw&#x105; dla UTF-16) jest (zwykle) w&#x142;a&#x15B;ciwe wy&#x15B;wietlanie tekstu. Nie ma potrzeby zmiany aktywnej strony kodowej. Mo&#x17C;e by&#x107; potrzeba zmiany fontu konsoli na font TrueType, aby znaki mi&#x119;dzynarodowe by&#x142;y wy&#x15B;wietlane poprawnie. Je&#x15B;li znak nie jest obecny w foncie TrueType, zwykle wida&#x107; ma&#x142;y kwadrat, czasami ze znakiem zapytania w &#x15B;rodku.</p>
<p>W przypadku u&#x17C;ywania konsoli ConEmu ca&#x142;y tekst jest wy&#x15B;wietlany poprawnie, poniewa&#x17C; ConEmu automatycznie wybiera dobry font.</p>
-<p>Wad&#x105; kodowania unicode jest niezgodno&#x15B;&#x107; z ASCII. Wyj&#x15B;cie nie jest &#x142;atwe do obs&#x142;u&#x17C;enia w przypadku przekierowania do innego programu lub pliku. Przekierowanie do pliku nie generuje poprawnego pliku w UTF-16.</p>
+<p>Wad&#x105; kodowania unicode jest niezgodno&#x15B;&#x107; z ASCII. Wyj&#x15B;cie nie jest &#x142;atwe do obs&#x142;u&#x17C;enia w przypadku przekierowania do innego programu lub pliku.</p>
+
+<p>W przypadku u&#x17C;ycia metody <code>unicodebom</code>, tekst w unikodzie jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w pow&#x142;oce PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</b></dt>
<dd>
-<p>Zalet&#x105; kodowania utf8 jest zgodno&#x15B;&#x107; z ASCII; kiedy przekierowuje si&#x119; wyj&#x15B;cie do pliku, uzyskuje si&#x119; w&#x142;a&#x15B;ciwy plik w UTF-8. Trzeba ustawi&#x107; font konsoli na font TrueType. Przy u&#x17C;yciu fontu TrueType tekst jest wy&#x15B;wietlany podobnie do kodowania <code>unicode</code>.</p>
+<p>Zalet&#x105; kodowania utf8 jest zgodno&#x15B;&#x107; z ASCII. Trzeba ustawi&#x107; font konsoli na font TrueType. Przy u&#x17C;yciu fontu TrueType tekst jest wy&#x15B;wietlany podobnie do kodowania <code>unicode</code>.</p>
<p>Wad&#x105; jest fakt, &#x17C;e w przypadku u&#x17C;ywania domy&#x15B;lnego fontu rastrowego, wszystkie znaki spoza ASCII s&#x105; wy&#x15B;wietlane niepoprawnie. Nie tylko unikodowe nazwy plik&oacute;w, ale tak&#x17C;e przet&#x142;umaczone komunikaty staj&#x105; si&#x119; nieczytelne. W Windows skonfigurowanym dla rejonu Azji Wschodniej wida&#x107; du&#x17C;o migotania konsoli w trakcie wy&#x15B;wietlania komunikat&oacute;w.</p>
<p>W konsoli ConEmu metoda kodowania utf8 dzia&#x142;a dobrze.</p>
+<p>W przypadku u&#x17C;ycia metody <code>utf8bom</code>, tekst w UTF-8 jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w pow&#x142;oce PowerShell.</p>
+
</dd>
</dl>
-<p>Domy&#x15B;lne kodowanie mo&#x17C;na zmieni&#x107; przy u&#x17C;yciu zmiennej &#x15B;rodowiskowej DOS2UNIX_DISPLAY_ENC, ustawiaj&#x105;c j&#x105; na <code>unicode</code> lub <code>utf8</code>.</p>
+<p>Domy&#x15B;lne kodowanie mo&#x17C;na zmieni&#x107; przy u&#x17C;yciu zmiennej &#x15B;rodowiskowej DOS2UNIX_DISPLAY_ENC, ustawiaj&#x105;c j&#x105; na <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code> lub <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Uwaga: czasami plik binarny mo&#x17C;e by&#x107; b&#x142;&#x119;dnie rozpoznany jako tekstowy. P. tak&#x17C;e opcja <code>-s</code>.</p>
+
<p>Opcjonalnie mo&#x17C;na ustawi&#x107; dodatkowe flagi, aby zmieni&#x107; wyj&#x15B;cie. Mo&#x17C;na doda&#x107; jedn&#x105; lub wi&#x119;cej flag.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Z flag&#x105; <code>c</code> dos2unix wypisze tylko pliki zawieraj&#x105;ce DOS-owe ko&#x144;ce linii, a unix2dos wypisze tylko nazwy plik&oacute;w zawieraj&#x105;cych uniksowe ko&#x144;ce linii.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Wypisanie nag&#x142;&oacute;wka.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Wy&#x15B;wietlanie nazw plik&oacute;w bez &#x15B;cie&#x17C;ki.</p>
+
+</dd>
</dl>
<p>Przyk&#x142;ady:</p>
@@ -364,6 +382,8 @@
<p>Pomini&#x119;cie plik&oacute;w binarnych (domy&#x15B;lne).</p>
+<p>Pomijanie plik&oacute;w binarnych ma na celu zapobie&#x17C;enie przypadkowym b&#x142;&#x119;dom. Uwaga: wykrywanie plik&oacute;w binarnych nie jest w 100% odporne na b&#x142;&#x119;dy. Pliki wej&#x15B;ciowe s&#x105; przeszukiwane pod k&#x105;tem symboli binarnych, kt&oacute;re zwykle nie wyst&#x119;puj&#x105; w plikach tekstowych. Mo&#x17C;e si&#x119; zdarzy&#x107;, &#x17C;e plik binarny zawiera tylko zwyk&#x142;e znaki tekstowe. Taki plik binarny b&#x119;dzie b&#x142;&#x119;dnie widziany jako plik tekstowy.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>Odczyt ze standardowego wej&#x15B;cia i zapis na standardowe wyj&#x15B;cie:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Konwersja i zast&#x105;pienie a.txt; konwersja i zast&#x105;pienie b.txt:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>U&#x17C;ytkownicy pow&#x142;oki PowerShell mog&#x105; u&#x17C;y&#x107; nast&#x119;puj&#x105;cego polecenia w Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOKALIZACJA">LOKALIZACJA</h1>
<dl>
diff --git a/man/pl/man1/dos2unix.pod b/man/pl/man1/dos2unix.pod
index b597c74..cea66b6 100644
--- a/man/pl/man1/dos2unix.pod
+++ b/man/pl/man1/dos2unix.pod
@@ -56,7 +56,9 @@ Dos2unix powstał na podstawie narzędzia dos2unix z systemu
SunOS/Solaris. Jest jedna istotna różnica w stosunku do oryginalnej wersji z
SunOS-a/Solarisa: ta wersja domyślnie wykonuje konwersję w miejscu (tryb
starego pliku), podczas gdy oryginalna obsługiwała tylko konwersję parami
-(tryb nowego pliku) - p. także opcje C<-o> i C<-n>.
+(tryb nowego pliku) - p. także opcje C<-o> i C<-n>. Ponadto wersja z
+SunOS-a/Solarisa domyślnie wykonuje konwersję w trybie I<iso>, podczas gdy
+ta wersja domyślnie wykonuje konwersję w trybie I<ascii>.
=head1 OPCJE
@@ -127,7 +129,7 @@ I<mac>, przy czym domyślny jest ascii.
=item B<-D, --display-enc KODOWANIE>
Ustawienie kodowania wyświetlanego tekstu. KODOWANIE to jedno z: I<ansi>,
-I<unicode>, I<utf8>, przy czym domyślne to ansi.
+I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, przy czym domyślne to ansi.
Ta opcja jest dostępna wyłączenie w programie dos2unix dla Windows z obsługą
nazw plików Unicode. Nie ma wpływu na same nawy odczytywanych i zapisywanych
@@ -155,7 +157,7 @@ właściwie. Można zamiast tego zobaczyć znak zapytania albo niewłaściwy
symbol. Jeżeli nie pracujemy z obcymi nazwami plików, ta metoda jest
poprawna.
-=item B<unicode>
+=item B<unicode, unicodebom>
Zaletą kodowania unicode (windowsową nazwą dla UTF-16) jest (zwykle)
właściwe wyświetlanie tekstu. Nie ma potrzeby zmiany aktywnej strony
@@ -168,13 +170,17 @@ W przypadku używania konsoli ConEmu cały tekst jest wyświetlany poprawnie,
ponieważ ConEmu automatycznie wybiera dobry font.
Wadą kodowania unicode jest niezgodność z ASCII. Wyjście nie jest łatwe do
-obsłużenia w przypadku przekierowania do innego programu lub
-pliku. Przekierowanie do pliku nie generuje poprawnego pliku w UTF-16.
+obsłużenia w przypadku przekierowania do innego programu lub pliku.
-=item B<utf8>
+W przypadku użycia metody C<unicodebom>, tekst w unikodzie jest poprzedzony
+znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego
+przekierowania lub przekazywania przez potok w powłoce PowerShell.
-Zaletą kodowania utf8 jest zgodność z ASCII; kiedy przekierowuje się wyjście
-do pliku, uzyskuje się właściwy plik w UTF-8. Trzeba ustawić font konsoli na
+
+
+=item B<utf8, utf8bom>
+
+Zaletą kodowania utf8 jest zgodność z ASCII. Trzeba ustawić font konsoli na
font TrueType. Przy użyciu fontu TrueType tekst jest wyświetlany podobnie do
kodowania C<unicode>.
@@ -186,10 +192,17 @@ konsoli w trakcie wyświetlania komunikatów.
W konsoli ConEmu metoda kodowania utf8 działa dobrze.
+W przypadku użycia metody C<utf8bom>, tekst w UTF-8 jest poprzedzony znakiem
+BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub
+przekazywania przez potok w powłoce PowerShell.
+
+
+
=back
Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej
-DOS2UNIX_DISPLAY_ENC, ustawiając ją na C<unicode> lub C<utf8>.
+DOS2UNIX_DISPLAY_ENC, ustawiając ją na C<unicode>, C<unicodebom>, C<utf8>
+lub C<utf8bom>.
=item B<-f, --force>
@@ -225,6 +238,9 @@ Przykładowe wyjście:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Uwaga: czasami plik binarny może być błędnie rozpoznany jako
+tekstowy. P. także opcja C<-s>.
+
Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać
jedną lub więcej flag.
@@ -257,6 +273,14 @@ Wypisanie tylko plików, które zostałyby przekonwertowane.
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.
+=item B<h>
+
+Wypisanie nagłówka.
+
+=item B<p>
+
+Wyświetlanie nazw plików bez ścieżki.
+
=back
Przykłady:
@@ -365,6 +389,13 @@ linii. P. także opcja C<-b>.
Pominięcie plików binarnych (domyślne).
+Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym
+błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne na
+błędy. Pliki wejściowe są przeszukiwane pod kątem symboli binarnych, które
+zwykle nie występują w plikach tekstowych. Może się zdarzyć, że plik binarny
+zawiera tylko zwykłe znaki tekstowe. Taki plik binarny będzie błędnie
+widziany jako plik tekstowy.
+
=item B<-u, --keep-utf16>
Zachowanie oryginalnego kodowania pliku wejściowego UTF-16. Plik wyjściowy
@@ -634,8 +665,8 @@ Unicode.
Odczyt ze standardowego wejścia i zapis na standardowe wyjście:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:
@@ -700,6 +731,13 @@ Z poziomu linii poleceń Windows można użyć następującego polecenia:
for /R %G in (*.txt) do dos2unix "%G"
+Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w Windows
+PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 LOKALIZACJA
=over 4
diff --git a/man/pl/man1/dos2unix.txt b/man/pl/man1/dos2unix.txt
index 6f04c8f..c571b44 100644
--- a/man/pl/man1/dos2unix.txt
+++ b/man/pl/man1/dos2unix.txt
@@ -38,6 +38,9 @@ OPIS
wersji z SunOS-a/Solarisa: ta wersja domyślnie wykonuje konwersję w
miejscu (tryb starego pliku), podczas gdy oryginalna obsługiwała tylko
konwersję parami (tryb nowego pliku) - p. także opcje "-o" i "-n".
+ Ponadto wersja z SunOS-a/Solarisa domyślnie wykonuje konwersję w trybie
+ *iso*, podczas gdy ta wersja domyślnie wykonuje konwersję w trybie
+ *ascii*.
OPCJE
-- Potraktowanie wszystkich kolejnych opcji jako nazw plików. Tej opcji
@@ -91,7 +94,8 @@ OPCJE
-D, --display-enc KODOWANIE
Ustawienie kodowania wyświetlanego tekstu. KODOWANIE to jedno z:
- *ansi*, *unicode*, *utf8*, przy czym domyślne to ansi.
+ *ansi*, *unicode*, *unicodebom*, *utf8*, *utf8bom*, przy czym
+ domyślne to ansi.
Ta opcja jest dostępna wyłączenie w programie dos2unix dla Windows z
obsługą nazw plików Unicode. Nie ma wpływu na same nawy
@@ -115,7 +119,7 @@ OPCJE
zapytania albo niewłaściwy symbol. Jeżeli nie pracujemy z obcymi
nazwami plików, ta metoda jest poprawna.
- unicode
+ unicode, unicodebom
Zaletą kodowania unicode (windowsową nazwą dla UTF-16) jest
(zwykle) właściwe wyświetlanie tekstu. Nie ma potrzeby zmiany
aktywnej strony kodowej. Może być potrzeba zmiany fontu konsoli
@@ -128,14 +132,17 @@ OPCJE
Wadą kodowania unicode jest niezgodność z ASCII. Wyjście nie
jest łatwe do obsłużenia w przypadku przekierowania do innego
- programu lub pliku. Przekierowanie do pliku nie generuje
- poprawnego pliku w UTF-16.
+ programu lub pliku.
- utf8
- Zaletą kodowania utf8 jest zgodność z ASCII; kiedy przekierowuje
- się wyjście do pliku, uzyskuje się właściwy plik w UTF-8. Trzeba
- ustawić font konsoli na font TrueType. Przy użyciu fontu
- TrueType tekst jest wyświetlany podobnie do kodowania "unicode".
+ W przypadku użycia metody "unicodebom", tekst w unikodzie jest
+ poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do
+ poprawnego przekierowania lub przekazywania przez potok w
+ powłoce PowerShell.
+
+ utf8, utf8bom
+ Zaletą kodowania utf8 jest zgodność z ASCII. Trzeba ustawić font
+ konsoli na font TrueType. Przy użyciu fontu TrueType tekst jest
+ wyświetlany podobnie do kodowania "unicode".
Wadą jest fakt, że w przypadku używania domyślnego fontu
rastrowego, wszystkie znaki spoza ASCII są wyświetlane
@@ -146,8 +153,14 @@ OPCJE
W konsoli ConEmu metoda kodowania utf8 działa dobrze.
+ W przypadku użycia metody "utf8bom", tekst w UTF-8 jest
+ poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do
+ poprawnego przekierowania lub przekazywania przez potok w
+ powłoce PowerShell.
+
Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej
- DOS2UNIX_DISPLAY_ENC, ustawiając ją na "unicode" lub "utf8".
+ DOS2UNIX_DISPLAY_ENC, ustawiając ją na "unicode", "unicodebom",
+ "utf8" lub "utf8bom".
-f, --force
Wymuszenie konwersji plików binarnych.
@@ -180,6 +193,9 @@ OPCJE
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Uwaga: czasami plik binarny może być błędnie rozpoznany jako
+ tekstowy. P. także opcja "-s".
+
Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście.
Można dodać jedną lub więcej flag.
@@ -199,6 +215,10 @@ OPCJE
końce linii, a unix2dos wypisze tylko nazwy plików zawierających
uniksowe końce linii.
+ h Wypisanie nagłówka.
+
+ p Wyświetlanie nazw plików bez ścieżki.
+
Przykłady:
Pokazanie informacji o wszystkich plikach *.txt:
@@ -295,6 +315,13 @@ OPCJE
-s, --safe
Pominięcie plików binarnych (domyślne).
+ Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym
+ błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne
+ na błędy. Pliki wejściowe są przeszukiwane pod kątem symboli
+ binarnych, które zwykle nie występują w plikach tekstowych. Może się
+ zdarzyć, że plik binarny zawiera tylko zwykłe znaki tekstowe. Taki
+ plik binarny będzie błędnie widziany jako plik tekstowy.
+
-u, --keep-utf16
Zachowanie oryginalnego kodowania pliku wejściowego UTF-16. Plik
wyjściowy zostanie zapisany w tym samym kodowaniu UTF-16 (little lub
@@ -543,8 +570,8 @@ GB18030
PRZYKŁADY
Odczyt ze standardowego wejścia i zapis na standardowe wyjście:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:
@@ -609,6 +636,11 @@ KONWERSJA REKURENCYJNA
for /R %G in (*.txt) do dos2unix "%G"
+ Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w
+ Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOKALIZACJA
LANG
Główny język wybiera się zmienną środowiskową LANG. Zmienna LANG
diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1
index ebc97a4..01e403e 100644
--- a/man/pt_BR/man1/dos2unix.1
+++ b/man/pt_BR/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -119,7 +119,9 @@ Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença
importante em relação à versão original do SunOS/Solaris. Essa versão faz
conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão
original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo
-de novo arquivo). Veja também as opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR.
+de novo arquivo). Veja também as opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR. Uma outra diferença é
+que a versão SunOS/Solaris usa, por padrão, a conversão de modo do \fIiso\fR
+enquanto esta versão usa o do \fIascii\fR.
.SH "OPÇÕES"
.IX Header "OPÇÕES"
.IP "\fB\-\-\fR" 4
@@ -165,7 +167,7 @@ Usa a página de código 863 do \s-1DOS \s0(Francês do Canadá).
Usa a página de código 865 do \s-1DOS \s0(Nórdico).
.IP "\fB\-7\fR" 4
.IX Item "-7"
-Converte caracteres de 8 bit para espaço de 7 bit.
+Converte caracteres de 8 bits para espaço de 7 bits.
.IP "\fB\-b, \-\-keep\-bom\fR" 4
.IX Item "-b, --keep-bom"
Mantém marca de ordem de bytes (\s-1BOM\s0). Quando o arquivo de entrada possuir um
@@ -178,7 +180,7 @@ Define o modo de conversão, sendo \s-1MODOCONV\s0 um dentre: \fIascii\fR, \fI7b
.IP "\fB\-D, \-\-display\-enc CODIFICAÇÃO\fR" 4
.IX Item "-D, --display-enc CODIFICAÇÃO"
Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: \fIansi\fR,
-\&\fIunicode\fR, \fIutf8\fR com ascii sendo o padrão.
+\&\fIunicode\fR, \fIutf8\fR, \fIutf8bom\fR com ansi sendo o padrão.
.Sp
Essa opção está disponível apenas no dos2unix para Windows com suporte a
nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de
@@ -199,10 +201,10 @@ dos2unix usa a página de código do sistema Windows.
A desvantagem do ansi é que nomes de arquivos internacionais com caracteres
fora a página de código padrão do sistema não são exibidos
apropriadamente. Você verá um sinal de interrogação, ou um símbolo
-incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse
+incorreto. Quando você não utiliza nomes de arquivos estrangeiros, esse
método funciona bem.
-.IP "\fBunicode\fR" 4
-.IX Item "unicode"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
A vantagem da codificação do unicode (o nome Windows para \s-1UTF\-16\s0) é que o
texto é normalmente exibido apropriadamente. Não há necessidade para alterar
a página de código ativa. Você pode precisar definir a fonte do console para
@@ -215,28 +217,34 @@ Quando você usa o console ConEmu todo texto é exibido apropriadamente,
porque o ConEmu seleciona automaticamente um fonte boa.
.Sp
A desvantagem do unicode é que ele não é compatível com \s-1ASCII. A\s0 saída não é
-fácil de lidar quando você o redireciona para um outro programa ou um
-arquivo. Redirecionamento para um arquivo não fornece um arquivo \s-1UTF\-16\s0
-correto.
-.IP "\fButf8\fR" 4
-.IX Item "utf8"
-A vantagem do utf8 é que ele é compatível com \s-1ASCII\s0 e quando você o
-redireciona para um arquivo, você obtém um arquivo \s-1UTF\-8\s0 apropriado. Você
-precisa definir a fonte do console para uma fonte TrueType. Com uma fonte
-TrueType, o texto é exibido similiar a uma codificação \f(CW\*(C`unicode\*(C'\fR.
-.Sp
-A desvantagem é que quando você usa a fonte raster padrão, caracteres
+fácil de lidar quando você o redireciona para um outro programa.
+.Sp
+Quando o método <unicodebom> é usado, o texto Unicode será precedido com um
+\&\s-1BOM \s0(Byte Order Mark, ou marca de ordem de byte). Um \s-1BOM\s0 é necessário para o
+redirecionamento, ou \*(L"piping\*(R", correto no PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+A vantagem do utf8 é que ele é compatível com \s-1ASCII.\s0 Você precisa definir a
+fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é
+exibido similar a uma codificação \f(CW\*(C`unicode\*(C'\fR.
+.Sp
+A desvantagem é que quando você usa a fonte \*(L"raster\*(R" padrão, caracteres
não\-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode,
mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para
uma região leste da Ásia, você pode ver muitas falhas no console quando as
mensagens são exibidas.
.Sp
Em um console ConEmu, o método de codificação utf8 funciona bem.
+.Sp
+Quando o método <utf8bom> é usado, o texto \s-1UTF\-8\s0 será precedido com um \s-1BOM
+\&\s0(Byte Order Mark, ou marca de ordem de byte). Um \s-1BOM\s0 é necessário para o
+redirecionamento, ou \*(L"piping\*(R", correto no PowerShell.
.RE
.RS 4
.Sp
A codificação padrão pode ser alterada com a variável de ambiente
-\&\s-1DOS2UNIX_DISPLAY_ENC\s0 definindo-a para \f(CW\*(C`unicode\*(C'\fR ou \f(CW\*(C`utf8\*(C'\fR.
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 definindo-a para \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR ou
+\&\f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -256,9 +264,9 @@ Exibe informação do arquivo. Nenhuma conversão é feita.
.Sp
A seguinte informação é exibida, nesta ordem: número de quebras de linha do
\&\s-1DOS,\s0 número de quebras de linha do Unix, número de quebras de linha do Mac,
-marca de ordem de byte, \*(L"text\*(R" ou \*(L"binário\*(R", nome de arquivo.
+marca de ordem de byte, \*(L"text\*(R" ou \*(L"binary\*(R", nome de arquivo.
.Sp
-Saída de exemplo:
+Exemplo de saída:
.Sp
.Vb 8
\& 6 0 0 no_bom text dos.txt
@@ -271,6 +279,9 @@ Saída de exemplo:
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Note que em algumas vezes um arquivo binário pode ser confundido com um
+arquivo texto. Veja também a opção \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou
mais opções podem ser adicionadas.
.RS 4
@@ -291,11 +302,17 @@ Exibe a marca de ordem de byte.
Exibe se arquivo é texto ou binário.
.IP "\fBc\fR" 4
.IX Item "c"
-Exib apenas os arquivos que seriam convertidos.
+Exibe apenas os arquivos que seriam convertidos.
.Sp
Com a opção \f(CW\*(C`c\*(C'\fR, dos2unix vai exibir apenas os arquivos que contêm quebras
de linha do \s-1DOS,\s0 unix2dos vai exibir apenas os nomes de arquivos que contêm
quebras de linha do Unix.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Print a header.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Show file names without path.
.RE
.RS 4
.Sp
@@ -408,6 +425,13 @@ Unix. Veja também a opção \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Ignora arquivo binários (padrão).
+.Sp
+A ação de ignorar arquivos binários é feita para evitar equívocos
+acidentais. Fique ciente de que a detecção de arquivos binários não é 100% à
+prova de erros. Arquivos de entrada são analisados por símbolos binários
+que, geralmente, não são encontrados em arquivos textos. É possível que um
+arquivo binário contenha apenas caracteres de texto normais. tal arquivo
+binário pode ser acidentalmente visto como um arquivo de texto.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Mantém a codificação \s-1UTF\-16\s0 original do arquivo de entrada. O arquivo de
@@ -469,13 +493,13 @@ os comandos \f(CW\*(C`mac2unix\*(C'\fR ou \f(CW\*(C`unix2mac\*(C'\fR.
No modo \f(CW\*(C`ascii\*(C'\fR, apenas as quebras de linha são convertidas. Esse é o modo
de conversão padrão.
.Sp
-Apesar do nome deste modo ser \s-1ASCII,\s0 o qual é um padrão de 7 bit, o modo é
-em verdade 8 bit. Sempre use este modo quando quiser converter arquivos
+Apesar do nome deste modo ser \s-1ASCII,\s0 o qual é um padrão de 7 bits, o modo é
+em verdade 8 bits. Sempre use este modo quando quiser converter arquivos
Unicode \s-1UTF\-8.\s0
.IP "\fB7bit\fR" 4
.IX Item "7bit"
-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.
+Neste modo todos os caracteres não\-ASCII de 8 bits (com valores entre 128 e
+255) são convertidos para um espaço de 7 bits.
.IP "\fBiso\fR" 4
.IX Item "iso"
Caracteres são convertidos entre um conjunto de caracteres do \s-1DOS \s0(página de
@@ -588,10 +612,10 @@ Quando a opção \f(CW\*(C`\-u\*(C'\fR é usada, o arquivo de saída será escri
codificação \s-1UTF\-16\s0 que o arquivo de saída. A opção \f(CW\*(C`\-u\*(C'\fR evita conversão
para \s-1UTF\-8.\s0
.PP
-Dos2unix e unix2dos não possuem opção para converter arquivos \s-1UTF\-8\s0 ára
+Dos2unix e unix2dos não possuem opção para converter arquivos \s-1UTF\-8\s0 para
\&\s-1UTF\-16.\s0
.PP
-Modo de conversão \s-1ISO\s0 e 7\-bit não funciona em arquivos \s-1UTF\-16.\s0
+Modo de conversão \s-1ISO\s0 e 7 bits não funcionam em arquivos \s-1UTF\-16.\s0
.SS "Marca de ordem de byte"
.IX Subsection "Marca de ordem de byte"
No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte
@@ -678,8 +702,8 @@ arquivos Unicode.
Lê a entrada da \*(L"stdin\*(R" e escreve a saída para \*(L"stdout\*(R":
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Converte e substitui a.txt. Converte e substitui b.txt:
@@ -751,8 +775,8 @@ substitui b.txt. Converte d.txt e escreve para f.txt:
.Vb 1
\& dos2unix \-n c.txt e.txt \-o a.txt b.txt \-n d.txt f.txt
.Ve
-.SH "Conversão recursiva"
-.IX Header "Conversão recursiva"
+.SH "CONVERSÃO RECURSIVA"
+.IX Header "CONVERSÃO RECURSIVA"
Use dos2unix em combinação com os comandos \fIfind\fR\|(1) e \fIxargs\fR\|(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
@@ -767,6 +791,12 @@ Em um Prompt de Comando do Windows o seguinte comando pode ser usado:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+Usuários do PowerShell podem usar o seguinte comando no Windows PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOCALIZAÇÃO"
.IX Header "LOCALIZAÇÃO"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm
index 57b6e81..10d4ca9 100644
--- a/man/pt_BR/man1/dos2unix.htm
+++ b/man/pt_BR/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title>
+<title>dos2unix 7.3.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:ASSI@cygwin.nonet" />
</head>
@@ -29,7 +29,7 @@
</li>
<li><a href="#GB18030">GB18030</a></li>
<li><a href="#EXEMPLOS">EXEMPLOS</a></li>
- <li><a href="#Converso-recursiva">Convers&atilde;o recursiva</a></li>
+ <li><a href="#CONVERSO-RECURSIVA">CONVERS&Atilde;O RECURSIVA</a></li>
<li><a href="#LOCALIZAO">LOCALIZA&Ccedil;&Atilde;O</a></li>
<li><a href="#VALOR-RETORNADO">VALOR RETORNADO</a></li>
<li><a href="#PADRES">PADR&Otilde;ES</a></li>
@@ -60,7 +60,7 @@
<p>Liga&ccedil;&otilde;es simb&oacute;licas e seus alvos s&atilde;o por padr&atilde;o mantidas intoc&aacute;veis. Liga&ccedil;&otilde;es simb&oacute;licas podem opcionalmente ser substitu&iacute;das, ou a sa&iacute;da pode ser escrita para o alvo das liga&ccedil;&otilde;es simb&oacute;licas. N&atilde;o h&aacute; suporte &agrave;s liga&ccedil;&otilde;es simb&oacute;licas do Windows.</p>
-<p>Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. H&aacute; uma diferen&ccedil;a importante em rela&ccedil;&atilde;o &agrave; vers&atilde;o original do SunOS/Solaris. Essa vers&atilde;o faz convers&atilde;o no-lugar (modo arquivo antigo) por padr&atilde;o, enquanto a vers&atilde;o original do SunOS/Solaris fornecia suporte apenas a convers&atilde;o pareada (modo de novo arquivo). Veja tamb&eacute;m as op&ccedil;&otilde;es <code>-o</code> e <code>-n</code>.</p>
+<p>Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. H&aacute; uma diferen&ccedil;a importante em rela&ccedil;&atilde;o &agrave; vers&atilde;o original do SunOS/Solaris. Essa vers&atilde;o faz convers&atilde;o no-lugar (modo arquivo antigo) por padr&atilde;o, enquanto a vers&atilde;o original do SunOS/Solaris fornecia suporte apenas a convers&atilde;o pareada (modo de novo arquivo). Veja tamb&eacute;m as op&ccedil;&otilde;es <code>-o</code> e <code>-n</code>. Uma outra diferen&ccedil;a &eacute; que a vers&atilde;o SunOS/Solaris usa, por padr&atilde;o, a convers&atilde;o de modo do <i>iso</i> enquanto esta vers&atilde;o usa o do <i>ascii</i>.</p>
<h1 id="OPES">OP&Ccedil;&Otilde;ES</h1>
@@ -129,7 +129,7 @@
<dt id="pod-7"><b>-7</b></dt>
<dd>
-<p>Converte caracteres de 8 bit para espa&ccedil;o de 7 bit.</p>
+<p>Converte caracteres de 8 bits para espa&ccedil;o de 7 bits.</p>
</dd>
<dt id="b---keep-bom"><b>-b, --keep-bom</b></dt>
@@ -147,7 +147,7 @@
<dt id="D---display-enc-CODIFICAO"><b>-D, --display-enc CODIFICA&Ccedil;&Atilde;O</b></dt>
<dd>
-<p>Define a codifica&ccedil;&atilde;o do texto exibido, sendo CODIFICA&Ccedil;&Atilde;O um dentre: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> com ascii sendo o padr&atilde;o.</p>
+<p>Define a codifica&ccedil;&atilde;o do texto exibido, sendo CODIFICA&Ccedil;&Atilde;O um dentre: <i>ansi</i>, <i>unicode</i>, <i>utf8</i>, <i>utf8bom</i> com ansi sendo o padr&atilde;o.</p>
<p>Essa op&ccedil;&atilde;o est&aacute; dispon&iacute;vel apenas no dos2unix para Windows com suporte a nome de arquivo em Unicode. Essa op&ccedil;&atilde;o n&atilde;o possui efeito nos nomes de arquivos lidos e escritos, apenas em como eles s&atilde;o exibidos.</p>
@@ -160,32 +160,36 @@
<p>O m&eacute;todo padr&atilde;o do dos2unix &eacute; usar o texto codificado em ANSI. A sua vantagem &eacute; a compatibilidade reversa. Ele funciona com fontes raster e TrueType. Em algumas regi&otilde;es voc&ecirc; pode precisar alterar a p&aacute;gina de c&oacute;digo OEM do DOS para ANSI do sistema Windows usando o comando <code>chcp</code>, porque dos2unix usa a p&aacute;gina de c&oacute;digo do sistema Windows.</p>
-<p>A desvantagem do ansi &eacute; que nomes de arquivos internacionais com caracteres fora a p&aacute;gina de c&oacute;digo padr&atilde;o do sistema n&atilde;o s&atilde;o exibidos apropriadamente. Voc&ecirc; ver&aacute; um sinal de interroga&ccedil;&atilde;o, ou um s&iacute;mbolo incorreto. Quando voc&ecirc; n&atilde;o utiliza nomes de arquivos extrangeiros, esse m&eacute;todo funciona bem.</p>
+<p>A desvantagem do ansi &eacute; que nomes de arquivos internacionais com caracteres fora a p&aacute;gina de c&oacute;digo padr&atilde;o do sistema n&atilde;o s&atilde;o exibidos apropriadamente. Voc&ecirc; ver&aacute; um sinal de interroga&ccedil;&atilde;o, ou um s&iacute;mbolo incorreto. Quando voc&ecirc; n&atilde;o utiliza nomes de arquivos estrangeiros, esse m&eacute;todo funciona bem.</p>
</dd>
-<dt id="unicode"><b>unicode</b></dt>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</b></dt>
<dd>
<p>A vantagem da codifica&ccedil;&atilde;o do unicode (o nome Windows para UTF-16) &eacute; que o texto &eacute; normalmente exibido apropriadamente. N&atilde;o h&aacute; necessidade para alterar a p&aacute;gina de c&oacute;digo ativa. Voc&ecirc; pode precisar definir a fonte do console para uma fonte TrueType para que caracteres internacionais sejam exibidos apropriadamente. Quando um caractere n&atilde;o est&aacute; inclu&iacute;do na fonte TrueType, geralmente voc&ecirc; v&ecirc; um pequeno quadrado, algumas vezes com um sinal de interroga&ccedil;&atilde;o nele.</p>
<p>Quando voc&ecirc; usa o console ConEmu todo texto &eacute; exibido apropriadamente, porque o ConEmu seleciona automaticamente um fonte boa.</p>
-<p>A desvantagem do unicode &eacute; que ele n&atilde;o &eacute; compat&iacute;vel com ASCII. A sa&iacute;da n&atilde;o &eacute; f&aacute;cil de lidar quando voc&ecirc; o redireciona para um outro programa ou um arquivo. Redirecionamento para um arquivo n&atilde;o fornece um arquivo UTF-16 correto.</p>
+<p>A desvantagem do unicode &eacute; que ele n&atilde;o &eacute; compat&iacute;vel com ASCII. A sa&iacute;da n&atilde;o &eacute; f&aacute;cil de lidar quando voc&ecirc; o redireciona para um outro programa.</p>
+
+<p>Quando o m&eacute;todo &lt;unicodebom&gt; &eacute; usado, o texto Unicode ser&aacute; precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM &eacute; necess&aacute;rio para o redirecionamento, ou &quot;piping&quot;, correto no PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</b></dt>
<dd>
-<p>A vantagem do utf8 &eacute; que ele &eacute; compat&iacute;vel com ASCII e quando voc&ecirc; o redireciona para um arquivo, voc&ecirc; obt&eacute;m um arquivo UTF-8 apropriado. Voc&ecirc; precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto &eacute; exibido similiar a uma codifica&ccedil;&atilde;o <code>unicode</code>.</p>
+<p>A vantagem do utf8 &eacute; que ele &eacute; compat&iacute;vel com ASCII. Voc&ecirc; precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto &eacute; exibido similar a uma codifica&ccedil;&atilde;o <code>unicode</code>.</p>
-<p>A desvantagem &eacute; que quando voc&ecirc; usa a fonte raster padr&atilde;o, caracteres n&atilde;o-ASCII s&atilde;o exibidos incorretamente. N&atilde;o apenas nomes de arquivos unicode, mas tamb&eacute;m mensagens traduzidas ficam ileg&iacute;veis. No Windows configurado para uma regi&atilde;o leste da &Aacute;sia, voc&ecirc; pode ver muitas falhas no console quando as mensagens s&atilde;o exibidas.</p>
+<p>A desvantagem &eacute; que quando voc&ecirc; usa a fonte &quot;raster&quot; padr&atilde;o, caracteres n&atilde;o-ASCII s&atilde;o exibidos incorretamente. N&atilde;o apenas nomes de arquivos unicode, mas tamb&eacute;m mensagens traduzidas ficam ileg&iacute;veis. No Windows configurado para uma regi&atilde;o leste da &Aacute;sia, voc&ecirc; pode ver muitas falhas no console quando as mensagens s&atilde;o exibidas.</p>
<p>Em um console ConEmu, o m&eacute;todo de codifica&ccedil;&atilde;o utf8 funciona bem.</p>
+<p>Quando o m&eacute;todo &lt;utf8bom&gt; &eacute; usado, o texto UTF-8 ser&aacute; precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM &eacute; necess&aacute;rio para o redirecionamento, ou &quot;piping&quot;, correto no PowerShell.</p>
+
</dd>
</dl>
-<p>A codifica&ccedil;&atilde;o padr&atilde;o pode ser alterada com a vari&aacute;vel de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para <code>unicode</code> ou <code>utf8</code>.</p>
+<p>A codifica&ccedil;&atilde;o padr&atilde;o pode ser alterada com a vari&aacute;vel de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code> ou <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -211,9 +215,9 @@
<p>Exibe informa&ccedil;&atilde;o do arquivo. Nenhuma convers&atilde;o &eacute; feita.</p>
-<p>A seguinte informa&ccedil;&atilde;o &eacute; exibida, nesta ordem: n&uacute;mero de quebras de linha do DOS, n&uacute;mero de quebras de linha do Unix, n&uacute;mero de quebras de linha do Mac, marca de ordem de byte, &quot;text&quot; ou &quot;bin&aacute;rio&quot;, nome de arquivo.</p>
+<p>A seguinte informa&ccedil;&atilde;o &eacute; exibida, nesta ordem: n&uacute;mero de quebras de linha do DOS, n&uacute;mero de quebras de linha do Unix, n&uacute;mero de quebras de linha do Mac, marca de ordem de byte, &quot;text&quot; ou &quot;binary&quot;, nome de arquivo.</p>
-<p>Sa&iacute;da de exemplo:</p>
+<p>Exemplo de sa&iacute;da:</p>
<pre><code> 6 0 0 no_bom text dos.txt
0 6 0 no_bom text unix.txt
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>Note que em algumas vezes um arquivo bin&aacute;rio pode ser confundido com um arquivo texto. Veja tamb&eacute;m a op&ccedil;&atilde;o <code>-s</code>.</p>
+
<p>Opcionalmente, op&ccedil;&otilde;es extra podem ser definidas para alterar a sa&iacute;da. Uma ou mais op&ccedil;&otilde;es podem ser adicionadas.</p>
<dl>
@@ -261,11 +267,23 @@
<dt id="c"><b>c</b></dt>
<dd>
-<p>Exib apenas os arquivos que seriam convertidos.</p>
+<p>Exibe apenas os arquivos que seriam convertidos.</p>
<p>Com a op&ccedil;&atilde;o <code>c</code>, dos2unix vai exibir apenas os arquivos que cont&ecirc;m quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que cont&ecirc;m quebras de linha do Unix.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Print a header.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Show file names without path.</p>
+
+</dd>
</dl>
<p>Exemplos:</p>
@@ -364,6 +382,8 @@
<p>Ignora arquivo bin&aacute;rios (padr&atilde;o).</p>
+<p>A a&ccedil;&atilde;o de ignorar arquivos bin&aacute;rios &eacute; feita para evitar equ&iacute;vocos acidentais. Fique ciente de que a detec&ccedil;&atilde;o de arquivos bin&aacute;rios n&atilde;o &eacute; 100% &agrave; prova de erros. Arquivos de entrada s&atilde;o analisados por s&iacute;mbolos bin&aacute;rios que, geralmente, n&atilde;o s&atilde;o encontrados em arquivos textos. &Eacute; poss&iacute;vel que um arquivo bin&aacute;rio contenha apenas caracteres de texto normais. tal arquivo bin&aacute;rio pode ser acidentalmente visto como um arquivo de texto.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -440,13 +460,13 @@
<p>No modo <code>ascii</code>, apenas as quebras de linha s&atilde;o convertidas. Esse &eacute; o modo de convers&atilde;o padr&atilde;o.</p>
-<p>Apesar do nome deste modo ser ASCII, o qual &eacute; um padr&atilde;o de 7 bit, o modo &eacute; em verdade 8 bit. Sempre use este modo quando quiser converter arquivos Unicode UTF-8.</p>
+<p>Apesar do nome deste modo ser ASCII, o qual &eacute; um padr&atilde;o de 7 bits, o modo &eacute; em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8.</p>
</dd>
<dt id="bit"><b>7bit</b></dt>
<dd>
-<p>Neste modo todos os caracteres n&atilde;o-ASCII de 8 bit (com valores entre 128 e 255) s&atilde;o convertidos para um espa&ccedil;o de 7 bit.</p>
+<p>Neste modo todos os caracteres n&atilde;o-ASCII de 8 bits (com valores entre 128 e 255) s&atilde;o convertidos para um espa&ccedil;o de 7 bits.</p>
</dd>
<dt id="iso1"><b>iso</b></dt>
@@ -519,9 +539,9 @@
<p>Quando a op&ccedil;&atilde;o <code>-u</code> &eacute; usada, o arquivo de sa&iacute;da ser&aacute; escrito na mesma codifica&ccedil;&atilde;o UTF-16 que o arquivo de sa&iacute;da. A op&ccedil;&atilde;o <code>-u</code> evita convers&atilde;o para UTF-8.</p>
-<p>Dos2unix e unix2dos n&atilde;o possuem op&ccedil;&atilde;o para converter arquivos UTF-8 &aacute;ra UTF-16.</p>
+<p>Dos2unix e unix2dos n&atilde;o possuem op&ccedil;&atilde;o para converter arquivos UTF-8 para UTF-16.</p>
-<p>Modo de convers&atilde;o ISO e 7-bit n&atilde;o funciona em arquivos UTF-16.</p>
+<p>Modo de convers&atilde;o ISO e 7 bits n&atilde;o funcionam em arquivos UTF-16.</p>
<h2 id="Marca-de-ordem-de-byte">Marca de ordem de byte</h2>
@@ -579,8 +599,8 @@
<p>L&ecirc; a entrada da &quot;stdin&quot; e escreve a sa&iacute;da para &quot;stdout&quot;:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Converte e substitui a.txt. Converte e substitui b.txt:</p>
@@ -629,7 +649,7 @@
<pre><code> dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt</code></pre>
-<h1 id="Converso-recursiva">Convers&atilde;o recursiva</h1>
+<h1 id="CONVERSO-RECURSIVA">CONVERS&Atilde;O RECURSIVA</h1>
<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>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>Usu&aacute;rios do PowerShell podem usar o seguinte comando no Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOCALIZAO">LOCALIZA&Ccedil;&Atilde;O</h1>
<dl>
diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod
index aafd72f..917bae8 100644
--- a/man/pt_BR/man1/dos2unix.pod
+++ b/man/pt_BR/man1/dos2unix.pod
@@ -58,7 +58,9 @@ Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença
importante em relação à versão original do SunOS/Solaris. Essa versão faz
conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão
original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo
-de novo arquivo). Veja também as opções C<-o> e C<-n>.
+de novo arquivo). Veja também as opções C<-o> e C<-n>. Uma outra diferença é
+que a versão SunOS/Solaris usa, por padrão, a conversão de modo do I<iso>
+enquanto esta versão usa o do I<ascii>.
=head1 OPÇÕES
@@ -112,7 +114,7 @@ Usa a página de código 865 do DOS (Nórdico).
=item B<-7>
-Converte caracteres de 8 bit para espaço de 7 bit.
+Converte caracteres de 8 bits para espaço de 7 bits.
=item B<-b, --keep-bom>
@@ -128,7 +130,7 @@ I<iso>, I<mac> com ascii sendo o padrão.
=item B<-D, --display-enc CODIFICAÇÃO>
Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>,
-I<unicode>, I<utf8> com ascii sendo o padrão.
+I<unicode>, I<utf8>, I<utf8bom> com ansi sendo o padrão.
Essa opção está disponível apenas no dos2unix para Windows com suporte a
nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de
@@ -153,10 +155,10 @@ dos2unix usa a página de código do sistema Windows.
A desvantagem do ansi é que nomes de arquivos internacionais com caracteres
fora a página de código padrão do sistema não são exibidos
apropriadamente. Você verá um sinal de interrogação, ou um símbolo
-incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse
+incorreto. Quando você não utiliza nomes de arquivos estrangeiros, esse
método funciona bem.
-=item B<unicode>
+=item B<unicode, unicodebom>
A vantagem da codificação do unicode (o nome Windows para UTF-16) é que o
texto é normalmente exibido apropriadamente. Não há necessidade para alterar
@@ -170,18 +172,21 @@ Quando você usa o console ConEmu todo texto é exibido apropriadamente,
porque o ConEmu seleciona automaticamente um fonte boa.
A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é
-fácil de lidar quando você o redireciona para um outro programa ou um
-arquivo. Redirecionamento para um arquivo não fornece um arquivo UTF-16
-correto.
+fácil de lidar quando você o redireciona para um outro programa.
-=item B<utf8>
+Quando o método <unicodebom> é usado, o texto Unicode será precedido com um
+BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o
+redirecionamento, ou "piping", correto no PowerShell.
-A vantagem do utf8 é que ele é compatível com ASCII e quando você o
-redireciona para um arquivo, você obtém um arquivo UTF-8 apropriado. Você
-precisa definir a fonte do console para uma fonte TrueType. Com uma fonte
-TrueType, o texto é exibido similiar a uma codificação C<unicode>.
-A desvantagem é que quando você usa a fonte raster padrão, caracteres
+
+=item B<utf8, utf8bom>
+
+A vantagem do utf8 é que ele é compatível com ASCII. Você precisa definir a
+fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é
+exibido similar a uma codificação C<unicode>.
+
+A desvantagem é que quando você usa a fonte "raster" padrão, caracteres
não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode,
mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para
uma região leste da Ásia, você pode ver muitas falhas no console quando as
@@ -189,10 +194,17 @@ mensagens são exibidas.
Em um console ConEmu, o método de codificação utf8 funciona bem.
+Quando o método <utf8bom> é usado, o texto UTF-8 será precedido com um BOM
+(Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o
+redirecionamento, ou "piping", correto no PowerShell.
+
+
+
=back
A codificação padrão pode ser alterada com a variável de ambiente
-DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode> ou C<utf8>.
+DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode>, C<unicodebom>, C<utf8> ou
+C<utf8bom>.
=item B<-f, --force>
@@ -215,9 +227,9 @@ Exibe informação do arquivo. Nenhuma conversão é feita.
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.
+marca de ordem de byte, "text" ou "binary", nome de arquivo.
-Saída de exemplo:
+Exemplo de saída:
6 0 0 no_bom text dos.txt
0 6 0 no_bom text unix.txt
@@ -228,6 +240,9 @@ Saída de exemplo:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Note que em algumas vezes um arquivo binário pode ser confundido com um
+arquivo texto. Veja também a opção C<-s>.
+
Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou
mais opções podem ser adicionadas.
@@ -255,12 +270,20 @@ Exibe se arquivo é texto ou binário.
=item B<c>
-Exib apenas os arquivos que seriam convertidos.
+Exibe apenas os arquivos que seriam convertidos.
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.
+=item B<h>
+
+Print a header.
+
+=item B<p>
+
+Show file names without path.
+
=back
Exemplos:
@@ -369,6 +392,13 @@ Unix. Veja também a opção C<-b>.
Ignora arquivo binários (padrão).
+A ação de ignorar arquivos binários é feita para evitar equívocos
+acidentais. Fique ciente de que a detecção de arquivos binários não é 100% à
+prova de erros. Arquivos de entrada são analisados por símbolos binários
+que, geralmente, não são encontrados em arquivos textos. É possível que um
+arquivo binário contenha apenas caracteres de texto normais. tal arquivo
+binário pode ser acidentalmente visto como um arquivo de texto.
+
=item B<-u, --keep-utf16>
Mantém a codificação UTF-16 original do arquivo de entrada. O arquivo de
@@ -443,14 +473,14 @@ os comandos C<mac2unix> ou C<unix2mac>.
No modo C<ascii>, apenas as quebras de linha são convertidas. Esse é o modo
de conversão padrão.
-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
+Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é
+em verdade 8 bits. Sempre use este modo quando quiser converter arquivos
Unicode UTF-8.
=item B<7bit>
-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.
+Neste modo todos os caracteres não-ASCII de 8 bits (com valores entre 128 e
+255) são convertidos para um espaço de 7 bits.
=item B<iso>
@@ -552,10 +582,10 @@ 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.
-Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára
+Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 para
UTF-16.
-Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16.
+Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16.
=head2 Marca de ordem de byte
@@ -638,8 +668,8 @@ arquivos Unicode.
Lê a entrada da "stdin" e escreve a saída para "stdout":
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Converte e substitui a.txt. Converte e substitui b.txt:
@@ -691,7 +721,7 @@ substitui b.txt. Converte d.txt e escreve para f.txt:
dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt
-=head1 Conversão recursiva
+=head1 CONVERSÃO RECURSIVA
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
@@ -704,6 +734,12 @@ Em um Prompt de Comando do Windows o seguinte comando pode ser usado:
for /R %G in (*.txt) do dos2unix "%G"
+Usuários do PowerShell podem usar o seguinte comando no Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 LOCALIZAÇÃO
=over 4
diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt
index d312b97..e7aaf80 100644
--- a/man/pt_BR/man1/dos2unix.txt
+++ b/man/pt_BR/man1/dos2unix.txt
@@ -39,7 +39,9 @@ DESCRIÇÃO
diferença importante em relação à versão original do SunOS/Solaris. Essa
versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto
a versão original do SunOS/Solaris fornecia suporte apenas a conversão
- pareada (modo de novo arquivo). Veja também as opções "-o" e "-n".
+ pareada (modo de novo arquivo). Veja também as opções "-o" e "-n". Uma
+ outra diferença é que a versão SunOS/Solaris usa, por padrão, a
+ conversão de modo do *iso* enquanto esta versão usa o do *ascii*.
OPÇÕES
-- Trata as opções seguintes como nomes de arquivos. Use essa opção se
@@ -80,7 +82,7 @@ OPÇÕES
-865
Usa a página de código 865 do DOS (Nórdico).
- -7 Converte caracteres de 8 bit para espaço de 7 bit.
+ -7 Converte caracteres de 8 bits para espaço de 7 bits.
-b, --keep-bom
Mantém marca de ordem de bytes (BOM). Quando o arquivo de entrada
@@ -94,7 +96,7 @@ OPÇÕES
-D, --display-enc CODIFICAÇÃO
Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre:
- *ansi*, *unicode*, *utf8* com ascii sendo o padrão.
+ *ansi*, *unicode*, *utf8*, *utf8bom* com ansi sendo o padrão.
Essa opção está disponível apenas no dos2unix para Windows com
suporte a nome de arquivo em Unicode. Essa opção não possui efeito
@@ -117,9 +119,9 @@ OPÇÕES
caracteres fora a página de código padrão do sistema não são
exibidos apropriadamente. Você verá um sinal de interrogação, ou
um símbolo incorreto. Quando você não utiliza nomes de arquivos
- extrangeiros, esse método funciona bem.
+ estrangeiros, esse método funciona bem.
- unicode
+ unicode, unicodebom
A vantagem da codificação do unicode (o nome Windows para
UTF-16) é que o texto é normalmente exibido apropriadamente. Não
há necessidade para alterar a página de código ativa. Você pode
@@ -135,17 +137,20 @@ OPÇÕES
A desvantagem do unicode é que ele não é compatível com ASCII. A
saída não é fácil de lidar quando você o redireciona para um
- outro programa ou um arquivo. Redirecionamento para um arquivo
- não fornece um arquivo UTF-16 correto.
+ outro programa.
- utf8
- A vantagem do utf8 é que ele é compatível com ASCII e quando
- você o redireciona para um arquivo, você obtém um arquivo UTF-8
- apropriado. Você precisa definir a fonte do console para uma
- fonte TrueType. Com uma fonte TrueType, o texto é exibido
- similiar a uma codificação "unicode".
+ Quando o método <unicodebom> é usado, o texto Unicode será
+ precedido com um BOM (Byte Order Mark, ou marca de ordem de
+ byte). Um BOM é necessário para o redirecionamento, ou "piping",
+ correto no PowerShell.
- A desvantagem é que quando você usa a fonte raster padrão,
+ utf8, utf8bom
+ A vantagem do utf8 é que ele é compatível com ASCII. Você
+ precisa definir a fonte do console para uma fonte TrueType. Com
+ uma fonte TrueType, o texto é exibido similar a uma codificação
+ "unicode".
+
+ A desvantagem é que quando você usa a fonte "raster" padrão,
caracteres não-ASCII são exibidos incorretamente. Não apenas
nomes de arquivos unicode, mas também mensagens traduzidas ficam
ilegíveis. No Windows configurado para uma região leste da Ásia,
@@ -154,8 +159,14 @@ OPÇÕES
Em um console ConEmu, o método de codificação utf8 funciona bem.
+ Quando o método <utf8bom> é usado, o texto UTF-8 será precedido
+ com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM
+ é necessário para o redirecionamento, ou "piping", correto no
+ PowerShell.
+
A codificação padrão pode ser alterada com a variável de ambiente
- DOS2UNIX_DISPLAY_ENC definindo-a para "unicode" ou "utf8".
+ DOS2UNIX_DISPLAY_ENC definindo-a para "unicode", "unicodebom",
+ "utf8" ou "utf8bom".
-f, --force
Força a conversão de arquivos binários.
@@ -174,10 +185,10 @@ OPÇÕES
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.
+ de linha do Mac, marca de ordem de byte, "text" ou "binary", nome de
+ arquivo.
- Saída de exemplo:
+ Exemplo de saída:
6 0 0 no_bom text dos.txt
0 6 0 no_bom text unix.txt
@@ -188,6 +199,9 @@ OPÇÕES
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Note que em algumas vezes um arquivo binário pode ser confundido com
+ um arquivo texto. Veja também a opção "-s".
+
Opcionalmente, opções extra podem ser definidas para alterar a
saída. Uma ou mais opções podem ser adicionadas.
@@ -201,12 +215,16 @@ OPÇÕES
t Exibe se arquivo é texto ou binário.
- c Exib apenas os arquivos que seriam convertidos.
+ c Exibe apenas os arquivos que seriam convertidos.
Com a opção "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.
+ h Print a header.
+
+ p Show file names without path.
+
Exemplos:
Mostra informação sobre todos os arquivos *.txt:
@@ -305,6 +323,14 @@ OPÇÕES
-s, --safe
Ignora arquivo binários (padrão).
+ A ação de ignorar arquivos binários é feita para evitar equívocos
+ acidentais. Fique ciente de que a detecção de arquivos binários não
+ é 100% à prova de erros. Arquivos de entrada são analisados por
+ símbolos binários que, geralmente, não são encontrados em arquivos
+ textos. É possível que um arquivo binário contenha apenas caracteres
+ de texto normais. tal arquivo binário pode ser acidentalmente visto
+ como um arquivo de texto.
+
-u, --keep-utf16
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
@@ -366,13 +392,13 @@ MODOS DE CONVERSÃO
No modo "ascii", apenas as quebras de linha são convertidas. Esse é
o modo de conversão padrão.
- 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
+ Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o
+ modo é em verdade 8 bits. Sempre use este modo quando quiser
converter arquivos Unicode UTF-8.
7bit
- 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.
+ Neste modo todos os caracteres não-ASCII de 8 bits (com valores
+ entre 128 e 255) são convertidos para um espaço de 7 bits.
iso 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
@@ -468,10 +494,10 @@ UNICODE
codificação UTF-16 que o arquivo de saída. A opção "-u" evita conversão
para UTF-8.
- Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára
+ Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 para
UTF-16.
- Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16.
+ Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16.
Marca de ordem de byte
No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte
@@ -552,8 +578,8 @@ GB18030
EXEMPLOS
Lê a entrada da "stdin" e escreve a saída para "stdout":
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Converte e substitui a.txt. Converte e substitui b.txt:
@@ -605,7 +631,7 @@ EXEMPLOS
dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt
-Conversão recursiva
+CONVERSÃO RECURSIVA
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
@@ -617,6 +643,11 @@ Conversão recursiva
for /R %G in (*.txt) do dos2unix "%G"
+ Usuários do PowerShell podem usar o seguinte comando no Windows
+ PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOCALIZAÇÃO
LANG
O idioma primário é selecionado com a variável de ambiente LANG. A
diff --git a/man/sv/man1/dos2unix.1 b/man/sv/man1/dos2unix.1
index 7693389..9d36d2c 100644
--- a/man/sv/man1/dos2unix.1
+++ b/man/sv/man1/dos2unix.1
@@ -71,14 +71,15 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
.SH "NAMN"
.IX Header "NAMN"
-dos2unix \- textfilsformatskonverterare från DOS/Mac till Unix och vice versa
+dos2unix \- konverterare för textfilsformat från DOS/Mac till Unix och vice
+versa
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
.Vb 2
@@ -88,7 +89,7 @@ dos2unix \- textfilsformatskonverterare från DOS/Mac till Unix och vice versa
.SH "BESKRIVNING"
.IX Header "BESKRIVNING"
Paketet Dos2unix inkluderar verktygen \f(CW\*(C`dos2unix\*(C'\fR och \f(CW\*(C`unix2dos\*(C'\fR som
-konverterar oformaterade textfiler i \s-1DOS\-\s0 eller Mac-format till Unix format
+konverterar oformaterade textfiler i \s-1DOS\-\s0 eller Mac-format till Unix-format
och vice versa.
.PP
Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är en
@@ -116,12 +117,14 @@ Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig
skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör
som standard konverteringen på plats (gammalfilsläge), medan
originalversionen från SunOS/Solaris bara hade stöd för parad konvertering
-(nyfilsläge). Se vidare flaggorna \f(CW\*(C`\-o\*(C'\fR och \f(CW\*(C`\-n\*(C'\fR.
+(nyfilsläge). Se vidare flaggorna \f(CW\*(C`\-o\*(C'\fR och \f(CW\*(C`\-n\*(C'\fR. En annan skillnad är att
+SunOS/Solaris\-versionen som standard använder \fIiso\fR\-lägeskonvertering medan
+denna version som standard använder \fIascii\fR\-lägeskonvertering.
.SH "FLAGGOR"
.IX Header "FLAGGOR"
.IP "\fB\-\-\fR" 4
.IX Item "--"
-Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du
+Behandla alla efterföljande flaggor som filnamn. Använd denna flagga om du
vill konvertera filer vars namn börjar med bindestreck. För att till exempel
konvertera en fil med namnet “\-foo“ kan du använda detta kommando:
.Sp
@@ -168,14 +171,14 @@ Konvertera 8\-bitars tecken till 7\-bitars blanksteg.
Behåll byteordningsmarkering (Byte Order Mark, \s-1BOM\s0). Om infilen har en \s-1BOM,\s0
skriv en \s-1BOM\s0 i utfilen. Detta är standardbeteendet vid konvertering av
DOS-radbrytningar. Se vidare flaggan \f(CW\*(C`\-r\*(C'\fR.
-.IP "\fB\-c, \-\-convmode KONVERTERINGLÄGE\fR" 4
-.IX Item "-c, --convmode KONVERTERINGLÄGE"
+.IP "\fB\-c, \-\-convmode KONVERTERINGSLÄGE\fR" 4
+.IX Item "-c, --convmode KONVERTERINGSLÄGE"
Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: \fIascii\fR,
\&\fI7bit\fR, \fIiso\fR, \fImac\fR där ascii är standard.
.IP "\fB\-D, \-\-display\-enc \s-1KODNING\s0\fR" 4
.IX Item "-D, --display-enc KODNING"
Ställ in kodning för visad text. Där \s-1KODNING\s0 är en av: \fIansi\fR, \fIunicode\fR,
-\&\fIutf8\fR där ansi är standardvalet.
+\&\fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\fR där ansi är standardvalet.
.Sp
Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för
Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses
@@ -196,8 +199,8 @@ Nackdelen med ansi är att internationella filnamn med tecken som inte finns
i systemets standardteckentabell inte visas korrekt. Du kommer att se
frågetecken, eller en felaktig symbol istället. När du inte arbetar med
utländska filnamn är denna metoden \s-1OK.\s0
-.IP "\fBunicode\fR" 4
-.IX Item "unicode"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
Fördelen med unicode-kodning (Windows-namnet för \s-1UTF\-16\s0) är att text
vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva
teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett
@@ -210,11 +213,14 @@ ConEmu automatiskt väljer ett bra teckensnitt.
.Sp
Nackdelen med unicode är att den inte är kompatibel med \s-1ASCII.\s0 Utmatningen
är inte lätt att hantera när du omdirigerar den till ett annat program eller
-en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF\-16\-fil.
-.IP "\fButf8\fR" 4
-.IX Item "utf8"
-Fördelen med utf8 är att den är kompatibel med \s-1ASCII\s0 och när du omdirigerar
-den till en fil kommer du att få en korrekt UTF\-8\-fil. Du måste ställa in
+en fil.
+.Sp
+När metod \f(CW\*(C`unicodebom\*(C'\fR används kommer Unicode-texten att föregås av en \s-1BOM
+\&\s0(byteordningsmarkering, Byte Order Mark). En \s-1BOM\s0 krävs för korrekt
+omdirigering eller rörledning i PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+Fördelen med utf8 är att den är kompatibel med \s-1ASCII.\s0 Du måste ställa in
konsolens teckensnitt till ett TrueType-teckensnitt. Med ett
TrueType-teckensnitt kommer text att visas på liknande sätt som med
\&\f(CW\*(C`unicode\*(C'\fR\-kodningen.
@@ -226,11 +232,15 @@ konfigurerats för Östasien kan man komma att se många blinkningar i konsolen
när meddelanden visas.
.Sp
I ConEmu-konsolen fungerar utf8\-kodningsmetoden väl.
+.Sp
+När metod \f(CW\*(C`utf8bom\*(C'\fR används kommer UTF\-8\-texten att föregås av en \s-1BOM
+\&\s0(byteordningsmarkering, Byte Order Mark). En \s-1BOM\s0 krävs för korrekt
+omdirigering eller rörledning i PowerShell.
.RE
.RS 4
.Sp
Standardkodningen kan ändras via miljövariabeln \s-1DOS2UNIX_DISPLAY_ENC\s0 genom
-att sätta den till \f(CW\*(C`unicode\*(C'\fR eller \f(CW\*(C`utf8\*(C'\fR.
+att sätta den till \f(CW\*(C`unicode\*(C'\fR, \f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR or \f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -265,6 +275,9 @@ Exempelutmatning:
\& 2 418 219 no_bom binär dos2unix.exe
.Ve
.Sp
+Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan
+\&\f(CW\*(C`\-s\*(C'\fR.
+.Sp
Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler
flaggor kan läggas till.
.RS 4
@@ -290,6 +303,12 @@ Skriv bara ut filerna som skulle ha konverterats.
Med \f(CW\*(C`c\*(C'\fR\-flaggan kommer dos2unix att skriva ut filerna som innehåller
DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har
Unix-radbrytningar.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Skriv ut rubrik.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Visa filnamn utan sökväg.
.RE
.RS 4
.Sp
@@ -369,7 +388,7 @@ Nyfilsläge. Konvertera filen \s-1INFIL\s0 och skriv utfilen \s-1UTFIL.\s0 Filna
ange i par och jokertecken i namnen ska \fIinte\fR användas annars \fIkommer\fR du
att förlora filer.
.Sp
-Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att
+Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att
bli ägaren till den konverterade filen. Läs\-/skrivbehörigheter för den nya
filen kommer att vara samma behörigheter som för originalfilen minus
\&\fIumask\fR\|(1) för användaren som kör konverteringen.
@@ -400,6 +419,12 @@ Se vidare flaggan \f(CW\*(C`\-b\*(C'\fR.
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Hoppa över binära filer (standard).
+.Sp
+Binärfiler hoppas över för att undvika oavsiktliga misstag. Var medveten om
+att detektering av binärfiler inte är 100% säker. Infiler genomsöks efter
+binära symboler som typiskt inte återfinns i textfiler. Det är möjligt att
+en binärfil enbart innehåller texttecken. En sådan binärfil kommer
+oavsiktligt att ses som en textfil.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Behåll infilens original UTF\-16\-kodning. Utfilen kommer att skrivas med
@@ -437,7 +462,7 @@ byteordningsmarkeringar och antalet konverterade radbrytningar.
Följ symboliska länkar och konvertera målen.
.IP "\fB\-R, \-\-replace\-symlink\fR" 4
.IX Item "-R, --replace-symlink"
-Ersätt symboliska länkar med konverterade filer (original målfilerna förblir
+Ersätt symboliska länkar med konverterade filer (originalmålfilerna förblir
oförändrade).
.IP "\fB\-S, \-\-skip\-symlink\fR" 4
.IX Item "-S, --skip-symlink"
@@ -479,7 +504,7 @@ med en punkt. Detsamma gäller för \s-1ISO\-8859\-1\s0 tecken utan motsvarighet
När enbart flaggan \f(CW\*(C`\-iso\*(C'\fR används kommer dos2unix att försöka avgöra den
aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda
standardteckentabellen \s-1CP437,\s0 vilken huvudsakligen används i \s-1USA.\s0 För att
-tvinga en specifik tackentabell använd flaggorna \f(CW\*(C`\-437\*(C'\fR (\s-1USA\s0), \f(CW\*(C`\-850\*(C'\fR
+tvinga en specifik teckentabell använd flaggorna \f(CW\*(C`\-437\*(C'\fR (\s-1USA\s0), \f(CW\*(C`\-850\*(C'\fR
(Västeuropeisk), \f(CW\*(C`\-860\*(C'\fR (Portugisisk), \f(CW\*(C`\-863\*(C'\fR (Fransk-kanadensisk) eller
\&\f(CW\*(C`\-865\*(C'\fR (Nordisk). Det finns också stöd för Windows-teckentabell \s-1CP\-1252
\&\s0(Västeuropeisk) via flaggan \f(CW\*(C`\-1252\*(C'\fR. För andra teckentabeller använd
@@ -545,7 +570,7 @@ Se även <http://czyborra.com/charsets/codepages.html> och
.IX Header "UNICODE"
.SS "Kodningar"
.IX Subsection "Kodningar"
-Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer
vanligtvis med UTF\-8\-kodning. I Windows kan Unicode-textfiler kodas i \s-1UTF\-8,
UTF\-16\s0 eller \s-1UTF\-16\s0 rak byteordning (big endian), men kodas mestadels i
UTF\-16\-format.
@@ -557,7 +582,7 @@ vanliga textfiler.
Alla versioner av dos2unix och unix2dos kan konvertera UTF\-8\-kodade filer,
eftersom \s-1UTF\-8\s0 designades för bakåtkompatibilitet med \s-1ASCII.\s0
.PP
-Dos2unix och unix2dos med Uncode\-UTF\-16\-stöd, kan läsa UTF\-16\-kodade
+Dos2unix och unix2dos med Unicode\-UTF\-16\-stöd, kan läsa UTF\-16\-kodade
textfiler i omvänd och rak byteordning (little och big endian). För att se
om dos2unix byggts med UTF\-16\-stöd skriv \f(CW\*(C`dos2unix \-V\*(C'\fR.
.PP
@@ -609,7 +634,7 @@ Unix2dos skriver som standard en \s-1BOM\s0 i utfilen när infilen har en
Dos2unix och unix2dos skriver alltid en \s-1BOM\s0 när flaggan \f(CW\*(C`\-m\*(C'\fR används.
.SS "Unicode-filnamn under Windows"
.IX Subsection "Unicode-filnamn under Windows"
-Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn i
+Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn i
Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har
tecken i sina namn som inte är en del av systemets atandard
ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för
@@ -670,8 +695,8 @@ Unicode-filer.
Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
@@ -759,6 +784,12 @@ I en Windows-kommandoprompt kan följande kommando användas:
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+PowerShell\-användare kan använda följande kommando i Windows PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "LOKALISERING"
.IX Header "LOKALISERING"
.IP "\fB\s-1LANG\s0\fR" 4
@@ -816,7 +847,7 @@ Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer
det senaste systemfelet att returneras. För andra fel kommer 1 att
returneras.
.PP
-Returvärdet är alltid noll i tystläge, utom när felaktiga
+Returvärdet är alltid noll i tyst läge, utom när felaktiga
kommandoradsflaggor används.
.SH "STANDARDER"
.IX Header "STANDARDER"
diff --git a/man/sv/man1/dos2unix.htm b/man/sv/man1/dos2unix.htm
index cddc1e3..9f9c1b9 100644
--- a/man/sv/man1/dos2unix.htm
+++ b/man/sv/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa</title>
+<title>dos2unix 7.3.3 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
@@ -39,7 +39,7 @@
<h1 id="NAMN">NAMN</h1>
-<p>dos2unix - textfilsformatskonverterare fr&aring;n DOS/Mac till Unix och vice versa</p>
+<p>dos2unix - konverterare f&ouml;r textfilsformat fr&aring;n DOS/Mac till Unix och vice versa</p>
<h1 id="SYNOPSIS">SYNOPSIS</h1>
@@ -48,7 +48,7 @@
<h1 id="BESKRIVNING">BESKRIVNING</h1>
-<p>Paketet Dos2unix inkluderar verktygen <code>dos2unix</code> och <code>unix2dos</code> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format och vice versa.</p>
+<p>Paketet Dos2unix inkluderar verktygen <code>dos2unix</code> och <code>unix2dos</code> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix-format och vice versa.</p>
<p>Textfiler i DOS/Windows har en radbrytning, ocks&aring; k&auml;nd som nyrad, som &auml;r en kombination av tv&aring; tecken: vagnretur (Carriage Return, CR) &aring;tf&ouml;ljt av radmatning (Line Feed, LF). Textfiler i Unix har en radbrytning som &auml;r ett enda tecken: radmatning (Line Feed, LF). Textfiler f&ouml;r Mac, innan Mac OS X, hade en radbrytning som var en enda vagnretur (Carriage Return, CR). Numera anv&auml;nder Mac OS radbrytning i Unix-stil (LF).</p>
@@ -60,7 +60,7 @@
<p>Symboliska l&auml;nkar och deras m&aring;l f&ouml;rblir of&ouml;r&auml;ndrade som standard. Symboliska l&auml;nkar kan valfritt bli ersatta eller s&aring; kan utmatningen skrivas till m&aring;let f&ouml;r den symboliska l&auml;nken. P&aring; Windows saknas st&ouml;d f&ouml;r att skriva till m&aring;let f&ouml;r en symbolisk l&auml;nk.</p>
-<p>Dos2unix modellerades efter dos2unix fr&aring;n SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen f&ouml;r SunOS/Solaris. Denna versionen g&ouml;r som standard konverteringen p&aring; plats (gammalfilsl&auml;ge), medan originalversionen fr&aring;n SunOS/Solaris bara hade st&ouml;d f&ouml;r parad konvertering (nyfilsl&auml;ge). Se vidare flaggorna <code>-o</code> och <code>-n</code>.</p>
+<p>Dos2unix modellerades efter dos2unix fr&aring;n SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen f&ouml;r SunOS/Solaris. Denna versionen g&ouml;r som standard konverteringen p&aring; plats (gammalfilsl&auml;ge), medan originalversionen fr&aring;n SunOS/Solaris bara hade st&ouml;d f&ouml;r parad konvertering (nyfilsl&auml;ge). Se vidare flaggorna <code>-o</code> och <code>-n</code>. En annan skillnad &auml;r att SunOS/Solaris-versionen som standard anv&auml;nder <i>iso</i>-l&auml;geskonvertering medan denna version som standard anv&auml;nder <i>ascii</i>-l&auml;geskonvertering.</p>
<h1 id="FLAGGOR">FLAGGOR</h1>
@@ -69,7 +69,7 @@
<dt id="pod"><b>--</b></dt>
<dd>
-<p>Behandla alla efterf&ouml;ljande flaggor som filnamn. Anv&auml;nd denna flagg om du vill konvertera filer vars namn b&ouml;rjar med bindestreck. F&ouml;r att till exempel konvertera en fil med namnet &ldquo;-foo&ldquo; kan du anv&auml;nda detta kommando:</p>
+<p>Behandla alla efterf&ouml;ljande flaggor som filnamn. Anv&auml;nd denna flagga om du vill konvertera filer vars namn b&ouml;rjar med bindestreck. F&ouml;r att till exempel konvertera en fil med namnet &ldquo;-foo&ldquo; kan du anv&auml;nda detta kommando:</p>
<pre><code> dos2unix -- -foo</code></pre>
@@ -138,7 +138,7 @@
<p>Beh&aring;ll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM, skriv en BOM i utfilen. Detta &auml;r standardbeteendet vid konvertering av DOS-radbrytningar. Se vidare flaggan <code>-r</code>.</p>
</dd>
-<dt id="c---convmode-KONVERTERINGLGE"><b>-c, --convmode KONVERTERINGL&Auml;GE</b></dt>
+<dt id="c---convmode-KONVERTERINGSLGE"><b>-c, --convmode KONVERTERINGSL&Auml;GE</b></dt>
<dd>
<p>St&auml;ller in konverteringsl&auml;ge. D&auml;r KONVERTERINGSL&Auml;GE &auml;r en av: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> d&auml;r ascii &auml;r standard.</p>
@@ -147,7 +147,7 @@
<dt id="D---display-enc-KODNING"><b>-D, --display-enc KODNING</b></dt>
<dd>
-<p>St&auml;ll in kodning f&ouml;r visad text. D&auml;r KODNING &auml;r en av: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> d&auml;r ansi &auml;r standardvalet.</p>
+<p>St&auml;ll in kodning f&ouml;r visad text. D&auml;r KODNING &auml;r en av: <i>ansi</i>, <i>unicode</i>, <i>unicodebom</i>, <i>utf8</i>, <i>utf8bom</i> d&auml;r ansi &auml;r standardvalet.</p>
<p>Denna flagga finns bara tillg&auml;nglig i dos2unix f&ouml;r Windows med st&ouml;d f&ouml;r Unicode-filnamn. Denna flagga har ingen effekt p&aring; sj&auml;lva filnamnen som l&auml;ses och skrivs, bara p&aring; hur de visas.</p>
@@ -163,29 +163,33 @@
<p>Nackdelen med ansi &auml;r att internationella filnamn med tecken som inte finns i systemets standardteckentabell inte visas korrekt. Du kommer att se fr&aring;getecken, eller en felaktig symbol ist&auml;llet. N&auml;r du inte arbetar med utl&auml;ndska filnamn &auml;r denna metoden OK.</p>
</dd>
-<dt id="unicode"><b>unicode</b></dt>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</b></dt>
<dd>
<p>F&ouml;rdelen med unicode-kodning (Windows-namnet f&ouml;r UTF-16) &auml;r att text vanligtvis visas korrekt. Det finns inget behov av att &auml;ndra den aktiva teckentabellen. Du kan beh&ouml;va st&auml;lla in konsolens teckensnitt till ett TrueType-teckensnitt f&ouml;r att f&aring; internationella tecken att visas korrekt. N&auml;r ett tecken inte finns inkluderat i TrueType-teckensnittet kommer du vanligtvis att se en liten ruta, ibland med ett fr&aring;getecken inuti.</p>
<p>N&auml;r du anv&auml;nder ConEmu-konsolen kommer all text att visas korrekt eftersom ConEmu automatiskt v&auml;ljer ett bra teckensnitt.</p>
-<p>Nackdelen med unicode &auml;r att den inte &auml;r kompatibel med ASCII. Utmatningen &auml;r inte l&auml;tt att hantera n&auml;r du omdirigerar den till ett annat program eller en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil.</p>
+<p>Nackdelen med unicode &auml;r att den inte &auml;r kompatibel med ASCII. Utmatningen &auml;r inte l&auml;tt att hantera n&auml;r du omdirigerar den till ett annat program eller en fil.</p>
+
+<p>N&auml;r metod <code>unicodebom</code> anv&auml;nds kommer Unicode-texten att f&ouml;reg&aring;s av en BOM (byteordningsmarkering, Byte Order Mark). En BOM kr&auml;vs f&ouml;r korrekt omdirigering eller r&ouml;rledning i PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</b></dt>
<dd>
-<p>F&ouml;rdelen med utf8 &auml;r att den &auml;r kompatibel med ASCII och n&auml;r du omdirigerar den till en fil kommer du att f&aring; en korrekt UTF-8-fil. Du m&aring;ste st&auml;lla in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas p&aring; liknande s&auml;tt som med <code>unicode</code>-kodningen.</p>
+<p>F&ouml;rdelen med utf8 &auml;r att den &auml;r kompatibel med ASCII. Du m&aring;ste st&auml;lla in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas p&aring; liknande s&auml;tt som med <code>unicode</code>-kodningen.</p>
<p>Nackdelen &auml;r att n&auml;r du anv&auml;nder standardrasterteckensnittet kommer alla icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan ocks&aring; &ouml;versatta meddelanden kommer att bli ol&auml;sbara. Under Windows som konfigurerats f&ouml;r &Ouml;stasien kan man komma att se m&aring;nga blinkningar i konsolen n&auml;r meddelanden visas.</p>
<p>I ConEmu-konsolen fungerar utf8-kodningsmetoden v&auml;l.</p>
+<p>N&auml;r metod <code>utf8bom</code> anv&auml;nds kommer UTF-8-texten att f&ouml;reg&aring;s av en BOM (byteordningsmarkering, Byte Order Mark). En BOM kr&auml;vs f&ouml;r korrekt omdirigering eller r&ouml;rledning i PowerShell.</p>
+
</dd>
</dl>
-<p>Standardkodningen kan &auml;ndras via milj&ouml;variabeln DOS2UNIX_DISPLAY_ENC genom att s&auml;tta den till <code>unicode</code> eller <code>utf8</code>.</p>
+<p>Standardkodningen kan &auml;ndras via milj&ouml;variabeln DOS2UNIX_DISPLAY_ENC genom att s&auml;tta den till <code>unicode</code>, <code>unicodebom</code>, <code>utf8</code> or <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom bin&auml;r dos2unix.exe</code></pre>
+<p>Notera att en bin&auml;rfil ibland kan misstas f&ouml;r en textfil. Se vidare flaggan <code>-s</code>.</p>
+
<p>Extra flaggor kan anv&auml;ndas valfritt f&ouml;r att &auml;ndra utmatningen. En eller fler flaggor kan l&auml;ggas till.</p>
<dl>
@@ -266,6 +272,18 @@
<p>Med <code>c</code>-flaggan kommer dos2unix att skriva ut filerna som inneh&aring;ller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>Skriv ut rubrik.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>Visa filnamn utan s&ouml;kv&auml;g.</p>
+
+</dd>
</dl>
<p>Exempel:</p>
@@ -336,7 +354,7 @@
<p>Nyfilsl&auml;ge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen m&aring;ste ange i par och jokertecken i namnen ska <i>inte</i> anv&auml;ndas annars <i>kommer</i> du att f&ouml;rlora filer.</p>
-<p>Anv&auml;ndaren som p&aring;b&ouml;rjar konverteringen i nyfilsl&auml;ge (paratl&auml;ge) kommer att bli &auml;garen till den konverterade filen. L&auml;s-/skrivbeh&ouml;righeter f&ouml;r den nya filen kommer att vara samma beh&ouml;righeter som f&ouml;r originalfilen minus umask(1) f&ouml;r anv&auml;ndaren som k&ouml;r konverteringen.</p>
+<p>Anv&auml;ndaren som p&aring;b&ouml;rjar konverteringen i nyfilsl&auml;ge (parat l&auml;ge) kommer att bli &auml;garen till den konverterade filen. L&auml;s-/skrivbeh&ouml;righeter f&ouml;r den nya filen kommer att vara samma beh&ouml;righeter som f&ouml;r originalfilen minus umask(1) f&ouml;r anv&auml;ndaren som k&ouml;r konverteringen.</p>
</dd>
<dt id="o---oldfile-FIL"><b>-o, --oldfile FIL &hellip;</b></dt>
@@ -364,6 +382,8 @@
<p>Hoppa &ouml;ver bin&auml;ra filer (standard).</p>
+<p>Bin&auml;rfiler hoppas &ouml;ver f&ouml;r att undvika oavsiktliga misstag. Var medveten om att detektering av bin&auml;rfiler inte &auml;r 100% s&auml;ker. Infiler genoms&ouml;ks efter bin&auml;ra symboler som typiskt inte &aring;terfinns i textfiler. Det &auml;r m&ouml;jligt att en bin&auml;rfil enbart inneh&aring;ller texttecken. En s&aring;dan bin&auml;rfil kommer oavsiktligt att ses som en textfil.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -406,7 +426,7 @@
<dt id="R---replace-symlink"><b>-R, --replace-symlink</b></dt>
<dd>
-<p>Ers&auml;tt symboliska l&auml;nkar med konverterade filer (original m&aring;lfilerna f&ouml;rblir of&ouml;r&auml;ndrade).</p>
+<p>Ers&auml;tt symboliska l&auml;nkar med konverterade filer (originalm&aring;lfilerna f&ouml;rblir of&ouml;r&auml;ndrade).</p>
</dd>
<dt id="S---skip-symlink"><b>-S, --skip-symlink</b></dt>
@@ -454,7 +474,7 @@
<p>Tecken konverteras mellan DOS teckenupps&auml;ttning (teckentabell) och ISO teckenupps&auml;ttning ISO-8859-1 (Latin-1) p&aring; Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, f&ouml;r vilka konvertering &auml;r om&ouml;jligt, kommer att ers&auml;ttas med en punkt. Detsamma g&auml;ller f&ouml;r ISO-8859-1 tecken utan motsvarighet i DOS.</p>
-<p>N&auml;r enbart flaggan <code>-iso</code> anv&auml;nds kommer dos2unix att f&ouml;rs&ouml;ka avg&ouml;ra den aktiva teckentabellen. N&auml;r detta inte &auml;r m&ouml;jligt kommer dos2unix att anv&auml;nda standardteckentabellen CP437, vilken huvudsakligen anv&auml;nds i USA. F&ouml;r att tvinga en specifik tackentabell anv&auml;nd flaggorna <code>-437</code> (USA), <code>-850</code> (V&auml;steuropeisk), <code>-860</code> (Portugisisk), <code>-863</code> (Fransk-kanadensisk) eller <code>-865</code> (Nordisk). Det finns ocks&aring; st&ouml;d f&ouml;r Windows-teckentabell CP-1252 (V&auml;steuropeisk) via flaggan <code>-1252</code>. F&ouml;r andra teckentabeller anv&auml;nd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en l&aring;ng lista av teckenkodningar.</p>
+<p>N&auml;r enbart flaggan <code>-iso</code> anv&auml;nds kommer dos2unix att f&ouml;rs&ouml;ka avg&ouml;ra den aktiva teckentabellen. N&auml;r detta inte &auml;r m&ouml;jligt kommer dos2unix att anv&auml;nda standardteckentabellen CP437, vilken huvudsakligen anv&auml;nds i USA. F&ouml;r att tvinga en specifik teckentabell anv&auml;nd flaggorna <code>-437</code> (USA), <code>-850</code> (V&auml;steuropeisk), <code>-860</code> (Portugisisk), <code>-863</code> (Fransk-kanadensisk) eller <code>-865</code> (Nordisk). Det finns ocks&aring; st&ouml;d f&ouml;r Windows-teckentabell CP-1252 (V&auml;steuropeisk) via flaggan <code>-1252</code>. F&ouml;r andra teckentabeller anv&auml;nd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en l&aring;ng lista av teckenkodningar.</p>
<p>Anv&auml;nd aldrig ISO-konvertering p&aring; Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer.</p>
@@ -501,7 +521,7 @@
<h2 id="Kodningar">Kodningar</h2>
-<p>Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format.</p>
+<p>Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format.</p>
<h2 id="Konvertering">Konvertering</h2>
@@ -509,7 +529,7 @@
<p>Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades f&ouml;r bak&aring;tkompatibilitet med ASCII.</p>
-<p>Dos2unix och unix2dos med Uncode-UTF-16-st&ouml;d, kan l&auml;sa UTF-16-kodade textfiler i omv&auml;nd och rak byteordning (little och big endian). F&ouml;r att se om dos2unix byggts med UTF-16-st&ouml;d skriv <code>dos2unix -V</code>.</p>
+<p>Dos2unix och unix2dos med Unicode-UTF-16-st&ouml;d, kan l&auml;sa UTF-16-kodade textfiler i omv&auml;nd och rak byteordning (little och big endian). F&ouml;r att se om dos2unix byggts med UTF-16-st&ouml;d skriv <code>dos2unix -V</code>.</p>
<p>Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Anv&auml;nd kommandot locale(1) f&ouml;r att ta reda p&aring; vilken lokalens teckenkodning &auml;r. N&auml;r konvertering inte &auml;r m&ouml;jlig kommer ett konverteringsfel att intr&auml;ffa och filen kommer att hoppas &ouml;ver.</p>
@@ -541,7 +561,7 @@
<h2 id="Unicode-filnamn-under-Windows">Unicode-filnamn under Windows</h2>
-<p>Dos2unix har valfritt st&ouml;d f&ouml;r l&auml;sning och skri8vning av Unicode-filnamn i Windows kommandoprompt. Detta inneb&auml;r att dos2unix kan &ouml;ppna filer som har tecken i sina namn som inte &auml;r en del av systemets atandard ANSI-teckentabell. F&ouml;r att se om dos2unix f&ouml;r Windows byggdes med st&ouml;d f&ouml;r Unicode-filnamn skriv <code>dos2unix -V</code>.</p>
+<p>Dos2unix har valfritt st&ouml;d f&ouml;r l&auml;sning och skrivning av Unicode-filnamn i Windows kommandoprompt. Detta inneb&auml;r att dos2unix kan &ouml;ppna filer som har tecken i sina namn som inte &auml;r en del av systemets atandard ANSI-teckentabell. F&ouml;r att se om dos2unix f&ouml;r Windows byggdes med st&ouml;d f&ouml;r Unicode-filnamn skriv <code>dos2unix -V</code>.</p>
<p>Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan <code>-D</code>, <code>--display-enc</code>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen.</p>
@@ -579,8 +599,8 @@
<p>L&auml;sa inmatning fr&aring;n &ldquo;stdin&ldquo; och skriv utmatning till &ldquo;stdout&ldquo;:</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>Konvertera och ers&auml;tta a.txt. Konvertera och ers&auml;tt b.txt:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>PowerShell-anv&auml;ndare kan anv&auml;nda f&ouml;ljande kommando i Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="LOKALISERING">LOKALISERING</h1>
<dl>
@@ -685,7 +709,7 @@
<p>Om allt g&aring;r bra kommer noll att returneras. N&auml;r ett systemfel uppst&aring;r kommer det senaste systemfelet att returneras. F&ouml;r andra fel kommer 1 att returneras.</p>
-<p>Returv&auml;rdet &auml;r alltid noll i tystl&auml;ge, utom n&auml;r felaktiga kommandoradsflaggor anv&auml;nds.</p>
+<p>Returv&auml;rdet &auml;r alltid noll i tyst l&auml;ge, utom n&auml;r felaktiga kommandoradsflaggor anv&auml;nds.</p>
<h1 id="STANDARDER">STANDARDER</h1>
diff --git a/man/sv/man1/dos2unix.pod b/man/sv/man1/dos2unix.pod
index e6ed68d..1bcf29b 100644
--- a/man/sv/man1/dos2unix.pod
+++ b/man/sv/man1/dos2unix.pod
@@ -17,7 +17,8 @@ If the PO get lost, keeping this translation up-to-date will be harder.
=head1 NAMN
-dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice versa
+dos2unix - konverterare för textfilsformat från DOS/Mac till Unix och vice
+versa
=head1 SYNOPSIS
@@ -27,7 +28,7 @@ dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice versa
=head1 BESKRIVNING
Paketet Dos2unix inkluderar verktygen C<dos2unix> och C<unix2dos> som
-konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format
+konverterar oformaterade textfiler i DOS- eller Mac-format till Unix-format
och vice versa.
Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är en
@@ -55,7 +56,9 @@ Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig
skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör
som standard konverteringen på plats (gammalfilsläge), medan
originalversionen från SunOS/Solaris bara hade stöd för parad konvertering
-(nyfilsläge). Se vidare flaggorna C<-o> och C<-n>.
+(nyfilsläge). Se vidare flaggorna C<-o> och C<-n>. En annan skillnad är att
+SunOS/Solaris-versionen som standard använder I<iso>-lägeskonvertering medan
+denna version som standard använder I<ascii>-lägeskonvertering.
=head1 FLAGGOR
@@ -63,7 +66,7 @@ originalversionen från SunOS/Solaris bara hade stöd för parad konvertering
=item B<-->
-Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du
+Behandla alla efterföljande flaggor som filnamn. Använd denna flagga om du
vill konvertera filer vars namn börjar med bindestreck. För att till exempel
konvertera en fil med namnet “-foo“ kan du använda detta kommando:
@@ -117,7 +120,7 @@ Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM,
skriv en BOM i utfilen. Detta är standardbeteendet vid konvertering av
DOS-radbrytningar. Se vidare flaggan C<-r>.
-=item B<-c, --convmode KONVERTERINGLÄGE>
+=item B<-c, --convmode KONVERTERINGSLÄGE>
Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: I<ascii>,
I<7bit>, I<iso>, I<mac> där ascii är standard.
@@ -125,7 +128,7 @@ I<7bit>, I<iso>, I<mac> där ascii är standard.
=item B<-D, --display-enc KODNING>
Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>,
-I<utf8> där ansi är standardvalet.
+I<unicodebom>, I<utf8>, I<utf8bom> där ansi är standardvalet.
Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för
Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses
@@ -151,7 +154,7 @@ i systemets standardteckentabell inte visas korrekt. Du kommer att se
frågetecken, eller en felaktig symbol istället. När du inte arbetar med
utländska filnamn är denna metoden OK.
-=item B<unicode>
+=item B<unicode, unicodebom>
Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att text
vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva
@@ -165,12 +168,17 @@ ConEmu automatiskt väljer ett bra teckensnitt.
Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen
är inte lätt att hantera när du omdirigerar den till ett annat program eller
-en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil.
+en fil.
-=item B<utf8>
+När metod C<unicodebom> används kommer Unicode-texten att föregås av en BOM
+(byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt
+omdirigering eller rörledning i PowerShell.
-Fördelen med utf8 är att den är kompatibel med ASCII och när du omdirigerar
-den till en fil kommer du att få en korrekt UTF-8-fil. Du måste ställa in
+
+
+=item B<utf8, utf8bom>
+
+Fördelen med utf8 är att den är kompatibel med ASCII. Du måste ställa in
konsolens teckensnitt till ett TrueType-teckensnitt. Med ett
TrueType-teckensnitt kommer text att visas på liknande sätt som med
C<unicode>-kodningen.
@@ -183,10 +191,16 @@ när meddelanden visas.
I ConEmu-konsolen fungerar utf8-kodningsmetoden väl.
+När metod C<utf8bom> används kommer UTF-8-texten att föregås av en BOM
+(byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt
+omdirigering eller rörledning i PowerShell.
+
+
+
=back
Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom
-att sätta den till C<unicode> eller C<utf8>.
+att sätta den till C<unicode>, C<unicodebom>, C<utf8> or C<utf8bom>.
=item B<-f, --force>
@@ -222,6 +236,9 @@ Exempelutmatning:
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binär dos2unix.exe
+Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan
+C<-s>.
+
Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler
flaggor kan läggas till.
@@ -255,6 +272,14 @@ Med C<c>-flaggan kommer dos2unix att skriva ut filerna som innehåller
DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har
Unix-radbrytningar.
+=item B<h>
+
+Skriv ut rubrik.
+
+=item B<p>
+
+Visa filnamn utan sökväg.
+
=back
Exempel:
@@ -325,7 +350,7 @@ Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste
ange i par och jokertecken i namnen ska I<inte> användas annars I<kommer> du
att förlora filer.
-Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att
+Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att
bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya
filen kommer att vara samma behörigheter som för originalfilen minus
umask(1) för användaren som kör konverteringen.
@@ -361,6 +386,12 @@ Se vidare flaggan C<-b>.
Hoppa över binära filer (standard).
+Binärfiler hoppas över för att undvika oavsiktliga misstag. Var medveten om
+att detektering av binärfiler inte är 100% säker. Infiler genomsöks efter
+binära symboler som typiskt inte återfinns i textfiler. Det är möjligt att
+en binärfil enbart innehåller texttecken. En sådan binärfil kommer
+oavsiktligt att ses som en textfil.
+
=item B<-u, --keep-utf16>
Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med
@@ -403,7 +434,7 @@ Följ symboliska länkar och konvertera målen.
=item B<-R, --replace-symlink>
-Ersätt symboliska länkar med konverterade filer (original målfilerna förblir
+Ersätt symboliska länkar med konverterade filer (originalmålfilerna förblir
oförändrade).
=item B<-S, --skip-symlink>
@@ -455,7 +486,7 @@ med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS.
När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den
aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda
standardteckentabellen CP437, vilken huvudsakligen används i USA. För att
-tvinga en specifik tackentabell använd flaggorna C<-437> (USA), C<-850>
+tvinga en specifik teckentabell använd flaggorna C<-437> (USA), C<-850>
(Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller
C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252
(Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd
@@ -508,7 +539,7 @@ L<http://czyborra.com/charsets/iso8859.html>.
=head2 Kodningar
-Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer
vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8,
UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i
UTF-16-format.
@@ -521,7 +552,7 @@ vanliga textfiler.
Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer,
eftersom UTF-8 designades för bakåtkompatibilitet med ASCII.
-Dos2unix och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade
+Dos2unix och unix2dos med Unicode-UTF-16-stöd, kan läsa UTF-16-kodade
textfiler i omvänd och rak byteordning (little och big endian). För att se
om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>.
@@ -575,7 +606,7 @@ Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används.
=head2 Unicode-filnamn under Windows
-Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn i
+Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn i
Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har
tecken i sina namn som inte är en del av systemets atandard
ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för
@@ -630,8 +661,8 @@ Unicode-filer.
Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
@@ -696,6 +727,12 @@ I en Windows-kommandoprompt kan följande kommando användas:
for /R %G in (*.txt) do dos2unix "%G"
+PowerShell-användare kan använda följande kommando i Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 LOKALISERING
=over 4
@@ -760,7 +797,7 @@ Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer
det senaste systemfelet att returneras. För andra fel kommer 1 att
returneras.
-Returvärdet är alltid noll i tystläge, utom när felaktiga
+Returvärdet är alltid noll i tyst läge, utom när felaktiga
kommandoradsflaggor används.
=head1 STANDARDER
diff --git a/man/sv/man1/dos2unix.txt b/man/sv/man1/dos2unix.txt
index dc189ca..207bd99 100644
--- a/man/sv/man1/dos2unix.txt
+++ b/man/sv/man1/dos2unix.txt
@@ -1,6 +1,6 @@
NAMN
- dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice
- versa
+ dos2unix - konverterare för textfilsformat från DOS/Mac till Unix och
+ vice versa
SYNOPSIS
dos2unix [flaggor] [FIL …] [-n INFIL UTFIL …]
@@ -8,8 +8,8 @@ SYNOPSIS
BESKRIVNING
Paketet Dos2unix inkluderar verktygen "dos2unix" och "unix2dos" som
- konverterar oformaterade textfiler i DOS- eller Mac-format till Unix
- format och vice versa.
+ konverterar oformaterade textfiler i DOS- eller Mac-format till
+ Unix-format och vice versa.
Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är
en kombination av två tecken: vagnretur (Carriage Return, CR) åtföljt av
@@ -37,10 +37,13 @@ BESKRIVNING
viktig skillnad gentemot originalversionen för SunOS/Solaris. Denna
versionen gör som standard konverteringen på plats (gammalfilsläge),
medan originalversionen från SunOS/Solaris bara hade stöd för parad
- konvertering (nyfilsläge). Se vidare flaggorna "-o" och "-n".
+ konvertering (nyfilsläge). Se vidare flaggorna "-o" och "-n". En annan
+ skillnad är att SunOS/Solaris-versionen som standard använder
+ *iso*-lägeskonvertering medan denna version som standard använder
+ *ascii*-lägeskonvertering.
FLAGGOR
- -- Behandla alla efterföljande flaggor som filnamn. Använd denna flagg
+ -- Behandla alla efterföljande flaggor som filnamn. Använd denna flagga
om du vill konvertera filer vars namn börjar med bindestreck. För
att till exempel konvertera en fil med namnet “-foo“ kan du använda
detta kommando:
@@ -85,13 +88,14 @@ FLAGGOR
en BOM, skriv en BOM i utfilen. Detta är standardbeteendet vid
konvertering av DOS-radbrytningar. Se vidare flaggan "-r".
- -c, --convmode KONVERTERINGLÄGE
+ -c, --convmode KONVERTERINGSLÄGE
Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av:
*ascii*, *7bit*, *iso*, *mac* där ascii är standard.
-D, --display-enc KODNING
Ställ in kodning för visad text. Där KODNING är en av: *ansi*,
- *unicode*, *utf8* där ansi är standardvalet.
+ *unicode*, *unicodebom*, *utf8*, *utf8bom* där ansi är
+ standardvalet.
Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd
för Unicode-filnamn. Denna flagga har ingen effekt på själva
@@ -114,7 +118,7 @@ FLAGGOR
Du kommer att se frågetecken, eller en felaktig symbol istället.
När du inte arbetar med utländska filnamn är denna metoden OK.
- unicode
+ unicode, unicodebom
Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att
text vanligtvis visas korrekt. Det finns inget behov av att
ändra den aktiva teckentabellen. Du kan behöva ställa in
@@ -128,15 +132,17 @@ FLAGGOR
Nackdelen med unicode är att den inte är kompatibel med ASCII.
Utmatningen är inte lätt att hantera när du omdirigerar den till
- ett annat program eller en fil. Omdirigering till en fil kommer
- inte att ge en korrekt UTF-16-fil.
+ ett annat program eller en fil.
- utf8
- Fördelen med utf8 är att den är kompatibel med ASCII och när du
- omdirigerar den till en fil kommer du att få en korrekt
- UTF-8-fil. Du måste ställa in konsolens teckensnitt till ett
- TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text
- att visas på liknande sätt som med "unicode"-kodningen.
+ När metod "unicodebom" används kommer Unicode-texten att föregås
+ av en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs
+ för korrekt omdirigering eller rörledning i PowerShell.
+
+ utf8, utf8bom
+ Fördelen med utf8 är att den är kompatibel med ASCII. Du måste
+ ställa in konsolens teckensnitt till ett TrueType-teckensnitt.
+ Med ett TrueType-teckensnitt kommer text att visas på liknande
+ sätt som med "unicode"-kodningen.
Nackdelen är att när du använder standardrasterteckensnittet
kommer alla icke-ASCII tecken att visas fel. Inte enbart
@@ -146,8 +152,13 @@ FLAGGOR
I ConEmu-konsolen fungerar utf8-kodningsmetoden väl.
+ När metod "utf8bom" används kommer UTF-8-texten att föregås av
+ en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs
+ för korrekt omdirigering eller rörledning i PowerShell.
+
Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC
- genom att sätta den till "unicode" eller "utf8".
+ genom att sätta den till "unicode", "unicodebom", "utf8" or
+ "utf8bom".
-f, --force
Tvinga konvertering av binära filer.
@@ -180,6 +191,9 @@ FLAGGOR
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binär dos2unix.exe
+ Notera att en binärfil ibland kan misstas för en textfil. Se vidare
+ flaggan "-s".
+
Extra flaggor kan användas valfritt för att ändra utmatningen. En
eller fler flaggor kan läggas till.
@@ -199,6 +213,10 @@ FLAGGOR
innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut
filnamn som har Unix-radbrytningar.
+ h Skriv ut rubrik.
+
+ p Visa filnamn utan sökväg.
+
Exempel:
Visa information för alla *.txt-filer:
@@ -262,7 +280,7 @@ FLAGGOR
Filnamnen måste ange i par och jokertecken i namnen ska *inte*
användas annars *kommer* du att förlora filer.
- Användaren som påbörjar konverteringen i nyfilsläge (paratläge)
+ Användaren som påbörjar konverteringen i nyfilsläge (parat läge)
kommer att bli ägaren till den konverterade filen.
Läs-/skrivbehörigheter för den nya filen kommer att vara samma
behörigheter som för originalfilen minus umask(1) för användaren som
@@ -296,6 +314,13 @@ FLAGGOR
-s, --safe
Hoppa över binära filer (standard).
+ Binärfiler hoppas över för att undvika oavsiktliga misstag. Var
+ medveten om att detektering av binärfiler inte är 100% säker.
+ Infiler genomsöks efter binära symboler som typiskt inte återfinns i
+ textfiler. Det är möjligt att en binärfil enbart innehåller
+ texttecken. En sådan binärfil kommer oavsiktligt att ses som en
+ textfil.
+
-u, --keep-utf16
Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas
med samma UTF-16-kodning som infilen, omvänd eller rak byteordning
@@ -332,7 +357,7 @@ FLAGGOR
Följ symboliska länkar och konvertera målen.
-R, --replace-symlink
- Ersätt symboliska länkar med konverterade filer (original målfilerna
+ Ersätt symboliska länkar med konverterade filer (originalmålfilerna
förblir oförändrade).
-S, --skip-symlink
@@ -373,7 +398,7 @@ KONVERTERINGSLÄGEN
När enbart flaggan "-iso" används kommer dos2unix att försöka avgöra
den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix
att använda standardteckentabellen CP437, vilken huvudsakligen
- används i USA. För att tvinga en specifik tackentabell använd
+ används i USA. För att tvinga en specifik teckentabell använd
flaggorna -437 (USA), -850 (Västeuropeisk), -860 (Portugisisk), -863
(Fransk-kanadensisk) eller -865 (Nordisk). Det finns också stöd för
Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan -1252. För
@@ -422,7 +447,7 @@ KONVERTERINGSLÄGEN
UNICODE
Kodningar
- Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+ Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer
vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i
UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas
mestadels i UTF-16-format.
@@ -434,7 +459,7 @@ UNICODE
Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade
filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII.
- Dos2unix och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade
+ Dos2unix och unix2dos med Unicode-UTF-16-stöd, kan läsa UTF-16-kodade
textfiler i omvänd och rak byteordning (little och big endian). För att
se om dos2unix byggts med UTF-16-stöd skriv "dos2unix -V".
@@ -486,7 +511,7 @@ UNICODE
Dos2unix och unix2dos skriver alltid en BOM när flaggan "-m" används.
Unicode-filnamn under Windows
- Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn
+ Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn
i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som
har tecken i sina namn som inte är en del av systemets atandard
ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd
@@ -539,8 +564,8 @@ GB18030
EXEMPEL
Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
@@ -604,6 +629,10 @@ REKURSIV KONVERTERING
for /R %G in (*.txt) do dos2unix "%G"
+ PowerShell-användare kan använda följande kommando i Windows PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
LOKALISERING
LANG
Det primära språket väljs med miljövariabeln LANG. LANG-variabeln
@@ -659,7 +688,7 @@ RETURVÄRDE
kommer det senaste systemfelet att returneras. För andra fel kommer 1
att returneras.
- Returvärdet är alltid noll i tystläge, utom när felaktiga
+ Returvärdet är alltid noll i tyst läge, utom när felaktiga
kommandoradsflaggor används.
STANDARDER
diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1
index accafcc..d6edadd 100644
--- a/man/uk/man1/dos2unix.1
+++ b/man/uk/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -120,7 +120,9 @@ SunOS/Solaris. Втім, існує одна важлива відмінніст
для SunOS/Solaris. Ця версія типово виконує заміну файлів під час
перетворення (старий режим обробки файлів), а у оригінальній версії для
SunOS/Solaris передбачено підтримку лише парного перетворення (новий режим
-обробки файлів). Див. також параметри \f(CW\*(C`\-o\*(C'\fR та \f(CW\*(C`\-n\*(C'\fR.
+обробки файлів). Див. також параметри \f(CW\*(C`\-o\*(C'\fR та \f(CW\*(C`\-n\*(C'\fR. Ще однією відмінністю
+є те, що у версії для SunOS/Solaris типово використовувався режим
+перетворення \fIiso\fR, а у цій версії типовим є режим перетворення \fIascii\fR.
.SH "ПАРАМЕТРИ"
.IX Header "ПАРАМЕТРИ"
.IP "\fB\-\-\fR" 4
@@ -181,7 +183,8 @@ SunOS/Solaris передбачено підтримку лише парного
.IP "\fB\-D, \-\-display\-enc КОДУВАННЯ\fR" 4
.IX Item "-D, --display-enc КОДУВАННЯ"
Встановити кодування показаного тексту. Можливі варіанти значень параметра
-КОДУВАННЯ: \fIansi\fR, \fIunicode\fR, \fIutf8\fR, типовим є ansi.
+КОДУВАННЯ: \fIansi\fR, \fIunicode\fR, \fIunicodebom\fR, \fIutf8\fR, \fIutf8bom\fR, типовим
+є ansi.
.Sp
Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів
у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів,
@@ -203,8 +206,8 @@ Windows.
системному кодуванні, буде показано неправильно. Замість цих символів ви
побачите знак питання або не той символ. Якщо у вашій системі немає файлів
із назвами, які містять нетипові символи, можна скористатися цим варіантом.
-.IP "\fBunicode\fR" 4
-.IX Item "unicode"
+.IP "\fBunicode, unicodebom\fR" 4
+.IX Item "unicode, unicodebom"
Перевагою кодування unicode (назва у Windows кодування \s-1UTF\-16\s0) є те, що
зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не
потрібно. Ймовірно, вам потрібно встановити шрифт консолі TrueType для
@@ -217,15 +220,16 @@ TrueType, зазвичай ви побачите невеличкий квадр
.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
+Якщо використовується метод \f(CW\*(C`unicodebom\*(C'\fR, текст у кодуванні Unicode буде
+оброблено з урахуванням \s-1BOM \s0(позначки порядку байтів). \s-1BOM\s0 потрібна для
+правильного переспрямовування або тунелювання даних у PowerShell.
+.IP "\fButf8, utf8bom\fR" 4
+.IX Item "utf8, utf8bom"
+Перевагою utf8 є те, що це кодування сумісне з \s-1ASCII.\s0 Вам слід встановити
+шрифт консолі TrueType. Якщо використано шрифт TrueType, текст буде показано
+подібно до того, як його показано, якщо визначено кодування \f(CW\*(C`unicode\*(C'\fR.
.Sp
Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі
символи поза \s-1ASCII\s0 буде показано неправильно. Не лише назви файлів у
@@ -234,11 +238,16 @@ Windows, налаштованому на роботі у східно\-азій
помітити значне блимання під час показу повідомлень.
.Sp
У консолі ConEmu добре працює спосіб кодування utf8.
+.Sp
+Якщо використовується метод \f(CW\*(C`utf8bom\*(C'\fR, текст у кодуванні \s-1UTF\-8\s0 буде
+оброблено з урахуванням \s-1BOM \s0(позначки порядку байтів). \s-1BOM\s0 потрібна для
+правильного переспрямовування або тунелювання даних у PowerShell.
.RE
.RS 4
.Sp
Типове кодування можна змінити за допомогою змінної середовища
-\&\s-1DOS2UNIX_DISPLAY_ENC\s0 встановленням для неї значення \f(CW\*(C`unicode\*(C'\fR або \f(CW\*(C`utf8\*(C'\fR.
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 встановленням для неї значення \f(CW\*(C`unicode\*(C'\fR,
+\&\f(CW\*(C`unicodebom\*(C'\fR, \f(CW\*(C`utf8\*(C'\fR або \f(CW\*(C`utf8bom\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -274,6 +283,9 @@ Windows, налаштованому на роботі у східно\-азій
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+Зауважте, що іноді бінарні файли помилково розпізнаються як
+текстові. Див. також параметр \f(CW\*(C`\-s\*(C'\fR.
+.Sp
Крім того, можна вказати додаткові прапорці для внесення змін у виведені
дані. Можна використовувати один або декілька таких прапорців.
.RS 4
@@ -299,6 +311,12 @@ Windows, налаштованому на роботі у східно\-азій
Із прапорцем \f(CW\*(C`c\*(C'\fR dos2unix виведе лише назви файлів, у яких містяться
розриви рядків \s-1DOS.\s0 unix2dos виведе лише назви файлів, у яких містяться
розриви рядків Unix.
+.IP "\fBh\fR" 4
+.IX Item "h"
+Вивести заголовок.
+.IP "\fBp\fR" 4
+.IX Item "p"
+Показувати назви файлів без шляхів.
.RE
.RS 4
.Sp
@@ -416,6 +434,13 @@ Unix:
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
Пропускати двійкові файли (типово).
+.Sp
+Пропускання бінарних файлів реалізовано для того, щоб уникнути випадкових
+помилок. Майте на увазі, що визначення бінарних файлів не є 100%
+точним. Програма просто шукає у файлах бінарні символи, які типово не
+трапляються у текстових файлах. Може так статися, що у бінарному файлі
+містяться лише звичайні текстові символи. Такий бінарний файл буде помилково
+сприйнято програмою як текстовий.
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
Зберегти початкове кодування \s-1UTF\-16.\s0 Файл результатів буде записано у тому
@@ -708,8 +733,8 @@ Dos2unix та unix2dos завжди записують до файла резу
до стандартного виведення (stdout):
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і
@@ -802,6 +827,13 @@ a.txt і замістити ними цей файл. Перетворити д
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+Користувачі PowerShell можуть скористатися такою командою у Windows
+PowerShell:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "ЛОКАЛІЗАЦІЯ"
.IX Header "ЛОКАЛІЗАЦІЯ"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm
index eaf5e54..33d75ec 100644
--- a/man/uk/man1/dos2unix.htm
+++ b/man/uk/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
+<title>dos2unix 7.3.3 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>&#x422;&#x438;&#x43F;&#x43E;&#x432;&#x43E;, &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x430; &#x43D;&#x435; &#x432;&#x43D;&#x43E;&#x441;&#x438;&#x442;&#x438;&#x43C;&#x435; &#x437;&#x43C;&#x456;&#x43D; &#x434;&#x43E; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x447;&#x43D;&#x438;&#x445; &#x43F;&#x43E;&#x441;&#x438;&#x43B;&#x430;&#x43D;&#x44C; &#x442;&#x430; &#x43E;&#x431;&rsquo;&#x454;&#x43A;&#x442;&#x456;&#x432; &#x43F;&#x43E;&#x441;&#x438;&#x43B;&#x430;&#x43D;&#x44C;. &#x42F;&#x43A;&#x449;&#x43E; &#x43F;&#x43E;&#x442;&#x440;&#x456;&#x431;&#x43D;&#x43E;, &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x430; &#x43C;&#x43E;&#x436;&#x435; &#x437;&#x430;&#x43C;&#x456;&#x43D;&#x438;&#x442;&#x438; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x447;&#x43D;&#x456; &#x43F;&#x43E;&#x441;&#x438;&#x43B;&#x430;&#x43D;&#x43D;&#x44F; &#x430;&#x431;&#x43E; &#x437;&#x430;&#x43F;&#x438;&#x441;&#x430;&#x442;&#x438; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x456; &#x434;&#x430;&#x43D;&#x456; &#x434;&#x43E; &#x444;&#x430;&#x439;&#x43B;&#x430;-&#x43F;&#x440;&#x438;&#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44F; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x447;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x43E;&#x441;&#x438;&#x43B;&#x430;&#x43D;&#x43D;&#x44F;. &#x423; Windows &#x437;&#x430;&#x43F;&#x438;&#x441;&#x443; &#x434;&#x43E; &#x43E;&#x431;&rsquo;&#x454;&#x43A;&#x442;&#x430; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x456;&#x447;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x43E;&#x441;&#x438;&#x43B;&#x430;&#x43D;&#x43D;&#x44F; &#x43D;&#x435; &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E;.</p>
-<p>&#x41F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x443; dos2unix &#x431;&#x443;&#x43B;&#x43E; &#x441;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43E; &#x437;&#x430; &#x437;&#x440;&#x430;&#x437;&#x43A;&#x43E;&#x43C; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x438; dos2unix &#x434;&#x43B;&#x44F; SunOS/Solaris. &#x412;&#x442;&#x456;&#x43C;, &#x456;&#x441;&#x43D;&#x443;&#x454; &#x43E;&#x434;&#x43D;&#x430; &#x432;&#x430;&#x436;&#x43B;&#x438;&#x432;&#x430; &#x432;&#x456;&#x434;&#x43C;&#x456;&#x43D;&#x43D;&#x456;&#x441;&#x442;&#x44C; &#x432;&#x456;&#x434; &#x43E;&#x440;&#x438;&#x433;&#x456;&#x43D;&#x430;&#x43B;&#x44C;&#x43D;&#x43E;&#x457; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x434;&#x43B;&#x44F; SunOS/Solaris. &#x426;&#x44F; &#x432;&#x435;&#x440;&#x441;&#x456;&#x44F; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x43D;&#x443;&#x454; &#x437;&#x430;&#x43C;&#x456;&#x43D;&#x443; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x43F;&#x456;&#x434; &#x447;&#x430;&#x441; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; (&#x441;&#x442;&#x430;&#x440;&#x438;&#x439; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43A;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;), &#x430; &#x443; &#x43E;&#x440;&#x438;&#x433;&#x456;&#x43D;&#x430;&#x43B;&#x44C;&#x43D;&#x456;&#x439; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x434;&#x43B;&#x44F; SunOS/Solaris &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x443; &#x43B;&#x438;&#x448;&#x435; &#x43F;&#x430;&#x440;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; (&#x43D;&#x43E;&#x432;&#x438;&#x439; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43A;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;). &#x414;&#x438;&#x432;. &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440;&#x438; <code>-o</code> &#x442;&#x430; <code>-n</code>.</p>
+<p>&#x41F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x443; dos2unix &#x431;&#x443;&#x43B;&#x43E; &#x441;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43E; &#x437;&#x430; &#x437;&#x440;&#x430;&#x437;&#x43A;&#x43E;&#x43C; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x438; dos2unix &#x434;&#x43B;&#x44F; SunOS/Solaris. &#x412;&#x442;&#x456;&#x43C;, &#x456;&#x441;&#x43D;&#x443;&#x454; &#x43E;&#x434;&#x43D;&#x430; &#x432;&#x430;&#x436;&#x43B;&#x438;&#x432;&#x430; &#x432;&#x456;&#x434;&#x43C;&#x456;&#x43D;&#x43D;&#x456;&#x441;&#x442;&#x44C; &#x432;&#x456;&#x434; &#x43E;&#x440;&#x438;&#x433;&#x456;&#x43D;&#x430;&#x43B;&#x44C;&#x43D;&#x43E;&#x457; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x434;&#x43B;&#x44F; SunOS/Solaris. &#x426;&#x44F; &#x432;&#x435;&#x440;&#x441;&#x456;&#x44F; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x43D;&#x443;&#x454; &#x437;&#x430;&#x43C;&#x456;&#x43D;&#x443; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x43F;&#x456;&#x434; &#x447;&#x430;&#x441; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; (&#x441;&#x442;&#x430;&#x440;&#x438;&#x439; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43A;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;), &#x430; &#x443; &#x43E;&#x440;&#x438;&#x433;&#x456;&#x43D;&#x430;&#x43B;&#x44C;&#x43D;&#x456;&#x439; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x434;&#x43B;&#x44F; SunOS/Solaris &#x43F;&#x435;&#x440;&#x435;&#x434;&#x431;&#x430;&#x447;&#x435;&#x43D;&#x43E; &#x43F;&#x456;&#x434;&#x442;&#x440;&#x438;&#x43C;&#x43A;&#x443; &#x43B;&#x438;&#x448;&#x435; &#x43F;&#x430;&#x440;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; (&#x43D;&#x43E;&#x432;&#x438;&#x439; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43A;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;). &#x414;&#x438;&#x432;. &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440;&#x438; <code>-o</code> &#x442;&#x430; <code>-n</code>. &#x429;&#x435; &#x43E;&#x434;&#x43D;&#x456;&#x454;&#x44E; &#x432;&#x456;&#x434;&#x43C;&#x456;&#x43D;&#x43D;&#x456;&#x441;&#x442;&#x44E; &#x454; &#x442;&#x435;, &#x449;&#x43E; &#x443; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x434;&#x43B;&#x44F; SunOS/Solaris &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x432;&#x441;&#x44F; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; <i>iso</i>, &#x430; &#x443; &#x446;&#x456;&#x439; &#x432;&#x435;&#x440;&#x441;&#x456;&#x457; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x438;&#x43C; &#x454; &#x440;&#x435;&#x436;&#x438;&#x43C; &#x43F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x435;&#x43D;&#x43D;&#x44F; <i>ascii</i>.</p>
<h1 id="3">&#x41F;&#x410;&#x420;&#x410;&#x41C;&#x415;&#x422;&#x420;&#x418;</h1>
@@ -147,7 +147,7 @@
<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>&#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>unicodebom</i>, <i>utf8</i>, <i>utf8bom</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>
@@ -163,29 +163,33 @@
<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>
+<dt id="unicode-unicodebom"><b>unicode, unicodebom</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>
+<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;.</p>
+
+<p>&#x42F;&#x43A;&#x449;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x454;&#x442;&#x44C;&#x441;&#x44F; &#x43C;&#x435;&#x442;&#x43E;&#x434; <code>unicodebom</code>, &#x442;&#x435;&#x43A;&#x441;&#x442; &#x443; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456; Unicode &#x431;&#x443;&#x434;&#x435; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43B;&#x435;&#x43D;&#x43E; &#x437; &#x443;&#x440;&#x430;&#x445;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F;&#x43C; BOM (&#x43F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x438; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432;). BOM &#x43F;&#x43E;&#x442;&#x440;&#x456;&#x431;&#x43D;&#x430; &#x434;&#x43B;&#x44F; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x44C;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x435;&#x440;&#x435;&#x441;&#x43F;&#x440;&#x44F;&#x43C;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x430;&#x431;&#x43E; &#x442;&#x443;&#x43D;&#x435;&#x43B;&#x44E;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x434;&#x430;&#x43D;&#x438;&#x445; &#x443; PowerShell.</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8-utf8bom"><b>utf8, utf8bom</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>&#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. &#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>
+<p>&#x42F;&#x43A;&#x449;&#x43E; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x454;&#x442;&#x44C;&#x441;&#x44F; &#x43C;&#x435;&#x442;&#x43E;&#x434; <code>utf8bom</code>, &#x442;&#x435;&#x43A;&#x441;&#x442; &#x443; &#x43A;&#x43E;&#x434;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x456; UTF-8 &#x431;&#x443;&#x434;&#x435; &#x43E;&#x431;&#x440;&#x43E;&#x431;&#x43B;&#x435;&#x43D;&#x43E; &#x437; &#x443;&#x440;&#x430;&#x445;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F;&#x43C; BOM (&#x43F;&#x43E;&#x437;&#x43D;&#x430;&#x447;&#x43A;&#x438; &#x43F;&#x43E;&#x440;&#x44F;&#x434;&#x43A;&#x443; &#x431;&#x430;&#x439;&#x442;&#x456;&#x432;). BOM &#x43F;&#x43E;&#x442;&#x440;&#x456;&#x431;&#x43D;&#x430; &#x434;&#x43B;&#x44F; &#x43F;&#x440;&#x430;&#x432;&#x438;&#x43B;&#x44C;&#x43D;&#x43E;&#x433;&#x43E; &#x43F;&#x435;&#x440;&#x435;&#x441;&#x43F;&#x440;&#x44F;&#x43C;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x430;&#x431;&#x43E; &#x442;&#x443;&#x43D;&#x435;&#x43B;&#x44E;&#x432;&#x430;&#x43D;&#x43D;&#x44F; &#x434;&#x430;&#x43D;&#x438;&#x445; &#x443; PowerShell.</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>
+<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>, <code>unicodebom</code>, <code>utf8</code> &#x430;&#x431;&#x43E; <code>utf8bom</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>&#x417;&#x430;&#x443;&#x432;&#x430;&#x436;&#x442;&#x435;, &#x449;&#x43E; &#x456;&#x43D;&#x43E;&#x434;&#x456; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x456; &#x444;&#x430;&#x439;&#x43B;&#x438; &#x43F;&#x43E;&#x43C;&#x438;&#x43B;&#x43A;&#x43E;&#x432;&#x43E; &#x440;&#x43E;&#x437;&#x43F;&#x456;&#x437;&#x43D;&#x430;&#x44E;&#x442;&#x44C;&#x441;&#x44F; &#x44F;&#x43A; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x43E;&#x432;&#x456;. &#x414;&#x438;&#x432;. &#x442;&#x430;&#x43A;&#x43E;&#x436; &#x43F;&#x430;&#x440;&#x430;&#x43C;&#x435;&#x442;&#x440; <code>-s</code>.</p>
+
<p>&#x41A;&#x440;&#x456;&#x43C; &#x442;&#x43E;&#x433;&#x43E;, &#x43C;&#x43E;&#x436;&#x43D;&#x430; &#x432;&#x43A;&#x430;&#x437;&#x430;&#x442;&#x438; &#x434;&#x43E;&#x434;&#x430;&#x442;&#x43A;&#x43E;&#x432;&#x456; &#x43F;&#x440;&#x430;&#x43F;&#x43E;&#x440;&#x446;&#x456; &#x434;&#x43B;&#x44F; &#x432;&#x43D;&#x435;&#x441;&#x435;&#x43D;&#x43D;&#x44F; &#x437;&#x43C;&#x456;&#x43D; &#x443; &#x432;&#x438;&#x432;&#x435;&#x434;&#x435;&#x43D;&#x456; &#x434;&#x430;&#x43D;&#x456;. &#x41C;&#x43E;&#x436;&#x43D;&#x430; &#x432;&#x438;&#x43A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x43E;&#x432;&#x443;&#x432;&#x430;&#x442;&#x438; &#x43E;&#x434;&#x438;&#x43D; &#x430;&#x431;&#x43E; &#x434;&#x435;&#x43A;&#x456;&#x43B;&#x44C;&#x43A;&#x430; &#x442;&#x430;&#x43A;&#x438;&#x445; &#x43F;&#x440;&#x430;&#x43F;&#x43E;&#x440;&#x446;&#x456;&#x432;.</p>
<dl>
@@ -266,6 +272,18 @@
<p>&#x406;&#x437; &#x43F;&#x440;&#x430;&#x43F;&#x43E;&#x440;&#x446;&#x435;&#x43C; <code>c</code> dos2unix &#x432;&#x438;&#x432;&#x435;&#x434;&#x435; &#x43B;&#x438;&#x448;&#x435; &#x43D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;, &#x443; &#x44F;&#x43A;&#x438;&#x445; &#x43C;&#x456;&#x441;&#x442;&#x44F;&#x442;&#x44C;&#x441;&#x44F; &#x440;&#x43E;&#x437;&#x440;&#x438;&#x432;&#x438; &#x440;&#x44F;&#x434;&#x43A;&#x456;&#x432; DOS. unix2dos &#x432;&#x438;&#x432;&#x435;&#x434;&#x435; &#x43B;&#x438;&#x448;&#x435; &#x43D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432;, &#x443; &#x44F;&#x43A;&#x438;&#x445; &#x43C;&#x456;&#x441;&#x442;&#x44F;&#x442;&#x44C;&#x441;&#x44F; &#x440;&#x43E;&#x437;&#x440;&#x438;&#x432;&#x438; &#x440;&#x44F;&#x434;&#x43A;&#x456;&#x432; Unix.</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>&#x412;&#x438;&#x432;&#x435;&#x441;&#x442;&#x438; &#x437;&#x430;&#x433;&#x43E;&#x43B;&#x43E;&#x432;&#x43E;&#x43A;.</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>&#x41F;&#x43E;&#x43A;&#x430;&#x437;&#x443;&#x432;&#x430;&#x442;&#x438; &#x43D;&#x430;&#x437;&#x432;&#x438; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x431;&#x435;&#x437; &#x448;&#x43B;&#x44F;&#x445;&#x456;&#x432;.</p>
+
+</dd>
</dl>
<p>&#x41F;&#x440;&#x438;&#x43A;&#x43B;&#x430;&#x434;&#x438;:</p>
@@ -364,6 +382,8 @@
<p>&#x41F;&#x440;&#x43E;&#x43F;&#x443;&#x441;&#x43A;&#x430;&#x442;&#x438; &#x434;&#x432;&#x456;&#x439;&#x43A;&#x43E;&#x432;&#x456; &#x444;&#x430;&#x439;&#x43B;&#x438; (&#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E;).</p>
+<p>&#x41F;&#x440;&#x43E;&#x43F;&#x443;&#x441;&#x43A;&#x430;&#x43D;&#x43D;&#x44F; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x438;&#x445; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x440;&#x435;&#x430;&#x43B;&#x456;&#x437;&#x43E;&#x432;&#x430;&#x43D;&#x43E; &#x434;&#x43B;&#x44F; &#x442;&#x43E;&#x433;&#x43E;, &#x449;&#x43E;&#x431; &#x443;&#x43D;&#x438;&#x43A;&#x43D;&#x443;&#x442;&#x438; &#x432;&#x438;&#x43F;&#x430;&#x434;&#x43A;&#x43E;&#x432;&#x438;&#x445; &#x43F;&#x43E;&#x43C;&#x438;&#x43B;&#x43E;&#x43A;. &#x41C;&#x430;&#x439;&#x442;&#x435; &#x43D;&#x430; &#x443;&#x432;&#x430;&#x437;&#x456;, &#x449;&#x43E; &#x432;&#x438;&#x437;&#x43D;&#x430;&#x447;&#x435;&#x43D;&#x43D;&#x44F; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x438;&#x445; &#x444;&#x430;&#x439;&#x43B;&#x456;&#x432; &#x43D;&#x435; &#x454; 100% &#x442;&#x43E;&#x447;&#x43D;&#x438;&#x43C;. &#x41F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x430; &#x43F;&#x440;&#x43E;&#x441;&#x442;&#x43E; &#x448;&#x443;&#x43A;&#x430;&#x454; &#x443; &#x444;&#x430;&#x439;&#x43B;&#x430;&#x445; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x456; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x438;, &#x44F;&#x43A;&#x456; &#x442;&#x438;&#x43F;&#x43E;&#x432;&#x43E; &#x43D;&#x435; &#x442;&#x440;&#x430;&#x43F;&#x43B;&#x44F;&#x44E;&#x442;&#x44C;&#x441;&#x44F; &#x443; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x43E;&#x432;&#x438;&#x445; &#x444;&#x430;&#x439;&#x43B;&#x430;&#x445;. &#x41C;&#x43E;&#x436;&#x435; &#x442;&#x430;&#x43A; &#x441;&#x442;&#x430;&#x442;&#x438;&#x441;&#x44F;, &#x449;&#x43E; &#x443; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x43E;&#x43C;&#x443; &#x444;&#x430;&#x439;&#x43B;&#x456; &#x43C;&#x456;&#x441;&#x442;&#x44F;&#x442;&#x44C;&#x441;&#x44F; &#x43B;&#x438;&#x448;&#x435; &#x437;&#x432;&#x438;&#x447;&#x430;&#x439;&#x43D;&#x456; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x43E;&#x432;&#x456; &#x441;&#x438;&#x43C;&#x432;&#x43E;&#x43B;&#x438;. &#x422;&#x430;&#x43A;&#x438;&#x439; &#x431;&#x456;&#x43D;&#x430;&#x440;&#x43D;&#x438;&#x439; &#x444;&#x430;&#x439;&#x43B; &#x431;&#x443;&#x434;&#x435; &#x43F;&#x43E;&#x43C;&#x438;&#x43B;&#x43A;&#x43E;&#x432;&#x43E; &#x441;&#x43F;&#x440;&#x438;&#x439;&#x43D;&#x44F;&#x442;&#x43E; &#x43F;&#x440;&#x43E;&#x433;&#x440;&#x430;&#x43C;&#x43E;&#x44E; &#x44F;&#x43A; &#x442;&#x435;&#x43A;&#x441;&#x442;&#x43E;&#x432;&#x438;&#x439;.</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>&#x41F;&#x440;&#x43E;&#x447;&#x438;&#x442;&#x430;&#x442;&#x438; &#x432;&#x445;&#x456;&#x434;&#x43D;&#x456; &#x434;&#x430;&#x43D;&#x456; &#x437;&#x456; &#x441;&#x442;&#x430;&#x43D;&#x434;&#x430;&#x440;&#x442;&#x43D;&#x43E;&#x433;&#x43E; &#x434;&#x436;&#x435;&#x440;&#x435;&#x43B;&#x430; (stdin) &#x456; &#x437;&#x430;&#x43F;&#x438;&#x441;&#x430;&#x442;&#x438; &#x440;&#x435;&#x437;&#x443;&#x43B;&#x44C;&#x442;&#x430;&#x442; &#x434;&#x43E; &#x441;&#x442;&#x430;&#x43D;&#x434;&#x430;&#x440;&#x442;&#x43D;&#x43E;&#x433;&#x43E; &#x432;&#x438;&#x432;&#x435;&#x434;&#x435;&#x43D;&#x43D;&#x44F; (stdout):</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>&#x41F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x438;&#x442;&#x438; &#x434;&#x430;&#x43D;&#x456; &#x443; a.txt &#x456; &#x437;&#x430;&#x43C;&#x456;&#x441;&#x442;&#x438;&#x442;&#x438; &#x446;&#x435;&#x439; &#x444;&#x430;&#x439;&#x43B;. &#x41F;&#x435;&#x440;&#x435;&#x442;&#x432;&#x43E;&#x440;&#x438;&#x442;&#x438; &#x434;&#x430;&#x43D;&#x456; &#x443; b.txt &#x456; &#x437;&#x430;&#x43C;&#x456;&#x441;&#x442;&#x438;&#x442;&#x438; &#x446;&#x435;&#x439; &#x444;&#x430;&#x439;&#x43B;:</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>&#x41A;&#x43E;&#x440;&#x438;&#x441;&#x442;&#x443;&#x432;&#x430;&#x447;&#x456; PowerShell &#x43C;&#x43E;&#x436;&#x443;&#x442;&#x44C; &#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; &#x443; Windows PowerShell:</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="10">&#x41B;&#x41E;&#x41A;&#x410;&#x41B;&#x406;&#x417;&#x410;&#x426;&#x406;&#x42F;</h1>
<dl>
diff --git a/man/uk/man1/dos2unix.pod b/man/uk/man1/dos2unix.pod
index ee00e0f..a66965a 100644
--- a/man/uk/man1/dos2unix.pod
+++ b/man/uk/man1/dos2unix.pod
@@ -59,7 +59,9 @@ SunOS/Solaris. Втім, існує одна важлива відмінніст
для SunOS/Solaris. Ця версія типово виконує заміну файлів під час
перетворення (старий режим обробки файлів), а у оригінальній версії для
SunOS/Solaris передбачено підтримку лише парного перетворення (новий режим
-обробки файлів). Див. також параметри C<-o> та C<-n>.
+обробки файлів). Див. також параметри C<-o> та C<-n>. Ще однією відмінністю
+є те, що у версії для SunOS/Solaris типово використовувався режим
+перетворення I<iso>, а у цій версії типовим є режим перетворення I<ascii>.
=head1 ПАРАМЕТРИ
@@ -131,7 +133,8 @@ SunOS/Solaris передбачено підтримку лише парного
=item B<-D, --display-enc КОДУВАННЯ>
Встановити кодування показаного тексту. Можливі варіанти значень параметра
-КОДУВАННЯ: I<ansi>, I<unicode>, I<utf8>, типовим є ansi.
+КОДУВАННЯ: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, типовим
+є ansi.
Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів
у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів,
@@ -158,7 +161,7 @@ Windows.
побачите знак питання або не той символ. Якщо у вашій системі немає файлів
із назвами, які містять нетипові символи, можна скористатися цим варіантом.
-=item B<unicode>
+=item B<unicode, unicodebom>
Перевагою кодування unicode (назва у Windows кодування UTF-16) є те, що
зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не
@@ -172,16 +175,19 @@ TrueType, зазвичай ви побачите невеличкий квадр
Недоліком unicode є те, що це кодування несумісне з ASCII. Обробка виведених
даних є непростою, якщо ви передаватимете ці дані до іншої програми або
-файла. Переспрямовування даних до файла призведе до створення некоректного
-файла UTF-16.
+файла.
-=item B<utf8>
+Якщо використовується метод C<unicodebom>, текст у кодуванні Unicode буде
+оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для
+правильного переспрямовування або тунелювання даних у PowerShell.
-Перевагою utf8 є те, що це кодування сумісне з ASCII і, якщо ви
-переспрямуєте дані до файла, буде створено коректний файл UTF-8. Вам слід
-встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст
-буде показано подібно до того, як його показано, якщо визначено кодування
-C<unicode>.
+
+
+=item B<utf8, utf8bom>
+
+Перевагою utf8 є те, що це кодування сумісне з ASCII. Вам слід встановити
+шрифт консолі TrueType. Якщо використано шрифт TrueType, текст буде показано
+подібно до того, як його показано, якщо визначено кодування C<unicode>.
Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі
символи поза ASCII буде показано неправильно. Не лише назви файлів у
@@ -191,10 +197,17 @@ Windows, налаштованому на роботі у східно-азійс
У консолі ConEmu добре працює спосіб кодування utf8.
+Якщо використовується метод C<utf8bom>, текст у кодуванні UTF-8 буде
+оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для
+правильного переспрямовування або тунелювання даних у PowerShell.
+
+
+
=back
Типове кодування можна змінити за допомогою змінної середовища
-DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode> або C<utf8>.
+DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode>,
+C<unicodebom>, C<utf8> або C<utf8bom>.
=item B<-f, --force>
@@ -231,6 +244,9 @@ DOS2UNIX_DISPLAY_ENC встановленням для неї значення C
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+Зауважте, що іноді бінарні файли помилково розпізнаються як
+текстові. Див. також параметр C<-s>.
+
Крім того, можна вказати додаткові прапорці для внесення змін у виведені
дані. Можна використовувати один або декілька таких прапорців.
@@ -264,6 +280,14 @@ DOS2UNIX_DISPLAY_ENC встановленням для неї значення C
розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться
розриви рядків Unix.
+=item B<h>
+
+Вивести заголовок.
+
+=item B<p>
+
+Показувати назви файлів без шляхів.
+
=back
Приклади:
@@ -377,6 +401,13 @@ UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE.
Пропускати двійкові файли (типово).
+Пропускання бінарних файлів реалізовано для того, щоб уникнути випадкових
+помилок. Майте на увазі, що визначення бінарних файлів не є 100%
+точним. Програма просто шукає у файлах бінарні символи, які типово не
+трапляються у текстових файлах. Може так статися, що у бінарному файлі
+містяться лише звичайні текстові символи. Такий бінарний файл буде помилково
+сприйнято програмою як текстовий.
+
=item B<-u, --keep-utf16>
Зберегти початкове кодування UTF-16. Файл результатів буде записано у тому
@@ -668,8 +699,8 @@ ASCII. GB18030 також є сумісним із кодовою сторінк
Прочитати вхідні дані зі стандартного джерела (stdin) і записати результат
до стандартного виведення (stdout):
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і
замістити цей файл:
@@ -739,6 +770,13 @@ xargs(1). Наприклад, щоб виконати перетворення
for /R %G in (*.txt) do dos2unix "%G"
+Користувачі PowerShell можуть скористатися такою командою у Windows
+PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 ЛОКАЛІЗАЦІЯ
=over 4
diff --git a/man/uk/man1/dos2unix.txt b/man/uk/man1/dos2unix.txt
index 2cab9a7..df32376 100644
--- a/man/uk/man1/dos2unix.txt
+++ b/man/uk/man1/dos2unix.txt
@@ -41,7 +41,10 @@
версії для SunOS/Solaris. Ця версія типово виконує заміну файлів під час
перетворення (старий режим обробки файлів), а у оригінальній версії для
SunOS/Solaris передбачено підтримку лише парного перетворення (новий
- режим обробки файлів). Див. також параметри "-o" та "-n".
+ режим обробки файлів). Див. також параметри "-o" та "-n". Ще однією
+ відмінністю є те, що у версії для SunOS/Solaris типово використовувався
+ режим перетворення *iso*, а у цій версії типовим є режим перетворення
+ *ascii*.
ПАРАМЕТРИ
-- Вважати усі наступні параметри назвами файлів. Цим параметром слід
@@ -97,7 +100,8 @@
-D, --display-enc КОДУВАННЯ
Встановити кодування показаного тексту. Можливі варіанти значень
- параметра КОДУВАННЯ: *ansi*, *unicode*, *utf8*, типовим є ansi.
+ параметра КОДУВАННЯ: *ansi*, *unicode*, *unicodebom*, *utf8*,
+ *utf8bom*, типовим є ansi.
Цей параметр доступний лише у dos2unix для Windows з підтримкою назв
файлів у Unicode. Цей параметр не впливає на справжнє читання та
@@ -120,7 +124,7 @@
Якщо у вашій системі немає файлів із назвами, які містять
нетипові символи, можна скористатися цим варіантом.
- unicode
+ unicode, unicodebom
Перевагою кодування unicode (назва у Windows кодування UTF-16) є
те, що зазвичай текст буде показано правильно. Змінювати активну
кодову сторінку не потрібно. Ймовірно, вам потрібно встановити
@@ -135,15 +139,18 @@
Недоліком unicode є те, що це кодування несумісне з ASCII.
Обробка виведених даних є непростою, якщо ви передаватимете ці
- дані до іншої програми або файла. Переспрямовування даних до
- файла призведе до створення некоректного файла UTF-16.
+ дані до іншої програми або файла.
- utf8
- Перевагою utf8 є те, що це кодування сумісне з ASCII і, якщо ви
- переспрямуєте дані до файла, буде створено коректний файл UTF-8.
- Вам слід встановити шрифт консолі TrueType. Якщо використано
- шрифт TrueType, текст буде показано подібно до того, як його
- показано, якщо визначено кодування "unicode".
+ Якщо використовується метод "unicodebom", текст у кодуванні
+ Unicode буде оброблено з урахуванням BOM (позначки порядку
+ байтів). BOM потрібна для правильного переспрямовування або
+ тунелювання даних у PowerShell.
+
+ utf8, utf8bom
+ Перевагою utf8 є те, що це кодування сумісне з ASCII. Вам слід
+ встановити шрифт консолі TrueType. Якщо використано шрифт
+ TrueType, текст буде показано подібно до того, як його показано,
+ якщо визначено кодування "unicode".
Недоліком є те, що якщо ви скористаєтеся типовим растровим
шрифтом, усі символи поза ASCII буде показано неправильно. Не
@@ -154,9 +161,14 @@
У консолі ConEmu добре працює спосіб кодування utf8.
+ Якщо використовується метод "utf8bom", текст у кодуванні UTF-8
+ буде оброблено з урахуванням BOM (позначки порядку байтів). BOM
+ потрібна для правильного переспрямовування або тунелювання даних
+ у PowerShell.
+
Типове кодування можна змінити за допомогою змінної середовища
- DOS2UNIX_DISPLAY_ENC встановленням для неї значення "unicode" або
- "utf8".
+ DOS2UNIX_DISPLAY_ENC встановленням для неї значення "unicode",
+ "unicodebom", "utf8" або "utf8bom".
-f, --force
Примусове перетворення двійкових файлів.
@@ -190,6 +202,9 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ Зауважте, що іноді бінарні файли помилково розпізнаються як
+ текстові. Див. також параметр "-s".
+
Крім того, можна вказати додаткові прапорці для внесення змін у
виведені дані. Можна використовувати один або декілька таких
прапорців.
@@ -210,6 +225,10 @@
містяться розриви рядків DOS. unix2dos виведе лише назви файлів,
у яких містяться розриви рядків Unix.
+ h Вивести заголовок.
+
+ p Показувати назви файлів без шляхів.
+
Приклади:
Вивести дані щодо усіх файлів *.txt:
@@ -316,6 +335,13 @@
-s, --safe
Пропускати двійкові файли (типово).
+ Пропускання бінарних файлів реалізовано для того, щоб уникнути
+ випадкових помилок. Майте на увазі, що визначення бінарних файлів не
+ є 100% точним. Програма просто шукає у файлах бінарні символи, які
+ типово не трапляються у текстових файлах. Може так статися, що у
+ бінарному файлі містяться лише звичайні текстові символи. Такий
+ бінарний файл буде помилково сприйнято програмою як текстовий.
+
-u, --keep-utf16
Зберегти початкове кодування UTF-16. Файл результатів буде записано
у тому самому кодуванні UTF-16, із прямим або зворотним порядком
@@ -596,8 +622,8 @@ GB18030
Прочитати вхідні дані зі стандартного джерела (stdin) і записати
результат до стандартного виведення (stdout):
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt
і замістити цей файл:
@@ -667,6 +693,11 @@ GB18030
for /R %G in (*.txt) do dos2unix "%G"
+ Користувачі PowerShell можуть скористатися такою командою у Windows
+ PowerShell:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
ЛОКАЛІЗАЦІЯ
LANG
Основна мова визначається за допомогою змінної середовища LANG.
diff --git a/man/zh_CN/man1/dos2unix.1 b/man/zh_CN/man1/dos2unix.1
index f6de3b6..bd00e0f 100644
--- a/man/zh_CN/man1/dos2unix.1
+++ b/man/zh_CN/man1/dos2unix.1
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -101,8 +101,8 @@ Unicode(UTF\-16)文件也可以被转换为Unix Unicode(UTF\-8)文件。
.PP
符号链接和其所指向的目标默认不会被转换。可以用选项来指定替换符号链接,或者将输出写入到链接目标。Windows下不支持写入到符号链接的目标。
.PP
-Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式)。参见选项
-\&\f(CW\*(C`\-o\*(C'\fR 和 \f(CW\*(C`\-n\*(C'\fR。
+Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式),参见选项
+\&\f(CW\*(C`\-o\*(C'\fR 和 \f(CW\*(C`\-n\*(C'\fR。还有一个区别是SunOS/Solaris下的版本默认使用 \fIiso\fR 模式,而本版本默认使用 \fIascii\fR 模式。
.SH "选项"
.IX Header "选项"
.IP "\fB\-\-\fR" 4
@@ -155,7 +155,8 @@ Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个
改变转换模式。转换模式可以为:\fIascii\fR、\fI7bit\fR、\fIiso\fR或\fImac\fR,默认为ascii。
.IP "\fB\-D, \-\-display\-enc \s-1ENCODAGE\s0\fR" 4
.IX Item "-D, --display-enc ENCODAGE"
-设置显示文本的编码。编码可以为:\fIansi\fR、\fIunicode\fR、\fIutf8\fR,默认为ansi。
+设置显示文本的编码。编码可以为:\fIansi\fR、\fIunicode\fR、\fIunicodebom\fR、\fIutf8\fR、\fIutf8bom\fR,默认为
+ansi。
.Sp
这一选项只对支持Unicode文件名的Windows版dos2unix有效。它对文件名的读写无效,只影响它们的显示结果。
.Sp
@@ -167,25 +168,32 @@ dos2unix默认使用ANSI编码文本。优点是它能提供向后兼容性,
\&\f(CW\*(C`chcp\*(C'\fR 命令将活动DOS OEM编码页设置为Windows系统ANSI编码页,因为dos2unix使用Windows系统编码页。
.Sp
ansi的缺点是含有非系统默认编码页中字符的国际化文件名将无法被正确显示。你会看到一些问号或其他错误的字符。如果你不需要处理外文文件名,这一方法是不错的选择。
-.IP "\fBunicode\fR" 4
-.IX Item "unicode"
+.IP "\fBunicode,unicodebom\fR" 4
+.IX Item "unicode,unicodebom"
Unicode编码(Windows中对UTF\-16的称呼)的优点是文本可以被正确显示,也无需改变活动编码页。你可能需要设置终端字体为TrueType以便正确显示国际化字符。如果TrueType字体中不包含某个字符,你会看到一个小方块,有时方块中还会有一个问号。
.Sp
当你使用ConEmu终端时,所以的文本将会被正确显示,因为ConEmu会自动选择合适的字体。
.Sp
-Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制。重定向到文件无法得到正确的UTF\-16文件。
-.IP "\fButf8\fR" 4
-.IX Item "utf8"
-utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件时,文件将会为正确的UTF\-8格式。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示,就像使用
+Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制
+.Sp
+当使用 \f(CW\*(C`unicodebom\*(C'\fR
+方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。
+.IP "\fButf8,utf8bom\fR" 4
+.IX Item "utf8,utf8bom"
+utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示,就像使用
\&\f(CW\*(C`unicode\*(C'\fR 编码时那样。
.Sp
缺点是当你使用默认的raster字体时,所有的非ASCII字符将无法被正确显示。不仅是unicode文件名,连翻译的消息也无法被读取。在配置为东亚地区的Windows中,当终端中显示这些消息时你可能会看到闪烁现象。
.Sp
在ConEmu终端中,utf编码方式可以正常工作。
+.Sp
+当使用 \f(CW\*(C`utf8bom\*(C'\fR
+方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。
.RE
.RS 4
.Sp
-默认的编码方式可以通过设置 \s-1DOS2UNIX_DISPLAY_ENC\s0 环境变量为 \f(CW\*(C`unicode\*(C'\fR 或 \f(CW\*(C`utf8\*(C'\fR 来改变。
+默认的编码方式可以通过设置 \s-1DOS2UNIX_DISPLAY_ENC\s0 环境变量为 \f(CW\*(C`unicode\*(C'\fR 、\f(CW\*(C`unicodebom\*(C'\fR、\f(CW\*(C`utf8\*(C'\fR 或
+\&\f(CW\*(C`utf8bom\*(C'\fR 来改变。
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -216,6 +224,8 @@ utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件
\& 2 418 219 no_bom binary dos2unix.exe
.Ve
.Sp
+注意,二进制文件有时会被误判为文本文件。参见选项 \f(CW\*(C`\-s\*(C'\fR。
+.Sp
可以为输出设置额外的标志(一个或多个)。
.RS 4
.IP "\fBd\fR" 4
@@ -238,6 +248,12 @@ utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件
只显示将会被转换的文件。
.Sp
若设置了 \f(CW\*(C`c\*(C'\fR标志,dos2unix将只显示含有DOS断行符的文件,unix2dos将只显示含有Unix断行符的文件。
+.IP "\fBh\fR" 4
+.IX Item "h"
+显示头部。
+.IP "\fBp\fR" 4
+.IX Item "p"
+显示不含路径的文件名。
.RE
.RS 4
.Sp
@@ -324,6 +340,8 @@ utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件
.IP "\fB\-s, \-\-safe\fR" 4
.IX Item "-s, --safe"
跳过二进制文件(默认)。
+.Sp
+跳过二进制文件是为了避免可能的错误。请注意,对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件区分开来,但有的二进制文件可能只包含普通的文本字符,这样的文件就会被误判为文本文件。
.IP "\fB\-u, \-\-keep\-utf16\fR" 4
.IX Item "-u, --keep-utf16"
保留输入文件的UTF\-16编码。输出文件也使用UTF\-16编码和相同的尾序。这将阻止转换到UTF\-8。相应也会写入UTF\-16 BOM。可以用
@@ -533,8 +551,8 @@ GB18030编码的文件和Unicode文件一样可以含有BOM。
从标准输入读取,并输出到标准输出:
.PP
.Vb 2
-\& dos2unix
-\& dos2unix \-l \-c mac
+\& dos2unix < a.txt
+\& cat a.txt | dos2unix
.Ve
.PP
转换并覆盖a.txt和b.txt:
@@ -616,6 +634,12 @@ GB18030编码的文件和Unicode文件一样可以含有BOM。
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
.Ve
+.PP
+PowerShell用户可以在Windows PowerShell中使用如下命令:
+.PP
+.Vb 1
+\& get\-childitem \-path . \-filter \*(Aq*.txt\*(Aq \-recurse | foreach\-object {dos2unix $_.Fullname}
+.Ve
.SH "区域"
.IX Header "区域"
.IP "\fB\s-1LANG\s0\fR" 4
diff --git a/man/zh_CN/man1/dos2unix.htm b/man/zh_CN/man1/dos2unix.htm
index 5cc52a9..40846cd 100644
--- a/man/zh_CN/man1/dos2unix.htm
+++ b/man/zh_CN/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!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.3.2 - DOS/Mac - Unix文件格式转换器</title>
+<title>dos2unix 7.3.3 - DOS/Mac - Unix文件格式转换器</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
@@ -60,7 +60,7 @@
<p>&#x7B26;&#x53F7;&#x94FE;&#x63A5;&#x548C;&#x5176;&#x6240;&#x6307;&#x5411;&#x7684;&#x76EE;&#x6807;&#x9ED8;&#x8BA4;&#x4E0D;&#x4F1A;&#x88AB;&#x8F6C;&#x6362;&#x3002;&#x53EF;&#x4EE5;&#x7528;&#x9009;&#x9879;&#x6765;&#x6307;&#x5B9A;&#x66FF;&#x6362;&#x7B26;&#x53F7;&#x94FE;&#x63A5;&#xFF0C;&#x6216;&#x8005;&#x5C06;&#x8F93;&#x51FA;&#x5199;&#x5165;&#x5230;&#x94FE;&#x63A5;&#x76EE;&#x6807;&#x3002;Windows&#x4E0B;&#x4E0D;&#x652F;&#x6301;&#x5199;&#x5165;&#x5230;&#x7B26;&#x53F7;&#x94FE;&#x63A5;&#x7684;&#x76EE;&#x6807;&#x3002;</p>
-<p>Dos2unix&#x7531;SunOS/Solaris&#x4E0B;&#x7684;&#x7248;&#x672C;&#x6539;&#x5199;&#x800C;&#x6210;&#x3002;&#x8FD9;&#x4E24;&#x4E2A;&#x7248;&#x672C;&#x95F4;&#x6709;&#x4E00;&#x4E2A;&#x91CD;&#x5927;&#x5DEE;&#x5F02;&#xFF1A;&#x672C;&#x7248;&#x672C;&#x9ED8;&#x8BA4;&#x8FDB;&#x884C;&#x539F;&#x4F4D;&#x8F6C;&#x6362;&#xFF08;&#x65E7;&#x6587;&#x4EF6;&#x6A21;&#x5F0F;&#xFF09;&#xFF0C;&#x800C;&#x539F;&#x6765;SunOS/Solaris&#x4E0B;&#x7684;&#x7248;&#x672C;&#x53EA;&#x652F;&#x6301;&#x914D;&#x5BF9;&#x8F6C;&#x6362;&#xFF08;&#x65B0;&#x6587;&#x4EF6;&#x6A21;&#x5F0F;&#xFF09;&#x3002;&#x53C2;&#x89C1;&#x9009;&#x9879; <code>-o</code> &#x548C; <code>-n</code>&#x3002;</p>
+<p>Dos2unix&#x7531;SunOS/Solaris&#x4E0B;&#x7684;&#x7248;&#x672C;&#x6539;&#x5199;&#x800C;&#x6210;&#x3002;&#x8FD9;&#x4E24;&#x4E2A;&#x7248;&#x672C;&#x95F4;&#x6709;&#x4E00;&#x4E2A;&#x91CD;&#x5927;&#x5DEE;&#x5F02;&#xFF1A;&#x672C;&#x7248;&#x672C;&#x9ED8;&#x8BA4;&#x8FDB;&#x884C;&#x539F;&#x4F4D;&#x8F6C;&#x6362;&#xFF08;&#x65E7;&#x6587;&#x4EF6;&#x6A21;&#x5F0F;&#xFF09;&#xFF0C;&#x800C;&#x539F;&#x6765;SunOS/Solaris&#x4E0B;&#x7684;&#x7248;&#x672C;&#x53EA;&#x652F;&#x6301;&#x914D;&#x5BF9;&#x8F6C;&#x6362;&#xFF08;&#x65B0;&#x6587;&#x4EF6;&#x6A21;&#x5F0F;&#xFF09;&#xFF0C;&#x53C2;&#x89C1;&#x9009;&#x9879; <code>-o</code> &#x548C; <code>-n</code>&#x3002;&#x8FD8;&#x6709;&#x4E00;&#x4E2A;&#x533A;&#x522B;&#x662F;SunOS/Solaris&#x4E0B;&#x7684;&#x7248;&#x672C;&#x9ED8;&#x8BA4;&#x4F7F;&#x7528; <i>iso</i> &#x6A21;&#x5F0F;&#xFF0C;&#x800C;&#x672C;&#x7248;&#x672C;&#x9ED8;&#x8BA4;&#x4F7F;&#x7528; <i>ascii</i> &#x6A21;&#x5F0F;&#x3002;</p>
<h1 id="3">&#x9009;&#x9879;</h1>
@@ -147,7 +147,7 @@
<dt id="D---display-enc-ENCODAGE"><b>-D, --display-enc ENCODAGE</b></dt>
<dd>
-<p>&#x8BBE;&#x7F6E;&#x663E;&#x793A;&#x6587;&#x672C;&#x7684;&#x7F16;&#x7801;&#x3002;&#x7F16;&#x7801;&#x53EF;&#x4EE5;&#x4E3A;&#xFF1A;<i>ansi</i>&#x3001;<i>unicode</i>&#x3001;<i>utf8</i>&#xFF0C;&#x9ED8;&#x8BA4;&#x4E3A;ansi&#x3002;</p>
+<p>&#x8BBE;&#x7F6E;&#x663E;&#x793A;&#x6587;&#x672C;&#x7684;&#x7F16;&#x7801;&#x3002;&#x7F16;&#x7801;&#x53EF;&#x4EE5;&#x4E3A;&#xFF1A;<i>ansi</i>&#x3001;<i>unicode</i>&#x3001;<i>unicodebom</i>&#x3001;<i>utf8</i>&#x3001;<i>utf8bom</i>&#xFF0C;&#x9ED8;&#x8BA4;&#x4E3A; ansi&#x3002;</p>
<p>&#x8FD9;&#x4E00;&#x9009;&#x9879;&#x53EA;&#x5BF9;&#x652F;&#x6301;Unicode&#x6587;&#x4EF6;&#x540D;&#x7684;Windows&#x7248;dos2unix&#x6709;&#x6548;&#x3002;&#x5B83;&#x5BF9;&#x6587;&#x4EF6;&#x540D;&#x7684;&#x8BFB;&#x5199;&#x65E0;&#x6548;&#xFF0C;&#x53EA;&#x5F71;&#x54CD;&#x5B83;&#x4EEC;&#x7684;&#x663E;&#x793A;&#x7ED3;&#x679C;&#x3002;</p>
@@ -163,29 +163,33 @@
<p>ansi&#x7684;&#x7F3A;&#x70B9;&#x662F;&#x542B;&#x6709;&#x975E;&#x7CFB;&#x7EDF;&#x9ED8;&#x8BA4;&#x7F16;&#x7801;&#x9875;&#x4E2D;&#x5B57;&#x7B26;&#x7684;&#x56FD;&#x9645;&#x5316;&#x6587;&#x4EF6;&#x540D;&#x5C06;&#x65E0;&#x6CD5;&#x88AB;&#x6B63;&#x786E;&#x663E;&#x793A;&#x3002;&#x4F60;&#x4F1A;&#x770B;&#x5230;&#x4E00;&#x4E9B;&#x95EE;&#x53F7;&#x6216;&#x5176;&#x4ED6;&#x9519;&#x8BEF;&#x7684;&#x5B57;&#x7B26;&#x3002;&#x5982;&#x679C;&#x4F60;&#x4E0D;&#x9700;&#x8981;&#x5904;&#x7406;&#x5916;&#x6587;&#x6587;&#x4EF6;&#x540D;&#xFF0C;&#x8FD9;&#x4E00;&#x65B9;&#x6CD5;&#x662F;&#x4E0D;&#x9519;&#x7684;&#x9009;&#x62E9;&#x3002;</p>
</dd>
-<dt id="unicode"><b>unicode</b></dt>
+<dt id="unicodeunicodebom"><b>unicode&#xFF0C;unicodebom</b></dt>
<dd>
<p>Unicode&#x7F16;&#x7801;&#xFF08;Windows&#x4E2D;&#x5BF9;UTF-16&#x7684;&#x79F0;&#x547C;&#xFF09;&#x7684;&#x4F18;&#x70B9;&#x662F;&#x6587;&#x672C;&#x53EF;&#x4EE5;&#x88AB;&#x6B63;&#x786E;&#x663E;&#x793A;&#xFF0C;&#x4E5F;&#x65E0;&#x9700;&#x6539;&#x53D8;&#x6D3B;&#x52A8;&#x7F16;&#x7801;&#x9875;&#x3002;&#x4F60;&#x53EF;&#x80FD;&#x9700;&#x8981;&#x8BBE;&#x7F6E;&#x7EC8;&#x7AEF;&#x5B57;&#x4F53;&#x4E3A;TrueType&#x4EE5;&#x4FBF;&#x6B63;&#x786E;&#x663E;&#x793A;&#x56FD;&#x9645;&#x5316;&#x5B57;&#x7B26;&#x3002;&#x5982;&#x679C;TrueType&#x5B57;&#x4F53;&#x4E2D;&#x4E0D;&#x5305;&#x542B;&#x67D0;&#x4E2A;&#x5B57;&#x7B26;&#xFF0C;&#x4F60;&#x4F1A;&#x770B;&#x5230;&#x4E00;&#x4E2A;&#x5C0F;&#x65B9;&#x5757;&#xFF0C;&#x6709;&#x65F6;&#x65B9;&#x5757;&#x4E2D;&#x8FD8;&#x4F1A;&#x6709;&#x4E00;&#x4E2A;&#x95EE;&#x53F7;&#x3002;</p>
<p>&#x5F53;&#x4F60;&#x4F7F;&#x7528;ConEmu&#x7EC8;&#x7AEF;&#x65F6;&#xFF0C;&#x6240;&#x4EE5;&#x7684;&#x6587;&#x672C;&#x5C06;&#x4F1A;&#x88AB;&#x6B63;&#x786E;&#x663E;&#x793A;&#xFF0C;&#x56E0;&#x4E3A;ConEmu&#x4F1A;&#x81EA;&#x52A8;&#x9009;&#x62E9;&#x5408;&#x9002;&#x7684;&#x5B57;&#x4F53;&#x3002;</p>
-<p>Unicode&#x7684;&#x7F3A;&#x70B9;&#x5728;&#x4E8E;&#x5B83;&#x4E0E;ASCII&#x4E0D;&#x517C;&#x5BB9;&#x3002;&#x5F53;&#x4F60;&#x5C06;&#x8F93;&#x51FA;&#x91CD;&#x5B9A;&#x5411;&#x5230;&#x5176;&#x4ED6;&#x7A0B;&#x5E8F;&#x6216;&#x6587;&#x4EF6;&#x65F6;&#xFF0C;&#x5B83;&#x53EF;&#x80FD;&#x4E0D;&#x90A3;&#x4E48;&#x5BB9;&#x6613;&#x63A7;&#x5236;&#x3002;&#x91CD;&#x5B9A;&#x5411;&#x5230;&#x6587;&#x4EF6;&#x65E0;&#x6CD5;&#x5F97;&#x5230;&#x6B63;&#x786E;&#x7684;UTF-16&#x6587;&#x4EF6;&#x3002;</p>
+<p>Unicode&#x7684;&#x7F3A;&#x70B9;&#x5728;&#x4E8E;&#x5B83;&#x4E0E;ASCII&#x4E0D;&#x517C;&#x5BB9;&#x3002;&#x5F53;&#x4F60;&#x5C06;&#x8F93;&#x51FA;&#x91CD;&#x5B9A;&#x5411;&#x5230;&#x5176;&#x4ED6;&#x7A0B;&#x5E8F;&#x6216;&#x6587;&#x4EF6;&#x65F6;&#xFF0C;&#x5B83;&#x53EF;&#x80FD;&#x4E0D;&#x90A3;&#x4E48;&#x5BB9;&#x6613;&#x63A7;&#x5236;</p>
+
+<p>&#x5F53;&#x4F7F;&#x7528; <code>unicodebom</code> &#x65B9;&#x6CD5;&#x65F6;&#xFF0C;&#x5C06;&#x4F1A;&#x5728;Unicode&#x6587;&#x672C;&#x524D;&#x6DFB;&#x52A0;&#x4E00;&#x4E2A;BOM&#xFF08;&#x5B57;&#x8282;&#x5E8F;&#x6807;&#x8BB0;&#xFF09;&#x3002;&#x5728;PowerShell&#x4E2D;&#xFF0C;&#x9700;&#x8981;&#x6839;&#x636E;BOM&#x6765;&#x8FDB;&#x884C;&#x6B63;&#x786E;&#x7684;&#x91CD;&#x5B9A;&#x5411;&#x6216;&#x7BA1;&#x9053;&#x8F93;&#x51FA;&#x3002;</p>
</dd>
-<dt id="utf8"><b>utf8</b></dt>
+<dt id="utf8utf8bom"><b>utf8&#xFF0C;utf8bom</b></dt>
<dd>
-<p>utf8&#x7684;&#x4F18;&#x70B9;&#x5728;&#x4E8E;&#x5B83;&#x4E0E;ASCII&#x517C;&#x5BB9;&#xFF0C;&#x5E76;&#x4E14;&#x5F53;&#x4F60;&#x5C06;&#x8F93;&#x51FA;&#x91CD;&#x5B9A;&#x5411;&#x5230;&#x6587;&#x4EF6;&#x65F6;&#xFF0C;&#x6587;&#x4EF6;&#x5C06;&#x4F1A;&#x4E3A;&#x6B63;&#x786E;&#x7684;UTF-8&#x683C;&#x5F0F;&#x3002;&#x4F60;&#x9700;&#x8981;&#x8BBE;&#x7F6E;&#x7EC8;&#x7AEF;&#x7684;&#x5B57;&#x4F53;&#x4E3A;TrueType&#x5B57;&#x4F53;&#x3002;&#x4F7F;&#x7528;TrueType&#x5B57;&#x4F53;&#x53EF;&#x4EE5;&#x4F7F;&#x5F97;&#x6587;&#x672C;&#x5F97;&#x4EE5;&#x6B63;&#x786E;&#x663E;&#x793A;&#xFF0C;&#x5C31;&#x50CF;&#x4F7F;&#x7528; <code>unicode</code> &#x7F16;&#x7801;&#x65F6;&#x90A3;&#x6837;&#x3002;</p>
+<p>utf8&#x7684;&#x4F18;&#x70B9;&#x5728;&#x4E8E;&#x5B83;&#x4E0E;ASCII&#x517C;&#x5BB9;&#x3002;&#x4F60;&#x9700;&#x8981;&#x8BBE;&#x7F6E;&#x7EC8;&#x7AEF;&#x7684;&#x5B57;&#x4F53;&#x4E3A;TrueType&#x5B57;&#x4F53;&#x3002;&#x4F7F;&#x7528;TrueType&#x5B57;&#x4F53;&#x53EF;&#x4EE5;&#x4F7F;&#x5F97;&#x6587;&#x672C;&#x5F97;&#x4EE5;&#x6B63;&#x786E;&#x663E;&#x793A;&#xFF0C;&#x5C31;&#x50CF;&#x4F7F;&#x7528; <code>unicode</code> &#x7F16;&#x7801;&#x65F6;&#x90A3;&#x6837;&#x3002;</p>
<p>&#x7F3A;&#x70B9;&#x662F;&#x5F53;&#x4F60;&#x4F7F;&#x7528;&#x9ED8;&#x8BA4;&#x7684;raster&#x5B57;&#x4F53;&#x65F6;&#xFF0C;&#x6240;&#x6709;&#x7684;&#x975E;ASCII&#x5B57;&#x7B26;&#x5C06;&#x65E0;&#x6CD5;&#x88AB;&#x6B63;&#x786E;&#x663E;&#x793A;&#x3002;&#x4E0D;&#x4EC5;&#x662F;unicode&#x6587;&#x4EF6;&#x540D;&#xFF0C;&#x8FDE;&#x7FFB;&#x8BD1;&#x7684;&#x6D88;&#x606F;&#x4E5F;&#x65E0;&#x6CD5;&#x88AB;&#x8BFB;&#x53D6;&#x3002;&#x5728;&#x914D;&#x7F6E;&#x4E3A;&#x4E1C;&#x4E9A;&#x5730;&#x533A;&#x7684;Windows&#x4E2D;&#xFF0C;&#x5F53;&#x7EC8;&#x7AEF;&#x4E2D;&#x663E;&#x793A;&#x8FD9;&#x4E9B;&#x6D88;&#x606F;&#x65F6;&#x4F60;&#x53EF;&#x80FD;&#x4F1A;&#x770B;&#x5230;&#x95EA;&#x70C1;&#x73B0;&#x8C61;&#x3002;</p>
<p>&#x5728;ConEmu&#x7EC8;&#x7AEF;&#x4E2D;&#xFF0C;utf&#x7F16;&#x7801;&#x65B9;&#x5F0F;&#x53EF;&#x4EE5;&#x6B63;&#x5E38;&#x5DE5;&#x4F5C;&#x3002;</p>
+<p>&#x5F53;&#x4F7F;&#x7528; <code>utf8bom</code> &#x65B9;&#x6CD5;&#x65F6;&#xFF0C;&#x5C06;&#x4F1A;&#x5728;Unicode&#x6587;&#x672C;&#x524D;&#x6DFB;&#x52A0;&#x4E00;&#x4E2A;BOM&#xFF08;&#x5B57;&#x8282;&#x5E8F;&#x6807;&#x8BB0;&#xFF09;&#x3002;&#x5728;PowerShell&#x4E2D;&#xFF0C;&#x9700;&#x8981;&#x6839;&#x636E;BOM&#x6765;&#x8FDB;&#x884C;&#x6B63;&#x786E;&#x7684;&#x91CD;&#x5B9A;&#x5411;&#x6216;&#x7BA1;&#x9053;&#x8F93;&#x51FA;&#x3002;</p>
+
</dd>
</dl>
-<p>&#x9ED8;&#x8BA4;&#x7684;&#x7F16;&#x7801;&#x65B9;&#x5F0F;&#x53EF;&#x4EE5;&#x901A;&#x8FC7;&#x8BBE;&#x7F6E; DOS2UNIX_DISPLAY_ENC &#x73AF;&#x5883;&#x53D8;&#x91CF;&#x4E3A; <code>unicode</code> &#x6216; <code>utf8</code> &#x6765;&#x6539;&#x53D8;&#x3002;</p>
+<p>&#x9ED8;&#x8BA4;&#x7684;&#x7F16;&#x7801;&#x65B9;&#x5F0F;&#x53EF;&#x4EE5;&#x901A;&#x8FC7;&#x8BBE;&#x7F6E; DOS2UNIX_DISPLAY_ENC &#x73AF;&#x5883;&#x53D8;&#x91CF;&#x4E3A; <code>unicode</code> &#x3001;<code>unicodebom</code>&#x3001;<code>utf8</code> &#x6216; <code>utf8bom</code> &#x6765;&#x6539;&#x53D8;&#x3002;</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -224,6 +228,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe</code></pre>
+<p>&#x6CE8;&#x610F;&#xFF0C;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#x6709;&#x65F6;&#x4F1A;&#x88AB;&#x8BEF;&#x5224;&#x4E3A;&#x6587;&#x672C;&#x6587;&#x4EF6;&#x3002;&#x53C2;&#x89C1;&#x9009;&#x9879; <code>-s</code>&#x3002;</p>
+
<p>&#x53EF;&#x4EE5;&#x4E3A;&#x8F93;&#x51FA;&#x8BBE;&#x7F6E;&#x989D;&#x5916;&#x7684;&#x6807;&#x5FD7;&#xFF08;&#x4E00;&#x4E2A;&#x6216;&#x591A;&#x4E2A;&#xFF09;&#x3002;</p>
<dl>
@@ -266,6 +272,18 @@
<p>&#x82E5;&#x8BBE;&#x7F6E;&#x4E86; <code>c</code>&#x6807;&#x5FD7;&#xFF0C;dos2unix&#x5C06;&#x53EA;&#x663E;&#x793A;&#x542B;&#x6709;DOS&#x65AD;&#x884C;&#x7B26;&#x7684;&#x6587;&#x4EF6;&#xFF0C;unix2dos&#x5C06;&#x53EA;&#x663E;&#x793A;&#x542B;&#x6709;Unix&#x65AD;&#x884C;&#x7B26;&#x7684;&#x6587;&#x4EF6;&#x3002;</p>
</dd>
+<dt id="h"><b>h</b></dt>
+<dd>
+
+<p>&#x663E;&#x793A;&#x5934;&#x90E8;&#x3002;</p>
+
+</dd>
+<dt id="p"><b>p</b></dt>
+<dd>
+
+<p>&#x663E;&#x793A;&#x4E0D;&#x542B;&#x8DEF;&#x5F84;&#x7684;&#x6587;&#x4EF6;&#x540D;&#x3002;</p>
+
+</dd>
</dl>
<p>&#x793A;&#x4F8B;&#xFF1A;</p>
@@ -364,6 +382,8 @@
<p>&#x8DF3;&#x8FC7;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#xFF08;&#x9ED8;&#x8BA4;&#xFF09;&#x3002;</p>
+<p>&#x8DF3;&#x8FC7;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#x662F;&#x4E3A;&#x4E86;&#x907F;&#x514D;&#x53EF;&#x80FD;&#x7684;&#x9519;&#x8BEF;&#x3002;&#x8BF7;&#x6CE8;&#x610F;&#xFF0C;&#x5BF9;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#x7684;&#x63A2;&#x6D4B;&#x5E76;&#x4E0D;&#x80FD;&#x505A;&#x5230;100%&#x51C6;&#x786E;&#x3002;&#x7A0B;&#x5E8F;&#x901A;&#x8FC7;&#x626B;&#x63CF;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#x6240;&#x7279;&#x6709;&#x7684;&#x6807;&#x8BB0;&#x6765;&#x5C06;&#x5176;&#x4E0E;&#x6587;&#x672C;&#x6587;&#x4EF6;&#x533A;&#x5206;&#x5F00;&#x6765;&#xFF0C;&#x4F46;&#x6709;&#x7684;&#x4E8C;&#x8FDB;&#x5236;&#x6587;&#x4EF6;&#x53EF;&#x80FD;&#x53EA;&#x5305;&#x542B;&#x666E;&#x901A;&#x7684;&#x6587;&#x672C;&#x5B57;&#x7B26;&#xFF0C;&#x8FD9;&#x6837;&#x7684;&#x6587;&#x4EF6;&#x5C31;&#x4F1A;&#x88AB;&#x8BEF;&#x5224;&#x4E3A;&#x6587;&#x672C;&#x6587;&#x4EF6;&#x3002;</p>
+
</dd>
<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
<dd>
@@ -579,8 +599,8 @@
<p>&#x4ECE;&#x6807;&#x51C6;&#x8F93;&#x5165;&#x8BFB;&#x53D6;&#xFF0C;&#x5E76;&#x8F93;&#x51FA;&#x5230;&#x6807;&#x51C6;&#x8F93;&#x51FA;&#xFF1A;</p>
-<pre><code> dos2unix
- dos2unix -l -c mac</code></pre>
+<pre><code> dos2unix &lt; a.txt
+ cat a.txt | dos2unix</code></pre>
<p>&#x8F6C;&#x6362;&#x5E76;&#x8986;&#x76D6;a.txt&#x548C;b.txt&#xFF1A;</p>
@@ -639,6 +659,10 @@
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+<p>PowerShell&#x7528;&#x6237;&#x53EF;&#x4EE5;&#x5728;Windows PowerShell&#x4E2D;&#x4F7F;&#x7528;&#x5982;&#x4E0B;&#x547D;&#x4EE4;&#xFF1A;</p>
+
+<pre><code> get-childitem -path . -filter &#39;*.txt&#39; -recurse | foreach-object {dos2unix $_.Fullname}</code></pre>
+
<h1 id="10">&#x533A;&#x57DF;</h1>
<dl>
diff --git a/man/zh_CN/man1/dos2unix.pod b/man/zh_CN/man1/dos2unix.pod
index 6fba995..dfae739 100644
--- a/man/zh_CN/man1/dos2unix.pod
+++ b/man/zh_CN/man1/dos2unix.pod
@@ -40,8 +40,8 @@ Unicode(UTF-16)文件也可以被转换为Unix Unicode(UTF-8)文件。
符号链接和其所指向的目标默认不会被转换。可以用选项来指定替换符号链接,或者将输出写入到链接目标。Windows下不支持写入到符号链接的目标。
-Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式)。参见选项
-C<-o> 和 C<-n>。
+Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式),参见选项
+C<-o> 和 C<-n>。还有一个区别是SunOS/Solaris下的版本默认使用 I<iso> 模式,而本版本默认使用 I<ascii> 模式。
=head1 选项
@@ -103,7 +103,8 @@ C<-o> 和 C<-n>。
=item B<-D, --display-enc ENCODAGE>
-设置显示文本的编码。编码可以为:I<ansi>、I<unicode>、I<utf8>,默认为ansi。
+设置显示文本的编码。编码可以为:I<ansi>、I<unicode>、I<unicodebom>、I<utf8>、I<utf8bom>,默认为
+ansi。
这一选项只对支持Unicode文件名的Windows版dos2unix有效。它对文件名的读写无效,只影响它们的显示结果。
@@ -120,26 +121,37 @@ C<chcp> 命令将活动DOS OEM编码页设置为Windows系统ANSI编码页,因
ansi的缺点是含有非系统默认编码页中字符的国际化文件名将无法被正确显示。你会看到一些问号或其他错误的字符。如果你不需要处理外文文件名,这一方法是不错的选择。
-=item B<unicode>
+=item B<unicode,unicodebom>
Unicode编码(Windows中对UTF-16的称呼)的优点是文本可以被正确显示,也无需改变活动编码页。你可能需要设置终端字体为TrueType以便正确显示国际化字符。如果TrueType字体中不包含某个字符,你会看到一个小方块,有时方块中还会有一个问号。
当你使用ConEmu终端时,所以的文本将会被正确显示,因为ConEmu会自动选择合适的字体。
-Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制。重定向到文件无法得到正确的UTF-16文件。
+Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制
-=item B<utf8>
+当使用 C<unicodebom>
+方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。
-utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件时,文件将会为正确的UTF-8格式。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示,就像使用
+
+
+=item B<utf8,utf8bom>
+
+utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示,就像使用
C<unicode> 编码时那样。
缺点是当你使用默认的raster字体时,所有的非ASCII字符将无法被正确显示。不仅是unicode文件名,连翻译的消息也无法被读取。在配置为东亚地区的Windows中,当终端中显示这些消息时你可能会看到闪烁现象。
在ConEmu终端中,utf编码方式可以正常工作。
+当使用 C<utf8bom>
+方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。
+
+
+
=back
-默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 C<unicode> 或 C<utf8> 来改变。
+默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 C<unicode> 、C<unicodebom>、C<utf8> 或
+C<utf8bom> 来改变。
=item B<-f, --force>
@@ -171,6 +183,8 @@ GB18030 一节。
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+注意,二进制文件有时会被误判为文本文件。参见选项 C<-s>。
+
可以为输出设置额外的标志(一个或多个)。
=over 4
@@ -201,6 +215,14 @@ GB18030 一节。
若设置了 C<c>标志,dos2unix将只显示含有DOS断行符的文件,unix2dos将只显示含有Unix断行符的文件。
+=item B<h>
+
+显示头部。
+
+=item B<p>
+
+显示不含路径的文件名。
+
=back
示例:
@@ -283,6 +305,8 @@ B<unix2dos>:只有Unix断行符会被转换为两个DOS断行符。在Mac模
跳过二进制文件(默认)。
+跳过二进制文件是为了避免可能的错误。请注意,对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件区分开来,但有的二进制文件可能只包含普通的文本字符,这样的文件就会被误判为文本文件。
+
=item B<-u, --keep-utf16>
保留输入文件的UTF-16编码。输出文件也使用UTF-16编码和相同的尾序。这将阻止转换到UTF-8。相应也会写入UTF-16 BOM。可以用
@@ -491,8 +515,8 @@ GB18030编码的文件和Unicode文件一样可以含有BOM。
从标准输入读取,并输出到标准输出:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
转换并覆盖a.txt和b.txt:
@@ -551,6 +575,12 @@ GB18030编码的文件和Unicode文件一样可以含有BOM。
for /R %G in (*.txt) do dos2unix "%G"
+PowerShell用户可以在Windows PowerShell中使用如下命令:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
+
+
=head1 区域
=over 4
diff --git a/man/zh_CN/man1/dos2unix.txt b/man/zh_CN/man1/dos2unix.txt
index 2266fd9..fb4f27f 100644
--- a/man/zh_CN/man1/dos2unix.txt
+++ b/man/zh_CN/man1/dos2unix.txt
@@ -21,7 +21,8 @@
符号链接和其所指向的目标默认不会被转换。可以用选项来指定替换符号链接,或者将输出写入到链接目标。Windows下不支持写入到符号链接的目标。
Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS
- /Solaris下的版本只支持配对转换(新文件模式)。参见选项 "-o" 和 "-n"。
+ /Solaris下的版本只支持配对转换(新文件模式),参见选项 "-o" 和 "-n"。还有一个区别是SunOS/Solaris下的版本默认使用
+ *iso* 模式,而本版本默认使用 *ascii* 模式。
选项
-- 将后面所有的选项当作文件名。如果你希望转换一个文件名以破折号开头的文件,可以使用这个选项。例如,要转换一个名为“-foo”的文件,你可以
@@ -66,7 +67,8 @@
改变转换模式。转换模式可以为:*ascii*、*7bit*、*iso*或*mac*,默认为ascii。
-D, --display-enc ENCODAGE
- 设置显示文本的编码。编码可以为:*ansi*、*unicode*、*utf8*,默认为ansi。
+ 设置显示文本的编码。编码可以为:*ansi*、*unicode*、*unicodebom*、*utf8*、*utf8bom*,默认为
+ ansi。
这一选项只对支持Unicode文件名的Windows版dos2unix有效。它对文件名的读写无效,只影响它们的显示结果。
@@ -80,26 +82,34 @@
ansi的缺点是含有非系统默认编码页中字符的国际化文件名将无法被正确显示。你会看到一些问号或其他错误的字符。如果你不需要处理外文
文件名,这一方法是不错的选择。
- unicode
+ unicode,unicodebom
Unicode编码(Windows中对UTF-16的称呼)的优点是文本可以被正确显示,也无需改变活动编码页。你可能需要设置终端字
体为TrueType以便正确显示国际化字符。如果TrueType字体中不包含某个字符,你会看到一个小方块,有时方块中还会有一个问
号。
当你使用ConEmu终端时,所以的文本将会被正确显示,因为ConEmu会自动选择合适的字体。
- Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制。重定向到文件无法得到正确
- 的UTF-16文件。
+ Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制
- utf8
- utf8的优点在于它与ASCII兼容,并且当你将输出重定向到文件时,文件将会为正确的UTF-8格式。你需要设置终端的字体为Tru
- eType字体。使用TrueType字体可以使得文本得以正确显示,就像使用 "unicode" 编码时那样。
+ 当使用 "unicodebom"
+ 方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道
+ 输出。
+
+ utf8,utf8bom
+ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显
+ 示,就像使用 "unicode" 编码时那样。
缺点是当你使用默认的raster字体时,所有的非ASCII字符将无法被正确显示。不仅是unicode文件名,连翻译的消息也无法被
读取。在配置为东亚地区的Windows中,当终端中显示这些消息时你可能会看到闪烁现象。
在ConEmu终端中,utf编码方式可以正常工作。
- 默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 "unicode" 或 "utf8" 来改变。
+ 当使用 "utf8bom"
+ 方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道
+ 输出。
+
+ 默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 "unicode"
+ 、"unicodebom"、"utf8" 或 "utf8bom" 来改变。
-f, --force
强制转换二进制文件。
@@ -127,6 +137,8 @@
50 0 0 UTF-8 text utf8dos.txt
2 418 219 no_bom binary dos2unix.exe
+ 注意,二进制文件有时会被误判为文本文件。参见选项 "-s"。
+
可以为输出设置额外的标志(一个或多个)。
d 显示DOS断行符的数量。
@@ -143,6 +155,10 @@
若设置了 "c"标志,dos2unix将只显示含有DOS断行符的文件,unix2dos将只显示含有Unix断行符的文件。
+ h 显示头部。
+
+ p 显示不含路径的文件名。
+
示例:
显示所有 *.txt 文件的信息:
@@ -214,6 +230,9 @@
-s, --safe
跳过二进制文件(默认)。
+ 跳过二进制文件是为了避免可能的错误。请注意,对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件
+ 区分开来,但有的二进制文件可能只包含普通的文本字符,这样的文件就会被误判为文本文件。
+
-u, --keep-utf16
保留输入文件的UTF-16编码。输出文件也使用UTF-16编码和相同的尾序。这将阻止转换到UTF-8。相应也会写入UTF-16
BOM。可以用 "-ascii"选项来禁止。
@@ -395,8 +414,8 @@ GB18030
示例
从标准输入读取,并输出到标准输出:
- dos2unix
- dos2unix -l -c mac
+ dos2unix < a.txt
+ cat a.txt | dos2unix
转换并覆盖a.txt和b.txt:
@@ -455,6 +474,10 @@ GB18030
for /R %G in (*.txt) do dos2unix "%G"
+ PowerShell用户可以在Windows PowerShell中使用如下命令:
+
+ get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}
+
区域
LANG
LANG环境变量指定了程序所使用的首选语言。它包括几个部分:第一部分是小写的语言编码,第二部分是(可选的)大写的国家/地区代码,前面用下
diff --git a/mingw.mak b/mingw.mak
deleted file mode 100644
index 2744d0c..0000000
--- a/mingw.mak
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Author: Erwin Waterlander
-# Copyright (C) 2009-2014 Erwin Waterlander
-# This file is distributed under the same license as the dos2unix package.
-
-# This makefile is for use with MSYS and MinGW (mingw.org) target 32 bit (i686)
-# http://www.mingw.org/
-.PHONY: test check
-
-UNIFILE=1
-CC = gcc
-prefix=c:/usr/local
-ENABLE_NLS=
-
-ifdef ENABLE_NLS
-LIBS_EXTRA = -lintl -liconv
-ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
-endif
-
-all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) UNIFILE=$(UNIFILE) CFLAGS_OS=-D_O_U16TEXT=0x20000
-
-test: all
- cd test; $(MAKE) test
-
-check: test
-
-install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) UNIFILE=$(UNIFILE) CFLAGS_OS=-D_O_U16TEXT=0x20000
-
-uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
-
-clean:
- $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-mostlyclean:
- $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-dist:
- $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="-win32" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS)
-
-strip:
- $(MAKE) strip LINK="cp -f" EXE=.exe
-
diff --git a/mingw32.mak b/mingw32.mak
deleted file mode 100644
index 73ff0f1..0000000
--- a/mingw32.mak
+++ /dev/null
@@ -1,53 +0,0 @@
-# Author: Erwin Waterlander
-# Copyright (C) 2013-2014 Erwin Waterlander
-# This file is distributed under the same license as the dos2unix package.
-
-# This makefile is for use with MSYS2 and MinGW-w64 target 32 bit (i686)
-# http://sourceforge.net/projects/msys2/
-.PHONY: test check
-
-# Ruben van Boxem i686-w64-mingw32
-#CRT_GLOB_OBJ = C:/mingw32/i686-w64-mingw32/lib/CRT_glob.o
-# We need C++ for d2u_printf in common.c.
-
-UNIFILE=1
-
-# MSYS2
-CC = gcc
-CRT_GLOB_OBJ = /mingw32/i686-w64-mingw32/lib/CRT_glob.o
-
-prefix=c:/usr/local
-ENABLE_NLS=
-
-ifdef ENABLE_NLS
-LIBS_EXTRA = -lintl -liconv
-ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll bin/libgcc_s_dw2-1.dll bin/libwinpthread-1.dll
-endif
-LIBS_EXTRA += $(CRT_GLOB_OBJ)
-
-all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw32/include UNIFILE=$(UNIFILE)
-
-test: all
- cd test; $(MAKE) test
-
-check: test
-
-install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw32/include UNIFILE=$(UNIFILE)
-
-uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
-
-clean:
- $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-mostlyclean:
- $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-dist:
- $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="-win32" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS)
-
-strip:
- $(MAKE) strip LINK="cp -f" EXE=.exe
-
diff --git a/mingw64.mak b/mingw64.mak
deleted file mode 100644
index bbf398a..0000000
--- a/mingw64.mak
+++ /dev/null
@@ -1,55 +0,0 @@
-# Author: Erwin Waterlander
-# Copyright (C) 2012-2014 Erwin Waterlander
-# This file is distributed under the same license as the dos2unix package.
-
-# This makefile is for use with MSYS2 and MinGW-w64 target 64 bit (x86_64)
-# http://sourceforge.net/projects/msys2/
-.PHONY: test check
-
-# Ruben van Boxem x86_64-w64-mingw32
-#CC = x86_64-w64-mingw32-gcc
-#STRIP = x86_64-w64-mingw32-strip
-#CRT_GLOB_OBJ = C:/mingw64/mingw/lib/CRT_glob.o
-
-UNIFILE=1
-
-# MSYS2
-CC = gcc
-STRIP = strip
-CRT_GLOB_OBJ = /mingw64/x86_64-w64-mingw32/lib/CRT_glob.o
-
-prefix=c:/usr/local64
-ENABLE_NLS=
-
-ifdef ENABLE_NLS
-LIBS_EXTRA = -lintl -liconv
-ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
-endif
-LIBS_EXTRA += $(CRT_GLOB_OBJ)
-
-all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw64/include UNIFILE=$(UNIFILE)
-
-test: all
- cd test; $(MAKE) test
-
-check: test
-
-install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw64/include UNIFILE=$(UNIFILE)
-
-uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
-
-clean:
- $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-mostlyclean:
- $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-dist:
- $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="-win64" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS)
-
-strip:
- $(MAKE) strip LINK="cp -f" EXE=.exe STRIP=$(STRIP)
-
diff --git a/man/de/man1/dos2unix.po b/po-man/de.po
index 08a3e4f..e42ab6d 100644
--- a/man/de/man1/dos2unix.po
+++ b/po-man/de.po
@@ -2,19 +2,19 @@
# 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-2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-25 19:05+0200\n"
+"Project-Id-Version: dos2unix-man-7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-09 09:37+0100\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.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
#. type: =head1
#: dos2unix.pod:52
@@ -80,26 +80,26 @@ msgstr "Symbolische Links und deren Ziele werden per Vorgabe unverändert belass
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris entwickelt, doch es gibt einen wesentlichen Unterschied zum Original: Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>. Ein weiterer Unterschied ist, dass die SunOS/Solaris-Version in der Voreinstellung die Umwandlung im I<iso>-Modus vornimmt, während diese Version den I<ascii>-Modus verwendet."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "OPTIONEN"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "nimmt alle folgenden Optionen als Dateinamen an. Verwenden Sie diese Option, wenn Sie Dateien umwandeln wollen, deren Namen mit einem Minuszeichen beginnen. Um beispielsweise eine Datei namens »-bla« umzuwandeln, können Sie folgenden Befehl verwenden:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -109,12 +109,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "oder im Neue-Datei-Modus:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -124,247 +124,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "wandelt aus dem DOS- in den ISO-8859-1-Zeichensatz um. Weitere Informationen hierzu finden Sie im Abschnitt UMWANDLUNGSMODI."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "verwendet die Windows-Codepage 1252 (Westeuropäisch)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "verwendet die DOS-Codepage 437 (US). Dies ist die vorgegebene Codepage für die ISO-Umwandlung."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "verwendet die DOS-Codepage 850 (Westeuropäisch)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "verwendet die DOS-Codepage 860 (Portugiesisch)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "verwendet die DOS-Codepage 863 (Kanadisches Französisch)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "verwendet die DOS-Codepage 865 (Skandinavisch)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "wandelt 8bit-Zeichen in ein 7bit-Bitmuster um."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "erhält die Markierung der Bytereihenfolge (BOM). Wenn die Eingabedatei eine BOM enthält, wird ebenfalls eine BOM in die Ausgabedatei geschrieben. Dies ist das Standardverhalten beim Umwandeln von DOS-Zeilenumbrüchen. Siehe auch die Option C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode UMWANDLUNGSMODUS>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann I<ascii>, I<7bit>, I<iso> oder I<mac> sein, wobei I<ascii> die Vorgabe ist."
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
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."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "legt die Kodierung des angezeigten Texts fest. KODIERUNG kann I<ansi>, I<unicode>, I<unicodebom>, I<utf8> oder <utf8bom> sein, wobei I<ansi> die Vorgabe ist."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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."
+#: dos2unix.pod:197
+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."
+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."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Wenn die Methode C<unicodebom> verwendet wird, dann wird dem Unicode-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist für korrekte um- oder Weiterleitung in der PowerShell notwendig."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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. 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
+#: dos2unix.pod:211
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
+#: dos2unix.pod:217
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."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Wenn die Methode C<utf8bom> verwendet wird, dann wird dem UTF-8-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist für korrekte um- oder Weiterleitung in der PowerShell notwendig."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_ENC auf C<unicode>, C<unicodebom>, C<utf8> oder C<utf8> geändert werden."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "erzwingt die Umwandlung von Binärdateien."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "zeigt eine Hilfe an und beendet das Programm."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[SCHALTER], --info[=SCHALTER] DATEI>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "zeigt Dateiinformationen an. Es wird keine Umwandlung vorgenommen."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Beispielausgabe:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -388,87 +398,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei erkannt wird. Siehe auch Option C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "gibt die Anzahl der DOS-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "gibt die Anzahl der Unix-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "gibt die Anzahl der Mac-Zeilenumbrüche aus."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "gibt die Markierung der Bytereihenfolge aus."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
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:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "gibt nur die Dateien aus, die umgewandelt werden würden."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "gibt eine Kopfzeile aus."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "zeigt Dateinamen ohne Pfade an."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Beispiele:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Informationen zu allen *.txt-Dateien anzeigen:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -478,12 +513,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -493,12 +528,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Nur die Markierung der Bytereihenfolge anzeigen:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -508,12 +543,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -523,12 +558,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Die Dateien auflisten, die Unix-Zeilenumbrüche enthalten:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -538,12 +573,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -553,12 +588,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Nach Textdateien suchen, die DOS-Zeilenumbrüche enthalten:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -568,307 +603,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "zeigt die Lizenz des Programms an."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "fügt eine zusätzliche neue Zeile hinzu."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile EINGABEDATEI AUSGABEDATEI …>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile DATEI …>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "überspringt Binärdateien (Vorgabe)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher funktioniert. Die übergebenen Dateien werden auf Binärsymbole überprüft, die typischerweise in Textdateien nicht vorkommen. Es ist jedoch möglich, dass eine Binärdatei ausschließlich gewöhnliche Textzeichen enthält. Eine solche Binärdatei wird dann fälschlicherweise als Textdatei angesehen."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Diese Option ist gleichbedeutend mit C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "folgt symbolischen Links und wandelt die Zieldateien um."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
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:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "zeigt Versionsinformationen an und beendet das Programm."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MAC-MODUS"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "UMWANDLUNGSMODI"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Einige Beispiele:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -878,12 +918,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Umwandlung von DOS CP850 nach Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -893,12 +933,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Umwandlung von Windows CP1252 nach Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -908,12 +948,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Umwandlung von Windows CP1252 nach Unix UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -923,12 +963,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -938,12 +978,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Umwandlung von Unix Latin-1 nach DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -953,12 +993,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Umwandlung von Unix Latin-1 nach Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -968,12 +1008,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Umwandlung von Unix UTF-8 (Unicode) nach Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -983,142 +1023,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Zeichenkodierungen"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Umwandlung"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
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:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Markierung der Bytereihenfolge"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Unicode-Dateinamen unter Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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:596
+#: dos2unix.pod:622
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:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Unicode-Beispiele"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1128,12 +1168,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1143,12 +1183,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1158,12 +1198,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1173,64 +1213,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "BEISPIELE"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Aus der Standardeingabe lesen und in die Standardausgabe schreiben:"
#. type: verbatim
-#: dos2unix.pod:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" find . -name '*.txt' |xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1242,12 +1284,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "a.txt im ascii-Modus umwandeln und ersetzen:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1257,12 +1299,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1276,12 +1318,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "a.txt aus dem Mac- in das Unix-Format umwandeln:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1293,12 +1335,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "a.txt aus dem Unix- in das Mac-Format umwandeln:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1310,12 +1352,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1327,12 +1369,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1342,12 +1384,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1357,12 +1399,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1374,12 +1416,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1389,17 +1431,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "REKURSIVE UMWANDLUNG"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1409,12 +1451,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
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:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1423,23 +1465,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "In der Windows PowerShell können Sie folgenden Befehl verwenden:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "LOKALISIERUNG"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1461,47 +1518,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Beispiel (POSIX-Shell):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1511,71 +1568,80 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "RÜCKGABEWERT"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "STANDARDS"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://de.wikipedia.org/wiki/Textdatei>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://de.wikipedia.org/wiki/Wagenr%C3%BCcklauf>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://de.wikipedia.org/wiki/Zeilenumbruch>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTOREN"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge-Seite: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
diff --git a/man/man1/dos2unix-man.pot b/po-man/dos2unix-man.pot
index 76653ca..21c5bcf 100644
--- a/man/man1/dos2unix-man.pot
+++ b/po-man/dos2unix-man.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-11-20 20:01+0100\n"
+"POT-Creation-Date: 2016-02-13 14:27+0100\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"
@@ -97,21 +97,23 @@ msgid ""
"important difference with the original SunOS/Solaris version. This version "
"does by default in-place conversion (old file mode), while the original "
"SunOS/Solaris version only supports paired conversion (new file mode). See "
-"also options C<-o> and C<-n>."
+"also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris "
+"version uses by default I<iso> mode conversion while this version uses by "
+"default I<ascii> mode conversion."
msgstr ""
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr ""
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr ""
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid ""
"Treat all following options as file names. Use this option if you want to "
"convert files whose names start with a dash. For instance to convert a file "
@@ -119,7 +121,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -127,12 +129,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -140,106 +142,106 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr ""
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid ""
"Conversion between DOS and ISO-8859-1 character set. See also section "
"CONVERSION MODES."
msgstr ""
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr ""
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid ""
"Use DOS code page 437 (US). This is the default code page used for ISO "
"conversion."
msgstr ""
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr ""
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr ""
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr ""
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr ""
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr ""
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid ""
"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in "
"the output file. This is the default behavior when converting to DOS line "
@@ -247,31 +249,31 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid ""
"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, "
"I<mac> with ascii being the default."
msgstr ""
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
msgid "B<-D, --display-enc ENCODING>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:159
msgid ""
"Set encoding of displayed text. Where ENCODING is one of: I<ansi>, "
-"I<unicode>, I<utf8> with ansi being the default."
+"I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
msgstr ""
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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 "
@@ -279,7 +281,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:165
+#: dos2unix.pod:167
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 "
@@ -287,12 +289,12 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:171
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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 "
@@ -302,7 +304,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:179
+#: dos2unix.pod:181
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 "
@@ -311,12 +313,12 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:184
-msgid "B<unicode>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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 "
@@ -327,36 +329,42 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:192
+#: dos2unix.pod:194
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
+#: dos2unix.pod:197
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."
+"output is not easy to handle when you redirect it to another program."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid ""
+"When method C<unicodebom> is used the Unicode text will be preceded with a "
+"BOM (Byte Order Mark). A BOM is required for correct redirection or piping "
+"in PowerShell."
msgstr ""
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:201
+#: dos2unix.pod:207
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 "
+"The advantage of utf8 is that it is compatible with ASCII. 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
+#: dos2unix.pod:211
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 "
@@ -366,34 +374,43 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:212
+#: dos2unix.pod:217
msgid "In a ConEmu console the utf8 encoding method works well."
msgstr ""
#. type: textblock
-#: dos2unix.pod:216
+#: dos2unix.pod:219
+msgid ""
+"When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM "
+"(Byte Order Mark). A BOM is required for correct redirection or piping in "
+"PowerShell."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:226
msgid ""
"The default encoding can be changed with environment variable "
-"DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+"DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or "
+"C<utf8bom>."
msgstr ""
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr ""
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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 "
@@ -401,27 +418,27 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr ""
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr ""
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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 "
@@ -429,12 +446,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -449,91 +466,118 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid ""
+"Note that sometimes a binary file can be mistaken for a text file. See also "
+"option C<-s>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:264
msgid ""
"Optionally extra flags can be set to change the output. One or more flags "
"can be added."
msgstr ""
#. type: =item
-#: dos2unix.pod:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr ""
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr ""
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr ""
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr ""
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:306
msgid "Examples:"
msgstr ""
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -541,12 +585,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -554,12 +598,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -567,12 +611,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -580,12 +624,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -593,14 +637,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid ""
"Convert only files that have DOS line breaks and leave the other files "
"untouched:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -608,12 +652,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -621,82 +665,82 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
msgid "Keep the date stamp of output file same as input file."
msgstr ""
#. type: =item
-#: dos2unix.pod:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr ""
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr ""
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
msgid ""
"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is "
"written."
msgstr ""
#. type: textblock
-#: dos2unix.pod:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
msgid ""
"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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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 "
@@ -704,7 +748,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:353
+#: dos2unix.pod:373
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 "
@@ -713,19 +757,19 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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 "
@@ -739,24 +783,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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 "
@@ -764,22 +808,32 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr ""
+#. type: textblock
+#: dos2unix.pod:407
+msgid ""
+"The skipping of binary files is done to avoid accidental mistakes. Be aware "
+"that the detection of binary files is not 100% foolproof. Input files are "
+"scanned for binary symbols which are typically not found in text files. It "
+"is possible that a binary file contains only normal text characters. Such a "
+"binary file will mistakenly be seen as a text file."
+msgstr ""
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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 "
@@ -788,24 +842,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
msgid "Assume that the input file format is UTF-16LE."
msgstr ""
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:424
msgid ""
"When there is a Byte Order Mark in the input file the BOM has priority over "
"this option."
msgstr ""
#. type: textblock
-#: dos2unix.pod:401
+#: dos2unix.pod:427
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 "
@@ -814,126 +868,126 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
msgid "Assume that the input file format is UTF-16BE."
msgstr ""
#. type: textblock
-#: dos2unix.pod:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr ""
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
msgid ""
"Display verbose messages. Extra information is displayed about Byte Order "
"Marks and the amount of converted line breaks."
msgstr ""
#. type: =item
-#: dos2unix.pod:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr ""
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
msgid ""
"Replace symbolic links with converted files (original target files remain "
"unchanged)."
msgstr ""
#. type: =item
-#: dos2unix.pod:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr ""
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr ""
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr ""
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr ""
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
msgid ""
"In mode C<ascii> only line breaks are converted. This is the default "
"conversion mode."
msgstr ""
#. type: textblock
-#: dos2unix.pod:459
+#: dos2unix.pod:485
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 "
@@ -941,24 +995,24 @@ msgid ""
msgstr ""
#. type: =item
-#: dos2unix.pod:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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 "
@@ -967,7 +1021,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:475
+#: dos2unix.pod:501
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 "
@@ -980,24 +1034,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:484
+#: dos2unix.pod:510
msgid ""
"Never use ISO conversion on Unicode text files. It will corrupt UTF-8 "
"encoded files."
msgstr ""
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr ""
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -1005,12 +1059,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -1018,12 +1072,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -1031,12 +1085,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -1044,12 +1098,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -1057,12 +1111,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -1070,12 +1124,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -1083,12 +1137,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -1096,24 +1150,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
msgid ""
"See also L<http://czyborra.com/charsets/codepages.html> and "
"L<http://czyborra.com/charsets/iso8859.html>."
msgstr ""
#. type: =head1
-#: dos2unix.pod:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr ""
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr ""
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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 "
@@ -1122,26 +1176,26 @@ msgid ""
msgstr ""
#. type: =head2
-#: dos2unix.pod:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr ""
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
msgid ""
"Unicode text files can have DOS, Unix or Mac line breaks, like regular text "
"files."
msgstr ""
#. type: textblock
-#: dos2unix.pod:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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 "
@@ -1149,7 +1203,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:546
+#: dos2unix.pod:572
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 "
@@ -1158,14 +1212,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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 "
@@ -1174,7 +1228,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:558
+#: dos2unix.pod:584
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 "
@@ -1182,22 +1236,22 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:587
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr ""
#. type: textblock
-#: dos2unix.pod:563
+#: dos2unix.pod:589
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr ""
#. type: =head2
-#: dos2unix.pod:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr ""
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
msgid ""
"On Windows Unicode text files typically have a Byte Order Mark (BOM), "
"because many Windows programs (including Notepad) add BOMs by default. See "
@@ -1205,14 +1259,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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 "
@@ -1220,36 +1274,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:578
+#: dos2unix.pod:604
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr ""
#. type: textblock
-#: dos2unix.pod:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr ""
#. type: =head2
-#: dos2unix.pod:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr ""
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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 "
@@ -1259,7 +1313,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:622
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 "
@@ -1268,17 +1322,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: dos2unix.pod:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr ""
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1286,12 +1340,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1299,12 +1353,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1312,12 +1366,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1325,12 +1379,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr ""
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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 "
@@ -1338,7 +1392,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:650
msgid ""
"GB18030 is fully compatible with Unicode, and can be considered an unicode "
"transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 "
@@ -1346,7 +1400,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:628
+#: dos2unix.pod:654
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 "
@@ -1355,41 +1409,41 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:632
+#: dos2unix.pod:658
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr ""
#. type: textblock
-#: dos2unix.pod:634
+#: dos2unix.pod:660
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr ""
#. type: =head1
-#: dos2unix.pod:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr ""
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:640
+#: dos2unix.pod:666
#, no-wrap
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1398,12 +1452,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1411,14 +1465,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
msgid ""
"Convert and replace a.txt in ascii conversion mode, convert and replace "
"b.txt in 7bit conversion mode:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1428,12 +1482,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1442,12 +1496,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1456,12 +1510,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1470,12 +1524,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1483,12 +1537,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1496,12 +1550,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1510,14 +1564,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1525,12 +1579,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr ""
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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 "
@@ -1539,7 +1593,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: dos2unix.pod:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1547,30 +1601,44 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object "
+"{dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr ""
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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 "
@@ -1581,7 +1649,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: dos2unix.pod:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1595,26 +1663,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
msgid ""
"On Unix systems you can use the command locale(1) to get locale specific "
"information."
msgstr ""
#. type: =item
-#: dos2unix.pod:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
msgid ""
"With the LANGUAGE environment variable you can specify a priority list of "
"languages, separated by colons. Dos2unix gives preference to LANGUAGE over "
@@ -1626,19 +1694,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:741
+#: dos2unix.pod:772
msgid ""
"If you select a language which is not available you will get the standard "
"English messages."
msgstr ""
#. type: =item
-#: dos2unix.pod:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
msgid ""
"With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during "
"compilation can be overruled. LOCALEDIR is used to find the language "
@@ -1647,12 +1715,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1660,56 +1728,56 @@ msgid ""
msgstr ""
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr ""
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
msgid ""
"The return value is always zero in quiet mode, except when wrong "
"command-line options are used."
msgstr ""
#. type: =head1
-#: dos2unix.pod:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr ""
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr ""
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr ""
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
msgid ""
"Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix "
"mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - "
@@ -1717,21 +1785,21 @@ msgid ""
msgstr ""
#. type: textblock
-#: dos2unix.pod:784
+#: dos2unix.pod:815
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr ""
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr ""
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr ""
diff --git a/man/es/man1/dos2unix.po b/po-man/es.po
index b8c85ab..017827f 100644
--- a/man/es/man1/dos2unix.po
+++ b/po-man/es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dos2unix-man-7.2.1-beta1\n"
-"POT-Creation-Date: 2015-09-23 19:55+0200\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\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"
@@ -81,26 +81,28 @@ msgstr "Los enlaces simbólicos y sus destinos no son modificados por defecto. L
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
+#, fuzzy
+#| msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
msgstr "Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una importante diferencia respecto a la versión original SunOS/Solaris. Esta versión hace, por defecto, la conversión en el mismo archivo (modo de archivo antiguo), mientras que la versión original de SunOS/Solaris sólo es compatible con la conversión en archivo emparejado (modo de archivo nuevo). Véanse las opciones C<-o> y C<-n>."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "PARÁMETROS"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Todos los parámetros siguientes son tratados como nombres de archivo. Use este parámetro si desea convertir archivos cuyos nombres inician con un guión. Por ejemplo para convertir un archivoo llamado \"-foo\", use este comando:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -110,12 +112,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "O en modo de archivo nuevo:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -125,249 +127,259 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Sólo convierte los salto de línea. Éste es el modo de conversión por defecto."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Conversión entre el conjunto de caracteres DOS e ISO-8859-1. Véase también la sección MODOS DE CONVERSIÓN."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Usa la página de códigos Windows 1252 (Europa Occidental)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Usa la página de códigos DOS 437 (EE. UU.). Está es la página de códigos usada por defecto para conversión ISO."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Usa la página de códigos DOS 850 (Europa Occidental)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Usa la página de códigos DOS 860 (Portugués)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Usa la página de códigos DOS 863 (Francocanadiense)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Usa la página de códigos DOS 865 (Nórdico)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Convierte caracteres de 8 bits al espacio de 7 bits."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Mantiene la Marca de Orden de Byte (BOM). Cuando el archivo de entrada tiene BOM, escribe BOM en el archivo de salida. Este es el comportamiento por defecto en la conversión a saltos de línea DOS. Vea también la opción C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode CONVMODE>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii 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: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
msgid "B<-D, --display-enc ENCODING>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:157
+#: dos2unix.pod:159
#, 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."
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> 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
+#: dos2unix.pod:163
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
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
msgstr ""
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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."
+#: dos2unix.pod:197
+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."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
msgstr ""
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
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."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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
+#: dos2unix.pod:211
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
+#: dos2unix.pod:217
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>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
msgstr ""
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Fuerza la conversión de archivos binarios."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Despiega la ayuda y termina el programa."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[MARCAS], --info[= MARCAS] ARCHIVO ...>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
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:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Ejemplo de salida:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -391,87 +403,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Muestra el número de saltos de línea DOS."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Muestra el número de saltos de línea Unix."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Muestra el número de saltos de línea Mac."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Muestra la Marca de Orden de Byte."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Muestra si el archivo es de texto o binario."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "Muestra sólo los archivos que pueden ser convertidos."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr ""
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Ejemplos:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Muestra información para todos los archivos *.txt:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -481,12 +518,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -496,12 +533,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Muestra sólo la Marca de Orden de Byte."
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -511,12 +548,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Muestra los archivos que tienen saltos de línea DOS:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -526,12 +563,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Muestra los archivos que tienen saltos de línea Unix:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -541,12 +578,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, fuzzy, no-wrap
#| msgid ""
#| " find . -name *.txt |xargs dos2unix\n"
@@ -559,14 +596,14 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
#, fuzzy
#| msgid "List the files that have DOS line breaks:"
msgid "Find text files that have DOS line breaks:"
msgstr "Muestra los archivos que tienen saltos de línea DOS:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, fuzzy, no-wrap
#| msgid ""
#| " find . -name *.txt |xargs dos2unix\n"
@@ -579,307 +616,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Muestra la licencia del programa."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Añade salto de línea adicional."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ARCHIVO ...>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Ignora los archivos binarios (por defecto)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr ""
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
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:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Sigue los enlaces simbólicos y convierte los destinos."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "No altera los enlaces simbólicos ni sus destinos (por defecto)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Despiega la información de la versión y termina el programa."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MODO MAC"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "MODOS DE CONVERSIÓN"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Algunos ejemplos:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -889,12 +931,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Convierte de DOS CP850 a Unix Latín-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -904,12 +946,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Convierte de Windows CP1252 a Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -919,12 +961,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Convierte de Windows CP1252 a Unix UTF-8 (Unicode)."
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -934,12 +976,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -949,12 +991,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Convierte de Unix Latin-1 a DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -964,12 +1006,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Convierte de Unix Latin-1 a Windows CP1252."
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -979,12 +1021,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Convierte de Unix UTF-8 (Unicode) a Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -994,142 +1036,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Codificaciones"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Conversion"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
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:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Marca de orden de bytes"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr ""
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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:596
+#: dos2unix.pod:622
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:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Ejemplos Unicode"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1139,12 +1181,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1154,12 +1196,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1169,12 +1211,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Convertir de Unix UTF-8 a Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1184,64 +1226,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "EJEMPLOS"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
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:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " find . -name *.txt |xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" find . -name *.txt |xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1253,12 +1297,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
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:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1268,12 +1312,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1287,12 +1331,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Convierte a.txt del formato de Mac a Unix:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1304,12 +1348,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Convierte a.txt del formato de Unix a Mac:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1321,12 +1365,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1338,12 +1382,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Convierte a.txt y escribe la salida en e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1353,12 +1397,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1368,12 +1412,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1385,12 +1429,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1400,17 +1444,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "CONVERSIÓN RECURSIVA"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, fuzzy, no-wrap
#| msgid ""
#| " find . -name *.txt |xargs dos2unix\n"
@@ -1423,12 +1467,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr ""
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, fuzzy, no-wrap
#| msgid ""
#| " find . -name *.txt |xargs dos2unix\n"
@@ -1440,23 +1484,36 @@ msgstr ""
" find . -name *.txt |xargs dos2unix\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "INTERNACIONALIZACIÓN"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1478,47 +1535,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Ejemplo (intérprete de comandos POSIX):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1528,75 +1585,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "VALOR DE RETORNO"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "ESTÁNDARES"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://es.wikipedia.org/wiki/Documento_de_texto>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://es.wikipedia.org/wiki/Retorno_de_carro>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://es.wikipedia.org/wiki/Nueva_l%C3%ADnea>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://es.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTORES"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Página de SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "VÉASE TAMBIÉN"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is."
#~ msgstr "Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos convierten ficheros UTF-16 a la codificación de caracteres local cuando es configurado a UTF-8. Emplee el comando locale(1) para determinar cual es la codificación de caracteres local."
diff --git a/man/fr/man1/dos2unix.po b/po-man/fr.po
index f68ddba..547cd6d 100644
--- a/man/fr/man1/dos2unix.po
+++ b/po-man/fr.po
@@ -1,12 +1,12 @@
# Messages français pour dos2unix-man.
-# Copyright (C) 2015 Erwin Waterlander (msgids)
+# Copyright (C) 2016 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
-# Frédéric Marchal <fmarchal@perso.be>, 2015.
+# Frédéric Marchal <fmarchal@perso.be>, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-24 17:13+0200\n"
+"Project-Id-Version: dos2unix-man-7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-06 17:11+0100\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -79,26 +79,26 @@ msgstr "Les liens symboliques et leur cible sont, par défaut, inchangés. En op
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une différence importante avec la version originale de SunOS/Solaris. Cette version effectue les conversions en place (ancien mode de fichiers) tandis que la version originale de SunOS/Solaris ne supporte que la conversion par paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une différence importante avec la version originale de SunOS/Solaris. Cette version effectue les conversions en place (ancien mode de fichier) tandis que la version originale de SunOS/Solaris ne supporte que la conversion par paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>. Une autre différence est que SunOS/Solaris utilise par défaut le mode de conversion I<iso> tandis que cette version utilise par défaut le mode de conversion I<ascii>."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "OPTIONS"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Traites toutes les options à sa suite comme étant des noms de fichiers. Utilisez cette option si vous voulez convertir des fichiers dont le nom commence par un tiret. Par exemple, pour convertir un fichier nommé « -foo », vous pouvez utiliser cette commande:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -108,12 +108,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Ou dans le style des nouveaux fichiers:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -123,247 +123,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Convertit le jeu de caractères du DOS vers ISO-8859-1. Voyez aussi la section des MODES DE CONVERSION."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Utilise le code page 1252 de Windows (Europe de l'ouest)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Utilise le code page 437 du DOS (US). C'est le code page par défaut pour les conversions ISO."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Utilise le code page 850 du DOS (Europe de l'ouest)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Utilise le code page 860 du DOS (portugais)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Utilise le code page 863 du DOS (français canadien)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Utilise le code page 865 du DOS (nordique)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Convertit les caractères 8 bits vers l'espace 7 bits."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Conserve la marque d'ordre des octets (BOM). Si le fichier d'entrée a une BOM, elle est écrite dans le fichier de sortie. C'est le comportement par défaut quand les sauts de lignes sont convertis au format DOS. Consultez aussi l'option C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode MODE_CONV>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "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."
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
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."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "Choisi l'encodage des textes affichés. L'ENCODAGE peut être : I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>. La valeur par défaut est ansi."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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."
+#: dos2unix.pod:197
+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."
+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."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Quand la méthode C<unicodebom> est utilisée, le texte Unicode est précédé d'une BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est nécessaire pour la redirection correcte ou le pipelining dans PowerShell."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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>."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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. 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
+#: dos2unix.pod:211
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
+#: dos2unix.pod:217
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."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Quand la méthode C<utf8bom> est utilisée, le texte UTF-8 est précédé d'une BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est nécessaire pour la redirection correcte ou le pipelining dans PowerShell."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "L'encodage par défaut peut être changé en assignant la valeur C<unicode>, C<unicodebom>, C<utf8> ou C<utf8bom> à la variable d'environnement DOS2UNIX_DISPLAY_ENC."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Force la conversion de fichiers binaires."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Affiche l'aide et s'arrête."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[FANIONS], --info[=FANIONS] FICHIER …>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
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:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Exemple de sortie :"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -387,87 +397,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Affiche le nombre de sauts de ligne DOS."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Affiche le nombre de sauts de ligne Unix."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Affiche le nombre de sauts de ligne Mac."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Afficher la marque d'ordre des octets."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Affiche si le fichier est texte ou binaire."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "Affiche uniquement les fichiers qui seraient convertis."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "Afficher un en-tête."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "Montrer les noms des fichiers sans le chemin."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Exemples:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Afficher les informations pour tous les fichier *.txt :"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -477,12 +512,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -492,12 +527,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Montrer uniquement la marque d'ordre des octets :"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -507,12 +542,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Liste les fichiers qui ont des sauts de ligne DOS :"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -522,12 +557,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Liste les fichiers qui ont des sauts de ligne Unix :"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -537,12 +572,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -552,12 +587,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Trouve les fichiers texte qui ont des sauts de ligne DOS :"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -567,307 +602,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Affiche la licence du programme."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Ajoute des sauts de lignes additionnels."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile FICHIER …>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Ignore les fichiers binaires (par défaut)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Ignorer les fichiers binaires sert à éviter les erreurs accidentelles. Attention que la détection de fichiers binaires n'est pas fiable à 100%. Les fichiers en entrée sont analysés pour y trouver des symboles binaires qui ne sont habituellement pas rencontrés dans des fichiers textes. Il est cependant possible qu'un fichier binaire ne contienne que des caractères textes normaux. Un tel fichier serait erronément traité comme un fichier texte."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Cette option fonctionne comme l'option C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Suit les liens symboliques et convertit les cibles."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
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:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Affiche les informations de version puis arrête."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MODE MAC"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "MODES DE CONVERSION"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Quelques exemples:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -877,12 +917,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Convertir du CP850 du DOS au Latin-1 Unix :"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -892,12 +932,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Convertir du CP1252 de Windows au Latin-1 de Unix :"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -907,12 +947,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
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:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -922,12 +962,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -937,12 +977,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Convertir le Latin-1 de Unix en CP850 du DOS :"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -952,12 +992,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Convertir le Latin-1 de Unix en CP1252 de Windows :"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -967,12 +1007,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
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:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -982,142 +1022,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Codages"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Conversion"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
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:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Marque d'ordre des octets"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Noms de fichiers unicode sous Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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:596
+#: dos2unix.pod:622
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:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Exemples Unicode"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1127,12 +1167,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1142,12 +1182,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1157,12 +1197,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
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:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1172,64 +1212,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "EXEMPLES"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
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:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1241,12 +1283,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
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:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1256,12 +1298,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1275,12 +1317,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
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:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1292,12 +1334,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Convertir a.txt du format Unix au format Mac :"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1309,12 +1351,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1326,12 +1368,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Convertir a.txt et écrire dans e.txt :"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1341,12 +1383,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1356,12 +1398,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1373,12 +1415,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1388,17 +1430,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "CONVERSIONS RÉCURSIVES"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1408,12 +1450,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
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:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1424,23 +1466,38 @@ msgstr ""
" find /R %G in \n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le PowerShell de Windows :"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "PARAMÈTRES LINGUISTIQUES"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1462,47 +1519,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Exemple (shell POSIX):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1512,75 +1569,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "VALEUR DE RETOUR"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "STANDARDS"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://fr.wikipedia.org/wiki/Fichier_texte>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://fr.wikipedia.org/wiki/Retour_chariot>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://fr.wikipedia.org/wiki/Fin_de_ligne>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://fr.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTEURS"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Page SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>"
#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>"
diff --git a/man/nl/man1/dos2unix.po b/po-man/nl.po
index 8abcf05..0ece8cf 100644
--- a/man/nl/man1/dos2unix.po
+++ b/po-man/nl.po
@@ -1,16 +1,16 @@
# Dutch translations for the dos2unix man page.
-# Copyright (C) 2015 Erwin Waterlander (msgids)
+# Copyright (C) 2016 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.”
#
# Erwin Waterlander <waterlan@xs4all.nl>, 2014.
-# Benno Schulenberg <benno@vertaalt.nl>, 2014, 2015.
+# Benno Schulenberg <benno@vertaalt.nl>, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-24 09:55+0200\n"
+"Project-Id-Version: dos2unix-man-7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-08 17:33+0100\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
"Language: nl\n"
@@ -84,26 +84,26 @@ msgstr "Symbolische koppelingen en hun doelen blijven standaard onaangeroerd. O
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is één belangrijk verschil: deze versie van dos2unix voert standaard een vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus) kent. Zie ook de opties C<-o> en C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix is gemodelleerd naar dos2unix op SunOS/Solaris, maar er is een belangrijk verschil: deze versie van dos2unix voert standaard een vervangende conversie uit (oud-bestand-modus) terwijl de oorspronkelijke SunOS/Solaris-versie alleen de gepaarde conversie (nieuw-bestand-modus) kent. Zie ook de opties C<-o> en C<-n>. Een ander verschil is dat de SunOS/Solaris-versie standaard een conversie in I<iso>-modus doet terwijl deze versie standaard I<ascii>-modus gebruikt."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "OPTIES"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Alle volgende opties als bestandsnamen behandelen. Gebruik deze optie als u een bestand wilt converteren waarvan de naam met een streepje begint. Bijvoorbeeld, om een bestand genaamd \"-foo\" om te zetten, gebruikt u de volgende opdracht:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -113,12 +113,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Of in nieuw-bestand-modus:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -128,247 +128,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Alleen regeleindes converteren. Dit is de standaardconversiemodus."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
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 B<CONVERSIEMODI>."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Windows-codetabel 1252 (West-Europees) gebruiken."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "DOS-codetabel 437 (VS) gebruiken. Dit is de standaard codetabel die gebruikt wordt bij ISO-conversie."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "DOS-codetabel 850 (West-Europees) gebruiken."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "DOS-codetabel 860 (Portugees) gebruiken."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "DOS-codetabel 863 (Canadees Frans) gebruiken."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "DOS-codetabel 865 (Scandinavisch) gebruiken."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Lettertekens met het achtste bit gezet converteren naar spaties."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b>, B<--keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Een Byte-Order-Mark (BOM) behouden. Als het invoerbestand een BOM bevat, dan wordt ook een BOM naar het uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar DOS. Zie ook optie C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c>, B<--convmode CONVERSIEMODUS>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: I<ascii>, I<7bit>, I<iso>, of I<mac>, waarbij ascii de standaardinstelling is."
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
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."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, of I<utf8bom>, waarbij ansi de standaardinstelling is."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode>, B<unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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."
+#: dos2unix.pod:197
+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."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
msgstr ""
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8>, B<utf8bom>"
#. 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."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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
+#: dos2unix.pod:211
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
+#: dos2unix.pod:217
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>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
msgstr ""
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f>, B<--force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Conversie van binaire bestanden afdwingen."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb>, B<--gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h>, B<--help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Een hulptekst tonen."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i>[B<VLAGGEN>], B<--info>[B<=VLAGGEN>] B<BESTAND>..."
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "Bestandsinformatie tonen. Er wordt niets geconverteerd."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Voorbeelduitvoer:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -392,87 +402,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Het aantal DOS-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Het aantal Unix-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Het aantal Mac-regeleindes tonen."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "De Byte-Order-Mark tonen."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Tonen of het bestand tekst is of binair."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
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:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "Een kopregel printen."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "Bestandsnamen tonen zonder pad."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Voorbeelden:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Informatie weergeven voor alle bestanden met de extensie 'txt':"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -482,12 +517,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -497,12 +532,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Alleen de Byte-Order-Mark tonen:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -512,12 +547,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "De bestanden opsommen die DOS-regeleindes bevatten:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -527,12 +562,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "De bestanden opsommen die Unix-regeleindes bevatten:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -542,12 +577,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -557,12 +592,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "De bestanden vinden die DOS-regeleindes bevatten:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -572,307 +607,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k>, B<--keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L>, B<--license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "De softwarelicentie tonen."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l>, B<--newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Een extra regeleinde toevoegen."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m>, B<--add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n>, B<--newfile INVOERBESTAND UITVOERBESTAND> ..."
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o>, B<--oldfile BESTAND> ..."
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q>, B<--quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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 afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven."
#. type: =item
-#: dos2unix.pod:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r>, B<--remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s>, B<--safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Binaire bestanden overslaan (standaard)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het detecteren van binaire bestanden is echter niet 100% betrouwbaar. Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel normale teksttekens bevat. Zo'n binair bestand zal dan foutief als een tekstbestand gezien worden."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u>, B<--keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul>, B<--assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub>, B<--assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Deze optie werkt hetzelfde als optie C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v>, B<--verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F>, B<--follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Symbolische koppelingen volgen en de doelen converteren."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R>, B<--replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S>, B<--skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Symbolische koppelingen en doelen ongewijzigd laten (standaard)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V>, B<--version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Versie-informatie tonen."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MAC-MODUS"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "CONVERSIEMODI"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Enkele voorbeelden:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -882,12 +922,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Omzetten van DOS CP850 naar Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -897,12 +937,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Omzetten van Windows CP1252 naar Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -912,12 +952,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Omzetten van Windows CP1252 naar Unix UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -927,12 +967,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -942,12 +982,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Omzetten van Unix Latin-1 naar DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -957,12 +997,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Omzetten van Unix Latin-1 naar Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -972,12 +1012,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Omzetten van Unix UTF-8 (Unicode) naar Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -987,142 +1027,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Coderingen"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Conversie"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
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:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Byte-Order-Mark"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Unicode-bestandsnamen op Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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:596
+#: dos2unix.pod:622
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:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Unicode-voorbeelden"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1132,12 +1172,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1147,12 +1187,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1162,12 +1202,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Omzetten van Unix UTF-8 naar Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1177,64 +1217,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "VOORBEELDEN"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:"
#. type: verbatim
-#: dos2unix.pod:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1246,12 +1288,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1261,12 +1303,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1280,12 +1322,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Omzetten van a.txt van Mac- naar Unix-indeling:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1297,12 +1339,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Omzetten van a.txt van Unix- naar Mac-indeling:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1314,12 +1356,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1331,12 +1373,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Omzetten van a.txt en resultaat naar e.txt schrijven:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1346,12 +1388,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1361,12 +1403,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1378,12 +1420,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1393,17 +1435,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "RECURSIEVE CONVERSIE"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1413,12 +1455,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
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:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1427,23 +1469,36 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr ""
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "LOKALISATIE"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1465,47 +1520,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Voorbeeld (POSIX-shell):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1515,75 +1570,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "AFSLUITWAARDE"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "STANDAARDEN"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://nl.wikipedia.org/wiki/Tekstbestand>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://nl.wikipedia.org/wiki/Carriage_Return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://nl.wikipedia.org/wiki/Linefeed>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "<http://nl.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTEURS"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge-pagina: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "ZIE OOK"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>"
#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>"
diff --git a/man/pl/man1/dos2unix.po b/po-man/pl.po
index b349319..d493f34 100644
--- a/man/pl/man1/dos2unix.po
+++ b/po-man/pl.po
@@ -1,12 +1,12 @@
# Polish translation for dos2unix man.
# This file is distributed under the same license as the dos2unix package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2015.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-28 19:36+0200\n"
+"Project-Id-Version: dos2unix-man 7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-07 21:20+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -78,26 +78,26 @@ msgstr "Dowiązania symboliczne i ich cele są domyślnie pozostawiane bez zmian
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix powstał na podstawie narzędzia dos2unix z systemu SunOS/Solaris. Jest jedna istotna różnica w stosunku do oryginalnej wersji z SunOS-a/Solarisa: ta wersja domyślnie wykonuje konwersję w miejscu (tryb starego pliku), podczas gdy oryginalna obsługiwała tylko konwersję parami (tryb nowego pliku) - p. także opcje C<-o> i C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix powstał na podstawie narzędzia dos2unix z systemu SunOS/Solaris. Jest jedna istotna różnica w stosunku do oryginalnej wersji z SunOS-a/Solarisa: ta wersja domyślnie wykonuje konwersję w miejscu (tryb starego pliku), podczas gdy oryginalna obsługiwała tylko konwersję parami (tryb nowego pliku) - p. także opcje C<-o> i C<-n>. Ponadto wersja z SunOS-a/Solarisa domyślnie wykonuje konwersję w trybie I<iso>, podczas gdy ta wersja domyślnie wykonuje konwersję w trybie I<ascii>."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "OPCJE"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Potraktowanie wszystkich kolejnych opcji jako nazw plików. Tej opcji należy użyć, aby przekonwertować pliki, których nazwy zaczynają się od minusa. Przykładowo, aby przekonwertować plik o nazwie \"-foo\", można użyć polecenia:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -107,12 +107,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Lub w trybie nowego pliku:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -122,247 +122,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Konwersja między zestawami znaków DOS i ISO-8859-1. Więcej w sekcji TRYBY KONWERSJI."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Użycie strony kodowej DOS 437 (US). Jest to domyślna strona kodowa używana przy konwersji ISO."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Użycie strony kodowej DOS 850 (zachodnioeuropejskiej)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Użycie strony kodowej DOS 860 (portugalskiej)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Użycie strony kodowej DOS 865 (nordyckiej)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Konwersja znaków 8-bitowych do przestrzeni 7-bitowej."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Zachowanie znaku BOM (Byte Order Makr). Jeżeli plik wejściowy zawiera BOM, powoduje zapisanie go w pliku wyjściowym. Jest to domyślne zachowanie przy konwersji na DOS-owe końce linii. P. także opcja C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode TRYB_KONW>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii 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: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
msgid "B<-D, --display-enc ENCODING>"
msgstr "B<-D, --display-enc KODOWANIE>"
#. 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 "Ustawienie kodowania wyświetlanego tekstu. KODOWANIE to jedno z: I<ansi>, I<unicode>, I<utf8>, przy czym domyślne to ansi."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "Ustawienie kodowania wyświetlanego tekstu. KODOWANIE to jedno z: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, przy czym domyślne to ansi."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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 "Ta opcja jest dostępna wyłączenie w programie dos2unix dla Windows z obsługą nazw plików Unicode. Nie ma wpływu na same nawy odczytywanych i zapisywanych plików, a jedynie na sposób ich wyświetlania."
#. type: textblock
-#: dos2unix.pod:165
+#: dos2unix.pod:167
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 "Istnieje kilka sposobów wyświetlania tekstu w konsoli Windows w zależności od kodowania tekstu. Wszystkie mają swoje zalety i wady."
#. type: =item
-#: dos2unix.pod:171
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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 "Domyślna metoda programu dos2unix to stosowanie tekstu kodowanego w ANSI. Zaletą jest wsteczna zgodność. Działa z fontami rastrowymi, jak i TrueType. W niektórych rejonach może być potrzeba zmiany aktywnej strony kodowej DOS OEM na systemową stronę kodową Windows ANSI przy użyciu polecenia C<chcp>, ponieważ dos2unix wykorzystuje systemową stronę kodową Windows."
#. type: textblock
-#: dos2unix.pod:179
+#: dos2unix.pod:181
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 "Wadą kodowania ansi jest fakt, że międzynarodowe nazwy plików ze znakami spoza domyślnej systemowej strony kodowej nie są wyświetlane właściwie. Można zamiast tego zobaczyć znak zapytania albo niewłaściwy symbol. Jeżeli nie pracujemy z obcymi nazwami plików, ta metoda jest poprawna."
#. type: =item
-#: dos2unix.pod:184
-msgid "B<unicode>"
-msgstr "B<unicode>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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 "Zaletą kodowania unicode (windowsową nazwą dla UTF-16) jest (zwykle) właściwe wyświetlanie tekstu. Nie ma potrzeby zmiany aktywnej strony kodowej. Może być potrzeba zmiany fontu konsoli na font TrueType, aby znaki międzynarodowe były wyświetlane poprawnie. Jeśli znak nie jest obecny w foncie TrueType, zwykle widać mały kwadrat, czasami ze znakiem zapytania w środku."
#. type: textblock
-#: dos2unix.pod:192
+#: dos2unix.pod:194
msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
msgstr "W przypadku używania konsoli ConEmu cały tekst jest wyświetlany poprawnie, ponieważ ConEmu automatycznie wybiera dobry font."
#. 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 "Wadą kodowania unicode jest niezgodność z ASCII. Wyjście nie jest łatwe do obsłużenia w przypadku przekierowania do innego programu lub pliku. Przekierowanie do pliku nie generuje poprawnego pliku w UTF-16."
+#: dos2unix.pod:197
+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."
+msgstr "Wadą kodowania unicode jest niezgodność z ASCII. Wyjście nie jest łatwe do obsłużenia w przypadku przekierowania do innego programu lub pliku."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "W przypadku użycia metody C<unicodebom>, tekst w unikodzie jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w powłoce PowerShell."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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 "Zaletą kodowania utf8 jest zgodność z ASCII; kiedy przekierowuje się wyjście do pliku, uzyskuje się właściwy plik w UTF-8. Trzeba ustawić font konsoli na font TrueType. Przy użyciu fontu TrueType tekst jest wyświetlany podobnie do kodowania C<unicode>."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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 "Zaletą kodowania utf8 jest zgodność z ASCII. Trzeba ustawić font konsoli na font TrueType. Przy użyciu fontu TrueType tekst jest wyświetlany podobnie do kodowania C<unicode>."
#. type: textblock
-#: dos2unix.pod:206
+#: dos2unix.pod:211
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 "Wadą jest fakt, że w przypadku używania domyślnego fontu rastrowego, wszystkie znaki spoza ASCII są wyświetlane niepoprawnie. Nie tylko unikodowe nazwy plików, ale także przetłumaczone komunikaty stają się nieczytelne. W Windows skonfigurowanym dla rejonu Azji Wschodniej widać dużo migotania konsoli w trakcie wyświetlania komunikatów."
#. type: textblock
-#: dos2unix.pod:212
+#: dos2unix.pod:217
msgid "In a ConEmu console the utf8 encoding method works well."
msgstr "W konsoli ConEmu metoda kodowania utf8 działa dobrze."
#. 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 "Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej DOS2UNIX_DISPLAY_ENC, ustawiając ją na C<unicode> lub C<utf8>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "W przypadku użycia metody C<utf8bom>, tekst w UTF-8 jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w powłoce PowerShell."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej DOS2UNIX_DISPLAY_ENC, ustawiając ją na C<unicode>, C<unicodebom>, C<utf8> lub C<utf8bom>."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Wymuszenie konwersji plików binarnych."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Wyświetlenie opisu i zakończenie."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[FLAGI], --info[=FLAGI] PLIK ...>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "Wyświetlenie informacji o pliku. Konwersja nie jest wykonywana."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Przykładowe wyjście:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -386,87 +396,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Wypisanie liczby DOS-owych końców linii."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Wypisanie liczby uniksowych końców linii."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Wypisanie liczby macowych końców linii."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Wypisanie znacznika BOM."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Wypisanie, czy plik jest tekstowy, czy binarny."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "Wypisanie tylko plików, które zostałyby przekonwertowane."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "Wypisanie nagłówka."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "Wyświetlanie nazw plików bez ścieżki."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Przykłady:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Pokazanie informacji o wszystkich plikach *.txt:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -476,12 +511,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -491,12 +526,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Pokazanie tylko znacznika BOM:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -506,12 +541,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
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:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -521,12 +556,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Wypisanie listy plików zawierających uniksowe końce linii:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -536,12 +571,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -551,12 +586,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Wyszukanie plików tekstowych zawierających DOS-owe końce linii:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -566,307 +601,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Wyświetlenie licencji programu."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Dodanie dodatkowego znaku końca linii."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile PLIK_WEJ PLIK_WYJ ...>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile PLIK ...>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Pominięcie plików binarnych (domyślne)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne na błędy. Pliki wejściowe są przeszukiwane pod kątem symboli binarnych, które zwykle nie występują w plikach tekstowych. Może się zdarzyć, że plik binarny zawiera tylko zwykłe znaki tekstowe. Taki plik binarny będzie błędnie widziany jako plik tekstowy."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Ta opcja działa analogicznie do C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Podążanie za dowiązaniami symbolicznymi i konwertowanie ich celów"
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Pozostawienie dowiązań symbolicznych i celów bez zmian (domyślne)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Wyświetlenie informacji o wersji i zakończenie."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "TRYB MAC"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "TRYBY KONWERSJI"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Kilka przykładów:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -876,12 +916,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Konwersja ze strony kodowej DOS CP850 do uniksowego Latin-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -891,12 +931,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -906,12 +946,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
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:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -921,12 +961,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -936,12 +976,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Konwersja z uniksowego Latin-1 do strony kodowej DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -951,12 +991,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Konwersja z uniksowego Latin-1 do strony kodowej Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -966,12 +1006,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
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:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -981,142 +1021,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Kodowania"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Konwersje"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
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:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Znacznik BOM"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Unikodowe nazwy plików w Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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 ma opcjonalną obsługę odczytu i zapisu nazw plików Unicode w linii poleceń Windows. Oznacza to, że dos2unix potrafi otwierać pliki zawierające w nazwie znaki spoza domyślnej systemowej strony kodowej ANSI. Aby sprawdzić, czy dos2unix dla Windows został zbudowany z obsługą nazw plików Unicode, można wpisać C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:622
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 "Przy wyświetlaniu nazw plików Unicode w konsoli Windows występuje kilka problemów. Więcej informacji w opisie opcji C<-D>, C<--display-enc>. Nazwy plików mogą być wyświetlane błędnie na konsoli, ale pliki będą zapisywane z poprawną nazwą."
#. type: =head2
-#: dos2unix.pod:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Przykłady Unicode"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1126,12 +1166,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1141,12 +1181,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1156,12 +1196,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
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:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1171,64 +1211,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "PRZYKŁADY"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
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:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1240,12 +1282,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Konwersja i zastąpienie a.txt w trybie ascii:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1255,12 +1297,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1274,12 +1316,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Konwersja a.txt z formatu Mac do formatu uniksowego:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1291,12 +1333,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Konwersja a.txt z formatu uniksowego do formatu Mac:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1308,12 +1350,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1325,12 +1367,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Konwersja a.txt i zapis do e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1340,12 +1382,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1355,12 +1397,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1372,12 +1414,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1387,17 +1429,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "KONWERSJA REKURENCYJNA"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1407,12 +1449,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr "Z poziomu linii poleceń Windows można użyć następującego polecenia:"
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1421,23 +1463,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w Windows PowerShell:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "LOKALIZACJA"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1459,47 +1516,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Przykład (dla powłoki POSIX):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1509,71 +1566,80 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "WARTOŚĆ ZWRACANA"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "STANDARDY"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://pl.wikipedia.org/wiki/Plik_tekstowy>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://pl.wikipedia.org/wiki/End-of-line>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://pl.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTORZY"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Strona SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "ZOBACZ TAKŻE"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
diff --git a/man/pt_BR/man1/dos2unix.po b/po-man/pt_BR.po
index 7613699..052098a 100644
--- a/man/pt_BR/man1/dos2unix.po
+++ b/po-man/pt_BR.po
@@ -2,22 +2,21 @@
# Copyright (c) 2015 Erwin Waterlander (msgids)
# Copyright (C) 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015.
-#
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
+"Project-Id-Version: dos2unix-man 7.3.3-beta6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-10-09 04:40-0300\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-01-28 09:08-0200\n"
"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
#. type: =head1
#: dos2unix.pod:52
@@ -83,26 +82,26 @@ msgstr "Ligações simbólicas e seus alvos são por padrão mantidas intocávei
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do I<iso> enquanto esta versão usa o do I<ascii>."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "OPÇÕES"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Trata as opções seguintes como nomes de arquivos. Use essa opção se você quiser converter arquivos cujos nomes iniciam com um traço. Por exemplo, para converter um arquivo chamado \"foo\", você pode usar este comando:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -112,12 +111,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Ou em modo de novo arquivo:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -127,247 +126,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Converte apenas as quebras de linhas. Esse é o modo de conversão padrão."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Conversão entre conjunto de caractere do DOS e ISO-8859-1. Veja também a seção MODOS DE CONVERSÃO."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Usa a página de código 1252 do Windows (Europa ocidental)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Usa a página de código 437 do DOS (EUA). Essa é a página de código padrão usada para conversão ISO."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Usa a página de código 850 do DOS (Europa ocidental)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Usa a página de código 860 do DOS (Português)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Usa a página de código 863 do DOS (Francês do Canadá)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Usa a página de código 865 do DOS (Nórdico)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
-msgstr "Converte caracteres de 8 bit para espaço de 7 bit."
+msgstr "Converte caracteres de 8 bits para espaço de 7 bits."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Mantém marca de ordem de bytes (BOM). Quando o arquivo de entrada possuir um BOM, escreve um BOM no arquivo de saída. Esse é o comportamento padrão ao converter para quebras de linha do DOS. Veja também a opção C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode MODOCONV>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii 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: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
msgid "B<-D, --display-enc ENCODING>"
msgstr "B<-D, --display-enc CODIFICAÇÃO>"
#. 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 "Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>, I<unicode>, I<utf8> com ascii sendo o padrão."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>, I<unicode>, I<utf8>, I<utf8bom> com ansi sendo o padrão."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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 "Essa opção está disponível apenas no dos2unix para Windows com suporte a nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de arquivos lidos e escritos, apenas em como eles são exibidos."
#. type: textblock
-#: dos2unix.pod:165
+#: dos2unix.pod:167
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 "Há vários métodos para exibir texto em um console Windows baseado na codificação do texto. Todos eles possuem suas próprias vantagens e desvantagens."
#. type: =item
-#: dos2unix.pod:171
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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 "O método padrão do dos2unix é usar o texto codificado em ANSI. A sua vantagem é a compatibilidade reversa. Ele funciona com fontes raster e TrueType. Em algumas regiões você pode precisar alterar a página de código OEM do DOS para ANSI do sistema Windows usando o comando C<chcp>, porque dos2unix usa a página de código do sistema Windows."
#. type: textblock
-#: dos2unix.pod:179
+#: dos2unix.pod:181
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 "A desvantagem do ansi é que nomes de arquivos internacionais com caracteres fora a página de código padrão do sistema não são exibidos apropriadamente. Você verá um sinal de interrogação, ou um símbolo incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse método funciona bem."
+msgstr "A desvantagem do ansi é que nomes de arquivos internacionais com caracteres fora a página de código padrão do sistema não são exibidos apropriadamente. Você verá um sinal de interrogação, ou um símbolo incorreto. Quando você não utiliza nomes de arquivos estrangeiros, esse método funciona bem."
#. type: =item
-#: dos2unix.pod:184
-msgid "B<unicode>"
-msgstr "B<unicode>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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 "A vantagem da codificação do unicode (o nome Windows para UTF-16) é que o texto é normalmente exibido apropriadamente. Não há necessidade para alterar a página de código ativa. Você pode precisar definir a fonte do console para uma fonte TrueType para que caracteres internacionais sejam exibidos apropriadamente. Quando um caractere não está incluído na fonte TrueType, geralmente você vê um pequeno quadrado, algumas vezes com um sinal de interrogação nele."
#. type: textblock
-#: dos2unix.pod:192
+#: dos2unix.pod:194
msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
msgstr "Quando você usa o console ConEmu todo texto é exibido apropriadamente, porque o ConEmu seleciona automaticamente um fonte boa."
#. 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 "A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é fácil de lidar quando você o redireciona para um outro programa ou um arquivo. Redirecionamento para um arquivo não fornece um arquivo UTF-16 correto."
+#: dos2unix.pod:197
+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."
+msgstr "A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é fácil de lidar quando você o redireciona para um outro programa."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Quando o método <unicodebom> é usado, o texto Unicode será precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o redirecionamento, ou \"piping\", correto no PowerShell."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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 "A vantagem do utf8 é que ele é compatível com ASCII e quando você o redireciona para um arquivo, você obtém um arquivo UTF-8 apropriado. Você precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é exibido similiar a uma codificação C<unicode>."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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 "A vantagem do utf8 é que ele é compatível com ASCII. Você precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é exibido similar a uma codificação C<unicode>."
#. type: textblock
-#: dos2unix.pod:206
+#: dos2unix.pod:211
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 "A desvantagem é que quando você usa a fonte raster padrão, caracteres não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode, mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para uma região leste da Ásia, você pode ver muitas falhas no console quando as mensagens são exibidas."
+msgstr "A desvantagem é que quando você usa a fonte \"raster\" padrão, caracteres não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode, mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para uma região leste da Ásia, você pode ver muitas falhas no console quando as mensagens são exibidas."
#. type: textblock
-#: dos2unix.pod:212
+#: dos2unix.pod:217
msgid "In a ConEmu console the utf8 encoding method works well."
msgstr "Em um console ConEmu, o método de codificação utf8 funciona bem."
#. 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 "A codificação padrão pode ser alterada com a variável de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode> ou C<utf8>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Quando o método <utf8bom> é usado, o texto UTF-8 será precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o redirecionamento, ou \"piping\", correto no PowerShell."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "A codificação padrão pode ser alterada com a variável de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode>, C<unicodebom>, C<utf8> ou C<utf8bom>."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Força a conversão de arquivos binários."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Exibe ajuda e sai."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[OPÇÕES], --info[=OPÇÕES] ARQUIVO ...>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "Exibe informação do arquivo. Nenhuma conversão é feita."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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."
+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 \"binary\", nome de arquivo."
#. type: textblock
-#: dos2unix.pod:241
+#: dos2unix.pod:251
msgid "Example output:"
-msgstr "Saída de exemplo:"
+msgstr "Exemplo de saída:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -391,87 +400,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
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:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Exibe o número de quebras de linhas do DOS."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Exibe o número de quebras de linhas do Unix."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Exibe o número de quebras de linhas do Mac."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Exibe a marca de ordem de byte."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Exibe se arquivo é texto ou binário."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
-msgstr "Exib apenas os arquivos que seriam convertidos."
+msgstr "Exibe apenas os arquivos que seriam convertidos."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr ""
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr ""
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr ""
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Exemplos:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Mostra informação sobre todos os arquivos *.txt:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -481,12 +515,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
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:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -496,12 +530,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Mostra apenas a marca de ordem de byte:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -511,12 +545,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Lista os arquivos que possuem quebras de linha do DOS:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -526,12 +560,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Lista os arquivos que possuem quebras de linha do Unix:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -541,12 +575,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -556,12 +590,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Localiza arquivos de texto que possuam quebras de linha do DOS:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -571,307 +605,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
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:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Exibe a licença do programa."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Adiciona nova linha adicional."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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, UTF-16 ou GB18030. Veja também a seção UNICODE."
#. type: =item
-#: dos2unix.pod:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ARQENT ARQSAÍDA ...>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ARQUIVO ...>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Ignora arquivo binários (padrão)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "A ação de ignorar arquivos binários é feita para evitar equívocos acidentais. Fique ciente de que a detecção de arquivos binários não é 100% à prova de erros. Arquivos de entrada são analisados por símbolos binários que, geralmente, não são encontrados em arquivos textos. É possível que um arquivo binário contenha apenas caracteres de texto normais. tal arquivo binário pode ser acidentalmente visto como um arquivo de texto."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
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:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
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:413
+#: dos2unix.pod:439
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:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
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:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Segue ligações simbólicas e converte os alvos."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
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:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Mentém ligações simbólicas e alvos inalterados (padrão)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Exibe informação da versão e sai."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MODO MAC"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "MODOS DE CONVERSÃO"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
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:459
+#: dos2unix.pod:485
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."
+msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8."
#. type: =item
-#: dos2unix.pod:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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."
+msgstr "Neste modo todos os caracteres não-ASCII de 8 bits (com valores entre 128 e 255) são convertidos para um espaço de 7 bits."
#. type: =item
-#: dos2unix.pod:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Alguns exemplos:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
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:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -881,12 +920,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
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:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -896,12 +935,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
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:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -911,12 +950,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
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:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -926,12 +965,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
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:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -941,12 +980,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
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:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -956,12 +995,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
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:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -971,12 +1010,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
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:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -986,142 +1025,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Codificações"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Conversão"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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."
+msgstr "Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 para UTF-16."
#. type: textblock
-#: dos2unix.pod:563
+#: dos2unix.pod:589
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."
+msgstr "Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16."
#. type: =head2
-#: dos2unix.pod:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Marca de ordem de byte"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
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:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Nomes de arquivos Unicode no Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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 possui um suporte opcional para leitura e escrita de nomes de arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix pode abrir arquivos que possuam caracteres no nome que não são parte da página de código ANSI padrão do sistema. Para ver ser dosunix para Windows foi compilado com suporte a nomes de arquivos Unicode, digite C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:622
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 "Há alguns problemas com a exibição de nomes de arquivos Unicode em um console Windows. Veja a opção C<-D>, C<--display-enc>. Para nomes de arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com o nome correto."
#. type: =head2
-#: dos2unix.pod:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Exemplos de Unicode"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
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:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1131,12 +1170,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
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:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1146,12 +1185,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
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:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1161,12 +1200,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
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:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1176,64 +1215,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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 o sistemas oferecer suporte à localização. Use o comando C<locale -a> para obter a lista de localizações às quais há suporte."
#. type: textblock
-#: dos2unix.pod:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
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:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "EXEMPLOS"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
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:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
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:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1245,12 +1286,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
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:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1260,12 +1301,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1279,12 +1320,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Converte a.txt do formato do Mac para Unix:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1296,12 +1337,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Converte a.txt do formato do Unix para Mac:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1313,12 +1354,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
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:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1330,12 +1371,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Converte a.txt e escreve para e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1345,12 +1386,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1360,12 +1401,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1377,12 +1418,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1392,17 +1433,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
-msgstr "Conversão recursiva"
+msgstr "CONVERSÃO RECURSIVA"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1412,12 +1453,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr "Em um Prompt de Comando do Windows o seguinte comando pode ser usado:"
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1426,23 +1467,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "Usuários do PowerShell podem usar o seguinte comando no Windows PowerShell:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "LOCALIZAÇÃO"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1464,47 +1520,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
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:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
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:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Exemplo (shell POSIX):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1514,75 +1570,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "VALOR RETORNADO"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
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:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "PADRÕES"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://en.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "AUTORES"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
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:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Página do SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "Veja também"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>"
#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>"
diff --git a/man/sv/man1/dos2unix.po b/po-man/sv.po
index 95173d2..9afe297 100644
--- a/man/sv/man1/dos2unix.po
+++ b/po-man/sv.po
@@ -1,13 +1,13 @@
# Swedish translation for dos2unix-man.
-# Copyright © 2014-2015 Erwin Waterlander, et al. (msgids)
+# Copyright © 2014-2016 Erwin Waterlander, et al. (msgids)
# This file is distributed under the same license as the dos2unix package.
-# Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015.
+# Sebastian Rasmussen <sebras@gmail.com>, 2014-2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-11-08 15:17+0100\n"
+"Project-Id-Version: dos2unix-man 7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-06 12:02+0100\n"
"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -24,7 +24,7 @@ msgstr "NAMN"
#. type: textblock
#: dos2unix.pod:54
msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter"
-msgstr "dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice versa"
+msgstr "dos2unix - konverterare för textfilsformat från DOS/Mac till Unix och vice versa"
#. type: =head1
#: dos2unix.pod:56
@@ -51,7 +51,7 @@ msgstr "BESKRIVNING"
#. type: textblock
#: dos2unix.pod:63
msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa."
-msgstr "Paketet Dos2unix inkluderar verktygen C<dos2unix> och C<unix2dos> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format och vice versa."
+msgstr "Paketet Dos2unix inkluderar verktygen C<dos2unix> och C<unix2dos> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix-format och vice versa."
#. type: textblock
#: dos2unix.pod:66
@@ -80,26 +80,26 @@ msgstr "Symboliska länkar och deras mål förblir oförändrade som standard. S
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör som standard konverteringen på plats (gammalfilsläge), medan originalversionen från SunOS/Solaris bara hade stöd för parad konvertering (nyfilsläge). Se vidare flaggorna C<-o> och C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör som standard konverteringen på plats (gammalfilsläge), medan originalversionen från SunOS/Solaris bara hade stöd för parad konvertering (nyfilsläge). Se vidare flaggorna C<-o> och C<-n>. En annan skillnad är att SunOS/Solaris-versionen som standard använder I<iso>-lägeskonvertering medan denna version som standard använder I<ascii>-lägeskonvertering."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "FLAGGOR"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
-msgstr "Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du vill konvertera filer vars namn börjar med bindestreck. För att till exempel konvertera en fil med namnet “-foo“ kan du använda detta kommando:"
+msgstr "Behandla alla efterföljande flaggor som filnamn. Använd denna flagga om du vill konvertera filer vars namn börjar med bindestreck. För att till exempel konvertera en fil med namnet “-foo“ kan du använda detta kommando:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -109,12 +109,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Eller i nyfilsläge:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -124,247 +124,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Konvertera enbart radbrytningar. Detta är standardkonverteringsläget."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare stycket KONVERTERINGSLÄGEN."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Använd Windows-teckentabell 1252 (Västeuropeisk)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Använd DOS-teckentabell 437 (USA). Detta är standardteckentabellen som används för ISO-konvertering."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Använd DOS-teckentabell 850 (Västeuropeisk)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Använd DOS-teckentabell 860 (Portugisisk)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Använd DOS-teckentabell 863 (Fransk-kanadensisk)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Använd DOS-teckentabell 865 (Nordisk)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Konvertera 8-bitars tecken till 7-bitars blanksteg."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM, skriv en BOM i utfilen. Detta är standardbeteendet vid konvertering av DOS-radbrytningar. Se vidare flaggan C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
-msgstr "B<-c, --convmode KONVERTERINGLÄGE>"
+msgstr "B<-c, --convmode KONVERTERINGSLÄGE>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: I<ascii>, I<7bit>, I<iso>, I<mac> där ascii är standard."
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
msgid "B<-D, --display-enc ENCODING>"
msgstr "B<-D, --display-enc KODNING>"
#. 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 "Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>, I<utf8> där ansi är standardvalet."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> där ansi är standardvalet."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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 "Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses och skrivs, bara på hur de visas."
#. type: textblock
-#: dos2unix.pod:165
+#: dos2unix.pod:167
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 "Det finns flera metoder för att visa text i en Windows-konsol baserad på vilken kodning texten har. De har alla för- och nackdelar."
#. type: =item
-#: dos2unix.pod:171
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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 standardmetod är att använda ANSI-kodad text. Fördelen är att den är bakåtkompatibel. Det fungerar med raster- och TrueType-teckensnitt. I vissa regioner kan du behöva ändra den aktiva DOS OEM-teckentabellen till Windows-systemets ANSI-teckentabell genom att använda kommandot C<chcp>, eftersom dos2unix använder Windows-systemets teckentabell."
#. type: textblock
-#: dos2unix.pod:179
+#: dos2unix.pod:181
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 "Nackdelen med ansi är att internationella filnamn med tecken som inte finns i systemets standardteckentabell inte visas korrekt. Du kommer att se frågetecken, eller en felaktig symbol istället. När du inte arbetar med utländska filnamn är denna metoden OK."
#. type: =item
-#: dos2unix.pod:184
-msgid "B<unicode>"
-msgstr "B<unicode>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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 "Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att text vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett TrueType-teckensnitt för att få internationella tecken att visas korrekt. När ett tecken inte finns inkluderat i TrueType-teckensnittet kommer du vanligtvis att se en liten ruta, ibland med ett frågetecken inuti."
#. type: textblock
-#: dos2unix.pod:192
+#: dos2unix.pod:194
msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
msgstr "När du använder ConEmu-konsolen kommer all text att visas korrekt eftersom ConEmu automatiskt väljer ett bra teckensnitt."
#. 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 "Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen är inte lätt att hantera när du omdirigerar den till ett annat program eller en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil."
+#: dos2unix.pod:197
+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."
+msgstr "Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen är inte lätt att hantera när du omdirigerar den till ett annat program eller en fil."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "När metod C<unicodebom> används kommer Unicode-texten att föregås av en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt omdirigering eller rörledning i PowerShell."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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 "Fördelen med utf8 är att den är kompatibel med ASCII och när du omdirigerar den till en fil kommer du att få en korrekt UTF-8-fil. Du måste ställa in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas på liknande sätt som med C<unicode>-kodningen."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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 "Fördelen med utf8 är att den är kompatibel med ASCII. Du måste ställa in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas på liknande sätt som med C<unicode>-kodningen."
#. type: textblock
-#: dos2unix.pod:206
+#: dos2unix.pod:211
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 "Nackdelen är att när du använder standardrasterteckensnittet kommer alla icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan också översatta meddelanden kommer att bli oläsbara. Under Windows som konfigurerats för Östasien kan man komma att se många blinkningar i konsolen när meddelanden visas."
#. type: textblock
-#: dos2unix.pod:212
+#: dos2unix.pod:217
msgid "In a ConEmu console the utf8 encoding method works well."
msgstr "I ConEmu-konsolen fungerar utf8-kodningsmetoden väl."
#. 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 "Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom att sätta den till C<unicode> eller C<utf8>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "När metod C<utf8bom> används kommer UTF-8-texten att föregås av en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt omdirigering eller rörledning i PowerShell."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom att sätta den till C<unicode>, C<unicodebom>, C<utf8> or C<utf8bom>."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Tvinga konvertering av binära filer."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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 "Under Windows konverteras UTF-16-filer som standard till UTF-8, oavsett vilken lokalinställning som är gjord. Använd denna flagga för att konvertera UTF-16-filer till GB18030. Denna flagga finns bara tillgänglig i Windows. Se vidare i avsnittet GB18030."
#. type: =item
-#: dos2unix.pod:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Visa hjälptext och avsluta."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[FLAGGOR], --info[=FLAGGOR] FIL ...>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "Visa filinformation. Ingen konvertering görs."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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 "Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar, antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen, text eller binär, filnamn."
#. type: textblock
-#: dos2unix.pod:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Exempelutmatning:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -388,87 +398,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till."
#. type: =item
-#: dos2unix.pod:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Skriv ut antal DOS-radbrytningar."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Skriv ut antal Unix-radbrytningar."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Skriv ut antal Mac-radbrytningar."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Skriv ut byteordningsmarkeringen."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Skriv ut om filen är text eller binär."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "Skriv bara ut filerna som skulle ha konverterats."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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 "Med C<c>-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar."
+#. type: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "Skriv ut rubrik."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "Visa filnamn utan sökväg."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Exempel:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Visa information för alla *.txt-filer:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -478,12 +513,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:"
#. type: verbatim
-#: dos2unix.pod:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -493,12 +528,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Visa bara byteordningsmarkeringen:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -508,12 +543,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Lista filerna som har DOS-radbrytningar:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -523,12 +558,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Lista filerna som har Unix-radbrytningar:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -538,12 +573,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -553,12 +588,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Hitta textfiler som har DOS-radbrytningar:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -568,307 +603,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
msgid "Keep the date stamp of output file same as input file."
msgstr "Behåll infilens datumstämpel för utfilen."
#. type: =item
-#: dos2unix.pod:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Visa programmets licens."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Lägg till ytterligare nyrad."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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>: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I Mac-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar."
#. type: textblock
-#: dos2unix.pod:332
+#: dos2unix.pod:352
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>: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I Mac-läge ändras Unix-radbrytningar till två Mac-radbrytningar."
#. type: =item
-#: dos2unix.pod:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som standard skrivs en UTF-8 BOM."
#. type: textblock
-#: dos2unix.pod:340
+#: dos2unix.pod:360
msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
msgstr "När infilen är UTF-16, och flaggan C<-u> används, kommer en UTF-16 BOM att skrivas."
#. type: textblock
-#: dos2unix.pod:343
+#: dos2unix.pod:363
msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
msgstr "Använd aldrig denna flagga när kodningen för utmatning är något annat än UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE."
#. type: =item
-#: dos2unix.pod:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile INFIL UTFIL …>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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 "Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste ange i par och jokertecken i namnen ska I<inte> användas annars I<kommer> du att förlora filer."
#. type: textblock
-#: dos2unix.pod:353
+#: dos2unix.pod:373
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 "Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen."
+msgstr "Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen."
#. type: =item
-#: dos2unix.pod:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile FIL …>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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 "Gammalfilsläge. Konvertera filen FIL och skriv över den med utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn får användas."
#. type: textblock
-#: dos2unix.pod:363
+#: dos2unix.pod:383
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 "I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen konverteras av en annan användare som har skrivbehörighet för filen (t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix."
#. type: =item
-#: dos2unix.pod:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är noll. Utom när felaktiga kommandoradsflaggor används."
#. type: =item
-#: dos2unix.pod:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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 "Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar. Se vidare flaggan C<-b>."
#. type: =item
-#: dos2unix.pod:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Hoppa över binära filer (standard)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Binärfiler hoppas över för att undvika oavsiktliga misstag. Var medveten om att detektering av binärfiler inte är 100% säker. Infiler genomsöks efter binära symboler som typiskt inte återfinns i textfiler. Det är möjligt att en binärfil enbart innehåller texttecken. En sådan binärfil kommer oavsiktligt att ses som en textfil."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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 "Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med samma UTF-16-kodning som infilen, omvänd eller rak byteordning (little eller big endian). Detta förhindrar transformation till UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med C<-ascii>-flaggan."
#. type: =item
-#: dos2unix.pod:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
msgid "Assume that the input file format is UTF-16LE."
msgstr "Antag att infilsformatet är UTF-16LE."
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:424
msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
msgstr "När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har BOM:en högre prioritet än denna flagga."
#. type: textblock
-#: dos2unix.pod:401
+#: dos2unix.pod:427
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 "När du har gjort fel antagande (infilen var inte i UTF-16LE-format) och konverteringens lyckas, kommer du att få en UTF-8 utfil med felaktig text. Du kan göra denna konvertering ogjord med iconv(1) genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att återskapa originalfilen."
#. type: textblock
-#: dos2unix.pod:406
+#: dos2unix.pod:432
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 "Antagandet om UTF-16LE fungerar som ett I<konverteringsläge>. Genom att växla till standard I<ascii>-läget kommer UTF-16LE antagandet att stängas av."
#. type: =item
-#: dos2unix.pod:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
msgid "Assume that the input file format is UTF-16BE."
msgstr "Antag att infilsformatet är UTF-16BE."
#. type: textblock
-#: dos2unix.pod:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Denna flagga fungerar på samma sätt som flaggan C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Visa utförliga meddelanden. Extra information visas om byteordningsmarkeringar och antalet konverterade radbrytningar."
#. type: =item
-#: dos2unix.pod:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Följ symboliska länkar och konvertera målen."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
-msgstr "Ersätt symboliska länkar med konverterade filer (original målfilerna förblir oförändrade)."
+msgstr "Ersätt symboliska länkar med konverterade filer (originalmålfilerna förblir oförändrade)."
#. type: =item
-#: dos2unix.pod:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Behåll symboliska länkar och mål oförändrade (standard)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Visa versionsinformation och avsluta."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "MAC-LÄGE"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte."
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:470
msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
msgstr "I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej."
#. type: textblock
-#: dos2unix.pod:447
+#: dos2unix.pod:473
msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
msgstr "För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd kommandona C<mac2unix> eller C<unix2mac>."
#. type: =head1
-#: dos2unix.pod:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "KONVERTERINGSLÄGEN"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "I läget C<ascii> konverteras enbart radbrytningar. Detta är standardkonverteringsläget."
#. type: textblock
-#: dos2unix.pod:459
+#: dos2unix.pod:485
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 "Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer."
#. type: =item
-#: dos2unix.pod:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
msgstr "I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden från 128 till 255) till ett 7-bitars blanksteg."
#. type: =item
-#: dos2unix.pod:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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 "Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och ISO teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, för vilka konvertering är omöjligt, kommer att ersättas med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS."
#. type: textblock
-#: dos2unix.pod:475
+#: dos2unix.pod:501
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 "När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda standardteckentabellen CP437, vilken huvudsakligen används i USA. För att tvinga en specifik tackentabell använd flaggorna C<-437> (USA), C<-850> (Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång lista av teckenkodningar."
+msgstr "När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda standardteckentabellen CP437, vilken huvudsakligen används i USA. För att tvinga en specifik teckentabell använd flaggorna C<-437> (USA), C<-850> (Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång lista av teckenkodningar."
#. type: textblock
-#: dos2unix.pod:484
+#: dos2unix.pod:510
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer."
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Några exempel:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Konvertera från DOS standardteckentabell till Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -878,12 +918,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Konvertera från DOS CP850 till Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -893,12 +933,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Konvertera från Windows CP1252 till Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -908,12 +948,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):"
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -923,12 +963,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Konvertera från Unix Latin-1 till DOS-standardteckentabell:"
#. type: verbatim
-#: dos2unix.pod:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -938,12 +978,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Konvertera från Unix Latin-1 till DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -953,12 +993,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Konvertera från Unix Latin-1 till Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -968,12 +1008,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -983,142 +1023,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
msgstr "Se även L<http://czyborra.com/charsets/codepages.html> och L<http://czyborra.com/charsets/iso8859.html>."
#. type: =head1
-#: dos2unix.pod:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Kodningar"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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 "Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format."
+msgstr "Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format."
#. type: =head2
-#: dos2unix.pod:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Konvertering"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
msgstr "Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler."
#. type: textblock
-#: dos2unix.pod:539
+#: dos2unix.pod:565
msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
msgstr "Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII."
#. type: textblock
-#: dos2unix.pod:542
+#: dos2unix.pod:568
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 och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade textfiler i omvänd och rak byteordning (little och big endian). För att se om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>."
+msgstr "Dos2unix och unix2dos med Unicode-UTF-16-stöd, kan läsa UTF-16-kodade textfiler i omvänd och rak byteordning (little och big endian). För att se om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:546
+#: dos2unix.pod:572
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 "Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Använd kommandot locale(1) för att ta reda på vilken lokalens teckenkodning är. När konvertering inte är möjlig kommer ett konverteringsfel att inträffa och filen kommer att hoppas över."
#. type: textblock
-#: dos2unix.pod:551
+#: dos2unix.pod:577
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 "Under Windows konverteras UTF-16-filer som standard till UTF-8. UTF-8-formaterade textfiler har bra stöd både under Windows och Unix/Linux."
#. type: textblock
-#: dos2unix.pod:554
+#: dos2unix.pod:580
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- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel uppstår, till exempel när infilen i UTF-16-format innehåller ett fel, kommer att filen att hoppas över."
#. type: textblock
-#: dos2unix.pod:558
+#: dos2unix.pod:584
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 "När flaggan C<-u> används kommer utfilen att skrivas med samma UTF-16-kodning som infilen. Flaggan C<-u> förhindrar konvertering till UTF-8."
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:587
msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
msgstr "Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer till UTF-16."
#. type: textblock
-#: dos2unix.pod:563
+#: dos2unix.pod:589
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer."
#. type: =head2
-#: dos2unix.pod:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Byteordningsmarkering (Byte Order Mark)"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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 "I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L<http://en.wikipedia.org/wiki/Byte_order_mark>."
#. type: textblock
-#: dos2unix.pod:571
+#: dos2unix.pod:597
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 "I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen."
#. type: textblock
-#: dos2unix.pod:574
+#: dos2unix.pod:600
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 bara detektera om en fil är i UTF-16-format om filen har en BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen som en binärfil."
#. type: textblock
-#: dos2unix.pod:578
+#: dos2unix.pod:604
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "Använd flaggan C<-ul> eller C<-ub> för att konvertera en UTF-16-fil utan BOM."
#. type: textblock
-#: dos2unix.pod:580
+#: dos2unix.pod:606
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 skriver som standard ingen BOM i utfilen. Med flaggan C<-b> kommer Dos2unix att skriva en BOM när infilen har en BOM."
#. type: textblock
-#: dos2unix.pod:583
+#: dos2unix.pod:609
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 skriver som standard en BOM i utfilen när infilen har en BOM. Använd flaggan C<-r> för att ta bort BOM:en."
#. type: textblock
-#: dos2unix.pod:586
+#: dos2unix.pod:612
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används."
#. type: =head2
-#: dos2unix.pod:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Unicode-filnamn under Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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 har valfritt stöd för läsning och skri8vning av Unicode-filnamn i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har tecken i sina namn som inte är en del av systemets atandard ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för Unicode-filnamn skriv C<dos2unix -V>."
+msgstr "Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har tecken i sina namn som inte är en del av systemets atandard ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för Unicode-filnamn skriv C<dos2unix -V>."
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:622
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 "Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan C<-D>, C<--display-enc>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen."
#. type: =head2
-#: dos2unix.pod:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Unicode-exempel"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1128,12 +1168,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1143,12 +1183,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:"
#. type: verbatim
-#: dos2unix.pod:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1158,12 +1198,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Konvertera från Unix UTF-8 till Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1173,64 +1213,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L<http://en.wikipedia.org/wiki/GB_18030>."
#. type: textblock
-#: dos2unix.pod:624
+#: dos2unix.pod:650
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 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK."
#. type: textblock
-#: dos2unix.pod:628
+#: dos2unix.pod:654
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 "Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när lokalens teckenkodning är inställd på GB18030. Notera att detta endast kommer att fungera om lokalen har stöd i systemet. Använd kommandot C<locale -a> för att få en lista över de lokaler som stöds."
#. type: textblock
-#: dos2unix.pod:632
+#: dos2unix.pod:658
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "Under Windows måste du använda flaggan C<-gb> för att konvertera UTF-16-filer till GB18030."
#. type: textblock
-#: dos2unix.pod:634
+#: dos2unix.pod:660
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "GB18030-kodade filer kan ha en byteordningsmarkering, precis som Unicode-filer."
#. type: =head1
-#: dos2unix.pod:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "EXEMPEL"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:"
#. type: verbatim
-#: dos2unix.pod:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:"
#. type: verbatim
-#: dos2unix.pod:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1242,12 +1284,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1257,12 +1299,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och ersätt b.txt i 7bit-konverteringsläge:"
#. type: verbatim
-#: dos2unix.pod:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1276,12 +1318,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Konvertera a.txt från Mac- till Unix-format:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1293,12 +1335,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Konvertera a.txt från Unix- till Mac-format:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1310,12 +1352,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:"
#. type: verbatim
-#: dos2unix.pod:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1327,12 +1369,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Konvertera a.txt och skriv till e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1342,12 +1384,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från a.txt:"
#. type: verbatim
-#: dos2unix.pod:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1357,12 +1399,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
msgstr "Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:"
#. type: verbatim
-#: dos2unix.pod:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1374,12 +1416,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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 "Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt, konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:"
#. type: verbatim
-#: dos2unix.pod:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1389,17 +1431,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "REKURSIV KONVERTERING"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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 "Använd dos2unix i kombination med kommandona find(1) och xargs(1) för att rekursivt konvertera filer i en katalogstruktur. För att till exempel konvertera alla .txt-filer i katalogträdet under den aktuella katalogen skriv:"
#. type: verbatim
-#: dos2unix.pod:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1409,12 +1451,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr "I en Windows-kommandoprompt kan följande kommando användas:"
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1423,23 +1465,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "PowerShell-användare kan använda följande kommando i Windows PowerShell:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "LOKALISERING"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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 "Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av flera delas. Den första delen är språkkoden i gemener. Den andra delen är valfri och utgör landskoden i versaler, föregången av ett understreck. Det finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett par exempel för skal av POSIX-standard-typ:"
#. type: verbatim
-#: dos2unix.pod:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1461,47 +1518,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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 "För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
#. type: textblock
-#: dos2unix.pod:728
+#: dos2unix.pod:759
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information."
#. type: =item
-#: dos2unix.pod:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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 "Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C<LANGUAGE=nl:de>. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:741
+#: dos2unix.pod:772
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard."
#. type: =item
-#: dos2unix.pod:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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 "Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in vid kompilering åsidosättas. LOCALEDIR används för att hitta språkfiler. Standardvärdet för GNU-program är C</usr/local/share/locale>. Flaggan B<--version> kommer att visa vilken LOCALEDIR som används."
#. type: textblock
-#: dos2unix.pod:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Exempel (POSIX-skal):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1511,71 +1568,80 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "RETURVÄRDE"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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 "Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer det senaste systemfelet att returneras. För andra fel kommer 1 att returneras."
#. type: textblock
-#: dos2unix.pod:764
+#: dos2unix.pod:795
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
-msgstr "Returvärdet är alltid noll i tystläge, utom när felaktiga kommandoradsflaggor används."
+msgstr "Returvärdet är alltid noll i tyst läge, utom när felaktiga kommandoradsflaggor används."
#. type: =head1
-#: dos2unix.pod:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "STANDARDER"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://en.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "FÖRFATTARE"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (upphovsman)"
#. type: textblock
-#: dos2unix.pod:784
+#: dos2unix.pod:815
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Projektsida: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge-sida: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "SE ÄVEN"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
diff --git a/man/uk/man1/dos2unix.po b/po-man/uk.po
index dde9029..b76f9c5 100644
--- a/man/uk/man1/dos2unix.po
+++ b/po-man/uk.po
@@ -3,12 +3,12 @@
# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
#
-# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-24 10:45+0300\n"
+"Project-Id-Version: dos2unix-man 7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-06 14:39+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -82,26 +82,26 @@ msgstr "Типово, програма не вноситиме змін до с
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Програму dos2unix було створено за зразком програми dos2unix для SunOS/Solaris. Втім, існує одна важлива відмінність від оригінальної версії для SunOS/Solaris. Ця версія типово виконує заміну файлів під час перетворення (старий режим обробки файлів), а у оригінальній версії для SunOS/Solaris передбачено підтримку лише парного перетворення (новий режим обробки файлів). Див. також параметри C<-o> та C<-n>."
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Програму dos2unix було створено за зразком програми dos2unix для SunOS/Solaris. Втім, існує одна важлива відмінність від оригінальної версії для SunOS/Solaris. Ця версія типово виконує заміну файлів під час перетворення (старий режим обробки файлів), а у оригінальній версії для SunOS/Solaris передбачено підтримку лише парного перетворення (новий режим обробки файлів). Див. також параметри C<-o> та C<-n>. Ще однією відмінністю є те, що у версії для SunOS/Solaris типово використовувався режим перетворення I<iso>, а у цій версії типовим є режим перетворення I<ascii>."
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "ПАРАМЕТРИ"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "Вважати усі наступні параметри назвами файлів. Цим параметром слід користуватися, якщо вам потрібно виконати перетворення файлів, чиї назви містять дефіси. Наприклад, щоб виконати перетворення файла «-foo», скористайтеся такою командою:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -111,12 +111,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "Або у новому режимі файлів:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -126,247 +126,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "Виконати лише перетворення символів розриву рядків. Типовий режим перетворення."
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "Виконати перетворення з кодування DOS на кодування ISO-8859-1. Див. розділ щодо режимів перетворення."
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "Використати кодову таблицю 1252 Windows (західноєвропейські мови)."
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "Використовувати кодову сторінку DOS 437 (США). Це типова кодова сторінка для перетворення ISO."
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "Використовувати кодову сторінку DOS 850 (західноєвропейські мови)."
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "Використовувати сторінку DOS 860 (португальська)."
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "Використовувати сторінку DOS 863 (канадська французька)."
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr "Використовувати сторінку DOS 865 (скандинавські мови)."
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "Перетворювати 8-бітові символи на 7-бітові."
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "Зберегти позначку порядку байтів (BOM). Якщо у файлі вхідних даних є BOM, записати BOM до файла результатів. Це типова поведінка під час перетворення у формат із символами розриву рядків DOS. Див. також параметр C<-r>."
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode РЕЖИМ>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "Встановити режим перетворення. Значенням аргументу РЕЖИМ може бути один з таких рядків: I<ascii>, I<7bit>, I<iso>, I<mac>. Типовим є режим ascii."
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
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."
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "Встановити кодування показаного тексту. Можливі варіанти значень параметра КОДУВАННЯ: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, типовим є ansi."
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode, unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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."
+#: dos2unix.pod:197
+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."
+msgstr "Недоліком unicode є те, що це кодування несумісне з ASCII. Обробка виведених даних є непростою, якщо ви передаватимете ці дані до іншої програми або файла."
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Якщо використовується метод C<unicodebom>, текст у кодуванні Unicode буде оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для правильного переспрямовування або тунелювання даних у PowerShell."
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8, utf8bom>"
#. 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>."
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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. Вам слід встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст буде показано подібно до того, як його показано, якщо визначено кодування C<unicode>."
#. type: textblock
-#: dos2unix.pod:206
+#: dos2unix.pod:211
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
+#: dos2unix.pod:217
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>."
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "Якщо використовується метод C<utf8bom>, текст у кодуванні UTF-8 буде оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для правильного переспрямовування або тунелювання даних у PowerShell."
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "Типове кодування можна змінити за допомогою змінної середовища DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode>, C<unicodebom>, C<utf8> або C<utf8bom>."
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "Примусове перетворення двійкових файлів."
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "Показати довідкові дані і завершити роботу."
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[ПРАПОРЦІ], --info[=ПРАПОРЦІ] ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "Вивести дані щодо файла. Не виконувати перетворення."
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "Приклад результатів:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -390,87 +400,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр C<-s>."
+
+#. type: textblock
+#: dos2unix.pod:264
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців."
#. type: =item
-#: dos2unix.pod:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "Вивести кількість символів розривів рядка DOS."
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "Вивести кількість символів розривів рядка Unix."
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "Вивести кількість символів розривів рядка Mac."
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "Вивести позначку порядку байтів."
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "Вивести дані щодо того, є файл текстовим чи бінарним."
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "Вивести дані лише тих файлів, які було б перетворено."
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "Вивести заголовок."
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "Показувати назви файлів без шляхів."
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "Приклади:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "Вивести дані щодо усіх файлів *.txt:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -480,12 +515,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "Вивести кількість розривів рядків у форматі DOS і розривів рядків у форматі Unix:"
#. type: verbatim
-#: dos2unix.pod:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -495,12 +530,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "Вивести лише позначку порядку байтів:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -510,12 +545,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "Вивести список файлів, у яких є символи розриву рядків DOS:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -525,12 +560,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "Вивести список файлів, у яких використано символи розриву рядків Unix:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -540,12 +575,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -555,12 +590,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "Знайти текстові файли і розривами рядків DOS:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -570,307 +605,312 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
msgid "Keep the date stamp of output file same as input file."
msgstr "Зберегти часову позначку файла вхідних даних у файлі результатів перетворення."
#. type: =item
-#: dos2unix.pod:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "Вивести умови ліцензування програми."
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "Вставити додатковий символ розриву рядка."
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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:332
+#: dos2unix.pod:352
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:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
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:340
+#: dos2unix.pod:360
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:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile ФАЙЛ ...>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
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:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "Пропускати двійкові файли (типово)."
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "Пропускання бінарних файлів реалізовано для того, щоб уникнути випадкових помилок. Майте на увазі, що визначення бінарних файлів не є 100% точним. Програма просто шукає у файлах бінарні символи, які типово не трапляються у текстових файлах. Може так статися, що у бінарному файлі містяться лише звичайні текстові символи. Такий бінарний файл буде помилково сприйнято програмою як текстовий."
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
msgid "Assume that the input file format is UTF-16LE."
msgstr "Припускати, що кодуванням вхідних файлів є UTF-16LE."
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
msgid "Assume that the input file format is UTF-16BE."
msgstr "Припускати, що вхідним форматом є UTF-16BE."
#. type: textblock
-#: dos2unix.pod:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "Цей параметр працює у спосіб, тотожний до параметра C<-ul>."
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "Виводити докладні повідомлення. Буде показано додаткові дані щодо позначок порядку байтів та кількості перетворених символів розриву рядків."
#. type: =item
-#: dos2unix.pod:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "Переходити за символічними посиланням і перетворювати файли, на які вони вказують."
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "Замінити символічні посилання перетвореними файлами (початкові файли, на які вони вказують, змінено не буде)."
#. type: =item
-#: dos2unix.pod:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "Не змінювати символічні посилання та файли, на які вони посилаються (типово)."
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "Вивести дані щодо версії і завершити роботу."
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "РЕЖИМ MAC"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
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:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "РЕЖИМИ ПЕРЕТВОРЕННЯ"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "У режимі C<ascii> виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення."
#. type: textblock
-#: dos2unix.pod:459
+#: dos2unix.pod:485
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:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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:475
+#: dos2unix.pod:501
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:484
+#: dos2unix.pod:510
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:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "Декілька прикладів:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -880,12 +920,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -895,12 +935,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -910,12 +950,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix (Unicode):"
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -925,12 +965,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS:"
#. type: verbatim
-#: dos2unix.pod:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -940,12 +980,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -955,12 +995,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -970,12 +1010,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -985,142 +1025,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "Кодування"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "Перетворення"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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:558
+#: dos2unix.pod:584
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:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "Режим перетворення ISO та 7-бітовий режим не працюють для файлів UTF-16."
#. type: =head2
-#: dos2unix.pod:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "Позначка порядку байтів"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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:571
+#: dos2unix.pod:597
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:574
+#: dos2unix.pod:600
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:578
+#: dos2unix.pod:604
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:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "Dos2unix та unix2dos завжди записують до файла результатів позначку порядку байтів (BOM), якщо використано параметр C<-m>."
#. type: =head2
-#: dos2unix.pod:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Назви файлів у Unicode у Windows"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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:596
+#: dos2unix.pod:622
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:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Приклади для Unicode"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у формат Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1130,12 +1170,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі UTF-8 Unix:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1145,12 +1185,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 без BOM:"
#. type: verbatim
-#: dos2unix.pod:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1160,12 +1200,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1175,64 +1215,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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:632
+#: dos2unix.pod:658
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:634
+#: dos2unix.pod:660
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "У файлах у кодуванні GB18030 може міститися позначка порядку байтів, так само, як у файлах у кодуванні Unicode."
#. type: =head1
-#: dos2unix.pod:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "ПРИКЛАДИ"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "Прочитати вхідні дані зі стандартного джерела (stdin) і записати результат до стандартного виведення (stdout):"
#. type: verbatim
-#: dos2unix.pod:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і замістити цей файл:"
#. type: verbatim
-#: dos2unix.pod:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1244,12 +1286,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1259,12 +1301,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1278,12 +1320,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "Перетворити файл a.txt з формату Mac на формат Unix:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1295,12 +1337,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "Перетворити файл a.txt з формату Unix на формат Mac:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1312,12 +1354,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "Перетворити дані у a.txt, замістити цей файл і зберегти часову позначку початкового файла:"
#. type: verbatim
-#: dos2unix.pod:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1329,12 +1371,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1344,12 +1386,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
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:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1359,12 +1401,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1376,12 +1418,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1391,17 +1433,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "РЕКУРСИВНЕ ПЕРЕТВОРЕННЯ"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1411,12 +1453,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr "У командному рядку Windows можна скористатися такою командою:"
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1425,23 +1467,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "Користувачі PowerShell можуть скористатися такою командою у Windows PowerShell:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "ЛОКАЛІЗАЦІЯ"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1463,47 +1520,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1)."
#. type: =item
-#: dos2unix.pod:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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:741
+#: dos2unix.pod:772
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою."
#. type: =item
-#: dos2unix.pod:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "Приклад (командна оболонка POSIX):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1513,75 +1570,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "ПОВЕРНУТЕ ЗНАЧЕННЯ"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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:764
+#: dos2unix.pod:795
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "У режимі без повідомлень повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка."
#. type: =head1
-#: dos2unix.pod:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "СТАНДАРТИ"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://uk.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://uk.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://uk.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "АВТОРИ"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "Сторінка проекту: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "Сторінка на SourceForge: L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>"
#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>"
diff --git a/man/zh_CN/man1/dos2unix.po b/po-man/zh_CN.po
index 42d450f..fcfc068 100644
--- a/man/zh_CN/man1/dos2unix.po
+++ b/po-man/zh_CN.po
@@ -1,20 +1,20 @@
# Chinese (simplified) translations for dos2unix-man.
# Copyright (C) 2014 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
-# zwpwjwtz <zwpwjwtz@126.com>, 2015.
+# Tianze Wang <zwpwjwtz@126.com>, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man-7.3.1-beta6\n"
-"POT-Creation-Date: 2015-09-23 20:09+0200\n"
-"PO-Revision-Date: 2015-09-24 18:56+0800\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"Project-Id-Version: dos2unix-man-7.3.3-beta9\n"
+"POT-Creation-Date: 2016-02-11 20:33+0100\n"
+"PO-Revision-Date: 2016-02-06 19:48+0800\n"
+"Last-Translator: Tianze Wang <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
#. type: =head1
#: dos2unix.pod:52
@@ -80,26 +80,26 @@ msgstr "符号链接和其所指向的目标默认不会被转换。可以用选
#. type: textblock
#: dos2unix.pod:84
-msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
-msgstr "Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式)。参见选项 C<-o> 和 C<-n>。"
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion."
+msgstr "Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个重大差异:本版本默认进行原位转换(旧文件模式),而原来SunOS/Solaris下的版本只支持配对转换(新文件模式),参见选项 C<-o> 和 C<-n>。还有一个区别是SunOS/Solaris下的版本默认使用 I<iso> 模式,而本版本默认使用 I<ascii> 模式。"
#. type: =head1
-#: dos2unix.pod:90
+#: dos2unix.pod:92
msgid "OPTIONS"
msgstr "选项"
#. type: =item
-#: dos2unix.pod:94
+#: dos2unix.pod:96
msgid "B<-->"
msgstr "B<-->"
#. type: textblock
-#: dos2unix.pod:96
+#: dos2unix.pod:98
msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
msgstr "将后面所有的选项当作文件名。如果你希望转换一个文件名以破折号开头的文件,可以使用这个选项。例如,要转换一个名为“-foo”的文件,你可以用这个命令:"
#. type: verbatim
-#: dos2unix.pod:100
+#: dos2unix.pod:102
#, no-wrap
msgid ""
" dos2unix -- -foo\n"
@@ -109,12 +109,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:102
+#: dos2unix.pod:104
msgid "Or in new file mode:"
msgstr "或者在新文件模式中:"
#. type: verbatim
-#: dos2unix.pod:104
+#: dos2unix.pod:106
#, no-wrap
msgid ""
" dos2unix -n -- -foo out.txt\n"
@@ -124,247 +124,257 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:106
+#: dos2unix.pod:108
msgid "B<-ascii>"
msgstr "B<-ascii>"
#. type: textblock
-#: dos2unix.pod:108
+#: dos2unix.pod:110
msgid "Convert only line breaks. This is the default conversion mode."
msgstr "只转换断行符。这是默认的转换模式。"
#. type: =item
-#: dos2unix.pod:110
+#: dos2unix.pod:112
msgid "B<-iso>"
msgstr "B<-iso>"
#. type: textblock
-#: dos2unix.pod:112
+#: dos2unix.pod:114
msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
msgstr "在DOS和ISO-8859-1字符集之间转换。参见 CONVERSION MODES 一节。"
#. type: =item
-#: dos2unix.pod:115
+#: dos2unix.pod:117
msgid "B<-1252>"
msgstr "B<-1252>"
#. type: textblock
-#: dos2unix.pod:117
+#: dos2unix.pod:119
msgid "Use Windows code page 1252 (Western European)."
msgstr "使用Windows 1252 编码页(西欧)。"
#. type: =item
-#: dos2unix.pod:119
+#: dos2unix.pod:121
msgid "B<-437>"
msgstr "B<-437>"
#. type: textblock
-#: dos2unix.pod:121
+#: dos2unix.pod:123
msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
msgstr "使用DOS 437 编码页(美国)。这是ISO转换时的默认编码页。"
#. type: =item
-#: dos2unix.pod:123
+#: dos2unix.pod:125
msgid "B<-850>"
msgstr "B<-850>"
#. type: textblock
-#: dos2unix.pod:125
+#: dos2unix.pod:127
msgid "Use DOS code page 850 (Western European)."
msgstr "使用DOS 850 编码页(西欧)。"
#. type: =item
-#: dos2unix.pod:127
+#: dos2unix.pod:129
msgid "B<-860>"
msgstr "B<-860>"
#. type: textblock
-#: dos2unix.pod:129
+#: dos2unix.pod:131
msgid "Use DOS code page 860 (Portuguese)."
msgstr "使用DOS 860 编码页(葡萄牙)。"
#. type: =item
-#: dos2unix.pod:131
+#: dos2unix.pod:133
msgid "B<-863>"
msgstr "B<-863>"
#. type: textblock
-#: dos2unix.pod:133
+#: dos2unix.pod:135
msgid "Use DOS code page 863 (French Canadian)."
msgstr "使用DOS 863 编码页(加拿大法语)。"
#. type: =item
-#: dos2unix.pod:135
+#: dos2unix.pod:137
msgid "B<-865>"
msgstr "B<-865>"
#. type: textblock
-#: dos2unix.pod:137
+#: dos2unix.pod:139
msgid "Use DOS code page 865 (Nordic)."
msgstr " 使用DOS 865 编码页(北欧)。"
#. type: =item
-#: dos2unix.pod:139
+#: dos2unix.pod:141
msgid "B<-7>"
msgstr "B<-7>"
#. type: textblock
-#: dos2unix.pod:141
+#: dos2unix.pod:143
msgid "Convert 8 bit characters to 7 bit space."
msgstr "将8位字符转换到7位空间。"
#. type: =item
-#: dos2unix.pod:143
+#: dos2unix.pod:145
msgid "B<-b, --keep-bom>"
msgstr "B<-b, --keep-bom>"
#. type: textblock
-#: dos2unix.pod:145
+#: dos2unix.pod:147
msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
msgstr "保留字节序标记(BOM)。当输入文件含有BOM头时,也向输出文件写入BOM。这是转换到DOS断行符时的默认行为。参见选项 C<-r>。"
#. type: =item
-#: dos2unix.pod:149
+#: dos2unix.pod:151
msgid "B<-c, --convmode CONVMODE>"
msgstr "B<-c, --convmode 转换模式>"
#. type: textblock
-#: dos2unix.pod:151
+#: dos2unix.pod:153
msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgstr "改变转换模式。转换模式可以为:I<ascii>、I<7bit>、I<iso>或I<mac>,默认为ascii。"
#. type: =item
-#: dos2unix.pod:155
+#: dos2unix.pod:157
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 "设置显示文本的编码。编码可以为:I<ansi>、I<unicode>、I<utf8>,默认为ansi。"
+#: dos2unix.pod:159
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default."
+msgstr "设置显示文本的编码。编码可以为:I<ansi>、I<unicode>、I<unicodebom>、I<utf8>、I<utf8bom>,默认为 ansi。"
#. type: textblock
-#: dos2unix.pod:161
+#: dos2unix.pod:163
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 "这一选项只对支持Unicode文件名的Windows版dos2unix有效。它对文件名的读写无效,只影响它们的显示结果。"
#. type: textblock
-#: dos2unix.pod:165
+#: dos2unix.pod:167
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
+#: dos2unix.pod:173
msgid "B<ansi>"
msgstr "B<ansi>"
#. type: textblock
-#: dos2unix.pod:173
+#: dos2unix.pod:175
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编码文本。优点是它能提供向后兼容性,并能用于raster和TrueType字体。在一些地方,你可能需要使用 C<chcp> 命令将活动DOS OEM编码页设置为Windows系统ANSI编码页,因为dos2unix使用Windows系统编码页。"
#. type: textblock
-#: dos2unix.pod:179
+#: dos2unix.pod:181
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>"
+#: dos2unix.pod:186
+msgid "B<unicode, unicodebom>"
+msgstr "B<unicode,unicodebom>"
#. type: textblock
-#: dos2unix.pod:186
+#: dos2unix.pod:188
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
+#: dos2unix.pod:194
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文件。"
+#: dos2unix.pod:197
+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."
+msgstr "Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时,它可能不那么容易控制"
+
+#. type: textblock
+#: dos2unix.pod:200
+msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "当使用 C<unicodebom> 方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。"
#. type: =item
-#: dos2unix.pod:199
-msgid "B<utf8>"
-msgstr "B<utf8>"
+#: dos2unix.pod:205
+msgid "B<utf8, utf8bom>"
+msgstr "B<utf8,utf8bom>"
#. 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> 编码时那样。"
+#: dos2unix.pod:207
+msgid "The advantage of utf8 is that it is compatible with ASCII. 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兼容。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示,就像使用 C<unicode> 编码时那样。"
#. type: textblock
-#: dos2unix.pod:206
+#: dos2unix.pod:211
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 "缺点是当你使用默认的raster字体时,所有的非ASCII字符将无法被正确显示。不仅是unicode文件名,连翻译的消息也无法被读取。在配置为东亚地区的Windows中,当终端中显示这些消息时你可能会看到闪烁现象。"
#. type: textblock
-#: dos2unix.pod:212
+#: dos2unix.pod:217
msgid "In a ConEmu console the utf8 encoding method works well."
msgstr "在ConEmu终端中,utf编码方式可以正常工作。"
#. 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> 来改变。"
+#: dos2unix.pod:219
+msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell."
+msgstr "当使用 C<utf8bom> 方法时,将会在Unicode文本前添加一个BOM(字节序标记)。在PowerShell中,需要根据BOM来进行正确的重定向或管道输出。"
+
+#. type: textblock
+#: dos2unix.pod:226
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>."
+msgstr "默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 C<unicode> 、C<unicodebom>、C<utf8> 或 C<utf8bom> 来改变。"
#. type: =item
-#: dos2unix.pod:219
+#: dos2unix.pod:229
msgid "B<-f, --force>"
msgstr "B<-f, --force>"
#. type: textblock
-#: dos2unix.pod:221
+#: dos2unix.pod:231
msgid "Force conversion of binary files."
msgstr "强制转换二进制文件。"
#. type: =item
-#: dos2unix.pod:223
+#: dos2unix.pod:233
msgid "B<-gb, --gb18030>"
msgstr "B<-gb, --gb18030>"
#. type: textblock
-#: dos2unix.pod:225
+#: dos2unix.pod:235
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:229
+#: dos2unix.pod:239
msgid "B<-h, --help>"
msgstr "B<-h, --help>"
#. type: textblock
-#: dos2unix.pod:231
+#: dos2unix.pod:241
msgid "Display help and exit."
msgstr "显示帮助,然后退出。"
#. type: =item
-#: dos2unix.pod:233
+#: dos2unix.pod:243
msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
msgstr "B<-i[标志], --info[=标志] 文件 …>"
#. type: textblock
-#: dos2unix.pod:235
+#: dos2unix.pod:245
msgid "Display file information. No conversion is done."
msgstr "显示文件信息。不进行转换。"
#. type: textblock
-#: dos2unix.pod:237
+#: dos2unix.pod:247
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断行符的数量、是否有BOM、文本/二进制、文件名。"
#. type: textblock
-#: dos2unix.pod:241
+#: dos2unix.pod:251
msgid "Example output:"
msgstr "输出示例:"
#. type: verbatim
-#: dos2unix.pod:243
+#: dos2unix.pod:253
#, no-wrap
msgid ""
" 6 0 0 no_bom text dos.txt\n"
@@ -388,87 +398,112 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:252
+#: dos2unix.pod:262
+msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>."
+msgstr "注意,二进制文件有时会被误判为文本文件。参见选项 C<-s>。"
+
+#. type: textblock
+#: dos2unix.pod:264
msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
msgstr "可以为输出设置额外的标志(一个或多个)。"
#. type: =item
-#: dos2unix.pod:257
+#: dos2unix.pod:269
msgid "B<d>"
msgstr "B<d>"
#. type: textblock
-#: dos2unix.pod:259
+#: dos2unix.pod:271
msgid "Print number of DOS line breaks."
msgstr "显示DOS断行符的数量。"
#. type: =item
-#: dos2unix.pod:261
+#: dos2unix.pod:273
msgid "B<u>"
msgstr "B<u>"
#. type: textblock
-#: dos2unix.pod:263
+#: dos2unix.pod:275
msgid "Print number of Unix line breaks."
msgstr "显示Unix断行符的数量。"
#. type: =item
-#: dos2unix.pod:265
+#: dos2unix.pod:277
msgid "B<m>"
msgstr "B<m>"
#. type: textblock
-#: dos2unix.pod:267
+#: dos2unix.pod:279
msgid "Print number of Mac line breaks."
msgstr "显示Mac断行符的数量。"
#. type: =item
-#: dos2unix.pod:269
+#: dos2unix.pod:281
msgid "B<b>"
msgstr "B<b>"
#. type: textblock
-#: dos2unix.pod:271
+#: dos2unix.pod:283
msgid "Print the byte order mark."
msgstr "显示BOM状况。"
#. type: =item
-#: dos2unix.pod:273
+#: dos2unix.pod:285
msgid "B<t>"
msgstr "B<t>"
#. type: textblock
-#: dos2unix.pod:275
+#: dos2unix.pod:287
msgid "Print if file is text or binary."
msgstr "显示文件为文本或二进制。"
#. type: =item
-#: dos2unix.pod:277
+#: dos2unix.pod:289
msgid "B<c>"
msgstr "B<c>"
#. type: textblock
-#: dos2unix.pod:279
+#: dos2unix.pod:291
msgid "Print only the files that would be converted."
msgstr "只显示将会被转换的文件。"
#. type: textblock
-#: dos2unix.pod:281
+#: dos2unix.pod:293
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: =item
+#: dos2unix.pod:296
+msgid "B<h>"
+msgstr "B<h>"
+
#. type: textblock
-#: dos2unix.pod:286
+#: dos2unix.pod:298
+msgid "Print a header."
+msgstr "显示头部。"
+
+#. type: =item
+#: dos2unix.pod:300
+msgid "B<p>"
+msgstr "B<p>"
+
+#. type: textblock
+#: dos2unix.pod:302
+msgid "Show file names without path."
+msgstr "显示不含路径的文件名。"
+
+#. type: textblock
+#: dos2unix.pod:306
msgid "Examples:"
msgstr "示例:"
#. type: textblock
-#: dos2unix.pod:288
+#: dos2unix.pod:308
msgid "Show information for all *.txt files:"
msgstr "显示所有 *.txt 文件的信息:"
#. type: verbatim
-#: dos2unix.pod:290
+#: dos2unix.pod:310
#, no-wrap
msgid ""
" dos2unix -i *.txt\n"
@@ -478,12 +513,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:292
+#: dos2unix.pod:312
msgid "Show only the number of DOS line breaks and Unix line breaks:"
msgstr "只显示DOS断行符和Unix断行符的数量:"
#. type: verbatim
-#: dos2unix.pod:294
+#: dos2unix.pod:314
#, no-wrap
msgid ""
" dos2unix -idu *.txt\n"
@@ -493,12 +528,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:296
+#: dos2unix.pod:316
msgid "Show only the byte order mark:"
msgstr "只显示BOM状况:"
#. type: verbatim
-#: dos2unix.pod:298
+#: dos2unix.pod:318
#, no-wrap
msgid ""
" dos2unix --info=b *.txt\n"
@@ -508,12 +543,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:300
+#: dos2unix.pod:320
msgid "List the files that have DOS line breaks:"
msgstr "列出含有DOS断行符的文件:"
#. type: verbatim
-#: dos2unix.pod:302
+#: dos2unix.pod:322
#, no-wrap
msgid ""
" dos2unix -ic *.txt\n"
@@ -523,12 +558,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:304
+#: dos2unix.pod:324
msgid "List the files that have Unix line breaks:"
msgstr "列出含有Unix断行符的文件:"
#. type: verbatim
-#: dos2unix.pod:306
+#: dos2unix.pod:326
#, no-wrap
msgid ""
" unix2dos -ic *.txt\n"
@@ -538,12 +573,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:308
+#: dos2unix.pod:328
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
msgstr "只转换含有DOS断行符的文件,保持其他文件不变:"
#. type: verbatim
-#: dos2unix.pod:310
+#: dos2unix.pod:330
#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
@@ -553,12 +588,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:312
+#: dos2unix.pod:332
msgid "Find text files that have DOS line breaks:"
msgstr "查找含有DOS断行符的文本文件:"
#. type: verbatim
-#: dos2unix.pod:314
+#: dos2unix.pod:334
#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
@@ -568,309 +603,314 @@ msgstr ""
"\n"
#. type: =item
-#: dos2unix.pod:316
+#: dos2unix.pod:336
msgid "B<-k, --keepdate>"
msgstr "B<-k, --keepdate>"
#. type: textblock
-#: dos2unix.pod:318
+#: dos2unix.pod:338
msgid "Keep the date stamp of output file same as input file."
msgstr "将输入文件的时间戳应用到输出文件。"
#. type: =item
-#: dos2unix.pod:320
+#: dos2unix.pod:340
msgid "B<-L, --license>"
msgstr "B<-L, --license>"
#. type: textblock
-#: dos2unix.pod:322
+#: dos2unix.pod:342
msgid "Display program's license."
msgstr "显示程序许可证。"
#. type: =item
-#: dos2unix.pod:324
+#: dos2unix.pod:344
msgid "B<-l, --newline>"
msgstr "B<-l, --newline>"
#. type: textblock
-#: dos2unix.pod:326
+#: dos2unix.pod:346
msgid "Add additional newline."
msgstr "添加额外的新行。"
#. type: textblock
-#: dos2unix.pod:328
+#: dos2unix.pod:348
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>:只有DOS断行符会被转换为两个Unix断行符。在Mac模式下,只有Mac断行符会被转换为Unix断行符。"
#. type: textblock
-#: dos2unix.pod:332
+#: dos2unix.pod:352
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>:只有Unix断行符会被转换为两个DOS断行符。在Mac模式下,Unix断行符会被转换为两个Mac断行符。"
#. type: =item
-#: dos2unix.pod:335
+#: dos2unix.pod:355
msgid "B<-m, --add-bom>"
msgstr "B<-m, --add-bom>"
#. type: textblock
-#: dos2unix.pod:337
+#: dos2unix.pod:357
msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
msgstr "将字节序标记(BOM)写入到输出文件。默认情况下将写入UTF-8 BOM。"
#. type: textblock
-#: dos2unix.pod:340
+#: dos2unix.pod:360
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 BOM。"
#. type: textblock
-#: dos2unix.pod:343
+#: dos2unix.pod:363
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:347
+#: dos2unix.pod:367
msgid "B<-n, --newfile INFILE OUTFILE ...>"
msgstr "B<-n, --newline 输入文件 输出文件 ...>"
#. type: textblock
-#: dos2unix.pod:349
+#: dos2unix.pod:369
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:353
+#: dos2unix.pod:373
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:358
+#: dos2unix.pod:378
msgid "B<-o, --oldfile FILE ...>"
msgstr "B<-o, --oldfile 文件 ...>"
#. type: textblock
-#: dos2unix.pod:360
+#: dos2unix.pod:380
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:363
+#: dos2unix.pod:383
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:372
+#: dos2unix.pod:392
msgid "B<-q, --quiet>"
msgstr "B<-q, --quiet>"
#. type: textblock
-#: dos2unix.pod:374
+#: dos2unix.pod:394
msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
msgstr "安静模式。不显示任何警告或信息。返回值为0,除非命令行选项有误。"
#. type: =item
-#: dos2unix.pod:377
+#: dos2unix.pod:397
msgid "B<-r, --remove-bom>"
msgstr "B<-r, --remove-bom>"
#. type: textblock
-#: dos2unix.pod:379
+#: dos2unix.pod:399
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:383
+#: dos2unix.pod:403
msgid "B<-s, --safe>"
msgstr "B<-s, --safe>"
#. type: textblock
-#: dos2unix.pod:385
+#: dos2unix.pod:405
msgid "Skip binary files (default)."
msgstr "跳过二进制文件(默认)。"
+#. type: textblock
+#: dos2unix.pod:407
+msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file."
+msgstr "跳过二进制文件是为了避免可能的错误。请注意,对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件区分开来,但有的二进制文件可能只包含普通的文本字符,这样的文件就会被误判为文本文件。"
+
#. type: =item
-#: dos2unix.pod:387
+#: dos2unix.pod:413
msgid "B<-u, --keep-utf16>"
msgstr "B<-u, --keep-utf16>"
#. type: textblock
-#: dos2unix.pod:389
+#: dos2unix.pod:415
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 BOM。可以用 C<-ascii>选项来禁止。"
#. type: =item
-#: dos2unix.pod:394
+#: dos2unix.pod:420
msgid "B<-ul, --assume-utf16le>"
msgstr "B<-ul, --assume-utf16le>"
#. type: textblock
-#: dos2unix.pod:396
+#: dos2unix.pod:422
msgid "Assume that the input file format is UTF-16LE."
msgstr "假定输入文件格式为UTF-16LE。"
#. type: textblock
-#: dos2unix.pod:398
+#: dos2unix.pod:424
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:401
+#: dos2unix.pod:427
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:406
+#: dos2unix.pod:432
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的假定将根据 l<转换模式> 来工作。若改变了默认的 l<ascii> 模式,则这一假定将会被关闭。"
#. type: =item
-#: dos2unix.pod:409
+#: dos2unix.pod:435
msgid "B<-ub, --assume-utf16be>"
msgstr "B<-ub, --assume-utf16be>"
#. type: textblock
-#: dos2unix.pod:411
+#: dos2unix.pod:437
msgid "Assume that the input file format is UTF-16BE."
msgstr "假定输入文件格式为UTF-16BE。"
#. type: textblock
-#: dos2unix.pod:413
+#: dos2unix.pod:439
msgid "This option works the same as option C<-ul>."
msgstr "这一选项与 C<-ul> 类似。"
#. type: =item
-#: dos2unix.pod:415
+#: dos2unix.pod:441
msgid "B<-v, --verbose>"
msgstr "B<-v, --verbose>"
#. type: textblock
-#: dos2unix.pod:417
+#: dos2unix.pod:443
msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
msgstr "显示更多信息。将会显示有关BOM和转换统计的额外信息。"
#. type: =item
-#: dos2unix.pod:420
+#: dos2unix.pod:446
msgid "B<-F, --follow-symlink>"
msgstr "B<-F, --follow-symlink>"
#. type: textblock
-#: dos2unix.pod:422
+#: dos2unix.pod:448
msgid "Follow symbolic links and convert the targets."
msgstr "追踪符号链接并转换其目标。"
#. type: =item
-#: dos2unix.pod:424
+#: dos2unix.pod:450
msgid "B<-R, --replace-symlink>"
msgstr "B<-R, --replace-symlink>"
#. type: textblock
-#: dos2unix.pod:426
+#: dos2unix.pod:452
msgid "Replace symbolic links with converted files (original target files remain unchanged)."
msgstr "将符号链接的目标替换为转换后的文件(原来的目标文件保持不变)。"
#. type: =item
-#: dos2unix.pod:429
+#: dos2unix.pod:455
msgid "B<-S, --skip-symlink>"
msgstr "B<-S, --skip-symlink>"
#. type: textblock
-#: dos2unix.pod:431
+#: dos2unix.pod:457
msgid "Keep symbolic links and targets unchanged (default)."
msgstr "保持符号链接和其目标文件不变(默认)。"
#. type: =item
-#: dos2unix.pod:433
+#: dos2unix.pod:459
msgid "B<-V, --version>"
msgstr "B<-V, --version>"
#. type: textblock
-#: dos2unix.pod:435
+#: dos2unix.pod:461
msgid "Display version information and exit."
msgstr "显示版本信息,然后退出。"
#. type: =head1
-#: dos2unix.pod:439
+#: dos2unix.pod:465
msgid "MAC MODE"
msgstr "Mac模式"
#. type: textblock
-#: dos2unix.pod:441
+#: dos2unix.pod:467
msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
msgstr "普通模式下,断行符将被转换为DOS格式,或相反。Mac格式的断行符将不会被转换。"
#. type: textblock
-#: dos2unix.pod:444
+#: dos2unix.pod:470
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:447
+#: dos2unix.pod:473
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:450
+#: dos2unix.pod:476
msgid "CONVERSION MODES"
msgstr "转换模式"
#. type: =item
-#: dos2unix.pod:454
+#: dos2unix.pod:480
msgid "B<ascii>"
msgstr "B<ascii>"
#. type: textblock
-#: dos2unix.pod:456
+#: dos2unix.pod:482
msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
msgstr "在 C<ascii> 模式下,只转换断行符。 这是默认的转换模式。"
#. type: textblock
-#: dos2unix.pod:459
+#: dos2unix.pod:485
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编码文件时请务必使用此模式。"
#. type: =item
-#: dos2unix.pod:463
+#: dos2unix.pod:489
msgid "B<7bit>"
msgstr "B<7bit>"
#. type: textblock
-#: dos2unix.pod:465
+#: dos2unix.pod:491
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:468
+#: dos2unix.pod:494
msgid "B<iso>"
msgstr "B<iso>"
#. type: textblock
-#: dos2unix.pod:470
+#: dos2unix.pod:496
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 "Unix下,将在DOS字符集(编码页)和ISO字符集 ISO-8859-1(Latin-1)之间进行转换。不具有 ISO-8859-1 中对等字符的DOS字符将会被转换为点号(“.”)。当 ISO-8859-1 字符集中没有DOS中的对等字符时也是如此。"
#. type: textblock
-#: dos2unix.pod:475
+#: dos2unix.pod:501
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将尝试确定当前活动代码页。若无法确定,则使用默认代码页 CP437(普遍用于美国)。若要强制指定代码页,请使用选项 C<-437>(美国)、C<-850>(西欧)、C<-860>(葡萄牙)、C<-863>(法国、加拿大)或C<-865>(北欧)。\n"
"Windows CP1252代码页(西欧)也可以通过选项 C<-1252> 获得支持。若要使用其他代码页,可以结合 iconv(1) 使用dos2unix。iconv可以在很多字符编码间进行转换。"
#. type: textblock
-#: dos2unix.pod:484
+#: dos2unix.pod:510
msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
msgstr "不对Unicode编码文本使用ISO转换。因这一转换会导致UTF-8编码文件损坏。"
#. type: textblock
-#: dos2unix.pod:486
+#: dos2unix.pod:512
msgid "Some examples:"
msgstr "一些示例:"
#. type: textblock
-#: dos2unix.pod:488
+#: dos2unix.pod:514
msgid "Convert from DOS default code page to Unix Latin-1:"
msgstr "从DOS默认编码页转换到Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:490
+#: dos2unix.pod:516
#, no-wrap
msgid ""
" dos2unix -iso -n in.txt out.txt\n"
@@ -880,12 +920,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:492
+#: dos2unix.pod:518
msgid "Convert from DOS CP850 to Unix Latin-1:"
msgstr "从DOS CP850转换到Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:494
+#: dos2unix.pod:520
#, no-wrap
msgid ""
" dos2unix -850 -n in.txt out.txt\n"
@@ -895,12 +935,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:496
+#: dos2unix.pod:522
msgid "Convert from Windows CP1252 to Unix Latin-1:"
msgstr "从Windows CP1252转换到Unix Latin-1:"
#. type: verbatim
-#: dos2unix.pod:498
+#: dos2unix.pod:524
#, no-wrap
msgid ""
" dos2unix -1252 -n in.txt out.txt\n"
@@ -910,12 +950,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:500
+#: dos2unix.pod:526
msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
msgstr "从WIndows CP1252转换到Unix UTF-8(Unicode):"
#. type: verbatim
-#: dos2unix.pod:502
+#: dos2unix.pod:528
#, no-wrap
msgid ""
" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
@@ -925,12 +965,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:504
+#: dos2unix.pod:530
msgid "Convert from Unix Latin-1 to DOS default code page:"
msgstr "从Unix Latin-1转换到DOS默认编码页:"
#. type: verbatim
-#: dos2unix.pod:506
+#: dos2unix.pod:532
#, no-wrap
msgid ""
" unix2dos -iso -n in.txt out.txt\n"
@@ -940,12 +980,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:508
+#: dos2unix.pod:534
msgid "Convert from Unix Latin-1 to DOS CP850:"
msgstr "从Unix Latin-1转换到DOS CP850:"
#. type: verbatim
-#: dos2unix.pod:510
+#: dos2unix.pod:536
#, no-wrap
msgid ""
" unix2dos -850 -n in.txt out.txt\n"
@@ -955,12 +995,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:512
+#: dos2unix.pod:538
msgid "Convert from Unix Latin-1 to Windows CP1252:"
msgstr "从Unix Latin-1转换到Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:514
+#: dos2unix.pod:540
#, no-wrap
msgid ""
" unix2dos -1252 -n in.txt out.txt\n"
@@ -970,12 +1010,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:516
+#: dos2unix.pod:542
msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
msgstr "从Unix UTF-8(Unicode)转换到Windows CP1252:"
#. type: verbatim
-#: dos2unix.pod:518
+#: dos2unix.pod:544
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
@@ -985,142 +1025,142 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:520
+#: dos2unix.pod:546
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> et L<http://czyborra.com/charsets/iso8859.html>。"
#. type: =head1
-#: dos2unix.pod:525
+#: dos2unix.pod:551
msgid "UNICODE"
msgstr "UNICODE"
#. type: =head2
-#: dos2unix.pod:527
+#: dos2unix.pod:553
msgid "Encodings"
msgstr "编码"
#. type: textblock
-#: dos2unix.pod:529
+#: dos2unix.pod:555
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中的文本文件可以是UTF-8、UTF-16或UTF-16BE编码,但大多采用UTF-16格式。"
#. type: =head2
-#: dos2unix.pod:534
+#: dos2unix.pod:560
msgid "Conversion"
msgstr "转换"
#. type: textblock
-#: dos2unix.pod:536
+#: dos2unix.pod:562
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:539
+#: dos2unix.pod:565
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:542
+#: dos2unix.pod:568
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 "含有Unicode UTF-16支持的dos2unix和unix2dos可以读取小尾序或大尾序的UTF-16编码文本。输入 C<dos2unix -V> 来确定dos2unix在编译是是否启用了UTF-16支持。"
#. type: textblock
-#: dos2unix.pod:546
+#: dos2unix.pod:572
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:551
+#: dos2unix.pod:577
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:554
+#: dos2unix.pod:580
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格式的输入文件含有错误,那么该文件将被跳过。"
#. type: textblock
-#: dos2unix.pod:558
+#: dos2unix.pod:584
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编码。C<-u>选项将阻止程序转换到UTF-8。"
#. type: textblock
-#: dos2unix.pod:561
+#: dos2unix.pod:587
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:563
+#: dos2unix.pod:589
msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
msgstr "ISO和7位编码模式的转换无法用于UTF-16文件。"
#. type: =head2
-#: dos2unix.pod:565
+#: dos2unix.pod:591
msgid "Byte Order Mark"
msgstr "字节序标记"
#. type: textblock
-#: dos2unix.pod:567
+#: dos2unix.pod:593
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中,文本文件一般含有字节序标记(BOM),因为很多Windows程序(包括记事本)默认添加BOM。参见 L<http://en.wikipedia.org/wiki/Byte_order_mark>。"
#. type: textblock
-#: dos2unix.pod:571
+#: dos2unix.pod:597
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文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。"
#. type: textblock
-#: dos2unix.pod:574
+#: dos2unix.pod:600
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只能检测含有BOM文件的UTF-16格式。若UTF-16文件不含BOM,dos2unix会将其视作二进制文件。"
#. type: textblock
-#: dos2unix.pod:578
+#: dos2unix.pod:604
msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
msgstr "请使用选项 C<-ul> 或 C<-ub> 来转换不含BOM的UTF-16文件。"
#. type: textblock
-#: dos2unix.pod:580
+#: dos2unix.pod:606
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:583
+#: dos2unix.pod:609
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:586
+#: dos2unix.pod:612
msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
msgstr "若使用了 C<-m> 选项,dos2unix和unix2dos将总是输出BOM。"
#. type: =head2
-#: dos2unix.pod:588
+#: dos2unix.pod:614
msgid "Unicode file names on Windows"
msgstr "Windows中Unicode文件的文件名"
#. type: textblock
-#: dos2unix.pod:590
+#: dos2unix.pod:616
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对于Windows命令提示符中读取和写入Unicode文件名有额外的支持。这意味着dos2unix可以打开那些包含非默认系统ANSI编码页字符的文件。若要查看Windows版dos2unix在编译时是否加入了Unicode文件名支持,请输入 C<dos2unix -V>。"
#. type: textblock
-#: dos2unix.pod:596
+#: dos2unix.pod:622
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 "在Windows终端中显示Unicode文件名有一些需要注意的问题。请参见 C<-D> 和 C<--display-enc> 选项。文件名在终端中可能无法被正确显示,但写入文件时文件名仍然是正确的。"
#. type: =head2
-#: dos2unix.pod:600
+#: dos2unix.pod:626
msgid "Unicode examples"
msgstr "Unicode示例"
#. type: textblock
-#: dos2unix.pod:602
+#: dos2unix.pod:628
msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
msgstr "转换Windows UTF-16到Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:604
+#: dos2unix.pod:630
#, no-wrap
msgid ""
" dos2unix -n in.txt out.txt\n"
@@ -1130,12 +1170,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:606
+#: dos2unix.pod:632
msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
msgstr "转换Windows UTF-16LE(不含BOM)到Unix UTF-8:"
#. type: verbatim
-#: dos2unix.pod:608
+#: dos2unix.pod:634
#, no-wrap
msgid ""
" dos2unix -ul -n in.txt out.txt\n"
@@ -1145,12 +1185,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:610
+#: dos2unix.pod:636
msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
msgstr "转换Unix UTF-8到Windows UTF-8(并添加BOM):"
#. type: verbatim
-#: dos2unix.pod:612
+#: dos2unix.pod:638
#, no-wrap
msgid ""
" unix2dos -m -n in.txt out.txt\n"
@@ -1160,12 +1200,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:614
+#: dos2unix.pod:640
msgid "Convert from Unix UTF-8 to Windows UTF-16:"
msgstr "转换Unix UTF-8到Windows UTF-16:"
#. type: verbatim
-#: dos2unix.pod:616
+#: dos2unix.pod:642
#, no-wrap
msgid ""
" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
@@ -1175,64 +1215,66 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:618
+#: dos2unix.pod:644
msgid "GB18030"
msgstr "GB18030"
#. type: textblock
-#: dos2unix.pod:620
+#: dos2unix.pod:646
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:624
+#: dos2unix.pod:650
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:628
+#: dos2unix.pod:654
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中,若区域编码被设置为GB18030,UTF-16文件将被转换为GB18030格式。注意只有当系统支持区域设置时这一才会进行这一转换。可以使用 C<locale -a> 命令来获取受支持的区域。"
#. type: textblock
-#: dos2unix.pod:632
+#: dos2unix.pod:658
msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
msgstr "在Windows中,你需要使用 C<-gb> 选项来转换UTF-16文件到GB18030编码。"
#. type: textblock
-#: dos2unix.pod:634
+#: dos2unix.pod:660
msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
msgstr "GB18030编码的文件和Unicode文件一样可以含有BOM。"
#. type: =head1
-#: dos2unix.pod:636
+#: dos2unix.pod:662
msgid "EXAMPLES"
msgstr "示例"
#. type: textblock
-#: dos2unix.pod:638
+#: dos2unix.pod:664
msgid "Read input from 'stdin' and write output to 'stdout':"
msgstr "从标准输入读取,并输出到标准输出:"
#. type: verbatim
-#: dos2unix.pod:640
-#, no-wrap
+#: dos2unix.pod:666
+#, fuzzy, no-wrap
+#| msgid ""
+#| " dos2unix -ic *.txt | xargs dos2unix\n"
+#| "\n"
msgid ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix < a.txt\n"
+" cat a.txt | dos2unix\n"
"\n"
msgstr ""
-" dos2unix\n"
-" dos2unix -l -c mac\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
-#: dos2unix.pod:643
+#: dos2unix.pod:669
msgid "Convert and replace a.txt. Convert and replace b.txt:"
msgstr "转换并覆盖a.txt和b.txt:"
#. type: verbatim
-#: dos2unix.pod:645
+#: dos2unix.pod:671
#, no-wrap
msgid ""
" dos2unix a.txt b.txt\n"
@@ -1244,12 +1286,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:648
+#: dos2unix.pod:674
msgid "Convert and replace a.txt in ascii conversion mode:"
msgstr "转换并覆盖a.txt,使用ascii模式:"
#. type: verbatim
-#: dos2unix.pod:650
+#: dos2unix.pod:676
#, no-wrap
msgid ""
" dos2unix a.txt\n"
@@ -1259,12 +1301,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:652
+#: dos2unix.pod:678
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:655
+#: dos2unix.pod:681
#, no-wrap
msgid ""
" dos2unix a.txt -c 7bit b.txt\n"
@@ -1278,12 +1320,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:659
+#: dos2unix.pod:685
msgid "Convert a.txt from Mac to Unix format:"
msgstr "将a.txt从Mac格式转换到Unix格式:"
#. type: verbatim
-#: dos2unix.pod:661
+#: dos2unix.pod:687
#, no-wrap
msgid ""
" dos2unix -c mac a.txt\n"
@@ -1295,12 +1337,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:664
+#: dos2unix.pod:690
msgid "Convert a.txt from Unix to Mac format:"
msgstr "将a.txt从Unix格式转换到Mac格式:"
#. type: verbatim
-#: dos2unix.pod:666
+#: dos2unix.pod:692
#, no-wrap
msgid ""
" unix2dos -c mac a.txt\n"
@@ -1312,12 +1354,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:669
+#: dos2unix.pod:695
msgid "Convert and replace a.txt while keeping original date stamp:"
msgstr "转换并覆盖a.txt,保留原始时间戳:"
#. type: verbatim
-#: dos2unix.pod:671
+#: dos2unix.pod:697
#, no-wrap
msgid ""
" dos2unix -k a.txt\n"
@@ -1329,12 +1371,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:674
+#: dos2unix.pod:700
msgid "Convert a.txt and write to e.txt:"
msgstr "转换a.txt,并输出到e.txt:"
#. type: verbatim
-#: dos2unix.pod:676
+#: dos2unix.pod:702
#, no-wrap
msgid ""
" dos2unix -n a.txt e.txt\n"
@@ -1344,12 +1386,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:678
+#: dos2unix.pod:704
msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
msgstr "转换a.txt,并输出到e.txt,同时使e.txt的时间戳和a.txt一致:"
#. type: verbatim
-#: dos2unix.pod:680
+#: dos2unix.pod:706
#, no-wrap
msgid ""
" dos2unix -k -n a.txt e.txt\n"
@@ -1359,12 +1401,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:682
+#: dos2unix.pod:708
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:684
+#: dos2unix.pod:710
#, no-wrap
msgid ""
" dos2unix a.txt -n b.txt e.txt\n"
@@ -1376,12 +1418,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:687
+#: dos2unix.pod:713
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:690
+#: dos2unix.pod:716
#, no-wrap
msgid ""
" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
@@ -1391,17 +1433,17 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:692
+#: dos2unix.pod:718
msgid "RECURSIVE CONVERSION"
msgstr "递归转换"
#. type: textblock
-#: dos2unix.pod:694
+#: dos2unix.pod:720
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 "结合 find(1) 和 xargs(1) 使用dos2unix可以递归地转换目录树中的文本文件。例如,转换当前目录的目录树中所有的.txt文件:"
#. type: verbatim
-#: dos2unix.pod:698
+#: dos2unix.pod:724
#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
@@ -1411,12 +1453,12 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:700
+#: dos2unix.pod:726
msgid "In a Windows Command Prompt the following command can be used:"
msgstr "在Windows命令提示符中,可以使用下列命令:"
#. type: verbatim
-#: dos2unix.pod:702
+#: dos2unix.pod:728
#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
@@ -1425,23 +1467,38 @@ msgstr ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
+#. type: textblock
+#: dos2unix.pod:730
+msgid "PowerShell users can use the following command in Windows PowerShell:"
+msgstr "PowerShell用户可以在Windows PowerShell中使用如下命令:"
+
+#. type: verbatim
+#: dos2unix.pod:732
+#, no-wrap
+msgid ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+msgstr ""
+" get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n"
+"\n"
+
#. type: =head1
-#: dos2unix.pod:704
+#: dos2unix.pod:735
msgid "LOCALIZATION"
msgstr "区域"
#. type: =item
-#: dos2unix.pod:708
+#: dos2unix.pod:739
msgid "B<LANG>"
msgstr "B<LANG>"
#. type: textblock
-#: dos2unix.pod:710
+#: dos2unix.pod:741
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环境变量指定了程序所使用的首选语言。它包括几个部分:第一部分是小写的语言编码,第二部分是(可选的)大写的国家/地区代码,前面用下划线连接;第三部分也是可选的,即字符编码,前面用点连接。一些POSIX规范的示例如下:"
#. type: verbatim
-#: dos2unix.pod:717
+#: dos2unix.pod:748
#, no-wrap
msgid ""
" export LANG=nl Dutch\n"
@@ -1463,47 +1520,47 @@ msgstr ""
"\n"
#. type: textblock
-#: dos2unix.pod:725
+#: dos2unix.pod:756
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:728
+#: dos2unix.pod:759
msgid "On Unix systems you can use the command locale(1) to get locale specific information."
msgstr "在Unix系统中,你可以使用 locale(1) 命令获取特定区域的信息。"
#. type: =item
-#: dos2unix.pod:731
+#: dos2unix.pod:762
msgid "B<LANGUAGE>"
msgstr "B<LANGUAGE>"
#. type: textblock
-#: dos2unix.pod:733
+#: dos2unix.pod:764
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=<zh:en>。在使用语言优先级之前,必须先启用区域化功能,即将LANG(或LC_ALL)变量设置为除了“C”以外的其他值。参见gettext手册:L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
#. type: textblock
-#: dos2unix.pod:741
+#: dos2unix.pod:772
msgid "If you select a language which is not available you will get the standard English messages."
msgstr "如果你选择了一个不可用的语言,程序将会输出标准的英语信息。"
#. type: =item
-#: dos2unix.pod:745
+#: dos2unix.pod:776
msgid "B<DOS2UNIX_LOCALEDIR>"
msgstr "B<DOS2UNIX_LOCALEDIR>"
#. type: textblock
-#: dos2unix.pod:747
+#: dos2unix.pod:778
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 "DOS2UNIX_LOCALEDIR环境变量将覆盖编译时设置的LOCALEDIR变量。LOCALEDIR被用于查找语言文件。GNU程序的默认值为 C</usr/local/share/locale>。可以使用 B<--version> 查看当前的LOCALEDIR。"
#. type: textblock
-#: dos2unix.pod:752
+#: dos2unix.pod:783
msgid "Example (POSIX shell):"
msgstr "示例(POSIX shell):"
#. type: verbatim
-#: dos2unix.pod:754
+#: dos2unix.pod:785
#, no-wrap
msgid ""
" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
@@ -1513,75 +1570,84 @@ msgstr ""
"\n"
#. type: =head1
-#: dos2unix.pod:759
+#: dos2unix.pod:790
msgid "RETURN VALUE"
msgstr "返回值"
#. type: textblock
-#: dos2unix.pod:761
+#: dos2unix.pod:792
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 "若成功,返回0。若出现系统错误,则返回最近一次系统错误号。若发生其他错误,返回1。"
#. type: textblock
-#: dos2unix.pod:764
+#: dos2unix.pod:795
msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
msgstr "在安静模式下,返回值总是为0,除非命令行选项有误。"
#. type: =head1
-#: dos2unix.pod:767
+#: dos2unix.pod:798
msgid "STANDARDS"
msgstr "遵循规范"
#. type: textblock
-#: dos2unix.pod:769
+#: dos2unix.pod:800
msgid "L<http://en.wikipedia.org/wiki/Text_file>"
msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
#. type: textblock
-#: dos2unix.pod:771
+#: dos2unix.pod:802
msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
#. type: textblock
-#: dos2unix.pod:773
+#: dos2unix.pod:804
msgid "L<http://en.wikipedia.org/wiki/Newline>"
msgstr "L<http://en.wikipedia.org/wiki/Newline>"
#. type: textblock
-#: dos2unix.pod:775
+#: dos2unix.pod:806
msgid "L<http://en.wikipedia.org/wiki/Unicode>"
msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
#. type: =head1
-#: dos2unix.pod:777
+#: dos2unix.pod:808
msgid "AUTHORS"
msgstr "作者"
#. type: textblock
-#: dos2unix.pod:779
+#: dos2unix.pod:810
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:784
+#: dos2unix.pod:815
msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
msgstr "项目主页:L<http://waterlan.home.xs4all.nl/dos2unix.html>"
#. type: textblock
-#: dos2unix.pod:786
+#: dos2unix.pod:817
msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
msgstr "SourceForge主页:L<http://sourceforge.net/projects/dos2unix/>"
#. type: =head1
-#: dos2unix.pod:788
+#: dos2unix.pod:819
msgid "SEE ALSO"
msgstr "参见"
#. type: textblock
-#: dos2unix.pod:790
+#: dos2unix.pod:821
msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
+#~ msgid ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+#~ msgstr ""
+#~ " dos2unix\n"
+#~ " dos2unix -l -c mac\n"
+#~ "\n"
+
#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>"
#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>"
diff --git a/po/da.po b/po/da.po
index 38626c5..f397509 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,15 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2014 Erwin Waterlander (msgids)
+# Danish translation dos2unix.
+# Copyright (C) 2016 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
# Thomas Pryds <thomas@pryds.eu>, 2014.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-10-05 12:07+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-23 12:07+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"
@@ -19,15 +19,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Ophavsret © 2009-2015 Erwin Waterlander\n"
+"Ophavsret © 2009-%d Erwin Waterlander\n"
"Ophavsret © 1998 Christian Wurll (Version 3.1)\n"
"Ophavsret © 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Ophavsret © 1994-1995 Benjamin Lin\n"
@@ -64,18 +65,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "fejl: Værdien af miljøvariabel DOS2UNIX_LOCALEDIR er for lang.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Ophavsret © 2009-2015 Erwin Waterlander\n"
+"Ophavsret © 2009-%d Erwin Waterlander\n"
"Ophavsret © 1994-1995 Benjamin Lin\n"
"Alle rettigheder forbeholdes.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -98,7 +100,7 @@ msgstr ""
" stilles til rådighed med distribueringen.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,68 +126,56 @@ msgstr ""
"(GÆLDER SELV VED IGNORERING ELLER ANDET) SOM KOMMER UD AF BRUGEN AF\n"
"DENNE SOFTWARE, SELVOM INFORMATION ER GIVET, AT DET VIL MEDFØRE SKADE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Brug: %s [tilvalg] [fil …] [-n indfil udfil …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii omdan kun linjeskift (standard)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso omdannelse mellem DOS- og ISO-8859-1-tegnsæt\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 brug Windows-tegnkodningstabel 1252 (Vesteuropa)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 brug DOS-tegnkodningstabel 437 (US) (standard)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 brug DOS-tegnkodningstabel 850 (Vesteuropa)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 brug DOS-tegnkodningstabel 860 (portugisisk)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 brug DOS-tegnkodningstabel 863 (fransk-canadisk)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 brug DOS-tegnkodningstabel 865 (nordisk)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 omdan 8-bit-tegn til 7-bit-plads\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom behold byte-rækkefølge-markering (BOM)\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom behold byte-rækkefølge-markering (standard)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -193,8 +183,7 @@ msgstr ""
" -c, --convmode omdannelsestilstand\n"
" convmode ascii, 7bit, iso, mac, standard er ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -202,23 +191,19 @@ msgstr ""
" -D, --display-enc angiv kodning for viste tekstbeskeder\n"
" kodning ansi, unicode, utf8, standarden er ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force gennemtving omdannelse af binære filer\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help vis denne hjælpetekst\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -226,28 +211,23 @@ msgstr ""
" -i, --info[=FLAG] vis filinformation\n"
" fil … filer at analysere\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate behold outputfils dato\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license vis softwarelicens\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline tilføj ekstra linjeskift\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom tilføj byte-rækkefølge-markering (standard UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -257,8 +237,7 @@ msgstr ""
" infile originalfil i ny-fil-tilstand\n"
" outfile outputfil i ny-fil-tilstand\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -266,53 +245,43 @@ msgstr ""
" -o, --oldfile skriv til gammel fil (standard)\n"
" file … filter til omdannelse i gammel-fil-tilstand\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stilletilstand, tilbagehold alle advarsler\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom fjern byte-rækkefølge-markering (standard)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom fjern byte-rækkefølge-markering\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe spring binære filer over (standard)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 behold UTF-16-kodning\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le antag at inputformatet er UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be antag at inputformatet er UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose uddybende operation\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink følg symbolske henvisninger og omdan deres mål\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -320,235 +289,233 @@ msgstr ""
" -R, --replace-symlink erstat symbolske henvisninger med omdannede filer\n"
" (oprindelige målfiler forbliver uændrede)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink behold symbolske henvisninger og deres mål uændrede (standard)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version vis versionsnummer\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-version (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-version (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-version (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-version (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-version.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-version.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-version (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-version (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-version (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-version (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-version (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-version (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-version (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-version (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s-version.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Med Unicode UTF-16-understøttelse.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Uden Unicode UTF-16-understøttelse.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Med Unicode filnavnsunderstøttelse.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Uden Unicode filnavnsunderstøttelse.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Med understøttelse for lokale sprog.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skriver %s BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Inddatafilen %s har %s BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Antager UTF-16LE-kodning.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Antager UTF-16BE-kodning.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Åbning af midlertidig outputfil mislykkedes: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "bruger %s som midlertidig fil\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Skrivning til midlertidig outputfil %s mislykkedes:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemer med at følge symbolsk henvisning \"%s\"\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " outputfil forbliver i \"%s\"\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "der opstod problemer under omdøbning af »%s« til »%s«:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " som er målet for symbolsk henvisning \"%s\"\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Springer binær fil %s over\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "tegnkodningstabel %d understøttes ikke.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Springer UTF-16-filen %s over. Størrelsen på wchar_t er %d byte.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Springer UTF-16-filen %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Springer UTF-16-filen %s over. UTF-16-konvertering er ikke understøttet i denne version af %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Springer %s over, ikke en almindelig fil.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Springer %s over. Outputfil %s er en symbolsk henvisning.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Springer symbolsk henvisning %s over. Målet er ikke en almindelig fil.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Springer %s over. Målet for symbolsk henvisning %s er ikke en almindelig fil.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "omdanner fil %s til fil %s i Unix-format …\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "omdanner fil %s til fil %s i Mac-format …\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "omdanner fil %s til fil %s i DOS-format …\n"
@@ -559,42 +526,42 @@ msgstr "omdanner fil %s til fil %s i DOS-format …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemer under omdannelse af fil %s til fil %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Springer symbolsk henvisning %s over.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "omdanner fil %s til Unix-format …\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "omdanner fil %s til Mac-format …\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "omdanner fil %s til DOS-format …\n"
@@ -604,75 +571,75 @@ msgstr "omdanner fil %s til DOS-format …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "omdanner %s-filen %s til %s-Unix-format …\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "omdanner %s-filen %s til %s-Mac-format …\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "omdanner %s-filen %s til %s-DOS-format …\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problemer under omdannelse af fil %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "kan ikke læse fra inputfilen %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "forkert flag »%c« for tilvalget -i eller --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktuel tegnkodningstabel: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ugyldig %s omdannelsestilstand specificeret\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "tilvalg \"%s\" kræver et argument\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "ugyldig %s visningstilstand specificeret\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "mål for fil %s er ikke angivet i ny-fil-tilstand\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "kan ikke læse fra inputfil: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan ikke skrive til outputfil: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "fejl: Ugyldigt surrogatpar. Mangler lav surrogat.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "fejl: Ugyldigt surrogatpar. Mangler høj surrogat.\n"
diff --git a/po/de.po b/po/de.po
index 780eeff..b6afb81 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2015-09-15 16:30+0200\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -20,8 +20,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -65,8 +66,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -76,7 +78,7 @@ msgstr ""
"Alle Rechte vorbehalten.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -99,7 +101,7 @@ msgstr ""
" Material wiedergeben.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -128,68 +130,56 @@ msgstr ""
"FAHRLÄSSIGKEIT), DIE AUS DER VERWENDUNG DIESER SOFTWARE ERWÄCHST,\n"
"SELBST WENN AUF DIE MÖGLICHKEIT SOLCHER SCHÄDEN HINGEWIESEN WURDE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Aufruf: %s [Optionen] [Datei …] [-n Eingabedatei Ausgabedatei …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso wandelt zwischen DOS- und ISO-8859-1-Zeichensatz um\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 verwendet DOS Codepage 437 (US) (Vorgabe)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 verwendet DOS Codepage 850 (Westeuropäisch)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 verwendet DOS Codepage 860 (Portugiesisch)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 verwendet DOS Codepage 865 (Nordisch)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -197,8 +187,7 @@ msgstr ""
" -c, --convmode gibt den Umwandlungsmodus an\n"
" convmode ascii, 7bit, iso, mac, Standard ist nach ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -206,23 +195,19 @@ msgstr ""
" -D, --display-enc die Kodierung für angezeigte Meldungen setzen\n"
" encoding ansi, unicode, utf8, Vorgabe ist ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force erzwingt die Umwandlung binärer Dateien\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 wandelt UTF-16 in GB18030 um\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help gibt diese Hilfe aus\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -230,28 +215,23 @@ msgstr ""
" -i, --info[=FLAGS] Dateiinformation anzeigen\n"
" Datei … zu analysierende Dateien\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate erhält das Datum der Ausgabedatei\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license gibt die Software-Lizenz aus\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline fügt einen Zeilenumbruch hinzu\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom eine Bytereihenfolge-Markierung hinzufen (Vorgabe UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -261,8 +241,7 @@ msgstr ""
" Eingabedatei Originaldatei im Neue-Datei-Modus\n"
" Ausgabedatei Ausgabedatei im Neue-Datei-Modus\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -270,53 +249,43 @@ msgstr ""
" -o, --oldfile überschreibt die alte Datei (Vorgabe)\n"
" Datei ... die im Alte-Datei-Modus umzuwandelnden Dateien\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stiller Modus, unterdrückt alle Warnungen\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe überspringt binäre Dateien (Vorgabe)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16-Kodierung beibehalten\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le setzt UTF-16LE als Eingabeformat voraus\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be setzt UTF-16BE als Eingabeformat voraus\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose ausführliche Ausgabe\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink folgt symbolischen Verknüpfungen und wandelt die Ziele um\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -324,237 +293,235 @@ msgstr ""
" -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die umgewandelten\n"
" Dateien (die originale Ziele bleiben unangetastet)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
" -S, --skip-symlink lässt symbolische Verknüpfungen und deren Ziele\n"
" unangetastet (Vorgabe)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version gibt die Versionsnummer aus\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-Version (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-Version (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-Version (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-Version (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-Version.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-Version.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-Version (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-Version (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-Version (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-Version (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-Version (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-Version (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-Version (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-Version (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s-Version.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Mit Unterstützung für Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Ohne Unterstützung für Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Mit Unterstützung für Unicode-Dateinamen.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Ohne Unterstützung für Unicode-Dateinamen.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Mit Unterstützung von Landessprachen.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Das %s BOM wird geschrieben.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Die EIngabedatei %s hat ein %s BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Es wird UTF-16LE-Kodierung angenommen.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Es wird UTF-16LE-Kodierung angenommen.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wird als temporäre Datei verwendet\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " Die Ausgabedatei verbleibt in »%s«\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "binäre Datei %s wird übersprungen\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Codepage %d wird nicht unterstützt.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16-Datei %s wird übersprungen, da beim Umwandeln ein Fehler in Zeile %u auftrat.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16-Datei %s wird übersprungen, da die Umwandlung von UTF-16 in dieser Version von %s nicht unterstützt wird.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Symbolische Verknüpfung %s wird übersprungen, da das Ziel keine reguläre Datei ist.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine reguläre Datei.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt …\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "Datei %s wird in Datei %s im Mac-Format umgewandelt …\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n"
@@ -565,42 +532,42 @@ msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische Verknüpfung %s wird übersprungen.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "Datei %s wird ins Unix-Format umgewandelt …\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "Datei %s wird ins Mac-Format umgewandelt …\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "Datei %s wird ins DOS-Format umgewandelt …\n"
@@ -610,76 +577,76 @@ msgstr "Datei %s wird ins DOS-Format umgewandelt …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "%s-Datei %s wird ins %s-Unix-Format umgewandelt …\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "%s-Datei %s wird ins %s-Mac-Format umgewandelt …\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "%s-Datei %s wird ins %s-DOS-Format umgewandelt …\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "Aus der Eingabedatei %s kann nicht gelesen werden:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "falsches Flag »%c« für Option -i oder --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "Aktive Codepage: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "Die Option »%s« benötigt ein Argument\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "Die angegebene Ausgabekodierung %s ist unzulässig\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "Aus der Eingabedatei kann nicht gelesen werden: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "Fehler: Ungültiges Surrogate-Paar. Das Low-Surrogate fehlt.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "Fehler: Ungültiges Surrogate-Paar. Das High-Surrogate fehlt.\n"
diff --git a/po/dos2unix.pot b/po/dos2unix.pot
index ad0ae2d..aac2369 100644
--- a/po/dos2unix.pot
+++ b/po/dos2unix.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-13 14:28+0100\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"
@@ -18,8 +18,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -57,14 +58,15 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr ""
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -77,7 +79,7 @@ msgid ""
"\n"
msgstr ""
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -92,418 +94,383 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr ""
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr ""
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr ""
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr ""
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr ""
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr ""
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr ""
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr ""
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr ""
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr ""
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr ""
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr ""
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
msgstr ""
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
msgstr ""
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr ""
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr ""
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
msgstr ""
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr ""
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr ""
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr ""
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr ""
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
" outfile output file in new-file mode\n"
msgstr ""
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
msgstr ""
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr ""
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr ""
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr ""
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr ""
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr ""
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr ""
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr ""
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr ""
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr ""
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
msgstr ""
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr ""
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr ""
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr ""
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr ""
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr ""
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr ""
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr ""
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr ""
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr ""
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr ""
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr ""
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr ""
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr ""
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr ""
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr ""
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr ""
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr ""
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr ""
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr ""
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr ""
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr ""
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr ""
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr ""
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr ""
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr ""
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr ""
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr ""
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr ""
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr ""
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr ""
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr ""
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr ""
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr ""
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr ""
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr ""
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr ""
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr ""
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr ""
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr ""
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr ""
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr ""
@@ -514,42 +481,42 @@ msgstr ""
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr ""
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr ""
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr ""
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr ""
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr ""
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr ""
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr ""
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr ""
@@ -559,75 +526,75 @@ msgstr ""
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr ""
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr ""
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr ""
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr ""
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr ""
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr ""
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr ""
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr ""
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr ""
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr ""
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr ""
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr ""
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr ""
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index c1a599d..12f5c55 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3-beta8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2015-08-23 11:37+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -21,8 +21,9 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -66,8 +67,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "eraro: Valoro de ĉirkaŭaĵa variablo DOS2UNIX_LOCALEDIR tro longas.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -77,7 +79,7 @@ msgstr ""
"Ĉiuj rajtoj estas rezervitaj.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +99,7 @@ msgstr ""
" la manlibro kaj/aŭ en la aliaj materialoj kiuj akompanis la distribuon.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,68 +114,56 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uzmaniero: %s [opcioj] [dosiero ...] [-n enigdosiero eligdosiero ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii konverti nur linifinojn (defaŭlto)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konverti inter signaroj DOS kaj ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 uzi Vindozan kodpaĝon 1252 (Okcident-Eŭropa)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 uzi DOS-kodpaĝon 437 (Usona) (defaŭlto)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 uzi DOS-kodpaĝon 850 (Okcident-Eŭropa)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 uzi DOS-kodpaĝon 860 (Portugala)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 uzi DOS-kodpaĝon 863 (Kebekia)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 uzi DOS-kodpaĝon 865 (Nordlandaj)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konverti signojn kun jesa oka bito al spacetojn\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom reteni bajtordo-markon\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom reteni bajtordo-markon (defaŭlto)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -181,8 +171,7 @@ msgstr ""
" -c, --convmode uzenda konvertmoduso\n"
" MODUSO 'ascii', '7bit', 'iso', aŭ 'mac' (defaŭltas al 'ascii')\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -190,23 +179,19 @@ msgstr ""
" -D, --display-enc uzenda kodprezento por montritaj mesaĝoj\n"
" KODPREZENTO 'ansi', 'unicode', aŭ 'utf8' (defaŭltas al 'ansi')\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force perforte konverti ankaŭ duumajn dosierojn\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverti UTF-16 al GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help montri ĉi tiun helptekston\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -214,28 +199,23 @@ msgstr ""
" -i, --info[=FLAGOJ] montri (specifajn) informojn pri dosieroj\n"
" DOSIERO... ekzamenendaj dosieroj\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate konservi dattempon de eliga dosiero\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license montri la permesilon de la programo\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline aldoni aldonan linifinon\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom aldoni bajtordo-markon\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -245,8 +225,7 @@ msgstr ""
" ENIGDOSIERO eniga dosiero en novdosiera moduso\n"
" ELIGDOSIERO eliga dosiero en novdosiera moduso\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -254,53 +233,43 @@ msgstr ""
" -o, --oldfile skribi al ekzistanta dosiero (defaŭlto)\n"
" DOSIERO... konvertendaj dosieroj en olddosiera moduso\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet subpremi ĉiujn avertojn\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom forigi bajtordo-markon (defaŭlto)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom forigi bajtordo-markon\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe preterpasi duumajn dosierojn (defaŭlto)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 reteni UTF-16-kodprezenton\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le trakti enigon kvazaŭ UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be trakti enigo kvazaŭ UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose parolema funkciado\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink sekvi simbolajn ligojn kaj konverti ties celojn\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -308,235 +277,233 @@ msgstr ""
" -R, --replace-symlink anstataŭigi simbolajn ligojn per la konvertitaj dosieroj\n"
" (la celaj dosieroj ne ŝanĝiĝas)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink ne ŝanĝi simbolajn ligojn nek ties celojn (defaŭlto)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version montri programversion\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bita versio (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bita versio (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bita versio (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bita versio (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-versio.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-versio.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bita versio (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bita versio (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bita versio (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bita versio (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bita versio (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bita versio (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versio (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versio (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s-versio.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Kun subteno por Unikoda UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sen subteno por Unikoda UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Kun subteno por Unikodaj dosiernomoj.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Sen subteno por Unikodaj dosiernomoj.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Kun subteno por lokaĵoj.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skribiĝas %s-BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Eniga dosiero %s havas %s-BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Supoziĝas UTF-16LE-kodprezento.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Supoziĝas UTF-16BE-kodprezento.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "uziĝas %s kiel provizora dosiero\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Malsukcesis skribi al provizora eliga dosiero %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Malsukcesis ŝanĝi la permesojn de provizora eliga dosiero %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Malsukcesis ŝanĝi posedanton kaj grupon de provizora eliga dosiero %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemoj dum redukto de simbola ligo '%s'\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " eliga dosiero restas en '%s'\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemoj dum alinomigo de '%s' al '%s':"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " kiu estas la celo de simbola ligo '%s'\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Preterpasiĝas duuma dosiero %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Kodpaĝo %d ne subtenatas.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; la grando de 'wchar_t' estas %d bajtoj.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Preterpasiĝas %s; ĝi ne estas normala dosiero.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Preterpasiĝas %s; eliga dosiero %s estas simbola ligo.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Preterpasiĝas simbola ligo %s; la celo ne estas normala dosiero.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Preterpasiĝas %s; la celo de simbola ligo %s ne estas normala dosiero.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s Unix-en...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s Mac-en...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n"
@@ -547,42 +514,42 @@ msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Preterpasiĝas simbola ligo %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konvertiĝas dosiero %s Unix-en...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konvertiĝas dosiero %s Mac-en...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konvertiĝas dosiero %s DOS-en...\n"
@@ -592,76 +559,76 @@ msgstr "konvertiĝas dosiero %s DOS-en...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en (%3$s)...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en (%3$s)...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en (%3$s)...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problemoj dum konverto de dosiero %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "ne eblas legi el eniga dosiero %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "malĝusta flago '%c' por opcio '-i' aŭ '--info'\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktiva kodpaĝo: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "malvalida konvertmoduso %s indikatas\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "opcio '%s' bezonas argumenton\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "malvalida montra kodprezento %s indikatas\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "celo de dosiero %s ne indikatas (en novdosiera moduso)\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "ne eblas legi el eniga dosiero: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "ne eblas skribi al eliga dosiero: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "eraro: nevalida surogata paro -- mankas la baza parto\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "eraro: nevalida surogata paro -- mankas la supra parto\n"
diff --git a/po/es.po b/po/es.po
index eb0cbcc..a34ae90 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2015-09-20 14:17+0200\n"
"Last-Translator: Enrique Lazcorreta Puigmartí <enrique.lazcorreta@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
@@ -21,8 +21,9 @@ msgstr ""
"X-Generator: Poedit 1.8.4\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -66,8 +67,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "error: El valor de la variable de entorno DOS2UNIX_LOCALEDIR es demasiado largo.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -78,7 +80,7 @@ msgstr ""
"\n"
# Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -101,7 +103,7 @@ msgstr ""
"\n"
# Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -127,68 +129,56 @@ msgstr ""
"O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER MANERA DEL USO DE ESTE\n"
"SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uso: %s [parámetros] [archivo ...] [-n archivo_de_entrada archivo_de_salida ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii solamente convierte los saltos de línea (por defecto)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversión entre DOS y el conjunto de caracteres ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 usa la página de códigos Windows 1252 (Europa Occidental)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 usa la página de códigos DOS 437 (EE. UU.) (por defecto)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 usa la página de códigos DOS 850 (Europa Occidental)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 usa la página de códigos DOS 860 (Portugués)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 usa la página de códigos DOS 863 (Francocanadiense)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 usa la página de códigos DOS 865 (Nórdico)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 convierte caracteres de 8 bits al espacio de 7 bits\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por defecto)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -196,8 +186,7 @@ msgstr ""
" -c, --convmode modo de conversión\n"
" modo_de_conversion ascii, 7bit, iso, mac, por defecto es ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -205,23 +194,19 @@ msgstr ""
" -D, --display-enc establece la codificación de los mensajes de texto que se muestran\n"
" codificación ansi, unicode, utf8, default to ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force fuerza la conversión de archivos binarios\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 convierte UTF-16 a GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help arroja esta ayuda\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -229,28 +214,23 @@ msgstr ""
" -i, --info[=FLAGS] muestra información del archivo\n"
" archivo ... archivos a analizar\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate conserva la fecha en el archivo de salida\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license muestra la licencia del programa\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline añade salto de línea adicional\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom añade la Marca de Orden del Byte, BOM (por defecto en UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -260,8 +240,7 @@ msgstr ""
" archivo_de_entrada archivo original en el modo de archivo nuevo\n"
" archivo_de_salida archivo de salida en el modo de archivo nuevo\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -269,53 +248,43 @@ msgstr ""
" -o, --oldfile escribe al archivo antiguo (por defecto)\n"
" archivo ... archivos a convertir en el modo de archivo antiguo\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet modo silencioso, suprime todas las advertencias\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM (por defecto)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignora archivos binarios (por defecto)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 mantiene la codificación UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le supone que el formato de entrada es UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be supone que el formato de entrada es UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose operación detallada\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink sigue los enlaces simbólicos y convierte los destinos\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -323,235 +292,233 @@ msgstr ""
" -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos convertidos\n"
" (los archivos destino originales no son alterados)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink no altera los enlaces simbólicos ni sus destinos (por defecto)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version despliega el número de versión\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Versión DOS de 16 bit (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Versión DOS de 16 bit (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Versión DOS de 32 bit (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Versión DOS de 32 bit (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Versión para MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Versión para Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Versión Windows de 64 bit (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Versión Windows de 32 bit (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Versión Windows de 32 bit (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Versión Windows de 32 bit (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Versión Windows de 64 bit (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Versión Windows de 32 bit (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Versión para OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Versión para OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Versión para %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Con soporte Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sin soporte Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Con soporte Unicode UTF-16.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Sin soporte Unicode UTF-16.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Con soporte de idioma materno.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Escribiendo BOM %s.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "El archivo de entrada %s tiene BOM %s.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Se asume codificación UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Se asume codificación UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Error al abrir el archivo de salida temporal: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "usando %s como archivo temporal\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Error al escribir el archivo de salida temporal %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Error al cambiar los permisos del archivo temporal de salida %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemas al resolver el enlace simbólico '%s'\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " el archivo de salida permanece en '%s'\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemas al renombrar '%s' como '%s':"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " cual es el destino del enlace simbólico '%s'\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignorando archivo binario %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "La página de códigos %d no está soportada.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignorando archivo UTF-16 %s, el tamaño de wchar_t es %d bytes.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16 en la línea %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Ignorando archivo UTF-16 %s, la conversión a UTF-16 no está soportada en esta versión de %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignorando %s, no es un archivo regular.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignorando %s, el archivo de salida %s es un enlace simbólico.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignorando enlace simbólico %s, el destino no es un archivo regular.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignorando %s, el destino del enlace simbólico %s no es un archivo regular.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "convirtiendo archivo %s a %s in formato Unix...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "convirtiendo archivo %s a %s in formato Mac...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "convirtiendo archivo %s a %s en formato DOS...\n"
@@ -562,42 +529,42 @@ msgstr "convirtiendo archivo %s a %s en formato DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemas al convertir el archivo %s a %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignorando enlace simbólico %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "convirtiendo archivo %s a formato Unix...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "convirtiendo archivo %s a formato Mac...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "convirtiendo archivo %s a formato DOS...\n"
@@ -607,76 +574,76 @@ msgstr "convirtiendo archivo %s a formato DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "convirtiendo archivo %s %s a formato %s Unix...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "convirtiendo archivo %s %s a formato %s Mac...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "convirtiendo archivo %s %s a formato %s DOS...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problemas convirtiendo el archivo %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "no puedo escribir al archivo de salida: %s"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "'%c' es un valor incorrecto para la opción -i o --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "Página de códigos activa: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "modo de conversión %s especificado es inválido\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "el parámetro '%s' requiere un argumento\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "el modo de conversión %s especificado no es válido\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "no puedo escribir al archivo de salida: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "no puedo escribir al archivo de salida: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "error: Par sustituto no válido. Falta el sustituto bajo.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "error: Par sustituto no válido. Falta el sustituto alto.\n"
diff --git a/po/fr.po b/po/fr.po
index b5579b3..eb0bcbf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,13 +1,13 @@
# Message français pour dos2unix.
-# Copyright (C) 2015 Erwin Waterlander (msgids)
+# Copyright (C) 2016 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
# Frédéric Marchal <fmarchal@perso.be>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-7.3.1-beta5\n"
+"Project-Id-Version: dos2unix-7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-15 20:26+0200\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 20:04+0100\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@@ -17,15 +17,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -62,18 +63,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "erreur: La valeur de la variable d'environnement DOS2UNIX_LOCALEDIR est trop longue.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"Tous droits réservés.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -93,7 +95,7 @@ msgstr ""
"2. La distribution sous forme binaire doit reproduire le copyright ci-dessus\n"
" dans la documentation ou tout autre matériel fournis avec la distribution.\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -119,68 +121,56 @@ msgstr ""
"DE QUELQUE MANIÈRE D'UTILISATION DE CE LOGICIEL, MÊME SI LA POSSIBILITÉ\n"
"D'UN TEL DOMMAGE A ÉTÉ ANNONCÉE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Usage: %s [options] [fichier …] [-n fichier_entrée fichier_sortie …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversion entre les jeux de caractères DOS et ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 utilise le code page 1252 de Windows (Europe de l'ouest)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 utilise le code page 437 du DOS (US) (par défaut)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 utilise le code page 850 du DOS (Europe de l'ouest)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 utilise le code page 860 du DOS (Portugais)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 utilise le code page 863 du DOS (Français Canadien)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 utilise le code page 865 du DOS (Nordique)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 converti les caractères 8 bits vers l'espace 7 bits\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom garde la marque d'ordre des octets\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom garde la marque d'ordre des octets (par défaut)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -188,8 +178,7 @@ msgstr ""
" -c, --convmode mode de conversion\n"
" modeconv ascii, 7bit, iso, mac, ascii par défaut\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -197,23 +186,19 @@ msgstr ""
" -D, --display-enc choisi l'encodage pour afficher les messages textes\n"
" encodage ansi, unicode ou utf8 (ansi par défaut)\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force force la conversion de fichiers binaires\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 converti UTF-16 en GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help affiche ce texte d'aide\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -221,28 +206,23 @@ msgstr ""
" -i, --info[=FANIONS] affiche les informations du fichier\n"
" fichier … fichiers à analyser\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate conserve la date du fichier de sortie\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license affiche la licence du logiciel\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline ajoute des sauts de ligne supplémentaires\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom ajoute la marque d'ordre des octets (par défaut avec UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -252,8 +232,7 @@ msgstr ""
" fichier_entrée fichier original dans le mode « nouveau fichier »\n"
" fichier_sortie fichier de sortie dans le mode « nouveau fichier »\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -261,53 +240,43 @@ msgstr ""
" -o, --oldfile écrit dans l'ancien fichier (par défaut)\n"
" fichier … fichiers à convertir dans le mode « ancien fichier »\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet mode silencieux, supprime tous les avertissements\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom supprime la marque d'ordre des octets (par défaut)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom supprime la marque d'ordre des octets\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignore les fichiers binaires (par défaut)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 conserve l'encodage UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le suppose que le format d'entrée est UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be suppose que le format d'entrée est UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose opération verbeuse\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink suit les liens symboliques et converti les cibles\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -315,235 +284,233 @@ msgstr ""
" -R, --replace-symlink remplace les liens symboliques par les fichiers convertis\n"
" (les fichiers cibles originaux restent inchangés)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink conserve les liens symboliques et les cibles inchangés (par défaut)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version affiche le numéro de version\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Version DOS 16 bits (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Version DOS 16 bits (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Version DOS 32 bits (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Version DOS 32 bits (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Version MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Version Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Version Windows 64 bit (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Version Windows 32 bits (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Version Windows 32 bits (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Version Windows 32 bits (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Version Windows 64 bits (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Version Windows 32 bits (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Version OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Version OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Version %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Avec support pour l'Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sans support pour l'Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Avec support pour les noms de fichiers Unicode.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Sans support pour les noms de fichiers Unicode.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Avec support pour la langue native.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Écriture de la BOM %s.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Le fichier d'entrée %s a une BOM %s.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Suppose un encodage UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Suppose un encodage UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "utilise %s comme fichier temporaire\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Échec d'écriture dans le fichier temporaire de sortie %s :"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s :"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s :"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problème lors de la résolution du lien symbolique « %s »\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " le fichier de sortie reste dans « %s »\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problèmes en renommant « %s » en « %s » :"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " quelle est la cible du lien symbolique « %s »\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignore le fichier binaire %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "le code page %d n'est pas supporté.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignore le fichier UTF-16 %s, la taille de wchar_t n'est pas de %d octets.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu à la ligne %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Ignore le fichier UTF-16 %s, la conversion UTF-16 n'est pas supportée dans cette version de %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignore %s, pas un fichier régulier.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignore %s, le fichier de sortie %s est un lien symbolique.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignore le lien symbolique %s, la cible n'est pas un fichier régulier.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignore %s, la cible du lien symbolique %s n'est pas un fichier régulier.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format Unix…\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format Mac…\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n"
@@ -554,42 +521,42 @@ msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problèmes lors de la conversion du fichier %s vers le fichier %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignore le lien symbolique %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "conversion du fichier %s au format Unix…\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "conversion du fichier %s au format Mac…\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "conversion du fichier %s au format DOS…\n"
@@ -599,76 +566,76 @@ msgstr "conversion du fichier %s au format DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "conversion du fichier %s %s au format Unix %s…\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "conversion du fichier %s %s au format Mac %s…\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "conversion du fichier %s %s au format DOS %s…\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problèmes lors de la conversion du fichier %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "impossible de lire depuis le fichier d'entrée %s :"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "mauvais fanion « %c » pour l'option -i ou --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "code page actif : %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "mode de conversion %s spécifié invalide\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "l'option « %s » requiert un argument\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "l'encodage %s spécifié pour l'affichage est invalide\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "la cible du fichier %s n'est pas spécifiée en mode nouveau fichier\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "impossible de lire depuis le fichier d'entrée : %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "impossible d'écrire dans le fichier de sortie : %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "erreur: Demi-codet invalide. Le demi-codet bas est manquant.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "erreur: Demi-codet invalide. Le demi-codet haut est manquant.\n"
diff --git a/po/hu.po b/po/hu.po
index cda8b36..67eb534 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.2.3-beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2015-06-30 13:38+0200\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,8 +19,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -64,8 +65,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "hiba: a DOS2UNIX_LOCALEDIR környezeti változó értéke túl hosszú.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -75,7 +77,7 @@ msgstr ""
"Minden jog fenntartva.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +99,7 @@ msgstr ""
" dokumentációban, illetve a csomaggal részét képező egyéb anyagokban.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -125,68 +127,56 @@ msgstr ""
"OKOZOTT KÁRBAN (BELEÉRTVE A HANYAGSÁGOT ÉS EGYEBET), AKKOR IS, HA AZ\n"
"ILYEN KÁR LEHETŐSÉGÉRE FELHÍVTÁK A FIGYELMET.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Használat: %s [kapcsolók] [fájl ...] [-n be_fájl ki_fájl ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii csak sortörések átalakítása (alapértelmezett)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso átalakítás DOS és ISO-8859-1 karakterkészlet között\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS 850-es kódlap használata (Nyugat-európai)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS 860-as kódlap használata (portugál)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS 863-as kódlap használata (francia-kanadai)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS 865-ös kódlap használata (északi)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 8-bites karakterek átalakítása 7-bitesre\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom bájtsorrendjel megtartása\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom bájtsorrendjel megtartása (alapértelmezett)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -194,8 +184,8 @@ msgstr ""
" -c, --convmode átalakítási mód\n"
" convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n"
-#: common.c:646
-#, fuzzy, c-format
+#: common.c:624
+#, fuzzy
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -203,23 +193,19 @@ msgstr ""
" -c, --convmode átalakítási mód\n"
" convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force bináris fájlok átalakításának kényszerítése\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 UTF-16 átalakítása GB18030-ra\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help ezen súgószöveg megjelenítése\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -227,28 +213,23 @@ msgstr ""
" -i, --info[=JELZŐK] fájlinformációk megjelenítése\n"
" fájl ... elemzendő fájlok\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate kimeneti fájl dátumának megtartása\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license szoftverlicenc megjelenítése\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline további új sor hozzáadása\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom bájtsorrendjel hozzáadása (alapértelmezetten UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -258,8 +239,7 @@ msgstr ""
" infile eredeti fájl új-fájl módban\n"
" outfile kimeneti fájl új-fájl módban\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -267,53 +247,43 @@ msgstr ""
" -o, --oldfile kiírás a régi fájlba (alapértelmezett)\n"
" file ... átalakítandó fájl régi-fájl módban\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom bájtsorrendjel eltávolítása (alapértelmezett)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom bájtsorrendjel eltávolítása\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe bináris fájlok kihagyása (alapértelmezett)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16 kódolás megtartása\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le feltételezze, hogy a bemeneti formátum UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be feltételezze, hogy a bemeneti formátum UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose részletes működés\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink szimbolikus linkek követése és a célok átalakítása\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -321,239 +291,237 @@ msgstr ""
" -R, --replace-symlink szimbolikus linkek cseréje az átalakított fájlokkal\n"
" (az eredeti célfájlok változatlanok maradnak)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
" -S, --skip-symlink szimbolikus linkek és célok változatlanul hagyása\n"
" (alapértelmezett)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version verziószám megjelenítése\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "16-bites DOS verzió (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "16-bites DOS verzió (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "32-bites DOS verzió (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "32-bites DOS verzió (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS verzió.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin verzió.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "64-bites Windows verzió (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "32-bites Windows verzió (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "32-bites Windows verzió (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "32-bites Windows verzió (MinGW)\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "64-bites Windows verzió (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "32-bites Windows verzió (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 verzió (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 verzió (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s verzió.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 támogatással.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 támogatás nélkül.\n"
-#: common.c:739
+#: common.c:717
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "Unicode UTF-16 támogatással.\n"
-#: common.c:741
+#: common.c:719
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "Unicode UTF-16 támogatás nélkül.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Natív nyelvi támogatással.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "%s BOM írása.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, fuzzy, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "A(z) %s bemeneti fájl %s BOM-mal rendelkezik.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE kódolás feltételezése.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE kódolás feltételezése.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s használata átmeneti fájlként\n"
-#: common.c:1430
+#: common.c:1412
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Nem sikerült írni a(z) %s átmeneti kimeneti fájlba: %s\n"
-#: common.c:1461
+#: common.c:1443
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait: %s\n"
-#: common.c:1478
+#: common.c:1460
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját: %s\n"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "hiba a(z) „%s” szimbolikus link feloldásakor\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " kimeneti fájl maradt ebben: „%s”\n"
-#: common.c:1552
+#: common.c:1534
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "hiba a(z) „%s” átnevezésekor erre: „%s”: %s\n"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " mi a(z) „%s” szimbolikus link célja\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "A(z) %s bináris fájl kihagyása\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "a(z) %d kódlap nem támogatott.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, a wchar_t mérete %d bájt.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "A(z) %s kihagyása, nem egy szabályos fájl.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "A(z) %s kihagyása, a(z) %s kimeneti fájl egy szimbolikus link.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "A(z) %s szimbolikus link kihagyása, a cél nem egy szabályos fájl.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "A(z) %s kihagyása, a(z) %s szimbolikus link célja nem egy szabályos fájl.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra Unix formátumban…\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra Mac formátumban…\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n"
@@ -564,42 +532,42 @@ msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Unix formátumban…\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "hiba a(z) %s fájl %s fájlra való átalakításakor\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "A(z) %s szimbolikus link kihagyása.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "a(z) %s fájl átalakítása Unix formátumra…\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "a(z) %s fájl átalakítása Mac formátumra…\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "a(z) %s fájl átalakítása DOS formátumra…\n"
@@ -609,76 +577,76 @@ msgstr "a(z) %s fájl átalakítása DOS formátumra…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Unix formátumra…\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Mac formátumra…\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású DOS formátumra…\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "hiba a(z) %s fájl átalakításakor\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "nem sikerült olvasni a(z) %s bemeneti fájlból: %s\n"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "hibás „%c” jelző a -i vagy --info kapcsolókhoz\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktív kódlap: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "érvénytelen %s átalakítási mód lett megadva\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "a(z) „%s” kapcsolóhoz argumentum szükséges\n"
-#: common.c:2361
+#: common.c:2372
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "érvénytelen %s átalakítási mód lett megadva\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "a(z) %s fájl célja nincs megadva az új-fájl módban\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "nem sikerült olvasni a bemeneti fájlból: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "nem sikerült írni a kimeneti fájlba: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó alacsony helyettesítő.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó magas helyettesítő.\n"
diff --git a/po/ja.po b/po/ja.po
index ef7855f..c78edd0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.1-beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2014-11-07 11:35+0000\n"
"Last-Translator: YASUAKI TANIGUCHI <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -17,8 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -62,8 +63,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "エラー: 環境変数 DOS2UNIX_LOCALEDIR の値が長すぎます。\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -74,7 +76,7 @@ msgstr ""
"\n"
# ライセンス条項なので翻訳しません
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +99,7 @@ msgstr ""
"\n"
# ライセンス条項なので翻訳しません
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -123,68 +125,56 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "使用法: %s [options] [file ...] [-n infile outfile ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 改行のみ変換する (既定)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso DOS と ISO-8859-1 文字セット間で変換する\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows コードページ 1252 (西欧) を使用する\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS コードページ 437 (US) を使用する (既定)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS コードページ 850 (西欧) を使用する\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS コードページ 860 (ポルトガル語) を使用する\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS コードページ 863 (カナダのフランス語) を使用する\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS コードページ 865 (北欧) を使用する\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 8 ビット文字を 7 ビットに変換する\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom バイト順マークを保つ\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom バイト順マークを残す (既定)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -192,8 +182,8 @@ msgstr ""
" -c, --convmode 変換モード\n"
" convmode ascii, 7bit, iso, mac, 既定は ascii\n"
-#: common.c:646
-#, fuzzy, c-format
+#: common.c:624
+#, fuzzy
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -201,23 +191,19 @@ msgstr ""
" -c, --convmode 変換モード\n"
" convmode ascii, 7bit, iso, mac, 既定は ascii\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force バイナリファイルを強制的に変換する\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help このヘルプメッセージを表示する\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -225,28 +211,23 @@ msgstr ""
" -i, --info[=FLAGS] ファイル情報を表示する\n"
" file ... 分析するファイル\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate ファイルの日付を保持する\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license ソフトウェアライセンスを表示する\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 改行を追加する\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom バイト順マークを加える (UTF-8 の既定)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -256,8 +237,7 @@ msgstr ""
" infile このモードでの入力ファイル\n"
" outfile このモードでの出力ファイル\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -265,53 +245,43 @@ msgstr ""
" -o, --oldfile 元のファイルに書き込む (既定)\n"
" file ... このモードでの変換するファイル\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 抑止モード、全ての警告を抑止する\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom バイト順マークを削除する (既定)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom バイト順マークを削除する\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe バイナリファイルをスキップする (既定)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16 エンコーディングを保つ\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 入力の形式を UTF-16LE と見なす\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 入力の形式を UTF-16BE と見なす\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose 冗長表示をする\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink シンボリックリンクを辿り、対象を変換する\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -319,237 +289,235 @@ msgstr ""
" -R, --replace-symlink シンボリックリンクを変換後の対象ファイルに置換する\n"
" (元の対象ファイルは変更されずそのまま残る)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink シンボリックリンクを辿らず、対象をそのままにする (既定)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version バージョン番号を表示する\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 ビットバージョン (WATCOMC)。\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 ビットバージョン (TURBOC)。\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 ビットバージョン (WATCOMC)。\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 ビットバージョン (DJGPP)。\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS バージョン。\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin バージョン。\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 ビットバージョン (MinGW-w64)。\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 ビットバージョン (WATCOMC)。\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32 ビットバージョン (MinGW-w64)。\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 ビットバージョン (MinGW)。\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 ビットバージョン (MSVC %d)。\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 ビットバージョン (MSVC %d)。\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 バージョン (WATCOMC)。\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 バージョン (EMX)。\n"
-#: common.c:727
+#: common.c:705
#, fuzzy, c-format
msgid "%s version.\n"
msgstr "MSYS バージョン。\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 サポート付き。\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 サポート無し。\n"
-#: common.c:739
+#: common.c:717
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "Unicode UTF-16 サポート付き。\n"
-#: common.c:741
+#: common.c:719
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "Unicode UTF-16 サポート無し。\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "ネイティブ言語サポート。\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr ""
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr ""
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr ""
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr ""
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE エンコーディングと見なしています。\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE エンコーディングと見なしています。\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "一時出力ファイルを開くのに失敗しました: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s を一時ファイルとして使用しています\n"
-#: common.c:1430
+#: common.c:1412
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "一時出力ファイル %s を開くのに失敗しました: %s\n"
-#: common.c:1461
+#: common.c:1443
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "一時出力ファイル %s のパーミッション変更に失敗しました: %s\n"
-#: common.c:1478
+#: common.c:1460
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました: %s\n"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "シンボリックリンク '%s' の解決中に問題が発生しました\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 出力ファイルは '%s' に残っています\n"
-#: common.c:1552
+#: common.c:1534
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr " '%s' から '%s' への名前変更で問題が発生しました: %s\n"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr ""
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "バイナリファイル %s をスキップしています\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "コードページ %d はサポートされていません\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16 ファイル %s をスキップしています。wchar_t のサイズは %d バイトです。\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s をスキップしています。通常ファイルではありません。\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s をスキップしています。出力ファイル %s はシンボリックリンクです。\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "シンボリックリンク %s をスキップしています。対象が通常ファイルではありません。\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s をスキップしています。シンボリックリンク %s を辿った先が通常ファイルではありません。\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "%s から %s へ Unix 形式でファイル変換しています。\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "%s から %s へ Mac 形式でファイル変換しています。\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "%s から %s へ DOS 形式で変換しています。\n"
@@ -560,42 +528,42 @@ msgstr "%s から %s へ DOS 形式で変換しています。\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "%s から %s へ Unix 形式でファイル変換しています。\n"
-#: common.c:1750
+#: common.c:1732
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "%s から %s へ Mac 形式でファイル変換しています。\n"
-#: common.c:1752
+#: common.c:1734
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "%s から %s へ DOS 形式で変換しています。\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "シンボリックリンク %s をスキップしています。\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "ファイル %s を Unix 形式へ変換しています。\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "ファイル %s を Mac 形式へ変換しています。\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "ファイル %s を DOS 形式へ変換しています。\n"
@@ -605,76 +573,76 @@ msgstr "ファイル %s を DOS 形式へ変換しています。\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, fuzzy, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "ファイル %s を Unix 形式へ変換しています。\n"
-#: common.c:1835
+#: common.c:1817
#, fuzzy, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "ファイル %s を Mac 形式へ変換しています。\n"
-#: common.c:1837
+#: common.c:1819
#, fuzzy, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "ファイル %s を DOS 形式へ変換しています。\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "ファイル %s 変換中に問題が発生しました。\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "オプション -i または --info に対する間違ったフラグ '%c' です。\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "有効なコードページ: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "無効な %s 変換モードが指定されました\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "オプション '%s' には引数が必要です。\n"
-#: common.c:2361
+#: common.c:2372
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "無効な %s 変換モードが指定されました\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "対象ファイル %s が新規ファイルモードで指定されていません\n"
-#: common.c:2474
+#: common.c:2485
#, fuzzy, c-format
msgid "can not read from input file: %s\n"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 724eb96..aab7131 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,14 @@
# Norwegian (bokmål) translation of dos2unix.
# Copyright (C) 2015 Erwin Waterlander (msgids)
# This file is distributed under the same license as the dos2unix package.
-# Åka Sikrom <a4@hush.com>, 2015.
+# Åka Sikrom <a4@hush.com>, 2015-2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-7.3.1-beta5\n"
+"Project-Id-Version: dos2unix-7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-16 07:44+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-28 10:26+0100\n"
"Last-Translator: Åka Sikrom <a4@hush.com>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
"Language: Norwegian Bokmål\n"
@@ -19,15 +19,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Opphavsrett (C) 2009-2015 Erwin Waterlander\n"
+"Opphavsrett (C) 2009-%d Erwin Waterlander\n"
"Opphavsrett (C) 1998 Christian Wurll (Versjon 3.1)\n"
"Opphavsrett (C) 1998 Bernd Johannes Wuebben (Versjon 3.0)\n"
"Opphavsrett (C) 1994-1995 Benjamin Lin\n"
@@ -64,18 +65,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "feil: Verdien av miljøvariabelen DOS2UNIX_LOCALEDIR er for lang.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Opphavsrett (C) 2009-2015 Erwin Waterlander\n"
+"Opphavsrett (C) 2009-%d Erwin Waterlander\n"
"Opphavsrett (C) 1994-1995 Benjamin Lin\n"
"Alle rettigheter tilhører rettighetshaveren.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +98,7 @@ msgstr ""
" distribusjonen.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,68 +124,56 @@ msgstr ""
"PROGRAMVAREN, SELV NÅR VEDKOMMENDE ER INFORMERT OM AT SLIK SKADE KAN \n"
"OPPSTÅ.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Bruk: %s [valg] [fil …] [-n inndatafil utdatafil …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii bare konverter linjeskift (standard)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konverter mellom tegnsettene DOS og ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 bruk Windows-kodeside 1252 (Vesteuropeisk)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 bruk DOS-kodeside 437 (US) (standard)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 bruk DOS-kodeside 850 (vesteuropeisk)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 bruk DOS-kodeside 860 (portugisisk)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 bruk DOS-kodeside 863 (fransk-kanadisk)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 bruk DOS-kodeside 865 (nordisk)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konverter 8-bit-tegn til 7-bit\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom behold «Byte Order»-merke\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom behold «Byte Order»-merke (standard)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -191,8 +181,7 @@ msgstr ""
" -c, --convmode konverteringsmodus\n"
" convmode ascii, 7bit, iso, mac (standardmodus er ascii)\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -200,23 +189,19 @@ msgstr ""
" -D, --display-enc endre koding av tekstmeldinger\n"
" encoding ansi, unicode, utf8 (ansi er standard)\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force tving konvertering av binærfiler\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help vis denne hjelpeteksten\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -224,28 +209,23 @@ msgstr ""
" -i, --info[=FLAGG] vis informasjon om fil\n"
" file … filer som skal undersøkes\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate behold utdata-filens dato\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license vis programvarelisens\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline legg til en ekstra ny linje\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom legg til «Byte Order»-merke (standard: UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -255,8 +235,7 @@ msgstr ""
" infile opprinnelig fil i ny fil-modus\n"
" outfile utdata-fil i ny fil-modus\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -264,53 +243,43 @@ msgstr ""
" -o, --oldfile skriv til gammel fil (standard)\n"
" file … filer som skal konverteres i gammel fil-modus\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stillemodus, uten advarsler\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom fjern «Byte Order»-merke (standard)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom fjern «Byte Order»-merke\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe hopp over binærfiler (standard)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 behold UTF-16-koding\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le anta at inndata-formatet er UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be anta at inndata-formatet er UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose detaljert utskrift\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink følg symbolske lenker, og konverter lenkemål\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -318,235 +287,233 @@ msgstr ""
" -R, --replace-symlink erstatt symbolske lenker med konverterte filer\n"
" (opprinnelig målfil forblir uendret)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink hold både symbolske lenker og lenkemål uendret (standard)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version vis versjonsnummer\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-versjon (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-versjon (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-versjon (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-versjon (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-versjon.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-versjon.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-versjon (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-versjon (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-versjon (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-versjon (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-versjon (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-versjon (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versjon (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versjon (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s-versjon.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Med støtte for Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Uten støtte for Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Med støtte for Unicode-filnavn.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Uten støtte for Unicode-filnavn.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Med innebygd språkstøtte.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skriver «Byte Order»-merke %s.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Inndatafil %s har %s BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Forventer UTF-16LE-koding.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Forventer UTF-16BE-koding.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Klarte ikke å åpne midlertidig utdata-fil: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "bruker %s som midlertidig fil\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Klarte ikke å skrive til midlertidig utdata-fil %s."
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Klarte ikke å endre rettigheter til midlertidig utdata-fil %s."
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Klarte ikke å endre eier og gruppetilhørighet for midlertidig utdata-fil %s."
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "det oppstod problemer med å følge den symbolske lenka «%s»\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " utdata-fil blir liggende i «%s»\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "det oppstod problemer med å gi «%s» det nye navnet «%s»."
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " som den symbolske lenka «%s» peker på\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Hopper over binærfil %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "kodesiden %d støttes ikke.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Hopper over UTF-16-fil %s. Størrelsen på wchar_t er %d byte.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Hopper over UTF-16-fil %s. Det oppstod en UTF-16-konverteringsfeil på linje %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Hopper over fila %s. Konvertering av UTF-16 støttes ikke av denne versjonen av %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Hopper over %s, som ikke er en vanlig fil.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Hopper over %s. Utdata-fil %s er en symbolsk lenke.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Hopper over symbolsk lenke %s. Målet er ikke en vanlig fil.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Hopper over %s. Målet for symbolsk lenke %s er ikke en vanlig fil.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konverterer fila %s til %s i Unix-format …\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konverterer fila %s til %s Mac-format …\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konverterer fila %s til %s i DOS-format …\n"
@@ -557,42 +524,42 @@ msgstr "konverterer fila %s til %s i DOS-format …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "det oppstod problemer under konvertering av fila %s til %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Hopper over symbolsk lenke %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konverterer fila %s til Unix-format …\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konverterer fila %s til Mac-format …\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konverterer fila %s til DOS-format …\n"
@@ -602,76 +569,76 @@ msgstr "konverterer fila %s til DOS-format …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konverterer %s-fila %s til %s-Unix-format …\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konverterer %s-fila %s til %s-Mac-format …\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konverterer %s-fila %s til %s-DOS-format …\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "det oppstod problemer under konvertering av fila %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "klarte ikke å lese fra inndata-fil %s."
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "«%c» er et ugyldig flagg for -i (--info)\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktiv kodeside: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "du har valgt en ugyldig %s-konverteringsmodus\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "valget «%s» krever at du bruker et argument\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "du har valgt en ugyldig %s-koding\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "mål for fila %s er ikke valgt i ny fil-modus\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "klarte ikke å lese fra inndata-fil: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "klarte ikke å skrive til utdata-fil: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "feil: ugyldig surrogatpar. Nedre surrogat mangler.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "feil: ugyldig surrogatpar. Øvre surrogat mangler.\n"
diff --git a/po/nl.po b/po/nl.po
index 793cd5e..8c456e5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2015-09-24 09:48+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -21,8 +21,9 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -66,8 +67,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -77,7 +79,7 @@ msgstr ""
"Alle rechten voorbehouden.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +99,7 @@ msgstr ""
" in de documentatie en/of andere materialen die bij de uitgave horen.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,68 +114,56 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii alleen regeleindes converteren (standaard)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso converteren tussen de tekensets DOS en ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -181,8 +171,7 @@ msgstr ""
" -c, --convmode te gebruiken conversiemodus\n"
" MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -190,23 +179,19 @@ msgstr ""
" -D, --display-enc te gebruiken codering voor getoonde berichten\n"
" CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force conversie van binaire bestanden afdwingen\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help deze hulptekst tonen\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -214,28 +199,23 @@ msgstr ""
" -i, --info[=VLAGGEN] bestandsinformatie weergeven\n"
" BESTAND... te analyseren bestand(en)\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license softwarelicentie tonen\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline extra regeleinde toevoegen\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -245,8 +225,7 @@ msgstr ""
" INVOERBESTAND het originele bestand in nieuwbestand-modus\n"
" UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -254,53 +233,43 @@ msgstr ""
" -o, --oldfile het oude bestand overschrijven (standaard)\n"
" BESTAND... te converteren bestand(en) in oudbestand-modus\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet alle waarschuwingen onderdrukken\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe binaire bestanden overslaan (standaard)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16-codering behouden\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le aannemen dat de invoeropmaak UTF-16LE is\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be aannemen dat de invoeropmaak UTF-16BE is\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose gedetailleerde uitvoer produceren\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink symbolische koppelingen volgen en de doelen converteren\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -308,235 +277,233 @@ msgstr ""
" -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n"
" (de originele doelbestanden blijven ongewijzigd)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version programmaversie tonen\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bits versie (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bits versie (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bits versie (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bits versie (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-versie.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-versie.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bits versie (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bits versie (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bits versie (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bits versie (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bits versie (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bits versie (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versie (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versie (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s-versie.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Met ondersteuning voor Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Zonder ondersteuning voor Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Met ondersteuning voor Unicode-bestandsnamen.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Zonder ondersteuning voor Unicode-bestandsnamen.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Met ondersteuning voor taalregio's.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Schrijven van %s-BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Invoerbestand %s heeft een %s-BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE-codering wordt aangenomen.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE-codering wordt aangenomen.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wordt als tijdelijk bestand gebruikt\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemen met het herleiden van symbolische koppeling '%s'\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " uitvoerbestand blijft in '%s'\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemen met hernoemen van '%s' naar '%s':"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welke het doel is van symbolische koppeling '%s'\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Binair bestand %s wordt overgeslagen\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Codetabel %d wordt niet ondersteund.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; de grootte van 'wchar_t' is %d bytes.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; er is een UTF-16-conversiefout opgetreden op regel %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; UTF-16-conversie wordt niet ondersteund in deze versie van %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s wordt overgeslagen; uitvoerbestand %s is een symbolische koppeling.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier bestand is.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen regulier bestand is.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "converteren van bestand %s naar bestand %s in Unix-opmaak...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "converteren van bestand %s naar bestand %s in Mac-opmaak...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n"
@@ -547,42 +514,42 @@ msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opmaak...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemen met conversie van bestand %s naar bestand %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische koppeling %s wordt overgeslagen.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "converteren van bestand %s naar Unix-opmaak...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "converteren van bestand %s naar Mac-opmaak...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "converteren van bestand %s naar DOS-opmaak...\n"
@@ -592,76 +559,76 @@ msgstr "converteren van bestand %s naar DOS-opmaak...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar Unix-opmaak (%3$s)...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar Mac-opmaak (%3$s)...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar DOS-opmaak (%3$s)...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problemen met conversie van bestand %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "kan niet lezen uit invoerbestand %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "onjuiste vlag '%c' voor optie '-i' of '--info'\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "actieve codetabel: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ongeldige conversiemodus %s opgegeven\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "optie '%s' vereist een argument\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "ongeldige weergavecodering %s opgegeven\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "doel van bestand %s is niet opgegeven in 'nieuwbestand-modus'\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "kan niet lezen uit invoerbestand: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan niet schrijven naar uitvoerbestand: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "fout: ongeldig surrogaatpaar -- het lage deel ontbreekt\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n"
diff --git a/po/pl.po b/po/pl.po
index 9601054..5d03519 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,13 +1,13 @@
# Polish translation for dos2unix.
# This file is distributed under the same license as the dos2unix package.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2015.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-15 17:45+0200\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 19:39+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -16,15 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (wersja 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (wersja 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -61,18 +62,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "błąd: wartość zmiennej środowiskowej DOS2UNIX_LOCALEDIR jest zbyt długa.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"Wszelkie prawa zastrzeżone.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -94,7 +96,7 @@ msgstr ""
" dołączonych do dystrybucji.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -120,68 +122,56 @@ msgstr ""
"W JAKIKOLWIEK SPOSÓB W WYNIKU UŻYCIA TEGO OPROGRAMOWANIA, NAWET JEŚLI\n"
"OSTRZEŻONO O MOŻLIWOŚCI TAKICH SZKÓD.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Składnia: %s [opcje] [plik ...] [-n plik_wej plik_wyj ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii konwersja tylko końców linii (domyślne)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konwersja między zestawem znaków DOS-a i ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 użycie strony kodowej DOS 437 (US; domyślna)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 użycie strony kodowej DOS 850 (zachodnioeuropejskiej)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 użycie strony kodowej DOS 860 (portugalskiej)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 użycie strony kodowej DOS 865 (nordyckiej)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark)\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark) (domyślne)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -189,8 +179,7 @@ msgstr ""
" -c, --convmode tryb konwersji\n"
" tryb konwersji ascii, 7bit, iso, mac; domyślnie ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -198,23 +187,19 @@ msgstr ""
" -D, --display-enc ustawienie kodowania wyświetlanych komunikatów\n"
" kodowanie ansi, unicode, utf8; domyślnie ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force wymuszenie konwersji plików binarnych\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konwersja UTF-16 do GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help wyświetlenie tego opisu\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -222,28 +207,23 @@ msgstr ""
" -i, --info[=FLAGI] wyświetlenie informacji o pliku\n"
" plik ... pliki do analizy\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate zachowanie daty pliku wyjściowego\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license wyświetlenie licencji oprogramowania\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline dodanie dodatkowego znaku nowej linii\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom dodanie znacznika BOM (domyślnie UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -253,8 +233,7 @@ msgstr ""
" plik_wej plik oryginalny w trybie nowego pliku\n"
" plik_wyj plik wyjściowy w trybie nowego pliku\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -262,53 +241,43 @@ msgstr ""
" -o, --oldfile zapis do starego pliku (domyślne)\n"
" plik ... pliki do konwersji w trybie starego pliku\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet tryb cichy, pominięcie wszystkich ostrzeżeń\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark) (domyślne)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark)\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe pomijanie plików binarnych (domyślne)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 zachowanie kodowania UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le przyjęcie formatu pliku wejściowego UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be przyjęcie formatu pliku wejściowego UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose działanie ze szczegółowym opisem\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink podążanie za dowiązaniami symbolicznymi i konwersja celów\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -316,235 +285,233 @@ msgstr ""
" -R, --replace-symlink zastępowanie dowiązań symbolicznych plikami wynikowymi\n"
" (oryginalne pliki docelowe pozostają bez zmian)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink bez zmian dowiązań symbolicznych i celów (domyślne)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version wyświetlenie numeru wersji\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Wersja 16-bitowa DOS (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Wersja 16-bitowa DOS (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Wersja 32-bitowa DOS (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Wersja 32-bitowa DOS (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Wersja MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Wersja Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Wersja 64-bitowa Windows (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Wersja 32-bitowa Windows (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Wersja 32-bitowa Windows (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Wersja 32-bitowa Windows (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Wersja 64-bitowa Windows (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Wersja 32-bitowa Windows (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Wersja OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Wersja OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Wersja %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Z obsługą Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Bez obsługi Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Z obsługą nazw plików w Unicode.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Bez obsługi nazw plików w Unicode.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Z obsługą języków narodowych.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Zapis znacznika BOM %s.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Plik wejściowy %s zawiera znacznik BOM %s.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Przyjęto kodowanie UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Przyjęto kodowanie UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Nie udało się otworzyć tymczasowego pliku wyjściowego: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "użycie %s jako pliku tymczasowego\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Nie udało się zapisać do tymczasowego pliku wyjściowego %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Nie udało się zmienić uprawnień tymczasowego pliku wyjściowego %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Nie udało się zmienić właściciela i grupy tymczasowego pliku wyjściowego %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemy z rozwiązaniem dowiązania symbolicznego '%s'\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " plik wyjściowy pozostaje w '%s'\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemy ze zmianą nazwy '%s' na '%s':"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " (czyli cel dowiązania symbolicznego '%s')\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Pominięto plik binarny %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "strona kodowa %d nie jest obsługiwana.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Pominięto plik UTF-16 %s, rozmiar wchar_t to %d bajt(y).\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Pominięto plik UTF-16 %s, wystąpił błąd konwersji UTF-16 w linii %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Pominięto plik UTF-16 %s, konwersja UTF-16 nie jest obsługiwana w tej wersji programu %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Pominięto %s, nie jest zwykłym plikiem.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Pominięto %s, plik wyjściowy %s jest dowiązaniem symbolicznym.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Pominięto dowiązanie symboliczne %s, cel nie jest zwykłym plikiem.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Pominięto %s, cel dowiązania symbolicznego %s nie jest zwykłym plikiem.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie uniksowym...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie Mac...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n"
@@ -555,42 +522,42 @@ msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemy z konwersją pliku %s do pliku %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Pominięto dowiązanie symboliczne %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konwersja pliku %s do formatu uniksowego...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konwersja pliku %s do formatu Mac...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konwersja pliku %s do formatu DOS...\n"
@@ -600,75 +567,75 @@ msgstr "konwersja pliku %s do formatu DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konwersja pliku %s %s do formatu uniksowego %s...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konwersja pliku %s %s do formatu Mac %s...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konwersja pliku %s %s do formatu DOS %s...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "problemy z konwersją pliku %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "nie można czytać z pliku wejściowego %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "błędna flaga '%c' dla opcji -i lub --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktywna strona kodowa: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "podano błędny tryb konwersji %s\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "opcja '%s' wymaga argumentu\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "podano błędne kodowanie wyświetlania %s\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "nie podano celu pliku %s w trybie nowego pliku\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "nie można czytać z pliku wejściowego: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "nie można zapisać do pliku wyjściowego: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "błąd: Błędna para zamienna. Brak młodszego zamiennika.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "błąd: Błędna para zamienna. Brak starszego zamiennika.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 552e10c..7774bfa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,16 +1,16 @@
# Brazilian Portuguese Translation for dos2unix.
-# Copyright (C) 2015 Erwin Waterlander (msgids)
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Erwin Waterlander (msgids)
+# Copyright (C) 2016 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
# Enrico Nicoletto <liverig@gmail.com>, 2014.
-# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015.
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-10-09 06:37-0300\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 06:37-0300\n"
"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
@@ -21,15 +21,16 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Versão 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Versão 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -66,18 +67,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "erro: O valor da variável de ambiente DOS2UNIX_LOCALEDIR é muito comprido.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"Todos os direitos reservados.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -99,7 +101,7 @@ msgstr ""
" fornecidos com a distribuição.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -125,68 +127,56 @@ msgstr ""
"OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, MESMO\n"
"SE RESSALVADO DA POSSIBILIDADE DE TAL DANO.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversão entre conjunto de caractere do DOS e ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 usa a página de código 1252 do Windows (Europa ocidental)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 usa a página de código 437 do DOS (EUA) (padrão)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 usa a página de código 850 do DOS (Europa ocidental)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 usa a página de código 860 do DOS (Português)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 usa a página de código 863 do DOS (Francês do Canadá)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 usa a página de código 865 do DOS (Nórdico)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 converte-se caracteres de 8 bit para espaço de 7 bit\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.)\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.) (padrão)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -194,8 +184,7 @@ msgstr ""
" -c, --convmode modo de conversão\n"
" convmode ascii, 7bit, iso, mac, padrão para ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -203,23 +192,19 @@ msgstr ""
" -D, --display-enc define codificação das mensagens de texto exibidas\n"
" codificação ansi, unicode, utf8, default to ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force força a conversão de arquivos binários\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 converte-se de UTF-16 para GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help exibe este texto de ajuda\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -227,28 +212,23 @@ msgstr ""
" -i, --info[=OPÇÕES] exibe informação do arquivo\n"
" file ... arquivos pra analisar\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate mantém a data do arquivo de saída\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license exibe a licença do software\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline acrescenta nova linha adicional\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom adiciona marca de ordem de byte (B.O.M.) (padrão UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -258,8 +238,7 @@ msgstr ""
" infile arquivo original no modo de novo arquivo\n"
" outfile arquivo de saída no modo de novo arquivo\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -267,53 +246,43 @@ msgstr ""
" -o, --oldfile grava no arquivo antigo (padrão)\n"
" file ... arquivos a converter no modo de arquivo antigo\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet modo silencioso, esconde todos os avisos\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.) (default)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.)\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignora os arquivos binários (padrão)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 mantém codificação UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le supõe que o formato de entrada é UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be supõe que o formato de entrada é UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose operação detalhada\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink segue os links simbólicos e converte os destinos\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -321,235 +290,233 @@ msgstr ""
" -R, --replace-symlink substitui os links simbólicos por arquivos convertidos\n"
" (os arquivos originais de destino permanecem inalterados)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink mantém os links simbólicos e os destinos inalterados (padrão)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version exibe o número da versão\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS versão de 16 bit (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS versão de 16 bit (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS versão de 32 bit (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS versão de 32 bit (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Versão do MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Versão do Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows versão de 64 bit (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows versão de 32 bit (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows versão de 32 bit (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows versão de 32 bit (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows versão de 64 bit (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows versão de 32 bit (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Versão OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Versão OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Versão %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Com suporte a Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sem suporte a Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Com suporte a nomes de arquivos em Unicode UTF-16.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Sem suporte a nomes de arquivos em Unicode UTF-16.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Com suporte ao idioma nativo.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Escrevendo %s BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Arquivo de entrada %s possui %s BOM\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Presume codificação UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Presumo codificação UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Ocorreu falha ao abrir o arquivo de saída temporário: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "usando %s como arquivo de temporário\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Ocorreu falha ao gravar no arquivo de saída temporário %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Ocorreu falha ao alterar as permissões do arquivo de saída temporário %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " o arquivo de saída permanece em '%s'\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "ocorreram problemas ao renomear '%s' para '%s':"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " que é o destino do link simbólico '%s'\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignorando o arquivo binário %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "não há suporte a página de código %d.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignorando o arquivo UTF-16 %s, o tamanho de wchar_t é de %d bytes.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16 na linha %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Ignorando o arquivo UTF-16 %s, não há suporte a conversão para UTF-16 nesta versão do %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignorando %s, não é um arquivo comum.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignorando %s, o arquivo de saída %s é um link simbólico.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignorando o link simbólico %s, o destino não é o de um arquivo comum.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignorando %s, o destino do link simbólico %s não é o de um arquivo comum.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato Unix...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato Mac...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n"
@@ -560,42 +527,42 @@ msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignorando o link simbólico %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "convertendo o arquivo %s para formato Unix...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "convertendo o arquivo %s para formato Mac...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "convertendo o arquivo %s para formato DOS...\n"
@@ -605,78 +572,78 @@ msgstr "convertendo o arquivo %s para formato DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "convertendo o arquivo %s %s para formato do Unix %s...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "convertendo o arquivo %s %s para formato do Mac %s...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "convertendo o arquivo %s %s para formato do DOS %s...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "ocorreram problemas ao converter o arquivo %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "não foi possível gravar no arquivo de entrada %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "opção incorreta \"%c\" para opção -i ou --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "página de código ativa: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "o modo de conversão %s especificado é inválido\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "a opção '%s' requer um argumento\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "a codificação de exibição %s especificada é inválida\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "o destino do arquivo %s não foi especificado no modo de novo arquivo\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "não foi possível ler do arquivo de saída: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "não foi possível gravar no arquivo de saída: %s\n"
# "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "erro: par de substitutos inválido. Faltando substituto baixo.\n"
# "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "erro: par de substitutos inválido. Faltando substituto alto.\n"
diff --git a/po/ru.po b/po/ru.po
index 0c475a0..5e060cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the dos2unix package.
#
# Andrei Uhlik <uglika@gmail.com>, 2013.
-# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015.
+# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-7.3.1-beta5\n"
+"Project-Id-Version: dos2unix-7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-16 19:02+0300\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 18:55+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
"Language: ru\n"
@@ -20,15 +20,16 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Авторское право (C) 2009-2015 Erwin Waterlander\n"
+"Авторское право (C) 2009-%d Erwin Waterlander\n"
"Авторское право (C) 1998 Christian Wurll (версия 3.1)\n"
"Авторское право (C) 1998 Bernd Johannes Wuebben (версия 3.0)\n"
"Авторское право (C) 1994-1995 Benjamin Lin\n"
@@ -65,18 +66,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "ошибка: Значение переменной окружения DOS2UNIX_LOCALEDIR слишком длинное.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Авторское право (C) 2009-2015 Erwin Waterlander\n"
+"Авторское право (C) 2009-%d Erwin Waterlander\n"
"Авторское право (C) 1994-1995 Benjamin Lin\n"
"Все права защищены.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -98,7 +100,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,68 +126,56 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Использование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii преобразовать только конец строки (по умолчанию)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso преобразовать DOS в ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 использовать кодировку Windows 1252 (Западно-Европейский)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 использовать кодировку DOS 437 (US) (по умолчанию)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 использовать кодировку DOS 850 (Западно-Европейский)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 использовать кодировку DOS 860 (Португальский)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 использовать кодировку DOS 863 (Франко-Канадский)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 использовать кодировку DOS 865 (Скандинавский)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 преобразовать 8-битные символы в 7-битные\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)(по умолчанию)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -193,8 +183,7 @@ msgstr ""
" -c, --convmode режим преобразования\n"
" convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -202,23 +191,19 @@ msgstr ""
" -D, --display-enc задать кодировку отображаемых текстовых сообщений\n"
" encoding ansi, unicode, utf8, по умолчанию ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force управление преобразованием двоичных файлов\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 преобразовать UTF-16 в GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help показать справку\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -226,28 +211,23 @@ msgstr ""
" -i, --info[=ФЛАГИ] показать информацию о файле\n"
" файл … файлы для анализа\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate сохранить дату выходного файла\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license отобразить лицензию программного обеспечения\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline добавить дополнительный разделитель строк\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom добавить метку порядка байтов (по умолчанию в UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -257,8 +237,7 @@ msgstr ""
" infile исходный файл в режиме нового файла\n"
" outfile выходной файл в режиме нового файла\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -266,53 +245,43 @@ msgstr ""
" -o, --oldfile записать в старый файл (по умолчанию)\n"
" file … файлы для преобразования в режиме старого файла\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet не показывать предупреждения\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom удалить метку порядка байтов (BOM) (по умолчанию)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom удалить метку порядка байтов (BOM)\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe пропустить двоичные файлы (по умолчанию)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 оставить кодировку UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le предположить, что входной формат UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be предположить, что входной формат UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose подробный режим\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink следовать символическим ссылкам и преобразовать цели\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -320,235 +289,233 @@ msgstr ""
" -R, --replace-symlink заменить символические ссылки преобразованными файлами\n"
" (оригинальные целевые файлы останутся без изменений)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink оставить символические ссылки и цели без изменений (по умолчанию)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version отобразить номер версии\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Версия для DOS, 16-битная (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Версия для DOS, 16-битная (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Версия для DOS, 32-битная (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Версия для DOS, 32-битная (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Версия с MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Версия с Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Версия для Windows, 64-битная (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Версия для Windows, 32-битная (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Версия для Windows, 32-битная (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Версия для Windows, 32-битная (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Версия для Windows, 64-битная (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Версия для Windows, 32-битная (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Версия для OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Версия для OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Версия для %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "С поддержкой Юникода UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без поддержки Юникода UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "С поддержкой имён файлов в Юникоде.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Без поддержки имён файлов в Юникоде.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "С поддержкой родного языка.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записывается %s BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Входной файл %s содержит %s BOM.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Предполагается кодировка UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Предполагается кодировка UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Не удалось открыть временный выходной файл: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "использование %s в качестве временного файла\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Не удалось записать во временный выходной файл %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Не удалось изменить права доступа ко временному выходному файлу %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Не удалось изменить владельца и группу временного выходного файла %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "конфликт при разрешении символической ссылки «%s»\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " выходной файл остаётся в «%s»\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "проблемы при переименовании «%s» в «%s»:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " который является целью символической ссылки «%s»\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Пропуск двоичного файла %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "кодовая страница %d не поддерживается.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Пропуск файла %s с UTF-16, размер wchar_t составляет %d байт.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Пропуск файла %s с UTF-16, возникла ошибка преобразования UTF-16 в строке %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Пропуск файла %s с UTF-16, преобразование UTF-16 не поддерживается в этой версии %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Пропуск %s, не является обычным файлом.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Пропуск символической ссылки %s, цель не является обычным файлом.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Пропуск %s, цель символической ссылки %s не является обычным файлом.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "преобразование файла %s в файл %s в формат Unix…\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "преобразование файла %s в файл %s в формат Mac…\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "преобразование файла %s в файл %s в формат DOS…\n"
@@ -559,42 +526,42 @@ msgstr "преобразование файла %s в файл %s в форма
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат Unix…\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "проблемы при преобразовании файла %s в файл %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Пропуск символической ссылки %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "преобразование файла %s в формат Unix…\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "преобразование файла %s в формат Mac…\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "преобразование файла %s в формат DOS…\n"
@@ -604,76 +571,76 @@ msgstr "преобразование файла %s в формат DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "преобразование %s из файла %s в %s формат Unix…\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "преобразование %s из файла %s в %s формат Mac…\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "преобразование %s из файла %s в %s формат DOS…\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "проблемы при преобразовании файла %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "не удалось прочитать из входного файла %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "некорректный флаг «%c» для параметра -i или --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "активная кодовая страница: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "задан неправильный %s режим преобразования\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "для параметра «%s» требуется аргумент\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "задана неправильная кодировка отображения (%s)\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "цель файла %s не задана в режиме нового файла\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "не удалось прочитать из входного файла: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не удалось записать в выходной файл: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "ошибка: некорректная суррогатная пара. Отсутствует младший суррогат.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "ошибка: некорректная суррогатная пара. Отсутствует старший суррогат.\n"
diff --git a/po/sr.po b/po/sr.po
index 258f5d5..347dca5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,10 +4,10 @@
# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-7.2-beta5\n"
+"Project-Id-Version: dos2unix-7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-04-12 11:01+0200\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2015-12-23 18:31+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
@@ -17,8 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -62,8 +63,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "грешка: Вредност променљиве окружења „ДОС2UNIX_LOCALEDIR“ је предуга.\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -73,7 +75,7 @@ msgstr ""
"Сва права су задржана.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -89,7 +91,7 @@ msgstr ""
"1. Расподела изворног кода мора да садржи горње обавештење о ауторском праву, овај списак услова и следећи опозив.\n"
"2. Расподела у бинарном облику мора да понови обавештење горе наведеног ауторског права у документацији и/или у другом материјалу који долази уз дистрибуцију.\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -115,68 +117,56 @@ msgstr ""
"НЕПАЖЊУ ИЛИ ДРУГО) ДОВОДЕЋИ НА БИЛО КОЈИ НАЧИН ДО ПРЕКИДА УПОТРЕБЕ\n"
"ОВОГ СОФТВЕРА, ЧАК И АКО СТЕ ОБАВЕШТЕНИ О МОГУЋНОСТИ ТАКВИХ ШТЕТА.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii претвара само прекиде реда (основно)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso претварање између скупа знакова ДОС-а и ИСО-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 користи Виндоуз кодну страницу 1252 (западно-европски)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 користи ДОС кодну страницу 437 (САД) (основно)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 користи ДОС кодну страницу 850 (западно-европски)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 користи ДОС кодну страницу 860 (португалски)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 користи ДОС кодну страницу 863 (канадски француски)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 користи ДОС кодну страницу 865 (норвешки)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 претвара 8-битне знакове у 7-битне размаке\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom задржава назнаку поретка бајта\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom задржава назнаку поретка бајта (основно)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -184,32 +174,27 @@ msgstr ""
" -c, --convmode режим претварања\n"
" режим претварања аскри, 7бита, исо, мек, подразумева аскри\n"
-#: common.c:646
-#, fuzzy, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
msgstr ""
-" -c, --convmode режим претварања\n"
-" режим претварања аскри, 7бита, исо, мек, подразумева аскри\n"
+" -D, --display-enc подешава кодирање приказаних порука текста\n"
+" кодирање „ansi“, „unicode“, „utf8“, основно је „ansi“\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force присиљава претварање бинарних датотека\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 претвара УТФ-16 у ГБ18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help приказује овај текст помоћи\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -217,28 +202,23 @@ msgstr ""
" -i, --info[=ЗАСТАВЕ] приказује податке о датотеци\n"
" file ... датотеке за анализу\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate задржава датум излазне датотеке\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license приказује дозволу софтвера\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline додаје додатни нови ред\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom додаје назнаку поретка бајта (основно УТФ-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -248,8 +228,7 @@ msgstr ""
" улазна датотека изворна датотека у режиму нове датотеке\n"
" излазна датотека излазна датотека у режиму нове датотеке\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -257,53 +236,43 @@ msgstr ""
" -o, --oldfile пише у стару датотеку (основно)\n"
" датотека ... датотеке за претварање у режиму старе датотеке\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet тихи режим, потискује сва упозорења\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom уклања назнаку поретка бајта (основно)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom уклања назнаку поретка бајта\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe прескаче бинарне датотеке (основно)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 задржава УТФ-16 кодирање\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le подразумева да је улазни запис „UTF-16LE“\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be подразумева да је улазни запис „UTF-16BE“\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose опширне радње\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink прати симболичке везе и претвара мете\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -311,237 +280,233 @@ msgstr ""
" -R, --replace-symlink замењује симболичке везе претвореним датотекама\n"
" (изворне датотеке мете остају непромењене)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink задржава неизмењеним симболичке везе и мете (основно)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version приказује број издања\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "ДОС 16 бита издање (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "ДОС 16 бита издање (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "ДОС 32 бита издање (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "ДОС 32 бита издање (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "МСИС издање.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Цигвин издање.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Виндоуз 64 бита издање (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Виндоуз 32 бита издање (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Виндоуз 32 бита издање (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Виндоуз 32 бита издање (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Виндоуз 64 бита издање (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Виндоуз 32 бита издање (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "ОС/2 издање (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "ОС/2 издање (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s издање.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Са подршком Јуникода УТФ-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без подршке Јуникода УТФ-16.\n"
-#: common.c:739
-#, fuzzy
+#: common.c:717
msgid "With Unicode file name support.\n"
-msgstr "Са подршком Јуникода УТФ-16.\n"
+msgstr "Са подршком назива датотеке Јуникода.\n"
-#: common.c:741
-#, fuzzy
+#: common.c:719
msgid "Without Unicode file name support.\n"
-msgstr "Без подршке Јуникода УТФ-16.\n"
+msgstr "Без подршке назива датотеке Јуникода.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Са подршком матерњег језика.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записујем %s НПБ-а.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "УТФ-16ЛЕ"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "УТФ-16БЕ"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "ГБ18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "УТФ-8"
-#: common.c:1135
-#, fuzzy, c-format
+#: common.c:1113
+#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Улазна датотека „%s“ има %s НПБ-а.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Подразумевам УТФ-16ЛЕ кодирање.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Подразумевам УТФ-16БЕ кодирање.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "користим „%s“ као привремену датотеку\n"
-#: common.c:1430
-#, fuzzy, c-format
+#: common.c:1412
+#, c-format
msgid "Failed to write to temporary output file %s:"
-msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“: %s\n"
+msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“:"
-#: common.c:1461
-#, fuzzy, c-format
+#: common.c:1443
+#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
-msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“: %s\n"
+msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“:"
-#: common.c:1478
-#, fuzzy, c-format
+#: common.c:1460
+#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
-msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“: %s\n"
+msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "проблеми решавања симболичке везе „%s“\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " излазна датотека остаје у „%s“\n"
-#: common.c:1552
-#, fuzzy, c-format
+#: common.c:1534
+#, c-format
msgid "problems renaming '%s' to '%s':"
-msgstr "проблеми преименовања „%s“ у „%s“: %s\n"
+msgstr "проблеми преименовања „%s“ у „%s“:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " који је мета симболичке везе „%s“\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Прескачем бинарну датотеку „%s“\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Кодна страница „%d“ није подржана.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Прескачем УТФ-16 датотеку „%s“, величина „wchar_t“-а је %d бајта.\n"
-#: common.c:1629 common.c:1721 common.c:1807
-#, fuzzy, c-format
+#: common.c:1611 common.c:1703 common.c:1789
+#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
-msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n"
+msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања у %u. реду.\n"
-#: common.c:1633 common.c:1725 common.c:1811
-#, fuzzy, c-format
+#: common.c:1615 common.c:1707 common.c:1793
+#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
-msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n"
+msgstr "Прескачем УТФ-16 датотеку „%s“, УТФ-16 претварање није подржано у овом издању „%s“.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Прескачем „%s“, није обична датотека.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Прескачем „%s“, излазна датотека „%s“ је симболичка веза.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Прескачем симболичку везу „%s“, мета није обична датотека.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Прескачем „%s“, мета симболичке везе „%s“ није обична датотека.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Мека...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису ДОС-а...\n"
@@ -552,42 +517,42 @@ msgstr "претварам датотеку „%s“ у датотеку „%s
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Прескачем симболичку везу „%s“.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "претварам датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "претварам датотеку „%s“ у запису Мека...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "претварам датотеку „%s“ у запису ДОС-а...\n"
@@ -597,82 +562,78 @@ msgstr "претварам датотеку „%s“ у запису ДОС-а..
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Јуникса...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Мека...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Дос-а...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "проблеми претварања датотеке „%s“\n"
-#: common.c:1911 common.c:1988
-#, fuzzy, c-format
+#: common.c:1949 common.c:2001
+#, c-format
msgid "can not read from input file %s:"
-msgstr "не могу да пишем у излазну датотеку: %s\n"
+msgstr "не могу да читам из улазне датотеке „%s“:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "погрешна заставица „%c“ за опцију „-i“ или „--info“\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "радна кодна страница: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "наведен је неисправан „%s“ режим претварања\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "опција „%s“ захтева аргумент\n"
-#: common.c:2361
-#, fuzzy, c-format
+#: common.c:2372
+#, c-format
msgid "invalid %s display encoding specified\n"
-msgstr "наведен је неисправан „%s“ режим претварања\n"
+msgstr "наведено је неисправно кодирање „%s“ приказа\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n"
-#: common.c:2474
-#, fuzzy, c-format
+#: common.c:2485
+#, c-format
msgid "can not read from input file: %s\n"
-msgstr "не могу да пишем у излазну датотеку: %s\n"
+msgstr "не могу да читам из улазне датотеке: „%s“\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не могу да пишем у излазну датотеку: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
-msgstr ""
+msgstr "грешка: Неисправан пар надометка. Недостаје нижи надометак.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
-msgstr ""
-
-#, fuzzy
-#~ msgid "has %s BOM.\n"
-#~ msgstr "Записујем %s НПБ-а.\n"
+msgstr "грешка: Неисправан пар надометка. Недостаје виши надометак.\n"
#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"
#~ msgstr "Прескачем УТФ-16 датотеку „%s“, кодни рспоред текућег језика није УТФ-8.\n"
diff --git a/po/sv.po b/po/sv.po
index 392a952..8951b8e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translation for dos2unix.
-# Copyright © 2014-2015 Erwin Waterlander, et al. (msgids)
+# Copyright © 2014-2016 Erwin Waterlander, et al. (msgids)
# This file is distributed under the same license as the dos2unix package.
-# Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015.
+# Sebastian Rasmussen <sebras@gmail.com>, 2014-2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
-"PO-Revision-Date: 2015-11-08 14:27+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-28 10:27+0100\n"
"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -18,15 +18,16 @@ msgstr ""
"X-Generator: Poedit 1.8.6\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -63,18 +64,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "fel: Värdet på miljövariabeln DOS2UNIX_LOCALEDIR är för långt.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"Alla rättigheter reserverade.\n"
"\n"
-#: common.c:597
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -95,7 +97,7 @@ msgstr ""
" med distributionen.\n"
"\n"
-#: common.c:607
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -109,8 +111,8 @@ msgid ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-"DENNA MJUKVARA TILLHANDAHÅLLS AV UPPHOVSRÄTTSINNEHAVAREN I “BEFINTLIGT\n"
-"SKICK“ (AS IS) OCH ANSVAR FÖR UTTRYCKLIGA ELLER UNDERFÖRSTÅDDA,\n"
+"DENNA MJUKVARA TILLHANDAHÅLLS AV UPPHOVSRÄTTSINNEHAVAREN I ”BEFINTLIGT\n"
+"SKICK” (AS IS) OCH ANSVAR FÖR UTTRYCKLIGA ELLER UNDERFÖRSTÅDDA,\n"
"INKLUSIVE, MEN INTE BEGRÄNSAT TILL UNDERFÖRSTÅDDA GARANTIER VID KÖP\n"
"OCH LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL AVVISAS. INTE I NÅGOT FALL SKALL\n"
"UPPHOVSRÄTTSINNEHAVAREN VARA SKYLDIG UTGE ERSÄTTNING FÖR DIREKT,\n"
@@ -123,68 +125,56 @@ msgstr ""
"ANVÄNDNING AV DENNA MJUKVARA, ÄVEN OM UNDERRÄTTAD OM MÖJLIGHETEN FÖR\n"
"SÅDAN SKADA.\n"
-#: common.c:632
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Användning: %s [flaggor] [fil …] [-n infil utfil …]\n"
-#: common.c:633
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii konvertera bara radbrytningar (standard)\n"
-#: common.c:634
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konvertering mellan DOS och ISO-8859-1 teckenuppsättningar\n"
-#: common.c:635
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 använd Windows teckentabell 1252 (Västeuropeisk)\n"
-#: common.c:636
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 använd DOS teckentabell 437 (USA) (standard)\n"
-#: common.c:637
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 använd DOS teckentabell 850 (Västeuropeisk)\n"
-#: common.c:638
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 använd DOS teckentabell 860 (portugisisk)\n"
-#: common.c:639
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 använd DOS teckentabell 863 (fransk-kanadensisk)\n"
-#: common.c:640
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 använd DOS-teckentabell 865 (nordisk)\n"
-#: common.c:641
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konvertera 8-bitars tecken till 7-bitars blanksteg\n"
-#: common.c:643
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark)\n"
-#: common.c:645
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark) (standard)\n"
-#: common.c:646
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -192,8 +182,7 @@ msgstr ""
" -c, --convmode konverteringsläge\n"
" konverteringsläge ascii, 7bit, iso, mac, standard är ascii\n"
-#: common.c:649
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -201,23 +190,19 @@ msgstr ""
" -D, --display-enc ställ in kodning för visade textmeddelanden\n"
" kodning ansi, unicode, utf8, standard är ansi\n"
-#: common.c:652
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force tvinga konvertering av binära filer\n"
-#: common.c:655
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konvertera UTF-16 till GB18030\n"
-#: common.c:658
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help visar denna hjälptext\n"
-#: common.c:659
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -225,39 +210,33 @@ msgstr ""
" -i, --info[=FLAGGOR] visa filinformation\n"
" fil … filer att analysera\n"
-#: common.c:661
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate behåll datum för utmatningsfilen\n"
-#: common.c:662
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license visa mjukvarulicensen\n"
-#: common.c:663
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline lägg till ytterligare nyrad\n"
-#: common.c:664
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom lägg till byteordningsmarkering (Byte Order Mark) (standard för UTF-8)\n"
-#: common.c:665
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
" outfile output file in new-file mode\n"
msgstr ""
" -n, --newfile skriv till ny fil\n"
-" infil originafil i nyfilsläge\n"
+" infil originalfil i nyfilsläge\n"
" utfil utmatningsfil i nyfilsläge\n"
-#: common.c:668
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -265,53 +244,43 @@ msgstr ""
" -o, --oldfile skriv till den gamla filen (standard)\n"
" fil … filer att konvertera i äldrefilsläge\n"
-#: common.c:670
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet tyst läge, dölj alla varningar\n"
-#: common.c:672
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark) (standard)\n"
-#: common.c:674
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark)\n"
-#: common.c:675
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe hoppa över binära filer (standard)\n"
-#: common.c:677
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 behåll UTF-16 teckenkodning\n"
-#: common.c:678
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le förmoda att inmatningsformatet är UTF-16LE\n"
-#: common.c:679
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
-msgstr " -ub, --assume-utf16be förmoda att inmatningsformatet är UTF16-BE\n"
+msgstr " -ub, --assume-utf16be förmoda att inmatningsformatet är UTF-16BE\n"
-#: common.c:681
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose utförlig drift\n"
-#: common.c:683
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink följ symboliska länkar och konvertera målen\n"
-#: common.c:686
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -319,235 +288,233 @@ msgstr ""
" -R, --replace-symlink ersätt symboliska länkar med konverterade filer\n"
" (de ursprungliga målfilerna förblir oförändrade)\n"
-#: common.c:688
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink behåll symboliska länkar och mål oförändrade (standard)\n"
-#: common.c:690
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version visa versionsnummer\n"
-#: common.c:702
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bitarsversion (WATCOMC).\n"
-#: common.c:704
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bitarsversion (TURBOC).\n"
-#: common.c:706
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bitarsversion (WATCOMC).\n"
-#: common.c:708
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bitarsversion (DJGPP).\n"
-#: common.c:710
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS-version.\n"
-#: common.c:712
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin-version.\n"
-#: common.c:714
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bitarsversion (MinGW-w64).\n"
-#: common.c:716
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bitarsversion (WATCOMC).\n"
-#: common.c:718
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bitarsversion (MinGW-w64).\n"
-#: common.c:720
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bitarsversion (MinGW).\n"
-#: common.c:722
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bitarsversion (MSVC %d).\n"
-#: common.c:724
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bitarsversion (MSVC %d).\n"
-#: common.c:726
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-version (WATCOMC).\n"
-#: common.c:728
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-version (EMX).\n"
-#: common.c:730
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "%s version.\n"
-#: common.c:736
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Med stöd för Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Utan stöd för Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Med stöd för Unicode-filnamn.\n"
-#: common.c:744
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Utan stöd för Unicode-filnamn.\n"
-#: common.c:748
+#: common.c:723
msgid "With native language support.\n"
msgstr "Med modersmålsstöd.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skriver %s BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Infil %s har %s BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Förmodar att UTF-16LE teckenkodning används.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Förmodar att UTF-16BE teckenkodning används.\n"
-#: common.c:1361
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Misslyckades att öppna temporär utmatningsfil: %s\n"
-#: common.c:1368
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "använder %s som temporär fil\n"
-#: common.c:1433
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Misslyckades att skriva till temporär utmatningsfil %s:"
-#: common.c:1464
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Misslyckades att ändra rättigheterna för temporär utmatningsfil %s:"
-#: common.c:1481
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Misslyckades att ändra ägare och grupp för temporär utmatningsfil %s:"
-#: common.c:1528
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
-msgstr "fel uppstod vid upplösning av symbolisk länk “%s“\n"
+msgstr "fel uppstod vid upplösning av symbolisk länk ”%s”\n"
-#: common.c:1529 common.c:1561
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
-msgstr " utfil förblir i “%s“\n"
+msgstr " utfil förblir i ”%s”\n"
-#: common.c:1555
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "fel när '%s' bytte namn till '%s':"
-#: common.c:1559
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
-msgstr " vilken är målet för den symboliska länken “%s“\n"
+msgstr " vilken är målet för den symboliska länken ”%s”\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Hoppar över binärfil %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "saknar stöd för teckentabell %d.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Hoppar över UTF-16-fil %s, storleken på wchar_t är %d byte.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Hoppar över UTF-16-fil %s, ett UTF-16-konverteringsfel inträffade på rad %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Hoppar över UTF-16 fil %s, UTF-16-konvertering saknar stöd i denna version av %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Hoppar över %s, är ingen vanlig fil.\n"
-#: common.c:1703
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Hoppar över %s, utfil %s är en symbolisk länk.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Hoppar över symbolisk länk %s, målet är inte en vanlig fil.\n"
-#: common.c:1709
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Hoppar över %s, målet för den symboliska länken %s är inte en vanlig fil.\n"
-#: common.c:1732
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konverterar fil %s till fil %s i Unix-format…\n"
-#: common.c:1735
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konverterar fil %s till fil %s i Mac-format…\n"
-#: common.c:1737
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konverterar fil %s till fil %s i DOS-format…\n"
@@ -558,42 +525,42 @@ msgstr "konverterar fil %s till fil %s i DOS-format…\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n"
-#: common.c:1751
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n"
-#: common.c:1753
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n"
-#: common.c:1759
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "fel vid konvertering från fil %s till fil %s\n"
-#: common.c:1792
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Hoppar över symbolisk länk %s.\n"
-#: common.c:1818
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konverterar fil %s till Unix-format…\n"
-#: common.c:1821
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konverterar fil %s till Mac-format…\n"
-#: common.c:1823
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konverterar fil %s till DOS-format…\n"
@@ -603,27 +570,27 @@ msgstr "konverterar fil %s till DOS-format…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konverterar %s-fil %s till %s Unix-format…\n"
-#: common.c:1836
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konverterar %s-fil %s till %s Mac-format…\n"
-#: common.c:1838
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konverterar %s-fil %s till %s DOS-format…\n"
-#: common.c:1844
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "fel vid konvertering av fil %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "kan inte läsa från inmatningsfil %s:"
@@ -633,45 +600,45 @@ msgstr "kan inte läsa från inmatningsfil %s:"
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "felaktig flagga '%c' för argumentet -i eller --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "aktiv teckentabell: %d\n"
-#: common.c:2336
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ogiltigt konverteringsläge %s angivet\n"
-#: common.c:2344 common.c:2370
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
-msgstr "flaggan “%s“ kräver ett argument\n"
+msgstr "flaggan ”%s” kräver ett argument\n"
-#: common.c:2362
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "ogiltig %s-kodning angiven\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "målet för fil %s specificerades inte i nyfilsläge\n"
-#: common.c:2475
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "kan inte läsa från inmatningsfil: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan inte skriva till utfil: %s\n"
-#: common.c:2578
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "fel: Ogiltigt surrogatpar. Den lägre delen av surrogatparet saknas.\n"
-#: common.c:2593
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "fel: Ogiltigt surrogatpar. Den högre delen av surrogatparet saknas.\n"
diff --git a/po/uk.po b/po/uk.po
index 38f3993..e0d8b22 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,13 +3,13 @@
# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
#
-# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015, 2016.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-15 16:32+0300\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 12:17+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -20,15 +20,16 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"© Erwin Waterlander, 2009-2015\n"
+"© Erwin Waterlander, 2009-%d\n"
"© Christian Wurll, 1998 (версія 3.1)\n"
"© Bernd Johannes Wuebben, 1998 (версія 3.0)\n"
"© Benjamin Lin, 1994-1995\n"
@@ -65,18 +66,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "помилка: значення змінної середовища DOS2UNIX_LOCALEDIR є надто довгим.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"© Erwin Waterlander, 2009-2015\n"
+"© Erwin Waterlander, 2009-%d\n"
"© Benjamin Lin, 1994-1995\n"
"Усі права застережено.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -105,7 +107,7 @@ msgstr ""
" від відповідальності у документації і/або інших супровідних матеріалах.)\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -131,68 +133,56 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Користування: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii перетворити лише символи розриву рядків (типово)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso виконати перетворення з кодування DOS до кодування ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 використати кодову таблицю 1252 Windows (західноєвропейські мови)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 використовувати кодову сторінку DOS 437 (США) (типово)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 використовувати кодову сторінку DOS 850 (західноєвропейські мови)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 використовувати сторінку DOS 860 (португальська)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 використовувати сторінку DOS 863 (канадська французька)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 використовувати сторінку DOS 865 (скандинавські мови)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 перетворювати 8-бітові символи на 7-бітові\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom зберегти позначку порядку байтів (BOM)\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom зберегти позначку порядку байтів (типово)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -200,8 +190,7 @@ msgstr ""
" -c, --convmode режим перетворення\n"
" режим ascii, 7bit, iso, mac, типовим є ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -209,23 +198,19 @@ msgstr ""
" -D, --display-enc встановити кодування показаних текстових повідомлень,\n"
" кодування ansi, unicode, utf8, типовим є ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force примусове перетворення бінарних файлів\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 перетворити UTF-16 на GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help показати це довідкове повідомлення\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -233,28 +218,23 @@ msgstr ""
" -i, --info[=ПРАПОРЦІ] показати дані щодо файла\n"
" файл ... файли, які слід проаналізувати\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate зберігати дату створення файла для результату\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license показати ліцензійну угоду щодо програмного забезпечення\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline вставити додатковий символ розриву рядка\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -b, --add-bom додати позначку порядку байтів (типово UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -264,8 +244,7 @@ msgstr ""
" вхідний_файл початковий файл у режимі створення файлів\n"
" результат файл результату у режимі створення файлів\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -273,53 +252,43 @@ msgstr ""
" -o, --oldfile записати до старого файла (типово)\n"
" файл ... файли, які слід перетворити у режимі без створення файлів\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet режим без повідомлень, не показувати попередження\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom вилучити позначку порядку байтів (типово)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom вилучити позначку порядку байтів (BOM)\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe пропускати двійкові файли (типово)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 зберегти кодування UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le припускати, що вхідним форматом є UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be припускати, що вхідним форматом є UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose режим докладних повідомлень\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink переходити за символічними посиланням і перетворювати файли, на які вони вказують\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -327,235 +296,233 @@ msgstr ""
" -R, --replace-symlink замінити символічні посилання перетвореними файлами\n"
" (початкові файли, на які вони вказують, змінено не буде)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink не змінювати символічні посилання та файли, на які вони посилаються (типово)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version показати дані щодо номера версії\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS, 16-бітова версія (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS, 16-бітова версія (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS, 32-бітова версія (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS, 32-бітова версія (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Версія MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Версія Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows, 64-бітова версія (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows, 32-бітова версія (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows, 32-бітова версія (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows, 32-бітова версія (MinGW)\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows, 64-бітова версія (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows, 32-бітова версія (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Версія для OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Версія для OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Версія %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "З підтримкою Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без підтримки Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "З підтримкою назв файлів у Unicode.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Без підтримки Unicode у назвах файлів.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "З підтримкою природної мови.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записуємо позначку порядку байтів %s.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "У вхідному файлі %s позначкою порядку байтів є %s.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Припускаємо кодування UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Припускаємо кодування UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Не вдалося відкрити файл для виведення тимчасових даних: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "використовуємо %s як тимчасовий файл\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Не вдалося записати дані до тимчасового файла виведення %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Не вдалося змінити права доступу до тимчасового файла виведення даних %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Не вдалося змінити власника і групу тимчасового файла виведення даних %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "проблеми з обробкою символічного посилання «%s»\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " файл результатів залишився у «%s»\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "проблеми з перейменуванням «%s» на «%s»:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " на який посилається символічне посилання «%s»\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Пропускаємо двійковий файл %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "підтримки кодової сторінки %d не передбачено.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, розміром wchar_t є %d байтів.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, сталася помилка під час перетворення даних UTF-16 у рядку %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, перетворення UTF-16 для цієї версії %s не передбачено.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Пропускаємо %s, не є звичайним файлом.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Пропускаємо %s, файл результату, %s, є символічним посиланням.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Пропускаємо символічне посилання %s, призначення не є звичайним файлом.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Пропускаємо %s, об’єкт, на який посилається символічне посилання %s, не є звичайним файлом.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n"
@@ -566,42 +533,42 @@ msgstr "перетворюємо файл %s на файл %s у форматі
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Unix...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "під час перетворення файла %s на файл %s виникли проблеми\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Пропускаємо символічне посилання %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "перетворюємо файл %s до формату Unix...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "перетворюємо файл %s до формату Mac...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "перетворюємо файл %s до формату DOS...\n"
@@ -611,76 +578,76 @@ msgstr "перетворюємо файл %s до формату DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s Unix...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s Mac...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s DOS...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "під час перетворення файла %s виникли проблеми\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "не вдалося прочитати дані із файла вхідних даних %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "помилковий прапорець «%c» для параметра -i або --info\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "активна кодова сторінка: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "вказано некоректний режим перетворення %s\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "до параметра «%s» слід вказувати аргумент\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "вказано некоректне кодування для показу %s\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "не вказано призначення для файла %s у режимі створення файлів\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "не вдалося прочитати дані із файла вхідних даних: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не вдалося виконати запис до файла результатів: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "помилка: некоректна пара заміщення. Пропущено нижній компонент.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "помилка: некоректна пара заміщення. Пропущено верхній компонент.\n"
diff --git a/po/vi.po b/po/vi.po
index 595979f..6afe0bc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,14 +1,14 @@
# Vietnamese translations for dos2unix package
# Bản dịch tiếng Việt cho gói dos2unix.
# This file is distributed under the same license as the dos2unix package.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-16 08:01+0700\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-13 09:01+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -20,15 +20,16 @@ msgstr ""
"X-Generator: Gtranslator 2.91.7\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Tác quyền (C) 2009-2015 Erwin Waterlander\n"
+"Tác quyền (C) 2009-%d Erwin Waterlander\n"
"Tác quyền (C) 1998 Christian Wurll (Phiên bản 3.1)\n"
"Tác quyền (C) 1998 Bernd Johannes Wuebben (Phiên bản 3.0)\n"
"Tác quyền (C) 1994-1995 Benjamin Lin\n"
@@ -65,18 +66,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "lỗi: Giá trị của biến môi trường DOS2UNIX_LOCALEDIR quá dài.\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Bản quyền (C) 2009-2015 Erwin Waterlander\n"
+"Bản quyền (C) 2009-%d Erwin Waterlander\n"
"Bản quyền (C) 1994-1995 Benjamin Lin\n"
"Giữ toàn bộ bản quyền.\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +99,7 @@ msgstr ""
" bản phân phối.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,68 +114,56 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Cách dùng: %s [các-tùy-chọn] [tập-tin …] [-n tập-tin-vào tập-tin-ra …]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii chỉ chuyển đổi các ngắt dòng (mặc định)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso chuyển đổi giữa DOS và ISO-8859-1\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 dùng trang mã Windows 1252 (Tây Âu)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 dùng trang mã DOS 437 (US) (mặc định)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 dùng trang mã DOS 850 (Tây Âu)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 dùng trang mã DOS 860 (Bồ Đào Nha)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 dùng trang mã DOS 863 (Ca Na Đa Pháp)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 dùng trang mã DOS 865 (Bắc Âu)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 chuyển đổi các ký tự 8 bit thành 7 bit\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark”\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark” (mặc định)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -181,8 +171,7 @@ msgstr ""
" -c, --convmode chế độ chuyển đổi\n"
" chế độ chuyển đổi: ascii, 7bit, iso, mac, mặc định là ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -190,23 +179,19 @@ msgstr ""
" -D, --display-enc đặt bảng mã để hiển thị các thông báo\n"
" bảng mã: ansi, unicode, utf8, mặc định là ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force bắt buộc chuyển đổi các tập tin nhị phân\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 đổi từ UTF-16 sang GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help hiển thị trợ giúp này\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -214,28 +199,23 @@ msgstr ""
" -i, --info[=CỜ] hiển thị thông tin tập tin\n"
" tập-tin … các tập tin cần phân tích\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate giữ nguyên ngày tháng tập tin đầu ra\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license hiển thị giấy phép dùng phần mềm\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline bổ xung thêm dòng mới\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom thêm “Byte Order Mark” (mặc định UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -245,8 +225,7 @@ msgstr ""
" tập-tin-vào tập tin gốc trong chế độ tập-tin-mới\n"
" tập-tin-ra tập tin đầu ra trong chế độ tập-tin-mới\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -254,53 +233,43 @@ msgstr ""
" -o, --oldfile ghi vào tập tin cũ (mặc định)\n"
" tập-tin … các tập tin cần chuyển đổi trong chế độ tập-tin-cũ\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet chế độ im lặng, chặn mọi cảnh báo\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark” (mặc định)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark”\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe bỏ qua tập tin nhị phân (mặc định)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 giữ bảng mã UTF-16\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le coi rằng định dạng đầu vào là UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be coi rằng định dạng đầu vào là UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose thông báo chi tiết\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink theo liên kết mềm và chuyển đổi đích\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -308,235 +277,233 @@ msgstr ""
" -R, --replace-symlink thay thế liên kết mềm bằng tập tin đã chuyển đổi\n"
" (các tập tin đích nguyên gốc thì để nguyên không thay đổi)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink giữ liên kết mềm và đích không thay đổi (mặc định)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version hiển thị số hiệu phiên bản\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Phiên bản DOS 16 bit (WATCOMC).\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Phiên bản DOS 16 bit (TURBOC).\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Phiên bản DOS 32 bit (WATCOMC).\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Phiên bản DOS 32 bit (DJGPP).\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "Phiên bản MSYS.\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Phiên bản Cygwin.\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Phiên bản Windows 64 bit (MinGW-w64).\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Phiên bản Windows 32 bit (WATCOMC).\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Phiên bản Windows 32 bit (MinGW-w64).\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Phiên bản Windows 32 bit (MinGW).\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Phiên bản Windows 64 bit (MSVC %d).\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Phiên bản Windows 32 bit (MSVC %d).\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "Phiên bản OS/2 (WATCOMC).\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "Phiên bản OS/2 (EMX).\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "Phiên bản %s.\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "Có hỗ trợ Unicode UTF-16.\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "Không hỗ trợ Unicode UTF-16.\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "Có hỗ trợ tên tập tin dạng Unicode.\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "Không hỗ trợ tên tập tin dạng Unicode.\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "Có hỗ trợ bản địa hóa ngôn ngữ.\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Đang ghi %s BOM.\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Tập tin đầu vào %s có BOM %s.\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Coi là bảng mã UTF-16LE.\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Coi là bảng mã UTF-16BE.\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Gặp lỗi khi mở tập tin đầu ra tạm thời: %s\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "đang dùng %s làm tập tin tạm\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Gặp lỗi khi ghi vào tập tin đầu ra tạm thời %s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Gặp lỗi khi thay đổi quyền hạn của tập tin đầu ra tạm %s:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Gặp lỗi khi đổi chủ sở hữu và nhóm của tập tin đầu ra tạm %s:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "gặp lỗi khi phân giải liên kết mềm “%s”\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " tập tin đầu ra còn trong “%s”\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "gặp lỗi khi đổi tên “%s” thành “%s”:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " cái là đích của liên kết mềm “%s”\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Bỏ qua tập tin nhị phân %s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "không hỗ trợ trang mã %d.\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, cỡ của wchar_t không phải là %d byte.\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, đã xảy ra lỗi chuyển đổi UTF-16 trên dòng %u.\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, chuyển đổi UTF-16 không được hỗ trợ ở phiên bản này của %s.\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Bỏ qua %s, đây không phải là tập tin thường.\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Bỏ qua %s, tập tin đầu ra %s là một liên kết mềm.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Bỏ qua liên kết mềm %s, đích của nó không phải là một tập tin thường.\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Bỏ qua liên kết mềm %s, đích %s của liên kết mềm không phải là một tập tin thường.\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s thành tập tin “%s” theo định dạng Unix…\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng Mac…\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng DOS…\n"
@@ -547,42 +514,42 @@ msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Unix %s…\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Bỏ qua liên kết mềm %s.\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Unix…\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Mac…\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n"
@@ -592,76 +559,76 @@ msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Unix %s…\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Mac %s…\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng DOS %s…\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "gặp trục trặc khi chuyển đổi tập tin %s\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "không thể đọc từ tập tin đầu vào %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "cờ “%c” cho tùy chọn -i hay --info bị sai\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "trang mã đang hoạt động: %d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "đã đưa ra chế độ chuyển đổi %s không hợp lệ\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "tùy chọn “%s” yêu cầu một đối số\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "đã đưa ra bảng mã hiển thị không hợp lệ %s\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "đích của tập tin %s không được chỉ định trong chế độ tập-tin-mới\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "không thể đọc từ tập tin đầu vào: %s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "không thể ghi vào tập tin đầu ra: %s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế dưới.\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế trên.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a612e5c..6cd1626 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,32 +1,33 @@
# Chinese (simplified) translations for dos2unix.
# This file is distributed under the same license as the dos2unix package.
#
-# zwpwjwtz <zwpwjwtz@126.com>, 2015.
+# Tianze Wang <zwpwjwtz@126.com>, 2015.
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Project-Id-Version: dos2unix 7.3.3-beta2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
-"PO-Revision-Date: 2015-09-24 18:57+0800\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
+"PO-Revision-Date: 2016-01-12 19:12+0800\n"
+"Last-Translator: Tianze Wang <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: dos2unix.c:79
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (版本 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (版本 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -63,18 +64,19 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "错误:环境变量 DOS2UNIX_LOCALEDIR 的值太长。\n"
#: unix2dos.c:69
+#, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
msgstr ""
-"Copyright © 2009-2015 Erwin Waterlander\n"
+"Copyright © 2009-%d Erwin Waterlander\n"
"Copyright © 1994-1995 Benjamin Lin\n"
"保留所有权利。\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +98,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,68 +124,56 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "用法:%s [选项] [文件 ...] [-n 输入文件 输出文件 ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 只转换换行符(默认)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso 在 DOS 和 ISO-8859-1 字符集之间转换\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 使用Windows 1252 编码页(西欧)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 使用DOS 437 编码页(US)(默认)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 使用DOS 850 编码页(西欧)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 使用DOS 860 编码页(葡萄牙)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 使用DOS 863 编码页(加拿大法語)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 使用DOS 865 编码页(北欧)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 转换8 位字符到7 位空间\n"
-#: common.c:640
-#, c-format
+#: common.c:618
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom 保留UTF-8 BOM头\n"
-#: common.c:642
-#, c-format
+#: common.c:620
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr "-b, --keep-bom 保留UTF-8 BOM头(默认)\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -191,8 +181,7 @@ msgstr ""
" -c, --convmode 转换模式\n"
" convmode ascii、7bit、iso或mac,默认为ascii\n"
-#: common.c:646
-#, c-format
+#: common.c:624
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -200,23 +189,19 @@ msgstr ""
" -D, --display-enc 设置消息文本的编码\n"
" encoding ansi、unicode或utf8,默认为ansi\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force 强制转换二进制文件\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 转换UTF-16为GB18030\n"
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help 显示本说明文字\n"
-#: common.c:656
-#, c-format
+#: common.c:634
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -224,28 +209,23 @@ msgstr ""
" -i, --info[=FLAGS] 显示文件信息\n"
" 文件 ... 需要分析的文件\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate 保留输出文件时间\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license 显示软件协议\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 加入额外的换行符\n"
-#: common.c:661
-#, c-format
+#: common.c:639
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom 添加UTF-8 BOM头(默认为UTF-8)\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -255,8 +235,7 @@ msgstr ""
" infile 新文件模式中的原始文件\n"
" outfile 新文件模式中的输出文件\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -264,53 +243,43 @@ msgstr ""
" -o, --oldfile 写入原文件(默认)\n"
" file ... 旧文件模式中要转换的文件\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 安静模式,不显示所有警告\n"
-#: common.c:669
-#, c-format
+#: common.c:647
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom 移除UTF-8 BOM头(默认)\n"
-#: common.c:671
-#, c-format
+#: common.c:649
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom 移除UTF-8 BOM头\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe 跳过二进制文件(默认)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 保留UTF-16编码\n"
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 假定输入文件格式为UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 假定输入文件格式为UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose 显示更多信息\n"
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink 根据符号链接转换其目标文件\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -318,235 +287,233 @@ msgstr ""
" -R, --replace-symlink 取代符号链接为转换后的文件\n"
" (原链接目标文件保持不变)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink 保持符号链接及其目标不变(默认)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version 显示版本号\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "16位DOS版本 (WATCOMC)。\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "16位DOS版本(TURBOC)。\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "32位DOS版本(WATCOMC)。\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "32位DOS版本(DJGPP)。\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS版本。\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin版本。\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "64位Windows版本(MinGW-w64)。\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "32位Windows版本(WATCOMC)。\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "32位Windows版本(MinGW-w64)。\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "32位Windows版本(MinGW)。\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "64位Windows版本(MSVC %d)。\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "32位Windows版本(MSVC %d)。\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 版本(WATCOMC)。\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 版本(EMX)。\n"
-#: common.c:727
+#: common.c:705
#, c-format
msgid "%s version.\n"
msgstr "版本 %s。\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "有Unicode UTF-16 支持。\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "无Unicode UTF-16 支持。\n"
-#: common.c:739
+#: common.c:717
msgid "With Unicode file name support.\n"
msgstr "有Unicode文件名支持。\n"
-#: common.c:741
+#: common.c:719
msgid "Without Unicode file name support.\n"
msgstr "无Unicode文件名支持。\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "含本地语言支持。\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr "写入 %s BOM。\n"
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "输入文件 %s 有 %s BOM。\n"
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr "假定为UTF-16LE编码。\n"
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr "假定为UTF-16BE编码。\n"
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "打开临时输出文件 %s 失败\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "使用 %s 作为临时文件\n"
-#: common.c:1430
+#: common.c:1412
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "写入临时输出文件失败%s:"
-#: common.c:1461
+#: common.c:1443
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "改变临时输出文件 %s 的权限失败:"
-#: common.c:1478
+#: common.c:1460
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "改变临时输出文件 %s 的所有者和群组失败:"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "解析符号链接“%s”遇到问题\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 输出文件“%s”未改变\n"
-#: common.c:1552
+#: common.c:1534
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "重新命名“%s”到“%s”错误:"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " 後者为符号链接'%s' 的目标\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "跳过二进制文件%s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "不支持编码页 %d。\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "跳过 UTF-16 文件 %s,wchar_t 的大小为 %d 位。\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "跳过 UTF-16 文件 %s,UTF-16 转换发生错误于第 %u 行。\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "跳过 UTF-16 文件 %s,本版本 %s 不支持UTF-16。\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "跳过 %s,不是一个普通文件。\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "跳过 %s,输出文件 %s 是一个符号链接。.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "跳过符号链接 %s,目标不是一个普通文件。\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "跳过 %s,符号链接 %s 目标不是一个普通文件。\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "正在转换文件 %s 为Unix格式到 %s...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "正在转换文件 %s 为Mac格式到 %s...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "正在转换文件 %s 为DOS格式到 %s...\n"
@@ -557,42 +524,42 @@ msgstr "正在转换文件 %s 为DOS格式到 %s...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n"
-#: common.c:1750
+#: common.c:1732
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n"
-#: common.c:1752
+#: common.c:1734
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "转换文件 %s 到 %s 错误\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "跳过符号链接 %s。\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "正在转换文件 %s 为Unix格式...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "正在转换文件 %s 为Mac格式...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "正在转换文件 %s 为DOS格式...\n"
@@ -602,76 +569,76 @@ msgstr "正在转换文件 %s 为DOS格式...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "正在转换 %s 文件 %s 为Unix格式的 %s 文件...\n"
-#: common.c:1835
+#: common.c:1817
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "正在转换 %s 文件 %s 为Mac格式的 %s 文件...\n"
-#: common.c:1837
+#: common.c:1819
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "正在转换 %s 文件 %s 为DOS格式的 %s 文件...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "转换文件 %s 出错\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, c-format
msgid "can not read from input file %s:"
msgstr "无法读取输入文件 %s:"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "-i/--info选项的标志“%c”错误\n"
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "作用中编码页:%d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "指定的转换模式 %s 不合法\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "选项“%s”需要一个参数\n"
-#: common.c:2361
+#: common.c:2372
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "指定了无效的显示编码 %s\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "新文件模式中未指明文件 %s 的目的位置\n"
-#: common.c:2474
+#: common.c:2485
#, c-format
msgid "can not read from input file: %s\n"
msgstr "无法读取输入文件:%s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "无法写入输出文件:%s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "错误:无效的代理对。缺少低位字符。\n"
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "错误:无效的代理对。缺少高位字符。\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4093225..4969030 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 6.0.5-b3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"POT-Creation-Date: 2016-02-10 19:46+0100\n"
"PO-Revision-Date: 2014-03-14 00:43+0800\n"
"Last-Translator: mail6543210 <mail6543210@yahoo.com.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -18,8 +18,9 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: dos2unix.c:79
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1998 Christian Wurll (Version 3.1)\n"
"Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -63,8 +64,9 @@ msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "錯誤:環境變數DOS2UNIX_LOCALEDIR 的值太長。\n"
#: unix2dos.c:69
+#, fuzzy, c-format
msgid ""
-"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 2009-%d Erwin Waterlander\n"
"Copyright (C) 1994-1995 Benjamin Lin\n"
"All rights reserved.\n"
"\n"
@@ -74,7 +76,7 @@ msgstr ""
"保留所有權利。\n"
"\n"
-#: common.c:594
+#: common.c:572
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +98,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:604
+#: common.c:582
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,68 +124,58 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:629
+#: common.c:607
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "用法: %s [選項] [file ...] [-n infile outfile ...]\n"
-#: common.c:630
-#, c-format
+#: common.c:608
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 只轉換換行字元(預設)\n"
-#: common.c:631
-#, c-format
+#: common.c:609
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso 在DOS 和ISO-8859-1 字元集間轉換\n"
-#: common.c:632
-#, c-format
+#: common.c:610
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 使用Windows 1252 編碼頁(西歐)\n"
-#: common.c:633
-#, c-format
+#: common.c:611
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 使用DOS 437 編碼頁(US) (預設)\n"
-#: common.c:634
-#, c-format
+#: common.c:612
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 使用DOS 850 編碼頁(西歐)\n"
-#: common.c:635
-#, c-format
+#: common.c:613
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 使用DOS 860 編碼頁(葡萄牙)\n"
-#: common.c:636
-#, c-format
+#: common.c:614
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 使用DOS 863 編碼頁(加拿大法語)\n"
-#: common.c:637
-#, c-format
+#: common.c:615
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 使用DOS 865 編碼頁(北歐)\n"
-#: common.c:638
-#, c-format
+#: common.c:616
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 轉換8 位元字元到7 位元空間\n"
-#: common.c:640
-#, fuzzy, c-format
+#: common.c:618
+#, fuzzy
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:642
-#, fuzzy, c-format
+#: common.c:620
+#, fuzzy
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:643
-#, c-format
+#: common.c:621
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
@@ -191,8 +183,8 @@ msgstr ""
" -c, --convmode 轉換模式\n"
" convmode ascii, 7bit, iso, mac, 預設為ascii\n"
-#: common.c:646
-#, fuzzy, c-format
+#: common.c:624
+#, fuzzy
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
@@ -200,23 +192,20 @@ msgstr ""
" -c, --convmode 轉換模式\n"
" convmode ascii, 7bit, iso, mac, 預設為ascii\n"
-#: common.c:649
-#, c-format
+#: common.c:627
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force 強制轉換二進位檔案\n"
-#: common.c:652
-#, c-format
+#: common.c:630
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:655
-#, c-format
+#: common.c:633
msgid " -h, --help display this help text\n"
msgstr " -h, --help 顯示本說明文字\n"
-#: common.c:656
-#, fuzzy, c-format
+#: common.c:634
+#, fuzzy
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
@@ -224,28 +213,24 @@ msgstr ""
" -o, --oldfile 寫入原檔案(預設)\n"
" file ... 原檔模式中要轉換的檔案\n"
-#: common.c:658
-#, c-format
+#: common.c:636
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate 保留輸出檔時間\n"
-#: common.c:659
-#, c-format
+#: common.c:637
msgid " -L, --license display software license\n"
msgstr " -L, --license 顯示軟體授權\n"
-#: common.c:660
-#, c-format
+#: common.c:638
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 加入額外的換行\n"
-#: common.c:661
-#, fuzzy, c-format
+#: common.c:639
+#, fuzzy
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:662
-#, c-format
+#: common.c:640
msgid ""
" -n, --newfile write to new file\n"
" infile original file in new-file mode\n"
@@ -255,8 +240,7 @@ msgstr ""
" infile 新檔模式中的原始檔案\n"
" outfile 新檔模式中的輸出檔案\n"
-#: common.c:665
-#, c-format
+#: common.c:643
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
@@ -264,53 +248,45 @@ msgstr ""
" -o, --oldfile 寫入原檔案(預設)\n"
" file ... 原檔模式中要轉換的檔案\n"
-#: common.c:667
-#, c-format
+#: common.c:645
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 安靜模式,抑制所有警告\n"
-#: common.c:669
-#, fuzzy, c-format
+#: common.c:647
+#, fuzzy
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:671
-#, fuzzy, c-format
+#: common.c:649
+#, fuzzy
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:672
-#, c-format
+#: common.c:650
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe 略過二進位檔案(預設)\n"
-#: common.c:674
-#, c-format
+#: common.c:652
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr ""
-#: common.c:675
-#, c-format
+#: common.c:653
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 假設輸入檔格式為UTF-16LE\n"
-#: common.c:676
-#, c-format
+#: common.c:654
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 假設輸入檔格式為UTF-16BE\n"
-#: common.c:678
-#, c-format
+#: common.c:656
msgid " -v, --verbose verbose operation\n"
msgstr ""
-#: common.c:680
-#, c-format
+#: common.c:658
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink 依循符號連結轉換其目標檔案\n"
-#: common.c:683
-#, c-format
+#: common.c:661
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -318,237 +294,235 @@ msgstr ""
" -R, --replace-symlink 取代符號連結為轉換後的檔案\n"
" (原連結目標檔案保持不變)\n"
-#: common.c:685
-#, c-format
+#: common.c:663
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink 保持符號連結及其目標不變(預設)\n"
-#: common.c:687
-#, c-format
+#: common.c:665
msgid " -V, --version display version number\n"
msgstr " -V, --version 顯示版本號碼\n"
-#: common.c:699
+#: common.c:677
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 位元版本(WATCOMC)。\n"
-#: common.c:701
+#: common.c:679
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 位元版本(TURBOC)。\n"
-#: common.c:703
+#: common.c:681
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 位元版本(WATCOMC)。\n"
-#: common.c:705
+#: common.c:683
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 位元版本(DJGPP)。\n"
-#: common.c:707
+#: common.c:685
msgid "MSYS version.\n"
msgstr "MSYS 版本。\n"
-#: common.c:709
+#: common.c:687
msgid "Cygwin version.\n"
msgstr "Cygwin 版本。\n"
-#: common.c:711
+#: common.c:689
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 位元版本(MinGW-w64)。\n"
-#: common.c:713
+#: common.c:691
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 位元版本(WATCOMC)。\n"
-#: common.c:715
+#: common.c:693
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32 位元版本(MinGW-w64)。\n"
-#: common.c:717
+#: common.c:695
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 位元版本(MinGW)。\n"
-#: common.c:719
+#: common.c:697
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 位元版本(MSVC %d)。\n"
-#: common.c:721
+#: common.c:699
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 位元版本(MSVC %d)。\n"
-#: common.c:723
+#: common.c:701
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 版本(WATCOMC)。\n"
-#: common.c:725
+#: common.c:703
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 版本(EMX)。\n"
-#: common.c:727
+#: common.c:705
#, fuzzy, c-format
msgid "%s version.\n"
msgstr "MSYS 版本。\n"
-#: common.c:733
+#: common.c:711
msgid "With Unicode UTF-16 support.\n"
msgstr "有Unicode UTF-16 支援。\n"
-#: common.c:735
+#: common.c:713
msgid "Without Unicode UTF-16 support.\n"
msgstr "無Unicode UTF-16 支援。\n"
-#: common.c:739
+#: common.c:717
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "有Unicode UTF-16 支援。\n"
-#: common.c:741
+#: common.c:719
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "無Unicode UTF-16 支援。\n"
-#: common.c:745
+#: common.c:723
msgid "With native language support.\n"
msgstr "含本地語言支援。\n"
-#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
-#: common.c:1090
+#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061
+#: common.c:1068
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
+#: common.c:1028 common.c:1084 common.c:1626 common.c:1647
msgid "UTF-16LE"
msgstr ""
-#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
+#: common.c:1035 common.c:1087 common.c:1628 common.c:1649
msgid "UTF-16BE"
msgstr ""
-#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
+#: common.c:1042 common.c:1061 common.c:1093 common.c:1639
msgid "GB18030"
msgstr ""
-#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
+#: common.c:1049 common.c:1068 common.c:1090 common.c:1641
msgid "UTF-8"
msgstr ""
-#: common.c:1135
+#: common.c:1113
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1171 common.c:1214
+#: common.c:1149 common.c:1192
msgid "Assuming UTF-16LE encoding.\n"
msgstr ""
-#: common.c:1175 common.c:1218
+#: common.c:1153 common.c:1196
msgid "Assuming UTF-16BE encoding.\n"
msgstr ""
-#: common.c:1358
+#: common.c:1336
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "暫存檔 %s 開啟失敗\n"
-#: common.c:1365
+#: common.c:1343
#, c-format
msgid "using %s as temporary file\n"
msgstr "使用 %s 作為暫存檔\n"
-#: common.c:1430
+#: common.c:1412
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "暫存檔寫入失敗%s:%s\n"
-#: common.c:1461
+#: common.c:1443
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "輸出暫存檔 %s 權限變更失敗:%s\n"
-#: common.c:1478
+#: common.c:1460
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "輸出暫存檔 %s 擁有者及群組變更失敗:%s\n"
-#: common.c:1525
+#: common.c:1507
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "解析符號連結'%s' 發生問題\n"
-#: common.c:1526 common.c:1558
+#: common.c:1508 common.c:1540
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 輸出檔案'%s' 未改變\n"
-#: common.c:1552
+#: common.c:1534
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "重新命名「%s」到「%s」錯誤:%s\n"
-#: common.c:1556
+#: common.c:1538
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " 後者為符號連結'%s' 的目標\n"
-#: common.c:1619 common.c:1711 common.c:1797
+#: common.c:1601 common.c:1693 common.c:1779
#, c-format
msgid "Skipping binary file %s\n"
msgstr "略過二進位檔案%s\n"
-#: common.c:1622 common.c:1714 common.c:1800
+#: common.c:1604 common.c:1696 common.c:1782
#, c-format
msgid "code page %d is not supported.\n"
msgstr "未支援%d 編碼頁。\n"
-#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
+#: common.c:1608 common.c:1700 common.c:1786 common.c:1846
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "略過 UTF-16 檔案 %s,wchar_t 的大小是 %d 位元組。\n"
-#: common.c:1629 common.c:1721 common.c:1807
+#: common.c:1611 common.c:1703 common.c:1789
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "略過 UTF-16 檔案 %s,UTF-16 轉換發生錯誤。\n"
-#: common.c:1633 common.c:1725 common.c:1811
+#: common.c:1615 common.c:1707 common.c:1793
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "略過 UTF-16 檔案 %s,UTF-16 轉換發生錯誤。\n"
-#: common.c:1699 common.c:1788 common.c:1853
+#: common.c:1681 common.c:1770 common.c:1835
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "略過 %s,不是一個普通檔案。\n"
-#: common.c:1702
+#: common.c:1684
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "略過 %s,輸出檔 %s 是一個符號連結。.\n"
-#: common.c:1705 common.c:1794 common.c:1858
+#: common.c:1687 common.c:1776 common.c:1840
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "略過符號連結 %s,目標不是一個普通檔案。\n"
-#: common.c:1708
+#: common.c:1690
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "略過 %s,符號連結 %s 目標不是一個普通檔案。\n"
-#: common.c:1731
+#: common.c:1713
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
-#: common.c:1734
+#: common.c:1716
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
-#: common.c:1736
+#: common.c:1718
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
@@ -559,42 +533,42 @@ msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1747
+#: common.c:1729
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
-#: common.c:1750
+#: common.c:1732
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
-#: common.c:1752
+#: common.c:1734
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
-#: common.c:1758
+#: common.c:1740
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "轉換檔案 %s 到 %s 錯誤\n"
-#: common.c:1791
+#: common.c:1773
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "略過符號連結 %s。\n"
-#: common.c:1817
+#: common.c:1799
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式...\n"
-#: common.c:1820
+#: common.c:1802
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式...\n"
-#: common.c:1822
+#: common.c:1804
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式...\n"
@@ -604,76 +578,76 @@ msgstr "正在轉換 %s 為DOS 格式...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1832
+#: common.c:1814
#, fuzzy, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式...\n"
-#: common.c:1835
+#: common.c:1817
#, fuzzy, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式...\n"
-#: common.c:1837
+#: common.c:1819
#, fuzzy, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式...\n"
-#: common.c:1843
+#: common.c:1825
#, c-format
msgid "problems converting file %s\n"
msgstr "轉換檔案 %s 錯誤\n"
-#: common.c:1911 common.c:1988
+#: common.c:1949 common.c:2001
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2161
+#: common.c:2162
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr ""
-#: common.c:2280 common.c:2323
+#: common.c:2287 common.c:2330
#, c-format
msgid "active code page: %d\n"
msgstr "作用中編碼頁:%d\n"
-#: common.c:2335
+#: common.c:2342
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "指定的轉換模式 %s 不合法\n"
-#: common.c:2343 common.c:2369
+#: common.c:2350 common.c:2380
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "選項'%s' 需要一個引數\n"
-#: common.c:2361
+#: common.c:2372
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "指定的轉換模式 %s 不合法\n"
-#: common.c:2381 common.c:2394 common.c:2460
+#: common.c:2392 common.c:2405 common.c:2471
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "新檔模式中未指明檔案 %s 的目的位置\n"
-#: common.c:2474
+#: common.c:2485
#, fuzzy, c-format
msgid "can not read from input file: %s\n"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2486 common.c:2500
+#: common.c:2497 common.c:2511
#, c-format
msgid "can not write to output file: %s\n"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2577
+#: common.c:2588
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2592
+#: common.c:2603
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/test/Makefile b/test/Makefile
index e2a55e9..e2a55e9 100755..100644
--- a/test/Makefile
+++ b/test/Makefile
diff --git a/test/chard7.txt b/test/chard7.txt
index 3b3c9fc..3b3c9fc 100755..100644
--- a/test/chard7.txt
+++ b/test/chard7.txt
diff --git a/test/chardos.txt b/test/chardos.txt
index ff85358..ff85358 100755..100644
--- a/test/chardos.txt
+++ b/test/chardos.txt
diff --git a/test/charu7.txt b/test/charu7.txt
index 0073580..0073580 100755..100644
--- a/test/charu7.txt
+++ b/test/charu7.txt
diff --git a/test/dos_bin.txt b/test/dos_bin.txt
index 82c9864..82c9864 100755..100644
--- a/test/dos_bin.txt
+++ b/test/dos_bin.txt
Binary files differ
diff --git a/test/gb18030.txt b/test/gb18030.txt
index 9e294aa..9e294aa 100755..100644
--- a/test/gb18030.txt
+++ b/test/gb18030.txt
diff --git a/test/gb18030b.txt b/test/gb18030b.txt
index 2b08b78..2b08b78 100755..100644
--- a/test/gb18030b.txt
+++ b/test/gb18030b.txt
diff --git a/test/gb18030u.txt b/test/gb18030u.txt
index 7687092..7687092 100755..100644
--- a/test/gb18030u.txt
+++ b/test/gb18030u.txt
diff --git a/test/invalhig.txt b/test/invalhig.txt
index da9ce0f..da9ce0f 100755..100644
--- a/test/invalhig.txt
+++ b/test/invalhig.txt
Binary files differ
diff --git a/test/invallow.txt b/test/invallow.txt
index c870871..c870871 100755..100644
--- a/test/invallow.txt
+++ b/test/invallow.txt
Binary files differ
diff --git a/test/setlocale.c b/test/setlocale.c
new file mode 100644
index 0000000..005f0fb
--- /dev/null
+++ b/test/setlocale.c
@@ -0,0 +1,89 @@
+#include <stdio.h>
+#include <fcntl.h>
+#include <windows.h>
+#include <locale.h>
+
+/*
+
+ This program proves that when you set the locale to "", the Chinese ANSI CP936
+ encoded text is printed wrongly in a simplified Chinese regional setting.
+ UTF-8 is also printed wrongly.
+
+To test this program you first need to change the Windows locale setting to
+simplified Chinese. There is no problem doing that, because the "display
+language" will stay the original language, and you can still use your Windows.
+
+Control Panel > Region and Language > Administrative > Change system locale
+
+Select simplified Chinese and reboot your PC.
+
+For example output see setlocale.png.
+
+ */
+
+print_string(const char* str, const char* ustr, const wchar_t *wstr) {
+ int prevmode;
+ UINT outputCP;
+ int utf8 = 0;
+
+ /* Set utf8 to 1 to print UTF-8 text.
+ If you print both UTF-16 en UTF-8 in one program the console gets
+ mixed up. When the UTF-8 is printed after UTF-16 the UTF-16 text
+ is displayed wrongly.
+ */
+
+ if ( ! utf8 ) {
+ /* When the locale is set to "" the following line will produce wrong output */
+ printf ("ANSI CP936 %s\n",str);
+
+ /* UTF-16 will produce correct output in all cases. */
+ prevmode = _setmode(_fileno(stdout), _O_U16TEXT);
+ wprintf(L"UTF-16 %ls\n",wstr);
+ _setmode(_fileno(stdout), prevmode);
+ } else {
+
+ /* UTF-8 will produce wrong output when the locale is "".
+ When the locale is "C" wrong output with raster font, and correct output
+ with TrueType font. */
+ outputCP = GetConsoleOutputCP();
+ SetConsoleOutputCP(CP_UTF8);
+ wprintf(L"UTF-8 %S\n",ustr);
+ SetConsoleOutputCP(outputCP);
+
+ /* The code below produces wrong output in all cases */
+ // prevmode = _setmode(_fileno(stdout), _O_U8TEXT);
+ // wprintf(L"UTF-8 %S",ustr);
+ // _setmode(_fileno(stdout), prevmode);
+ }
+
+}
+
+int main() {
+
+ char str[5]; /* ANSI CP936 */
+ char ustr[15]; /* UTF-8 */
+ wchar_t wstr[10]; /* UTF-16 */
+
+/* Create ANSI CP936 string (meaning: Western-European). */
+ str[0] = 0xce;
+ str[1] = 0xf7;
+ str[2] = 0xc5;
+ str[3] = 0xb7;
+ str[4] = '\0';
+/* Convert CP936 to UTF-16. */
+ MultiByteToWideChar(936, 0, str, -1, wstr, sizeof(wstr));
+/* Convert UTF-16 to UTF-8 */
+ WideCharToMultiByte(CP_UTF8, 0, wstr, -1, ustr, sizeof(ustr), NULL, NULL);
+
+
+
+ setlocale (LC_ALL, "");
+ printf("==> setlocale (LC_ALL, \"\");\n");
+ print_string(str, ustr, wstr);
+
+ setlocale (LC_ALL, "C");
+ printf("\n==> setlocale (LC_ALL, \"C\");\n");
+ print_string(str, ustr, wstr);
+
+ return 0;
+}
diff --git a/test/setlocale.png b/test/setlocale.png
new file mode 100644
index 0000000..9920216
--- /dev/null
+++ b/test/setlocale.png
Binary files differ
diff --git a/test/testcmd.bat b/test/testcmd.bat
index 9431352..8acea08 100755
--- a/test/testcmd.bat
+++ b/test/testcmd.bat
@@ -8,7 +8,7 @@ REM This script will only run on Windows 7 and higher.
REM switch to UTF-8 code page
chcp 65001
-dos2unix -i uni_el_αρχείο.txt uni_zh_文件.txt
+dos2unix -D unicode -i uni_el_αρχείο.txt uni_zh_文件.txt
REM set code page back to original value
chcp 850
diff --git a/test/testps16.ps1 b/test/testps16.ps1
index 059ec03..c927442 100755
--- a/test/testps16.ps1
+++ b/test/testps16.ps1
Binary files differ
diff --git a/test/testps8.ps1 b/test/testps8.ps1
index 7bf72db..dc2bcfe 100755
--- a/test/testps8.ps1
+++ b/test/testps8.ps1
@@ -8,5 +8,8 @@ dos2unix -i uni_el_αρχείο.txt uni_zh_文件.txt
echo "test select-string:"
-# The following is not working. Why?
-dos2unix -i uni* | select-string -encoding utf8 -pattern αρχ \ No newline at end of file
+# select-string requires a BOM.
+$env:DOS2UNIX_DISPLAY_ENC = "utf8bom"
+dos2unix -i uni* | select-string -encoding utf8 -pattern αρχ
+
+$env:DOS2UNIX_DISPLAY_ENC = ""
diff --git a/test/testu16.c b/test/testu16.c
index 8ed706a..d0a8f9e 100755..100644
--- a/test/testu16.c
+++ b/test/testu16.c
@@ -3,44 +3,27 @@
#include <fcntl.h>
#include <io.h>
-/* This program demonstrates that when Unicode printed text is redirected to
- a file, the file is not in correct UTF-16.
+/* This program demonstrates Unicode UTF-16 printed text redirected to a
+ correct UTF-16 file.
+
+ .\testu16.exe > out.txt
+
*/
int main () {
int prevmode;
-/*
- When the output of this program is redirected to a file in Windows Command
- Prompt you get for line breaks 0d0a 00, while it should be 0d00 0a00.
-
-c:\test>.\testu16.exe > o.txt
-
-c:\test>xxd o.txt
-0000000: 6f00 6e00 6500 0d0a 0074 0077 006f 000d o.n.e....t.w.o..
-0000010: 0a00 7400 6800 7200 6500 6500 0d0a 00 ..t.h.r.e.e....
-
-
-
- When the output is redirected to a file in PowerShell, null characters
- 0000 are inserted. It looks like UTF-32 with an UTF-16 BOM and UTF-16 line
- breaks.
-
-PS C:\test> .\testu16.exe > p.txt
-PS C:\test> xxd p.txt
-0000000: fffe 6f00 0000 6e00 0000 6500 0000 0d00 ..o...n...e.....
-0000010: 0a00 0000 7400 0000 7700 0000 6f00 0000 ....t...w...o...
-0000020: 0d00 0a00 0000 7400 0000 6800 0000 7200 ......t...h...r.
-0000030: 0000 6500 0000 6500 0000 0d00 0a00 0000 ..e...e.........
-0000040: 0d00 0a00 ....
-
-*/
prevmode = _setmode(_fileno(stdout), _O_U16TEXT);
+ /* We need to print an UTF-16 BOM for correct redirection in PowerShell. */
+ fwprintf(stdout, L"\xfeff");
fwprintf(stdout,L"one\n");
fwprintf(stdout,L"two\n");
fwprintf(stdout,L"three\n");
+ /* Flushing stdout is required to get correct UTF-16.
+ This is required for both CMD.exe and PowerShell. */
+ fflush(stdout);
_setmode(_fileno(stdout), prevmode);
diff --git a/test/uni_nl_ëäï.txt b/test/uni_nl_ëäï.txt
index a9cd879..a9cd879 100755..100644
--- a/test/uni_nl_ëäï.txt
+++ b/test/uni_nl_ëäï.txt
diff --git a/test/unix_bin.txt b/test/unix_bin.txt
index b2cafbc..b2cafbc 100755..100644
--- a/test/unix_bin.txt
+++ b/test/unix_bin.txt
Binary files differ
diff --git a/test/utf16.txt b/test/utf16.txt
index 868b5af..868b5af 100755..100644
--- a/test/utf16.txt
+++ b/test/utf16.txt
Binary files differ
diff --git a/test/utf16be.txt b/test/utf16be.txt
index 1be5db9..1be5db9 100755..100644
--- a/test/utf16be.txt
+++ b/test/utf16be.txt
Binary files differ
diff --git a/test/utf16bin.txt b/test/utf16bin.txt
index 6c4216b..6c4216b 100755..100644
--- a/test/utf16bin.txt
+++ b/test/utf16bin.txt
Binary files differ
diff --git a/test/utf16le.txt b/test/utf16le.txt
index db9f535..db9f535 100755..100644
--- a/test/utf16le.txt
+++ b/test/utf16le.txt
Binary files differ
diff --git a/test/utf16m.txt b/test/utf16m.txt
index cd523f8..cd523f8 100755..100644
--- a/test/utf16m.txt
+++ b/test/utf16m.txt
Binary files differ
diff --git a/test/utf16u.txt b/test/utf16u.txt
index 2bd9b3b..2bd9b3b 100755..100644
--- a/test/utf16u.txt
+++ b/test/utf16u.txt
Binary files differ
diff --git a/test/utf8dos.txt b/test/utf8dos.txt
index 76afa4f..76afa4f 100755..100644
--- a/test/utf8dos.txt
+++ b/test/utf8dos.txt
diff --git a/test/utf8dosn.txt b/test/utf8dosn.txt
index 154aa88..154aa88 100755..100644
--- a/test/utf8dosn.txt
+++ b/test/utf8dosn.txt
diff --git a/test/utf8unix.txt b/test/utf8unix.txt
index 8b93c0c..8b93c0c 100755..100644
--- a/test/utf8unix.txt
+++ b/test/utf8unix.txt
diff --git a/test/utf8unxb.txt b/test/utf8unxb.txt
index f670e9b..f670e9b 100755..100644
--- a/test/utf8unxb.txt
+++ b/test/utf8unxb.txt
diff --git a/unix2dos.c b/unix2dos.c
index 791ee6c..4ece0b6 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -8,7 +8,7 @@
* See also http://www.freebsd.org/copyright/freebsd-license.html
* --------
*
- * Copyright (C) 2009-2015 Erwin Waterlander
+ * Copyright (C) 2009-2016 Erwin Waterlander
* Copyright (C) 1994-1995 Benjamin Lin.
* All rights reserved.
*
@@ -66,10 +66,10 @@
void PrintLicense(void)
{
- printf("%s", _("\
-Copyright (C) 2009-2015 Erwin Waterlander\n\
+ D2U_ANSI_FPRINTF(stdout,_("\
+Copyright (C) 2009-%d Erwin Waterlander\n\
Copyright (C) 1994-1995 Benjamin Lin\n\
-All rights reserved.\n\n"));
+All rights reserved.\n\n"),2016);
PrintBSDLicense();
}
@@ -145,8 +145,8 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
}
break;
}
@@ -205,8 +205,8 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x00%02X found at line %u\n"), TempChar, line_nr);
}
break;
}
@@ -257,16 +257,16 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *prog
default: /* unknown FromToMode */
;
#if DEBUG
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
exit(1);
#endif
}
if (ipFlag->status & UNICODE_CONVERSION_ERROR)
ipFlag->line_nr = line_nr;
if ((RetVal == 0) && (ipFlag->verbose > 1)) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
}
return RetVal;
}
@@ -323,8 +323,8 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ConvTable = U2DAsciiTable;
if ((ipFlag->ConvMode > CONVMODE_7BIT) && (ipFlag->verbose)) { /* not ascii or 7bit */
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("using code page %d.\n"), ipFlag->ConvMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("using code page %d.\n"), ipFlag->ConvMode);
}
/* LF -> CR-LF */
@@ -345,8 +345,8 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x%02X found at line %u\n"), TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x%02X found at line %u\n"), TempChar, line_nr);
}
break;
}
@@ -405,8 +405,8 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
ipFlag->status |= BINARY_FILE ;
if (ipFlag->verbose) {
if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1;
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Binary symbol 0x%02X found at line %u\n"), TempChar, line_nr);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Binary symbol 0x%02X found at line %u\n"), TempChar, line_nr);
}
break;
}
@@ -457,14 +457,14 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progn
default: /* unknown FromToMode */
;
#if DEBUG
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("program error, invalid conversion mode %d\n"),ipFlag->FromToMode);
exit(1);
#endif
}
if ((RetVal == 0) && (ipFlag->verbose > 1)) {
- d2u_fprintf(stderr, "%s: ", progname);
- d2u_fprintf(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
+ D2U_UTF8_FPRINTF(stderr, "%s: ", progname);
+ D2U_UTF8_FPRINTF(stderr, _("Converted %u out of %u line breaks.\n"), converted, line_nr -1);
}
return RetVal;
}
@@ -494,8 +494,8 @@ int main (int argc, char *argv[])
if (strlen(ptr) < sizeof(localedir))
strcpy(localedir,ptr);
else {
- d2u_fprintf(stderr,"%s: ",progname);
- d2u_ansi_fprintf(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"));
+ D2U_UTF8_FPRINTF(stderr,"%s: ",progname);
+ D2U_ANSI_FPRINTF(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"));
strcpy(localedir,LOCALEDIR);
}
}
@@ -503,8 +503,16 @@ int main (int argc, char *argv[])
#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__))
/* setlocale() is also needed for nl_langinfo() */
+#if (defined(_WIN32) && !defined(__CYGWIN__))
+/* When the locale is set to "" on Windows all East-Asian multi-byte ANSI encoded text is printed
+ wrongly when you use standard printf(). Also UTF-8 code is printed wrongly. See also test/setlocale.c.
+ When we set the locale to "C" gettext still translates the messages on Windows. On Unix this would disable
+ gettext. */
+ setlocale (LC_ALL, "C");
+#else
setlocale (LC_ALL, "");
#endif
+#endif
#ifdef ENABLE_NLS
bindtextdomain (PACKAGE, localedir);
@@ -515,8 +523,8 @@ int main (int argc, char *argv[])
/* variable initialisations */
pFlag = (CFlag*)malloc(sizeof(CFlag));
if (pFlag == NULL) {
- d2u_fprintf(stderr, "unix2dos:");
- d2u_ansi_fprintf(stderr, " %s\n", strerror(errno));
+ D2U_UTF8_FPRINTF(stderr, "unix2dos:");
+ D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno));
return errno;
}
pFlag->FromToMode = FROMTO_UNIX2DOS; /* default unix2dos */
@@ -542,8 +550,8 @@ int main (int argc, char *argv[])
argv_glob = (char ***)malloc(sizeof(char***));
if (argv_glob == NULL) {
- d2u_fprintf(stderr, "%s:", progname);
- d2u_ansi_fprintf(stderr, " %s\n", strerror(errno));
+ D2U_UTF8_FPRINTF(stderr, "%s:", progname);
+ D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno));
return errno;
}
/* Glob the arguments and convert them to UTF-8 */
diff --git a/version.mk b/version.mk
index a624b74..79da3ac 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-DOS2UNIX_VERSION = 7.3.2
-DOS2UNIX_VERSION_SHORT = 732
-DOS2UNIX_DATE = 2015-11-20
+DOS2UNIX_VERSION = 7.3.3
+DOS2UNIX_VERSION_SHORT = 733
+DOS2UNIX_DATE = 2016-02-13
DOS2UNIX_AUTHOR = 'Erwin Waterlander'
diff --git a/wcc.mif b/wcc.mif
index 651355f..651355f 100755..100644
--- a/wcc.mif
+++ b/wcc.mif