summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:27:40 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:27:44 +0900
commit842ebc0fa15fca613e0c9fce10dd63fa09d27666 (patch)
treeac48c8ec511c025b1b479462056510eedc3ac6bc
parent3d6ee8c3ccc0f65c7c87122dba80908ae751aa16 (diff)
downloaddos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.tar.gz
dos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.tar.bz2
dos2unix-842ebc0fa15fca613e0c9fce10dd63fa09d27666.zip
Imported Upstream version 6.0.4
Change-Id: I3ce28283323425d17877da03683ac6a2b70f2382 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat
-rw-r--r--ChangeLog.txt60
-rw-r--r--INSTALL.txt78
-rw-r--r--Makefile113
-rw-r--r--NEWS.txt8
-rw-r--r--README.txt14
-rw-r--r--common.c12
-rw-r--r--common.h18
-rw-r--r--djgpp.mak8
-rw-r--r--dos2unix.c31
-rw-r--r--emx.mak8
-rwxr-xr-xman/es/man1/dos2unix.pod38
-rw-r--r--man/man1/Makefile44
-rw-r--r--man/man1/dos2unix.pod34
-rw-r--r--man/nl/man1/dos2unix.pod42
-rw-r--r--mingw.mak8
-rw-r--r--mingw32.mak39
-rw-r--r--mingw64.mak10
-rw-r--r--po/de.po144
-rw-r--r--po/dos2unix.pot135
-rw-r--r--po/eo-x.po159
-rw-r--r--po/eo.po143
-rw-r--r--po/es.po141
-rw-r--r--po/nl.po141
-rw-r--r--po/ru.po443
-rw-r--r--test/utf16_be_nobom.txtbin0 -> 1924 bytes
-rw-r--r--test/utf16_le_nobom.txtbin0 -> 1924 bytes
-rw-r--r--unix2dos.c31
-rw-r--r--version.mk6
28 files changed, 1432 insertions, 476 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9702cd1..ae3a3ea 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,63 @@
+2013-12-30 Erwin Waterlander <waterlan@xs4all.nl>
+ * Version 6.0.4
+ * man/nonlatin/man1/ru/dos2unix.pod: Removed. Russian
+ translation of manual moved to later release.
+
+2013-11-26 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile, common.c: When MinGW-w64 is used for 32 bit, option
+ -V prints (MinGW-w64) for used compiler name.
+
+2013-11-24 Erwin Waterlander <waterlan@xs4all.nl>
+ * mingw32.mak: New makefile for MinGW-w64 targeting win32.
+ MinGW-w64 supports Large File Support (LFS) with
+ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 while mingw.org
+ doesn't. Dos2unix failed when concurrent dos2unix processes
+ processed huge files on Windows network share drives.
+ Using MinGW-w64 with LFS support fixed the problem.
+ Thanks to report by F.J. Brandelik.
+
+
+2013-10-07 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Set MAN_NONLATIN back to 1. Include non-Latin
+ manuals in source package to prevent compilation troubles.
+ Target 'clean' keeps non-Latin manuals. Use 'maintainer-clean'
+ to erase them.
+
+2013-10-05 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: By default don't build non-Latin1 manuals. There are
+ still too many old perl/pod2man versions around (perl < 5.10.1).
+ Add MAN_NONLATIN=1 to enable non-Latin1 manuals.
+
+2013-10-01 Erwin Waterlander <waterlan@xs4all.nl>
+ * man/man1/Makefile: Support non-Latin1 man pages.
+ * Makefile: Support non-Latin1 man pages.
+ * man/nonlatin/man1/ru/dos2unix.pod: Placeholder for Russian manual.
+
+2013-09-13 Андрей Углик (Andrei Uhlik) <uglika@gmail.com>
+ * po/ru.po: New Russian translation of the messages.
+
+2013-08-05 Erwin Waterlander <waterlan@xs4all.nl>
+ * po/de.po: Update German translations. Thanks to Lars Wendler.
+
+2013-06-14 Erwin Waterlander <waterlan@xs4all.nl>
+ * dos2unix.c/unix2dos.c: New options -ul and -ub to convert
+ UTF-16 files without BOM.
+
+2013-06-11 Erwin Waterlander <waterlan@xs4all.nl>
+ * dos2unix.c/unix2dos.c: Print value of binary symbol
+ when found.
+
+2013-03-12 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile: Set CC to gcc for MSYS target. Otherwise
+ /mingw/bin/cc is used.
+
+2013-01-27 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile:
+ - CC and CPP can be overridden by environment.
+ - CFLAGS optimization flags can be overridden by environment.
+ - Separate LIBS from LDFLAGS.
+ Thanks to Justin Lecher <jlec@gentoo.org>
+
2013-01-25 Erwin Waterlander <waterlan@xs4all.nl>
* Version 6.0.3
diff --git a/INSTALL.txt b/INSTALL.txt
index e265f55..f024389 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -9,6 +9,8 @@ PREREQUISITES
* GNU coreutils: Core utilities package (chmod, install, mkdir,
mv, rm, uname)
* perl : Practical Extraction and Report Language (perlpod)
+ For manuals in non-Latin1 (non-Western-European)
+ languages perl >= 5.10.1 is required.
Optional (depending on build targets):
* gettext : Framework to help GNU packages produce multi-
@@ -95,6 +97,60 @@ NATIVE LANGUAGE SUPPORT
make clean install ENABLE_NLS=
+INTERNATIONAL MAN PAGES
+
+ Man pages for Latin1 (Western European) scripts are supported
+ on all systems.
+
+ Man pages for non-Latin1 scripts are only supported on modern
+ Unix (like) systems. This is controlled via the make variable
+ MAN_NONLATIN. When the value of MAN_NONLATIN is equal to 1
+ (default for Unix) non-Latin manual pages are built. For DOS,
+ Windows, OS/2 this variable is default empty.
+
+ Enable non-Latin man pages:
+
+ make install MAN_NONLATIN=1
+
+ Disable non-Latin man pages:
+
+ make install MAN_NONLATIN=
+
+ Generation of non-Latin1 manuals requires Perl >= 5.10.1.
+
+
+ Originally the Unix man system supported only man pages in Latin1
+ format (ISO-8859-1). Although the world is moving to Unicode format
+ (UTF-8) there is still a lot of Latin1 legacy around.
+
+ The English man page is a pure ASCII file and is readable on all
+ platforms.
+
+ The non-English Latin script man pages are ASCII files and use GNU
+ groff extension codes (see man groff_char) for the non-ASCII Latin1
+ characters. This way the man pages show properly in UTF-8 environments
+ (modern Linuxes) and legacy Latin1 (DJGPP, MinGW, Cygwin, old Unixes).
+ GNU groff is wide spread, but there are also roff implementations
+ around that don't support the GNU extensions.
+
+ Man pages for non-Latin1 scripts are encoded in UTF-8. These do not
+ show properly on old systems. Therefore these are not built for DOS,
+ and Windows by default. Man pages in UTF-8 format are shown properly
+ on Linux. Not all roff implementations support UTF-8.
+
+ In order to show UTF-8 man pages properly on Cygwin you need to do the
+ following:
+
+ In /etc/man.conf, change the NROFF definition to use 'preconv'.
+
+ NROFF /usr/bin/preconv | /usr/bin/nroff -c -mandoc 2>/dev/null
+
+ To view the man page set the correct locale. E.g. for Russian:
+
+ export LANG=ru_RU.UTF-8
+ man dos2unix
+
+
LARGE FILE SUPPORT
Large File Support (LFS) is by default enabled. This enables
@@ -106,6 +162,10 @@ LARGE FILE SUPPORT
Disable LFS:
make clean install LFS=
+ The gcc compiler from the mingw.org project does not support LFS.
+ It is advised to use the mingw-w64 compiler tool chain for LFS on
+ 32 bit Windows.
+
UNICODE SUPPORT
@@ -154,16 +214,24 @@ DOCUMENTATION
PDF generation requires GhostScript to be installed.
-WINDOWS PORT
+WINDOWS 32 BIT PORT
- To compile a version for Windows, get the Mingw compiler
- <http://www.mingw.org>, and use makefile mingw.mak:
+ 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-w64 compiler <http://mingw-w64.sourceforge.net>:
+ I used Ruben van Boxem release installed in c:\mingw32
+ 32 bit host, 32 bit target: i686-w64-mingw32-gcc-4.6.3-2-release-win32_rubenvb.7z
+
+ make -f mingw32.mak clean
+ make -f mingw32.mak
+ make -f mingw32.mak strip
+ make -f mingw32.mak install
+
Or use Open Watcom and type:
wmake -f wccwin32.mak clean
@@ -185,8 +253,10 @@ WINDOWS PORT
WINDOWS 64 BIT PORT
- To compile a version for Windows, get the Mingw-w64 compiler
+ To compile a version for 64 bit Windows, get the Mingw-w64 compiler
<http://mingw-w64.sourceforge.net>, and use makefile mingw64.mak:
+ I used Ruben van Boxem release installed in c:\mingw64
+ 32 bit host, 64 bit target: x86_64-w64-mingw32-gcc-4.6.3-2-release-win32_rubenvb.7z
make -f mingw64.mak clean
make -f mingw64.mak
diff --git a/Makefile b/Makefile
index 25400de..e02287f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# Author: Erwin Waterlander
#
-# Copyright (C) 2009-2012 Erwin Waterlander
+# Copyright (C) 2009-2013 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,10 @@
include version.mk
+.PHONY: man txt html pdf mofiles tags merge
-CC = gcc
-CPP = cpp
+CC ?= gcc
+CPP ?= cpp
CPP_FLAGS_POD = ALL
STRIP = strip
@@ -52,6 +53,10 @@ ENABLE_NLS = 1
LFS = 1
DEBUG = 0
UCS = 1
+# I can set MAN_NONLATIN to 1, despite the compilation issues with old Perl
+# versions, because I'm going to include the non-Latin1 manual files into the
+# source package.
+MAN_NONLATIN = 1
EXE=
@@ -92,7 +97,7 @@ HTMLEXT = htm
# By default we generate only English text and html manuals.
# Then we don't need "pod2text --utf8" and we have no dependency on iconv.
DOCFILES = man/man1/$(PACKAGE).txt man/man1/$(PACKAGE).$(HTMLEXT)
-INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
+INSTALL_OBJS_DOC = README.txt INSTALL.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
PODFILES_ALL = man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
PODFILES = $(wildcard man/*/man1/dos2unix.pod)
@@ -133,8 +138,9 @@ endif
ifeq (cygwin,$(D2U_OS))
ifdef ENABLE_NLS
- LDFLAGS_EXTRA = -lintl -liconv -Wl,--enable-auto-import
+ LIBS_EXTRA = -lintl -liconv
endif
+ LDFLAGS_EXTRA = -Wl,--enable-auto-import
EXE = .exe
# allow non-cygwin clients which do not understand cygwin
# symbolic links to launch applications...
@@ -146,17 +152,20 @@ endif
# documentation directories.
docsubdir = $(PACKAGE)
VERSIONSUFFIX = -cygwin
+ MAN_NONLATIN = 1
endif
ifndef D2U_OS
ifeq ($(findstring MSYS,$(shell uname)),MSYS)
+ CC=gcc
D2U_OS = msys
EXE = .exe
VERSIONSUFFIX = -msys
EO_XNOTATION=1
UCS =
+ MAN_NONLATIN =
ifdef ENABLE_NLS
- LDFLAGS_EXTRA = -lintl -liconv
+ LIBS_EXTRA = -lintl -liconv
endif
endif
endif
@@ -169,10 +178,14 @@ ifeq ($(findstring MINGW32,$(shell uname)),MINGW32)
VERSIONSUFFIX = -win32
LINK = cp -f
EO_XNOTATION=1
+ MAN_NONLATIN =
ifdef ENABLE_NLS
- LDFLAGS_EXTRA = -lintl -liconv
+ LIBS_EXTRA = -lintl -liconv
ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
endif
+ifeq ($(findstring w64-mingw32,$(shell gcc -dumpmachine)),w64-mingw32)
+ CFLAGS_COMPILER = -DD2U_COMPILER=MINGW32_W64
+endif
endif
endif
@@ -186,9 +199,10 @@ ifneq ($(DJGPP),)
docsubdir = dos2unix
EO_XNOTATION=1
UCS =
+ MAN_NONLATIN =
ZIPOBJ_EXTRA = bin/cwsdpmi.exe
ifdef ENABLE_NLS
- LDFLAGS_EXTRA = -lintl -liconv
+ LIBS_EXTRA = -lintl -liconv
endif
endif
endif
@@ -202,9 +216,10 @@ ifeq ($(shell uname),OS/2)
LINK_MAN = cp -f
EO_XNOTATION=1
UCS =
+ MAN_NONLATIN =
LDFLAGS_EXTRA = -Zargs-wild
ifdef ENABLE_NLS
- LDFLAGS_EXTRA += -lintl -liconv
+ LIBS_EXTRA += -lintl -liconv
endif
endif
endif
@@ -214,7 +229,8 @@ ifeq (FreeBSD, $(shell uname -s))
D2U_OS = freebsd
ifdef ENABLE_NLS
CFLAGS_OS = -I/usr/local/include
- LDFLAGS_EXTRA = -lintl -L/usr/local/lib
+ LDFLAGS_EXTRA = -L/usr/local/lib
+ LIBS_EXTRA = -lintl
endif
endif
endif
@@ -223,7 +239,8 @@ ifeq (Darwin, $(shell uname -s))
D2U_OS = Darwin
ifdef ENABLE_NLS
CFLAGS_OS = -I/usr/local/include
- LDFLAGS_EXTRA = -lintl -L/usr/local/lib
+ LDFLAGS_EXTRA = -L/usr/local/lib
+ LIBS_EXTRA = -lintl
endif
endif
@@ -236,7 +253,7 @@ endif
ifeq (sun,$(D2U_OS))
# Running under SunOS/Solaris
- LDFLAGS_EXTRA = -lintl
+ LIBS_EXTRA = -lintl
endif
ifndef D2U_OS
@@ -263,14 +280,27 @@ ifdef EO_XNOTATION
EO_NOTATION = -x
endif
+ifeq ($(MAN_NONLATIN),1)
+PODFILES_NONLATIN = $(wildcard man/nonlatin/*/man1/dos2unix.pod)
+MANFILES_NONLATIN = $(patsubst %.pod,%.1,$(PODFILES_NONLATIN))
+TXTFILES_NONLATIN = $(patsubst %.pod,%.txt,$(PODFILES_NONLATIN))
+HTMLFILES_NONLATIN = $(patsubst %.pod,%.$(HTMLEXT),$(PODFILES_NONLATIN))
+# PostScript and PDF generation from UTF-8 manuals is not working,
+# or I don't know how to do it.
+#PSFILES_NONLATIN = $(patsubst %.pod,%.ps,$(PODFILES_NONLATIN))
+#PDFFILES_NONLATIN = $(patsubst %.pod,%.pdf,$(PODFILES_NONLATIN))
+endif
+
CFLAGS_USER =
-CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
+CFLAGS ?= -O2
+CFLAGS += -Wall $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER)
EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \
-DVER_DATE=\"$(DOS2UNIX_DATE)\" \
-DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \
-DDEBUG=$(DEBUG) \
- $(CFLAGS_OS)
+ $(CFLAGS_OS) \
+ $(CFLAGS_COMPILER)
ifeq ($(DEBUG), 1)
EXTRA_CFLAGS += -g
@@ -290,19 +320,22 @@ endif
LDFLAGS_USER =
LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER)
+LIBS = $(LIBS_EXTRA)
DEFS_USER =
DEFS = $(EXTRA_DEFS) $(DEFS_USER)
# .......................................................... targets ...
-all: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) $(DOCFILES) $(MOFILES) $(EOX_POFILES) $(MANFILES) man/man1/dos2unix.1
+all: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) $(DOCFILES) $(MOFILES) $(EOX_POFILES) man/man1/dos2unix.1 $(MANFILES) $(MANFILES_NONLATIN)
status:
@echo "D2U_OS = $(D2U_OS)"
@echo "UCS = $(UCS)"
@echo "CFLAGS = $(CFLAGS)"
@echo "EXTRA_CFLAGS = $(EXTRA_CFLAGS)"
+ @echo "LDFLAGS = $(LDFLAGS)"
+ @echo "LIBS = $(LIBS)"
common.o : common.c common.h
$(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@
@@ -310,38 +343,40 @@ common.o : common.c common.h
querycp.o : querycp.c querycp.h
$(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@
-dos2unix.o : dos2unix.c dos2unix.h querycp.h common.h
+dos2unix.o : dos2unix.c dos2unix.h querycp.h common.h version.mk
$(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@
-unix2dos.o : unix2dos.c unix2dos.h querycp.h common.h
+unix2dos.o : unix2dos.c unix2dos.h querycp.h common.h version.mk
$(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@
$(BIN): dos2unix.o querycp.o common.o
- $(CC) $+ $(LDFLAGS) -o $@
+ $(CC) $+ $(LDFLAGS) $(LIBS) -o $@
$(UNIX2DOS_BIN): unix2dos.o querycp.o common.o
- $(CC) $+ $(LDFLAGS) -o $@
+ $(CC) $+ $(LDFLAGS) $(LIBS) -o $@
$(MAC2UNIX_BIN) : $(BIN)
$(LINK) $< $@
%.1 : %.pod
- $(MAKE) -C man/man1
+ $(MAKE) -C man/man1 MAN_NONLATIN=$(MAN_NONLATIN)
$(UNIX2MAC_BIN) : $(UNIX2DOS_BIN)
$(LINK) $< $@
mofiles: $(MOFILES)
-html: $(HTMLFILES)
+html: $(HTMLFILES) $(HTMLFILES_NONLATIN)
-txt: $(TXTFILES)
+txt: $(TXTFILES) $(TXTFILES_NONLATIN)
-ps: $(PSFILES)
+ps: $(PSFILES) $(PSFILES_NONLATIN)
-pdf: $(PDFFILES)
+pdf: $(PDFFILES) $(PDFFILES_NONLATIN)
-doc: $(DOCFILES) $(MANFILES) man/man1/dos2unix.1
+man: man/man1/dos2unix.1 $(MANFILES) $(MANFILES_NONLATIN)
+
+doc: $(DOCFILES)
tags: $(POT)
@@ -375,6 +410,10 @@ $(POT) : dos2unix.c unix2dos.c common.c
man/man1/$(PACKAGE).txt : man/man1/$(PACKAGE).pod
pod2text $< > $@
+# Non-Latin1 script manuals are already in UTF-8 format.
+man/nonlatin/ru/man1/$(PACKAGE).txt : man/nonlatin/ru/man1/$(PACKAGE).pod
+ pod2text $< > $@
+
%.ps : %.1
groff -man $< -T ps > $@
@@ -401,6 +440,9 @@ man/nl/man1/$(PACKAGE).$(HTMLEXT) : man/nl/man1/$(PACKAGE).ut8
man/es/man1/$(PACKAGE).$(HTMLEXT) : man/es/man1/$(PACKAGE).ut8
pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa" $< > $@
+man/nonlatin/ru/man1/$(PACKAGE).$(HTMLEXT) : man/nonlatin/ru/man1/$(PACKAGE).pod
+ pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
+
install: all
$(MKDIR) -p -m 755 $(DESTDIR)$(bindir)
$(INSTALL) -m 755 $(BIN) $(DESTDIR)$(bindir)
@@ -428,6 +470,11 @@ endif
$(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 ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), $(MKDIR) -p -m 755 $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), $(INSTALL) -m 644 $(manfile) $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), cd $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), cd $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(dir $(manfile))) ; $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), cd $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(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 ;)
@@ -453,6 +500,10 @@ install-doc: $(INSTALL_OBJS_DOC)
$(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 txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;)
+ $(foreach txtfile, $(wildcard man/nonlatin/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(txtfile),)) ;)
+ $(foreach htmlfile, $(wildcard man/nonlatin/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(htmlfile),)) ;)
+ $(foreach htmlfile, $(wildcard man/nonlatin/*/man1/*.$(HTMLEXT)), $(INSTALL) -m 644 $(htmlfile) $(DESTDIR)$(docdir)/$(word 3,$(subst /, ,$(htmlfile),)) ;)
uninstall:
@echo "-- target: uninstall"
@@ -468,6 +519,7 @@ endif
-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2DOS).1
-rm -f $(DESTDIR)$(mandir)/man1/$(UNIX2MAC).1
$(foreach manfile, $(MANFILES), rm -f $(DESTDIR)$(datarootdir)/$(manfile) ;)
+ $(foreach manfile, $(MANFILES_NONLATIN), rm -f $(DESTDIR)$(datarootdir)/$(subst nonlatin/,,$(manfile)) ;)
-rm -rf $(DESTDIR)$(docdir)
mostlyclean:
@@ -493,12 +545,23 @@ clean: mostlyclean
rm -f man/*/man1/*.ps
rm -f man/*/man1/*.pdf
rm -f man/*/man1/*.ut8
+ rm -f man/nonlatin/*/man1/*.ps
+ rm -f man/nonlatin/*/man1/*.pdf
distclean: clean
+# Because there is so much trouble with generating non-Latin1 man pages with
+# pod2man, due to old Perl versions (< 5.10.1) on many systems, I include the
+# non-Latin1 man pages in the source tar file.
+# Old pod2man versions do not have the --utf8 option. Old pod2man, pod2text,
+# and pod2html do not support the =encoding command.
+
maintainer-clean: distclean
@echo 'This command is intended for maintainers to use; it'
@echo 'deletes files that may need special tools to rebuild.'
+ rm -f man/nonlatin/*/man1/*.txt
+ rm -f man/nonlatin/*/man1/*.$(HTMLEXT)
+ rm -f man/nonlatin/*/man1/*.1
realclean: maintainer-clean
diff --git a/NEWS.txt b/NEWS.txt
index 62ac7d5..876a4b9 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,11 @@
+2013-12-30: Version 6.0.4
+
+ * New options -ul and -ub to convert UTF-16 files without BOM.
+ * New Russian translation of the messages.
+ * Build 32 bit Windows binaries with Large File Support (LFS)
+ by using mingw-w64 for 32 bit Windows.
+ * When a binary symbol is encountered the value is printed.
+
2013-01-25: Version 6.0.3
* Source code compiles with Microsoft Visual C.
diff --git a/README.txt b/README.txt
index 16bdd16..318e9de 100644
--- a/README.txt
+++ b/README.txt
@@ -35,7 +35,8 @@ HISTORY
Features
- * Native language support: Dutch, English, Esperanto, German, Spanish.
+ * Native language support: Dutch, English, Esperanto, German, Russian,
+ Spanish.
* Automatically skips binary and non-regular files
* In-place, paired, or stdio mode conversion.
* Keep original file dates option.
@@ -46,7 +47,7 @@ HISTORY
AUTHORS
- Erwin Waterlander version 3.2-6.0.3 2009-2013
+ Erwin Waterlander version 3.2-6.0.4 2009-2013
Christian Wurll version 3.1 1998
Bernd Johannes Wuebben version 3.0 1998
Benjamin Lin version 1.1-2.3 1994-1995
@@ -57,6 +58,8 @@ TRANSLATORS
Dutch Erwin Waterlander <waterlan@xs4all.nl>
Esperanto Rugxulo <rugxulo@gmail.com>
German Philipp Thomas <psmt@opensuse.org>
+ German Lars Wendler <polynomial-c@gentoo.org> Version 6.0.4.
+ Russian Андрей Углик (Andrei Uhlik) <uglika@gmail.com>
Spanish Julio A. Freyre-Gonzalez <jfreyreg@gmail.com>
ACKNOWLEDGEMENTS
@@ -64,7 +67,7 @@ ACKNOWLEDGEMENTS
Rugxulo query_con_codepage(), code page detection in DOS.
Rugxulo DJGPP stubs for mac2unix and unix2mac.
Jari Aalto Improvements man page.
- Jari Aalto Improvments Makefile.
+ Jari Aalto Improvements Makefile.
Ben Pfaff Treat form feeds as valid text.
Marc Gianzero Darwin OS port.
Elbert Pol OS/2 port.
@@ -79,7 +82,10 @@ ACKNOWLEDGEMENTS
Steven H. Levine Support wildcard expansion on OS/2.
Steve Hay Support wildcard expansion on win64.
Michael Schindler Fixed compiler warning.
- Somsak Pattanaprateep Print line number when binary symbol is found.
+ Somsak Pattanaprateep Print line number when binary symbol is found.
+ Justin Lecher Makefile improvement.
+ F.J. Brandelik Reported problems when win32 version processes
+ huge files on a network drive.
FINDUTILS
diff --git a/common.c b/common.c
index 72803a5..d200ba3 100644
--- a/common.c
+++ b/common.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2012 Erwin Waterlander
+ * Copyright (C) 2009-2013 Erwin Waterlander
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -215,12 +215,17 @@ Usage: %s [options] [file ...] [-n infile outfile ...]\n\
-n, --newfile write to new file\n\
infile original file in new file mode\n\
outfile output file in new file mode\n\
- -o, --oldfile write to old file\n\
+ -o, --oldfile write to old file (default)\n\
file ... files to convert in old file mode\n\
-q, --quiet quiet mode, suppress all warnings\n\
always on in stdio mode\n\
-s, --safe skip binary files (default)\n"),
progname, VER_REVISION, VER_DATE, progname);
+#ifdef D2U_UNICODE
+ fprintf(stderr, _("\
+ -ul, --assume-utf16le Assume that the input format is UTF-16LE\n\
+ -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"));
+#endif
#ifdef S_ISLNK
fprintf(stderr, _("\
-F, --follow-symlink follow symbolic links and convert the targets\n\
@@ -232,6 +237,7 @@ Usage: %s [options] [file ...] [-n infile outfile ...]\n\
-V, --version display version number\n"));
}
+#define MINGW32_W64 1
void PrintVersion(char *progname)
{
@@ -255,6 +261,8 @@ void PrintVersion(char *progname)
fprintf(stderr, "%s", _("Windows 64 bit version (MinGW-w64).\n"));
#elif defined(__WATCOMC__) && defined(__NT__)
fprintf(stderr, "%s", _("Windows 32 bit version (WATCOMC).\n"));
+#elif defined(_WIN32) && defined(__MINGW32__) && (D2U_COMPILER == MINGW32_W64)
+ fprintf(stderr, "%s", _("Windows 32 bit version (MinGW-w64).\n"));
#elif defined(_WIN32) && defined(__MINGW32__)
fprintf(stderr, "%s", _("Windows 32 bit version (MinGW).\n"));
#elif defined(_WIN64) && defined(_MSC_VER)
diff --git a/common.h b/common.h
index cf7c885..fa3f357 100644
--- a/common.h
+++ b/common.h
@@ -165,14 +165,16 @@
#define WCHAR_T_TOO_SMALL 0x80
#define UNICODE_CONVERSION_ERROR 0x100
-#define CONVMODE_ASCII 0
-#define CONVMODE_7BIT 1
-#define CONVMODE_437 437
-#define CONVMODE_850 850
-#define CONVMODE_860 860
-#define CONVMODE_863 863
-#define CONVMODE_865 865
-#define CONVMODE_1252 1252
+#define CONVMODE_ASCII 0
+#define CONVMODE_UTF16LE 1
+#define CONVMODE_UTF16BE 2
+#define CONVMODE_7BIT 3
+#define CONVMODE_437 437
+#define CONVMODE_850 850
+#define CONVMODE_860 860
+#define CONVMODE_863 863
+#define CONVMODE_865 865
+#define CONVMODE_1252 1252
#define FROMTO_DOS2UNIX 0
#define FROMTO_MAC2UNIX 1
diff --git a/djgpp.mak b/djgpp.mak
index 40a9e1c..f811a81 100644
--- a/djgpp.mak
+++ b/djgpp.mak
@@ -11,7 +11,7 @@ ENABLE_NLS=
VERSIONSUFFIX=-dos32
ifdef ENABLE_NLS
-LDFLAGS_EXTRA = -lintl -liconv
+LIBS_EXTRA = -lintl -liconv
NLS_SUFFIX = -nls
endif
VERSIONSUFFIX = pm
@@ -20,13 +20,13 @@ ZIPOBJ_EXTRA = bin/cwsdpmi.exe
docsubdir = dos2unix
all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS=
+ $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS= MAN_NONLATIN=
install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS=
+ $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS= MAN_NONLATIN=
uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir)
+ $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir) MAN_NONLATIN=
clean:
$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
diff --git a/dos2unix.c b/dos2unix.c
index a0d582b..20bf44f 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -161,7 +161,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -199,7 +199,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -282,6 +282,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
switch (ipFlag->ConvMode)
{
case CONVMODE_ASCII: /* ascii */
+ case CONVMODE_UTF16LE: /* Assume UTF-16LE */
+ case CONVMODE_UTF16BE: /* Assume UTF-16BE */
ConvTable = D2UAsciiTable;
break;
case CONVMODE_7BIT: /* 7bit */
@@ -337,7 +339,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -372,7 +374,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -554,6 +556,12 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
}
InF = read_bom(InF, &ipFlag->bomtype);
+#ifdef D2U_UNICODE
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE))
+ ipFlag->bomtype = FILE_UTF16LE;
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE))
+ ipFlag->bomtype = FILE_UTF16BE;
+#endif
#ifdef D2U_UNICODE
#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */
@@ -587,7 +595,8 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
fprintf(TempF, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */
/* Turn off ISO and 7-bit conversion for Unicode text files */
- if (ipFlag->bomtype > 0)
+ /* When we assume UTF16, don't change the conversion mode. We need to remember it. */
+ if ((ipFlag->bomtype > 0) && (ipFlag->ConvMode != CONVMODE_UTF16LE) && (ipFlag->ConvMode != CONVMODE_UTF16BE))
ipFlag->ConvMode = CONVMODE_ASCII;
/* conversion sucessful? */
@@ -807,6 +816,12 @@ int ConvertDosToUnixStdio(CFlag *ipFlag, char *progname)
#endif
read_bom(stdin, &ipFlag->bomtype);
+#ifdef D2U_UNICODE
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE))
+ ipFlag->bomtype = FILE_UTF16LE;
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE))
+ ipFlag->bomtype = FILE_UTF16BE;
+#endif
if (ipFlag->add_bom)
fprintf(stdout, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */
@@ -976,6 +991,12 @@ int main (int argc, char *argv[])
pFlag->ConvMode = CONVMODE_865;
else if (strcmp(argv[ArgIdx],"-1252") == 0)
pFlag->ConvMode = CONVMODE_1252;
+#ifdef D2U_UNICODE
+ else if ((strcmp(argv[ArgIdx],"-ul") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16le") == 0))
+ pFlag->ConvMode = CONVMODE_UTF16LE;
+ else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0))
+ pFlag->ConvMode = CONVMODE_UTF16BE;
+#endif
else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0))
{
if (++ArgIdx < argc)
diff --git a/emx.mak b/emx.mak
index 99fa4a0..b14c7c9 100644
--- a/emx.mak
+++ b/emx.mak
@@ -8,18 +8,18 @@ ENABLE_NLS=1
LDFLAGS_EXTRA = -Zargs-wild
ifdef ENABLE_NLS
-LDFLAGS_EXTRA += -lintl -liconv
+LIBS_EXTRA += -lintl -liconv
endif
ZIPOBJ_EXTRA =
all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 UCS=
+ $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 UCS= MAN_NONLATIN=
install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 UCS=
+ $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 UCS= MAN_NONLATIN=
uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
+ $(MAKE) uninstall EXE=.exe prefix=$(prefix) MAN_NONLATIN=
clean:
$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod
index 8579e01..8c49b38 100755
--- a/man/es/man1/dos2unix.pod
+++ b/man/es/man1/dos2unix.pod
@@ -4,7 +4,7 @@
#
# Copyright and License
#
-# Copyright (C) 2009-2012 Erwin Waterlander
+# Copyright (C) 2009-2013 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,11 @@ solamente un carcter: el salto de lnea (LF). En archivos de texto Mac, antes
de Mac OS X, un salto de lnea era slo un carcter retorno de carro (CR).
Actualmente, Mac OS usa el estilo Unix de saltos de lnea (LF).
+Adems de saltos de lnea, Dos2unix puede tambin convertir la
+codificacin de archivos. Unas cuantas pginas de cdigos DOS pueden ser
+convertidas a Unix Latin-1. Y archivos Unicode de Windows (UTF-16) pueden ser
+convertidos a archivos Unicode de Unix (UTF-8).
+
Los archivos binarios son ignorados automticamente, a menos que se fuerce su
conversin.
@@ -218,6 +223,30 @@ es cero. Excepto cuando se emplean parmetros incorrectos.
Ignora los archivos binarios (por defecto).
+=item B<-ul, --assume-utf16le>
+
+Supone que el formato de archivo de entrada es UTF-16LE.
+
+Cuando existe una marca de orden de bytes (BOM) en el archivo de
+entrada, la BOM tiene prioridad sobre esta opcin.
+
+Cuando se hace un supuesto incorrecto (el archivo de entrada no estaba
+en formato UTF-16LE) y la conversin tiene xito, obtendr un archivo
+UTF-8 de salida con el texto errneo.
+
+La conversin errnea puede ser deshecha con iconv(1) mediante convertir
+el archivo UTF-8 de salida de vuelta a UTF-16LE. Esto restaurar el
+archivo original.
+
+El supuesto de UTF-16LE funciona como un I<modo de conversin>. Al
+cambiar al modo por defecto I<ascii> el supuesto UTF-16LE es deshabilitado.
+
+=item B<-ub, --assume-utf16be>
+
+Supone que el formato del archivo de entrada es UTF-16BE.
+
+Esta opcin funciona igual que la opcin C<-ul>.
+
=item B<-F, --follow-symlink>
Sigue los enlaces simblicos y convierte los destinos.
@@ -382,8 +411,7 @@ tiene una BOM.
Cuando un archivo UTF-16 no tiene una BOM, dos2unix tratar el archivo como un
archivo binario.
-Emplee dos2unix en combinacin con iconv(1) para convertir un archivo UTF-16 sin
-una BOM.
+Emplee la opcin C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM.
Dos2unix nunca escribe una BOM en el archivo de salida, a menos que emplee la
opcin C<-m>.
@@ -397,9 +425,9 @@ Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8
dos2unix -n in.txt out.txt
-Convertir de Windows UTF-16 (sin una BOM) a Unix UTF-8
+Convertir de Windows UTF-16LE (sin una BOM) a Unix UTF-8
- iconv -f UTF-16 -t UTF-8 in.txt | dos2unix > out.txt
+ dos2unix -ul -n in.txt out.txt
Convertir de Unix UTF-8 a Windows UTF-8 sin una BOM
diff --git a/man/man1/Makefile b/man/man1/Makefile
index 560c785..c542a86 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -64,21 +64,28 @@ MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT)
POD2MAN = pod2man
POD2MAN_FLAGS =
+MAN_NONLATIN ?= 1
PODFILES = $(wildcard ../*/man1/dos2unix.pod)
MAN_OBJECTS = dos2unix.1 $(patsubst %.pod,%.1,$(PODFILES))
+ifeq ($(MAN_NONLATIN),1)
+PODFILES_NONLATIN = $(wildcard ../nonlatin/*/man1/dos2unix.pod)
+MAN_OBJECTS_NONLATIN = dos2unix.1 $(patsubst %.pod,%.1,$(PODFILES_NONLATIN))
+endif
-all: $(MAN_OBJECTS)
+all: $(MAN_OBJECTS) $(MAN_OBJECTS_NONLATIN)
+MAN_OBJECTS_NONLATIN = $(patsubst %.pod,%.1,$(PODFILES_NONLATIN))
-# The .pod files are encoded in Latin-1. UTF-8 man pages are not properly
-# displayed in a Windows Command Prompt, therefore we keep them in Latin-1
-# (CP1252) format.
+# The .pod files for Latin scripts are encoded in Latin-1 (ISO-8859-1/CP1252).
+# UTF-8 man pages are not properly displayed in a Windows Command Prompt,
+# therefore we keep them in Latin-1 format.
# Cygwin 1.7 expects man pages to be in Latin-1 format.
# The perl version of MinGW and DJGPP is 5.8.8. The pod2man command of perl
-# 5.8.8 does not yet have the options -u, --utf8.
+# 5.8.8 does not yet have the options -u, --utf8, and does support the =encoding
+# command.
# There are different *roff implementations. For now I assume we are using
# groff (GNU-roff) which is wide spread, default on Linux, Cygwin, MinGW, and
@@ -119,4 +126,31 @@ all: $(MAN_OBJECTS)
-e s/u\\\\\\*\'/\\\\[\'u]/g\; \
$@
+
+
+# The .pod files under the 'nonlatin' folder are encoded in UTF-8.
+# For these manuals pod2man needs to support the =encoding command
+# and the --utf8 option. This is supported since perl 5.10.1.
+# Erwin W.
+
+nonlatin: $(MAN_OBJECTS_NONLATIN)
+
+
+../nonlatin/ru/%.1 : ../nonlatin/ru/%.pod
+ # make target - create manual page from a *.pod page
+ podchecker $<
+ $(POD2MAN) $(POD2MAN_FLAGS) \
+ --utf8 \
+ --center="$(PODCENTER)" \
+ --name="$(PACKAGE)" \
+ --section="$(MANSECT)" \
+ $< \
+ | perl -p -e 's/[Pp]erl v[0-9.]+/$(PACKAGE)/;' \
+ > $@ && \
+ rm -f pod*.tmp
+
+clean:
+ rm -f $(MAN_OBJECTS)
+ rm -f $(MAN_OBJECTS_NONLATIN)
+
# End of of Makefile part
diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod
index 52e7856..4bcef37 100644
--- a/man/man1/dos2unix.pod
+++ b/man/man1/dos2unix.pod
@@ -1,7 +1,7 @@
/*
# Copyright and License
#
-# Copyright (C) 2009-2012 Erwin Waterlander
+# Copyright (C) 2009-2013 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -67,6 +67,10 @@ text files a line break is a single character: the Line Feed (LF). In Mac text
files, prior to Mac OS X, a line break was single Carriage Return (CR)
character. Nowadays Mac OS uses Unix style (LF) line breaks.
+Besides line breaks Dos2unix can also convert the encoding of files. A few
+DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16)
+files can be converted to Unix Unicode (UTF-8) files.
+
Binary files are automatically skipped, unless conversion is forced.
Non-regular files, such as directories and FIFOs, are automatically skipped.
@@ -205,6 +209,27 @@ Except when wrong command-line options are used.
Skip binary files (default).
+=item B<-ul, --assume-utf16le>
+
+Assume that the input file format is UTF-16LE.
+
+When there is a Byte Order Mark in the input file the BOM has priority over
+this option.
+
+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.
+
+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.
+
+=item B<-ub, --assume-utf16be>
+
+Assume that the input file format is UTF-16BE.
+
+This option works the same as option C<-ul>.
+
=item B<-F, --follow-symlink>
Follow symbolic links and convert the targets.
@@ -362,8 +387,7 @@ 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.
-Use dos2unix in combination with iconv(1) to convert an UTF-16 file without
-BOM.
+Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM.
Dos2unix never writes a BOM in the output file, unless you use option C<-m>.
@@ -376,9 +400,9 @@ Convert from Windows UTF-16 (with BOM) to Unix UTF-8
dos2unix -n in.txt out.txt
-Convert from Windows UTF-16 (without BOM) to Unix UTF-8
+Convert from Windows UTF-16LE (without BOM) to Unix UTF-8
- iconv -f UTF-16 -t UTF-8 in.txt | dos2unix > out.txt
+ dos2unix -ul -n in.txt out.txt
Convert from Unix UTF-8 to Windows UTF-8 with BOM
diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod
index 95b82cc..1a5a143 100644
--- a/man/nl/man1/dos2unix.pod
+++ b/man/nl/man1/dos2unix.pod
@@ -1,7 +1,7 @@
/*
# Copyright and License
#
-# Copyright (C) 2009-2012 Erwin Waterlander
+# Copyright (C) 2009-2013 Erwin Waterlander
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -68,10 +68,16 @@ gelijk is aan een DOS 'Line Feed' (LF) teken. In Mac tekst bestanden, voor Mac
OS X, bestaan regeleindes uit een enkel 'Carriage Return' teken. Mac OS X is
Unix gebaseerd en heeft dezelfde regeleindes als Unix.
+Naast regeleindes kan Dos2unix ook de codering van bestanden omzetten. Enkele
+DOS code tabellen kunnen omgezet worden naar Unix Latin-1. En Windows
+Unicode (UTF-16) bestanden kunnen geconverteerd worden naar Unix Unicode
+(UTF-8) bestanden.
+
Binaire bestanden worden automatisch overgeslagen, behalve als de omzetting
geforceerd wordt.
-Niet-reguliere bestanden, zoals mappen en FIFOs, worden automatisch overgeslagen.
+Niet-reguliere bestanden, zoals mappen en FIFO's, worden automatisch
+overgeslagen.
Symbolische koppelingen en hun doelen blijven standaard onaangeroerd.
Optioneel kunnen symbolische koppelingen worden vervangen, of de uitvoer
@@ -81,7 +87,8 @@ symbolische koppelingen worden altijd vervangen, de doelen onaangeroerd
gelaten.
-Dos2unix is gemodelleerd naar dos2unix onder SunOS/Solaris en heeft gelijke conversiemodi.
+Dos2unix is gemodelleerd naar dos2unix onder SunOS/Solaris en heeft gelijke
+conversiemodi.
=head1 OPTIES
@@ -211,6 +218,28 @@ Behalve wanneer verkeerde opties worden gegeven.
Sla binaire bestanden over (standaard).
+=item B<-ul, --assume-utf16le>
+
+Veronderstel dat het formaat van het invoerbestand UTF-16LE is.
+
+Wanneer er een Byte Order Mark (BOM) in het invoerbestand zit dan gaat de BOM
+voor op deze optie.
+
+Wanneer een verkeerde aanname is gemaakt (het invoerbestand was geen UTF-16LE
+formaat) 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.
+
+De aanname van UTF-16LE werkt als een I<conversie modus>. Door te schakelen
+naar I<ascii> modus wordt de UTF-16LE veronderstelling uitgeschakeld.
+
+=item B<-ub, --assume-utf16be>
+
+Veronderstel dat het formaat van het invoerbestand UTF-16BE is.
+
+Deze optie werkt hetzelfde als optie C<-ul>.
+
=item B<-F, --follow-symlink>
Volg symbolische koppelingen en coverteer de doelen.
@@ -368,8 +397,7 @@ Dos2unix kan alleen detecteren of een bestand in UTF-16 formaat is als het
bestand een BOM heeft. Wanneer een UTF-16 bestand geen BOM heeft, ziet
dos2unix het bestand als een binair bestand.
-Gebruik dos2unix in combinatie met iconv(1) om een UTF-16 bestand zonder BOM om
-te zetten.
+Gebruik optie C<-ul> of C<-ub> om een UTF-16 bestand zonder BOM om te zetten.
Dos2unix schrijft nooit een BOM in het uitvoerbestand, tenzij optie C<-m>
gebruikt wordt.
@@ -383,9 +411,9 @@ Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8
dos2unix -n in.txt uit.txt
-Omzetten van Windows UTF-16 (zonder BOM) naar Unix UTF-8
+Omzetten van Windows UTF-16LE (zonder BOM) naar Unix UTF-8
- iconv -f UTF-16 -t UTF-8 in.txt | dos2unix > uit.txt
+ dos2unix -ul -n in.txt uit.txt
Omzetten van Unix UTF-8 naar Windows UTF-8 met BOM
diff --git a/mingw.mak b/mingw.mak
index bf030c2..18aff9d 100644
--- a/mingw.mak
+++ b/mingw.mak
@@ -7,7 +7,7 @@ prefix=c:/usr/local
ENABLE_NLS=1
ifdef ENABLE_NLS
-LDFLAGS_EXTRA = -lintl -liconv
+LIBS_EXTRA = -lintl -liconv
# Using GnuWin32 gettext,iconv
#ZIPOBJ_EXTRA = bin/libintl3.dll bin/libiconv2.dll
# Using MinGW gettext,iconv
@@ -15,13 +15,13 @@ ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
endif
all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1
+ $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 MAN_NONLATIN=
install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1
+ $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" EO_XNOTATION=1 MAN_NONLATIN=
uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
+ $(MAKE) uninstall EXE=.exe prefix=$(prefix) MAN_NONLATIN=
clean:
$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
diff --git a/mingw32.mak b/mingw32.mak
new file mode 100644
index 0000000..0da4b0e
--- /dev/null
+++ b/mingw32.mak
@@ -0,0 +1,39 @@
+
+# Author: Erwin Waterlander
+# Copyright (C) 2013 Erwin Waterlander
+# This file is distributed under the same license as the dos2unix package.
+
+CC = gcc
+CRT_GLOB_OBJ = C:/mingw32/i686-w64-mingw32/lib/CRT_glob.o
+
+prefix=c:/usr/local
+ENABLE_NLS=
+
+ifdef ENABLE_NLS
+LIBS_EXTRA = -lintl -liconv
+# Using MinGW gettext,iconv
+#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) EO_XNOTATION=1 MAN_NONLATIN=
+
+install:
+ $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) EO_XNOTATION=1 MAN_NONLATIN=
+
+uninstall:
+ $(MAKE) uninstall EXE=.exe prefix=$(prefix) MAN_NONLATIN=
+
+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
index 32f9e6a..64ceb31 100644
--- a/mingw64.mak
+++ b/mingw64.mak
@@ -11,20 +11,20 @@ prefix=c:/usr/local64
ENABLE_NLS=
ifdef ENABLE_NLS
-LDFLAGS_EXTRA = -lintl -liconv
+LIBS_EXTRA = -lintl -liconv
# Using MinGW gettext,iconv
#ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll
endif
-LDFLAGS_EXTRA += $(CRT_GLOB_OBJ)
+LIBS_EXTRA += $(CRT_GLOB_OBJ)
all:
- $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) EO_XNOTATION=1
+ $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) EO_XNOTATION=1 MAN_NONLATIN=
install:
- $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) EO_XNOTATION=1
+ $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) EO_XNOTATION=1 MAN_NONLATIN=
uninstall:
- $(MAKE) uninstall EXE=.exe prefix=$(prefix)
+ $(MAKE) uninstall EXE=.exe prefix=$(prefix) MAN_NONLATIN=
clean:
$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
diff --git a/po/de.po b/po/de.po
index 8e0c1a7..bd7fb0c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,15 @@
# German messages for dos2unix
-# Copyright (C) 2009-2012
+# Copyright (C) 2009-2013
# This file is distributed under the same license as the dos2unix package.
#
# Philipp Thomas <pth@suse.de>, 2009, 2010, 2011.
# Philipp Thomas <psmt@opensuse.org>, 2009,2010, 2011.
+# Lars Wendler <polynomial-c@gentoo.org> 2013
msgid ""
msgstr ""
"Project-Id-Version: dos2unix 5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 11:09+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+0100\n"
"PO-Revision-Date: 2010-01-24 09:00+0100\n"
"Last-Translator: Philipp Thomas <psmt@opensuse.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -35,138 +36,142 @@ msgstr ""
"Alle Rechte vorbehalten.\n"
"\n"
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
-msgstr "Ein binäres Symbol wurde in Zeile %d gefunden\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Ein binäres Symbol 0x00%02X wurde in Zeile %d gefunden\n"
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n"
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr "Programmfehler, der Konvertierungsmodus %d ist unzulässig\n"
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr "Codepage %d wird verwendet.\n"
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Ein binäres Symbol 0x%02X wurde in Zeile %d gefunden\n"
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n"
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wird als temporäre Datei verwendet\n"
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden: %s\n"
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte: %s\n"
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
"Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s "
"scheiterte: %s\n"
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«\n"
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr " Die Ausgabedatei verbleibt in »%s«\n"
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten: %s\n"
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n"
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr ""
"Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n"
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr "aktive Codepage: %d\n"
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "Der angegebene Konvertierungsmodus %s ist unzulässig\n"
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "Die Option »%s« benötigt ein Argument\n"
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, 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"
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n"
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, 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"
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, 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"
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, 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"
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr "binäre Datei %s wird übersprungen\n"
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Codepage %d wird nicht unterstützt.\n"
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -175,38 +180,38 @@ msgstr ""
"UTF-16 Datei %s wird übersprungen, da die derzeitige Zeichenkodierung nicht "
"UTF-8 ist.\n"
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, 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"
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr ""
"UTF-16 Datei %s wird übersprungen, da beim Umwandeln ein Fehler auftrat.\n"
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, 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"
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "Beim Konvertieren von Datei %s zu Datei %s sind Probleme aufgetreten\n"
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische Verknüpfung %s wird übersprungen.\n"
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr "Datei %s wird ins Unix-Format umgewandelt ...\n"
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n"
@@ -223,22 +228,22 @@ msgstr ""
"Alle Rechte vorbehalten.\n"
"\n"
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr "Datei %s wird in Datei %s im Mac-Format konvertiert ...\n"
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr "Datei %s wird in Datei %s im DOS-Format konvertiert ...\n"
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr "Datei %s wird ins Mac-Format konvertiert ...\n"
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr "Datei %s wird ins DOS-Format konvertiert ...\n"
@@ -316,7 +321,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -346,7 +351,7 @@ msgstr ""
" -n, --newfile eine neue Datei wird erzeugt\n"
" Eingabedatei Originaldatei im neue Datei Modus\n"
" Ausgabedatei Ausgabedatei im neue Datei Modus\n"
-" -o, --oldfile überschreibt die alte Datei\n"
+" -o, --oldfile überschreibt die alte Datei (Vorgabe)\n"
" Datei ... Die im alte Datei Modus zu konvertierenden Dateien\n"
" -q, --quiet ruhiger Modus, unterdrückt alle Warnungen\n"
" ist im stdio Modus immer aktiv\n"
@@ -355,6 +360,15 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le setze UTF-16LE als Eingabeformat voraus\n"
+" -ub, --assume-utf16be setze UTF-16BE als Eingabeformat voraus\n"
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -368,73 +382,77 @@ msgstr ""
" -S, --skip-symlink symbolische Verknüpfungen und deren Ziele bleiben\n"
" unangetastet (Vorgabe)\n"
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version gibt die Versionsnummer aus\n"
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 bit Version (WATCOMC).\n"
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 bit Version (TURBOC).\n"
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 bit Version (WATCOMC).\n"
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 bit Version (DJGPP).\n"
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr "MSYS Version.\n"
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr "Cygwin Version.\n"
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 bit Version (MinGW-w64).\n"
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 bit Version (WATCOMC).\n"
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows 32 bit Version (MinGW-w64).\n"
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 bit Version (MinGW).\n"
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 bit Version (MSVC %d).\n"
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 bit Version (MSVC %d).\n"
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 Version (WATCOMC).\n"
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 Version (EMX).\n"
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr "Mit Unterstützung für Unicode UTF-16.\n"
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr "Ohne Unterstützung für Unicode UTF-16.\n"
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr "Mit Unterstützung von Landessprachen.\n"
diff --git a/po/dos2unix.pot b/po/dos2unix.pot
index 1e8cd03..026d38d 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: 2013-01-23 20:51+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+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"
@@ -27,167 +27,171 @@ msgid ""
"\n"
msgstr ""
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
msgstr ""
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr ""
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr ""
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr ""
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr ""
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr ""
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr ""
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr ""
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr ""
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr ""
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr ""
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr ""
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr ""
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr ""
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr ""
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr ""
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr ""
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, c-format
msgid "target of file %s not specified in new file mode\n"
msgstr ""
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr ""
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr ""
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr ""
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr ""
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr ""
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr ""
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
"UTF-8.\n"
msgstr ""
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr ""
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr ""
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, c-format
msgid "converting file %s to file %s in Unix format ...\n"
msgstr ""
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr ""
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr ""
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr ""
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr ""
@@ -200,22 +204,22 @@ msgid ""
"\n"
msgstr ""
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr ""
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr ""
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr ""
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr ""
@@ -269,7 +273,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -279,79 +283,90 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr ""
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr ""
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr ""
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr ""
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr ""
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr ""
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr ""
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr ""
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr ""
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr ""
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr ""
diff --git a/po/eo-x.po b/po/eo-x.po
index d5190dc..a7d1ce8 100644
--- a/po/eo-x.po
+++ b/po/eo-x.po
@@ -2,13 +2,13 @@
# Copyright (C) 2009-2012 THE dos2unix's COPYRIGHT HOLDER
# This file is distributed under the same license as the dos2unix package.
# waterlan <waterlan@xs4all.nl>, 2009-2012.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: dos2unix 5.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 11:09+0100\n"
-"PO-Revision-Date: 2010-03-07 19:50+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+-0100\n"
+"PO-Revision-Date: 2010-03-07 19:50+-0100\n"
"Last-Translator: Rugxulo <rugxulo@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"
@@ -27,133 +27,137 @@ msgid ""
"\n"
msgstr ""
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
-msgstr "Netekstan signon trovigxis cxe linio %d\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Netekstan signon 0x00%02X trovigxis cxe linio %d\n"
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr "ne povas registri dosieren: %s\n"
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr "programa eraro, negxustan sxangxmodon %d\n"
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr "uzante kodpagxon %d.\n"
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Netekstan signon 0x%02X trovigxis cxe linio %d\n"
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr "uzante %s kiel provizora dosiero\n"
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr "Ne sukcesis registri provizoran eligitan dosieron %s: %s\n"
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr ""
"Malsukcesis sxangxi la permesajxojn de la provizora eldona dosiero %s: %s\n"
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
-"Malsukcesis sxangxi la proprietulon kaj grupon de la provizora eldona "
-"dosiero %s: %s\n"
+"Malsukcesis sxangxi la proprietulon kaj grupon de la provizora eldona dosiero "
+"%s: %s\n"
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "erarojn legante dosieran cxeneron '%s'\n"
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr " kreatan dosieron restas en '%s'\n"
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " kiu estas la atingon de dosiera cxenero '%s'\n"
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "eraro: DOS2UNIX_LOCALEDIR tro longigxis.\n"
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr "nuntempa kodpagxo: %d\n"
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "neuzebla %s sxangxmodo menciita\n"
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "elekto '%s' bezonas elekto-vorton\n"
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, c-format
msgid "target of file %s not specified in new file mode\n"
msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Pasante %s, dosiero ne taugxa.\n"
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Evitante %s, atingan dosieron %s jam estas dosiera cxenero.\n"
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Evitante dosieran cxeneron %s, atingon ne estas normala dosiero.\n"
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Evitante %s, atingon de dosiera cxenero %s ne estas normala dosiero.\n"
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Pasante ne-tekstan dosieron %s\n"
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr "kodpagxo %d ne estas konvertebla.\n"
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -162,37 +166,37 @@ msgstr ""
"Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodigxo ne "
"egalas UTF-8.\n"
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukigxo okazis.\n"
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, c-format
msgid "converting file %s to file %s in Unix format ...\n"
msgstr "sxangxante dosieron %s al dosiero %s Unix-en ...\n"
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemojn trovitajn dum sxangxi dosiero %s al dosiero %s\n"
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Evitante dosieran cxeneron %s.\n"
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr "sxangxante dosiero %s Unix-en ...\n"
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr "problemojn dum sxangxi dosiero %s\n"
@@ -205,22 +209,22 @@ msgid ""
"\n"
msgstr ""
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr "sxangxante dosiero %s al dosiero %s Mac-en ...\n"
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr "sxangxante dosiero %s al dosiero %s DOS-en ...\n"
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr "sxangxante dosiero %s Mac-en ...\n"
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr "sxangxante dosiero %s DOS-en ...\n"
@@ -274,7 +278,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -292,7 +296,7 @@ msgstr ""
" -865 Uzu DOS kodpagxon 865 (Nordlandaj)\n"
" -7 Traduku de 8-bitaj literoj en blankspacon\n"
" -c, --convmode modo de sxangxo\n"
-" sxangxmodo ascii, 7bit, iso, mac, provizore elektita ascii\n"
+" sxangxmodo ascii, 7bit, iso, mac, provizore elektita ascii\n"
" -f, --force forte konvertado de netekstaj dosieroj\n"
" -h, --help diri cxi tiun mesagxon\n"
" -k, --keepdate konservi dato-tempon dosieran\n"
@@ -300,9 +304,9 @@ msgstr ""
" -l, --newline aldoni markon linian finan\n"
" -m, --aldoni-bom aldoni UTF-8 internan ordo-markon\n"
" -n, --newfile registri novan dosieron\n"
-" antauxajxo al antauxa dosiero metita novmoden\n"
-" kreajxo al dosiero registrita novmoden\n"
-" -o, --oldfile registri malnovan dosieron\n"
+" antauxajxo al antauxa dosiero metita novmoden\n"
+" kreajxo al dosiero registrita novmoden\n"
+" -o, --oldfile registri malnovan dosieron (jam sxaltita)\n"
" dosiero... dosiero(j)n por registri per malnova modo\n"
" -q, --quiet silente eviti avertojn\n"
" cxiam ensxaltata dum stdio modo\n"
@@ -311,85 +315,98 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le trakti enmeton kvazaux UTF-16LE\n"
+" -ub, --assume-utf16be trakti enmeton kvazaux UTF-16BE\n"
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
" -F, --follow-symlink legu dosierajn cxenerojn kaj konverti la atingojn\n"
-" -R, --replace-symlink anstatauxe registru dosierajn cxenerojn per "
-"konvertotaj dosieroj\n"
+" -R, --replace-symlink anstatauxe registru dosierajn cxenerojn per konvertotaj "
+"dosieroj\n"
" (ne-cxeneraj atingaj dosieroj restas nesxangxitaj)\n"
" -S, --skip-symlink retenu dosierajn cxenerojn kaj atingojn nesxangxataj "
"(jam sxaltita)\n"
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version diri eldono-numeron\n"
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS-16 eldono (WATCOMC).\n"
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS-16 eldono (TURBOC).\n"
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS-32 eldono (WATCOMC).\n"
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS-32 eldono (DJGPP).\n"
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr "MSYS eldono.\n"
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr "Cygwin eldono.\n"
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows-64 eldono (MinGW-w64).\n"
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows-32 eldono (WATCOMC).\n"
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows-32 eldono (MinGW-w64).\n"
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows-32 eldono (MinGW).\n"
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows-64 eldono (MSVC %d).\n"
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows-32 eldono (MSVC %d).\n"
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 eldono (WATCOMC).\n"
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 eldono (EMX).\n"
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr "Kun subteno de Unikodo da UTF-16.\n"
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sen subteno de Unikodo da UTF-16.\n"
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/eo.po b/po/eo.po
index 729878c..c958de4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,12 +2,12 @@
# Copyright (C) 2009-2012 THE dos2unix's COPYRIGHT HOLDER
# This file is distributed under the same license as the dos2unix package.
# waterlan <waterlan@xs4all.nl>, 2009-2012.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: dos2unix 5.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 11:09+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+0100\n"
"PO-Revision-Date: 2010-03-07 19:50+0100\n"
"Last-Translator: Ruĝulo <ruĝulo@gmail.com>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -27,133 +27,137 @@ msgid ""
"\n"
msgstr ""
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
-msgstr "Netekstan signon troviĝis ĉe linio %d\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Netekstan signon 0x00%02X troviĝis ĉe linio %d\n"
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr "ne povas registri dosieren: %s\n"
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr "programa eraro, neĝustan ŝanĝmodon %d\n"
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr "uzante kodpaĝon %d.\n"
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Netekstan signon 0x%02X troviĝis ĉe linio %d\n"
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr "uzante %s kiel provizora dosiero\n"
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr "Ne sukcesis registri provizoran eligitan dosieron %s: %s\n"
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr ""
"Malsukcesis ŝanĝi la permesaĵojn de la provizora eldona dosiero %s: %s\n"
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
"Malsukcesis ŝanĝi la proprietulon kaj grupon de la provizora eldona dosiero "
"%s: %s\n"
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "erarojn legante dosieran ĉeneron '%s'\n"
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr " kreatan dosieron restas en '%s'\n"
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " kiu estas la atingon de dosiera ĉenero '%s'\n"
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "eraro: DOS2UNIX_LOCALEDIR tro longiĝis.\n"
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr "nuntempa kodpaĝo: %d\n"
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "neuzebla %s ŝanĝmodo menciita\n"
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "elekto '%s' bezonas elekto-vorton\n"
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, c-format
msgid "target of file %s not specified in new file mode\n"
msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Pasante %s, dosiero ne tauĝa.\n"
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Evitante %s, atingan dosieron %s jam estas dosiera ĉenero.\n"
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Evitante dosieran ĉeneron %s, atingon ne estas normala dosiero.\n"
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Evitante %s, atingon de dosiera ĉenero %s ne estas normala dosiero.\n"
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Pasante ne-tekstan dosieron %s\n"
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr "kodpaĝo %d ne estas konvertebla.\n"
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -162,37 +166,37 @@ msgstr ""
"Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodiĝo ne "
"egalas UTF-8.\n"
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukiĝo okazis.\n"
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, c-format
msgid "converting file %s to file %s in Unix format ...\n"
msgstr "ŝanĝante dosieron %s al dosiero %s Unix-en ...\n"
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemojn trovitajn dum ŝanĝi dosiero %s al dosiero %s\n"
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Evitante dosieran ĉeneron %s.\n"
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr "ŝanĝante dosiero %s Unix-en ...\n"
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr "problemojn dum ŝanĝi dosiero %s\n"
@@ -205,22 +209,22 @@ msgid ""
"\n"
msgstr ""
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr "ŝanĝante dosiero %s al dosiero %s Mac-en ...\n"
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr "ŝanĝante dosiero %s al dosiero %s DOS-en ...\n"
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr "ŝanĝante dosiero %s Mac-en ...\n"
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr "ŝanĝante dosiero %s DOS-en ...\n"
@@ -274,7 +278,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -302,7 +306,7 @@ msgstr ""
" -n, --newfile registri novan dosieron\n"
" antaŭaĵo al antaŭa dosiero metita novmoden\n"
" kreaĵo al dosiero registrita novmoden\n"
-" -o, --oldfile registri malnovan dosieron\n"
+" -o, --oldfile registri malnovan dosieron (jam ŝaltita)\n"
" dosiero... dosiero(j)n por registri per malnova modo\n"
" -q, --quiet silente eviti avertojn\n"
" ĉiam enŝaltata dum stdio modo\n"
@@ -311,6 +315,15 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le trakti enmeton kvazaŭ UTF-16LE\n"
+" -ub, --assume-utf16be trakti enmeton kvazaŭ UTF-16BE\n"
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -323,73 +336,77 @@ msgstr ""
" -S, --skip-symlink retenu dosierajn ĉenerojn kaj atingojn neŝanĝataj "
"(jam ŝaltita)\n"
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version diri eldono-numeron\n"
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS-16 eldono (WATCOMC).\n"
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS-16 eldono (TURBOC).\n"
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS-32 eldono (WATCOMC).\n"
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS-32 eldono (DJGPP).\n"
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr "MSYS eldono.\n"
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr "Cygwin eldono.\n"
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows-64 eldono (MinGW-w64).\n"
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows-32 eldono (WATCOMC).\n"
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows-32 eldono (MinGW-w64).\n"
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows-32 eldono (MinGW).\n"
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows-64 eldono (MSVC %d).\n"
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows-32 eldono (MSVC %d).\n"
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 eldono (WATCOMC).\n"
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 eldono (EMX).\n"
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr "Kun subteno de Unikodo da UTF-16.\n"
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sen subteno de Unikodo da UTF-16.\n"
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/es.po b/po/es.po
index ac79f6e..cb92105 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 11:09+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+0100\n"
"PO-Revision-Date: 2011-06-20 09:13+0200\n"
"Last-Translator: <jfreyreg@gmail.com>\n"
"Language-Team: Spanish\n"
@@ -28,174 +28,178 @@ msgid ""
"\n"
msgstr ""
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
-msgstr "Smbolo binario encontrado en la lnea %d\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Smbolo binario 0x00%02X encontrado en la lnea %d\n"
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr "no puedo escribir al archivo de salida: %s\n"
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr "error, modo de conversin %d invlido\n"
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr "usando pgina de cdigos %d.\n"
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Smbolo binario 0x%02X encontrado en la lnea %d\n"
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Fall al abrir el archivo de salida temporal: %s\n"
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr "usando %s como archivo temporal\n"
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr "Fall al escribir el archivo de salida temporal %s: %s\n"
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr "Error al cambiar los permisos del archivo temporal de salida %s: %s\n"
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
"Error al cambiar el propietario y grupo del archivo temporal de salida %s: "
"%s\n"
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemas al resolver el enlace simblico '%s'\n"
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr " el archivo de salida permanece en '%s'\n"
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr "problemas al renombrar '%s' como '%s': %s\n"
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " cual es el destino del enlace simblico '%s'\n"
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
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"
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr "Pgina de cdigos activa: %d\n"
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "modo de conversin %s especificado es invlido\n"
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "el parmetro '%s' requiere un argumento\n"
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, 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"
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignorando %s, no es un archivo regular.\n"
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignorando %s, el archivo de salida %s es un enlace simblico.\n"
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignorando enlace simblico %s, el destino no es un archivo regular.\n"
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr ""
"Ignorando %s, el destino del enlace simblico %s no es un archivo regular.\n"
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignorando archivo binario %s\n"
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr "La pgina de cdigos %d no est soportada.\n"
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
"UTF-8.\n"
msgstr "Ignorando archivo UTF-16 %s, la codificacin actual no es UTF-8.\n"
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignorando archivo UTF-16 %s, el tamao de wchar_t es %d bytes.\n"
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr ""
"Ignorando archivo UTF-16 %s, ocurri un error de conversin a UTF-16.\n"
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, c-format
msgid "converting file %s to file %s in Unix format ...\n"
msgstr "convirtiendo archivo %s a %s in formato Unix ...\n"
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemas al convertir el archivo %s a %s\n"
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignorando enlace simblico %s.\n"
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr "convirtiendo archivo %s a formato Unix ...\n"
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr "problemas convirtiendo el archivo %s\n"
@@ -208,22 +212,22 @@ msgid ""
"\n"
msgstr ""
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr "convirtiendo archivo %s a %s in formato Mac ...\n"
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr "convirtiendo archivo %s a %s en formato DOS ...\n"
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr "convirtiendo archivo %s a formato Mac ...\n"
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr "convirtiendo archivo %s a formato DOS ...\n"
@@ -277,7 +281,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -310,7 +314,7 @@ msgstr ""
" -n, --newfile escribe a un nuevo archivo\n"
" 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"
-" -o, --oldfile escribe al archivo antiguo\n"
+" -o, --oldfile escribe al archivo antiguo (por defecto)\n"
" archivo ... archivos a convertir en el modo de archivo antiguo\n"
" -q, --quiet modo silencioso, suprime todas las advertencias\n"
" siempre en modo stdio\n"
@@ -319,6 +323,15 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le Supone que el formato de entrada es UTF-16LE\n"
+" -ub, --assume-utf16be Supone que el formato de entrada es UTF-16BE\n"
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -332,73 +345,77 @@ msgstr ""
" -S, --skip-symlink no altera los enlaces simblicos ni sus destinos (por "
"defecto)\n"
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version despliega el nmero de versin\n"
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Versin DOS de 16 bit (WATCOMC).\n"
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Versin DOS de 16 bit (TURBOC).\n"
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Versin DOS de 32 bit (WATCOMC).\n"
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Versin DOS de 32 bit (DJGPP).\n"
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr "Versin para MSYS.\n"
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr "Versin para Cygwin.\n"
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Versin Windows de 64 bit (MinGW-w64).\n"
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Versin Windows de 32 bit (WATCOMC).\n"
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Versin Windows de 32 bit (MinGW-w64).\n"
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Versin Windows de 32 bit (MinGW).\n"
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Versin Windows de 64 bit (MSVC %d).\n"
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Versin Windows de 32 bit (MSVC %d).\n"
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr "Versin para OS/2 (WATCOMC).\n"
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr "Versin para OS/2 (EMX).\n"
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr "Con soporte Unicode UTF-16.\n"
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sin soporte Unicode UTF-16.\n"
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr "Con soporte de idioma materno.\n"
diff --git a/po/nl.po b/po/nl.po
index 1168e32..5a77956 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 5.3.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-18 11:09+0100\n"
+"POT-Creation-Date: 2013-11-26 23:08+0100\n"
"PO-Revision-Date: 2009-12-08 21:59+0100\n"
"Last-Translator: Erwin Waterlander <waterlan@xs4all.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -27,139 +27,143 @@ msgid ""
"\n"
msgstr ""
-#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
-#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
#, c-format
-msgid "Binary symbol found at line %d\n"
-msgstr "Binair teken gevonden op regel %d\n"
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Binair teken 0x00%02X gevonden op regel %d\n"
-#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
-#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
-#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan niet schrijven naar uitvoerbestand: %s\n"
-#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
#, c-format
msgid "program error, invalid conversion mode %d\n"
msgstr "programma fout, ongeldige conversie modus %d\n"
-#: dos2unix.c:315 unix2dos.c:309
+#: dos2unix.c:317 unix2dos.c:311
#, c-format
msgid "using code page %d.\n"
msgstr "codetabel %d wordt gebruikt.\n"
-#: dos2unix.c:514 unix2dos.c:529
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Binair teken 0x%02X gevonden op regel %d\n"
+
+#: dos2unix.c:516 unix2dos.c:531
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Niet gelukt om tijdelijk uitvoerbestand te openen: %s\n"
-#: dos2unix.c:521 unix2dos.c:536
+#: dos2unix.c:523 unix2dos.c:538
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wordt als tijdelijk bestand gebruikt\n"
-#: dos2unix.c:627 unix2dos.c:642
+#: dos2unix.c:636 unix2dos.c:651
#, c-format
msgid "Failed to write to temporary output file %s: %s\n"
msgstr "Niet gelukt om tijdelijk uitvoerbestand %s te schrijven: %s\n"
-#: dos2unix.c:662 unix2dos.c:677
+#: dos2unix.c:671 unix2dos.c:686
#, c-format
msgid "Failed to change the permissions of temporary output file %s: %s\n"
msgstr ""
"Niet gelukt om de permissies van tijdelijk uitvoerbestand %s te wijzigen: "
"%s\n"
-#: dos2unix.c:681 unix2dos.c:696
+#: dos2unix.c:690 unix2dos.c:705
#, c-format
msgid "Failed to change the owner and group of temporary output file %s: %s\n"
msgstr ""
"Niet gelukt om de eigenaar en groep van tijdelijk uitvoerbestand %s te "
"wijzigen: %s\n"
-#: dos2unix.c:734 unix2dos.c:749
+#: dos2unix.c:743 unix2dos.c:758
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemen met het herleiden van symbolische koppeling '%s'\n"
-#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
#, c-format
msgid " output file remains in '%s'\n"
msgstr " uitvoerbestand blijft in '%s'\n"
-#: dos2unix.c:764 unix2dos.c:779
+#: dos2unix.c:773 unix2dos.c:788
#, c-format
msgid "problems renaming '%s' to '%s': %s\n"
msgstr "problemen met hernoemen van '%s' naar '%s': %s\n"
-#: dos2unix.c:767 unix2dos.c:782
+#: dos2unix.c:776 unix2dos.c:791
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welke het doel is van symbolische koppeling '%s'\n"
-#: dos2unix.c:859 unix2dos.c:874
+#: dos2unix.c:874 unix2dos.c:889
msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n"
-#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
#, c-format
msgid "active code page: %d\n"
msgstr "actieve code tabel: %d\n"
-#: dos2unix.c:1003 unix2dos.c:1018
+#: dos2unix.c:1024 unix2dos.c:1039
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ongeldige %s conversie modus gespecificeerd\n"
-#: dos2unix.c:1013 unix2dos.c:1028
+#: dos2unix.c:1034 unix2dos.c:1049
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "optie '%s' heeft een argument nodig\n"
-#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
-#: unix2dos.c:1055 unix2dos.c:1255
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
#, c-format
msgid "target of file %s not specified in new file mode\n"
msgstr "doel van bestand %s is niet gespecificeerd in 'nieuw bestand modus'\n"
-#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n"
-#: dos2unix.c:1077 unix2dos.c:1092
+#: dos2unix.c:1098 unix2dos.c:1113
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr ""
"%s wordt overgeslagen, uitvoerbestand %s is een symbolische koppeling.\n"
-#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
#, 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"
-#: dos2unix.c:1091 unix2dos.c:1106
+#: dos2unix.c:1112 unix2dos.c:1127
#, 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"
-#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Binair bestand %s wordt overgeslagen\n"
-#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
#, c-format
msgid "code page %d is not supported.\n"
msgstr "codetabel %d wordt niet ondersteund.\n"
-#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
#, c-format
msgid ""
"Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -168,40 +172,40 @@ msgstr ""
"UTF-16 bestand %s wordt overgeslagen, de huidige lokale karakter codering is "
"niet UTF-8.\n"
-#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
#, 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"
-#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
msgstr ""
"UTF-16 bestand %s wordt overgeslagen, een UTF-16 conversie fout is "
"opgetreden.\n"
-#: dos2unix.c:1132
+#: dos2unix.c:1153
#, c-format
msgid "converting file %s to file %s in Unix format ...\n"
msgstr "converteren bestand %s naar bestand %s in Unix formaat ...\n"
-#: dos2unix.c:1139 unix2dos.c:1157
+#: dos2unix.c:1160 unix2dos.c:1178
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemen met conversie van bestand %s naar bestand %s\n"
-#: dos2unix.c:1161 unix2dos.c:1179
+#: dos2unix.c:1182 unix2dos.c:1200
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische koppeling %s wordt overgeslagen.\n"
-#: dos2unix.c:1209
+#: dos2unix.c:1230
#, c-format
msgid "converting file %s to Unix format ...\n"
msgstr "converteren bestand %s naar Unix formaat ...\n"
-#: dos2unix.c:1216 unix2dos.c:1237
+#: dos2unix.c:1237 unix2dos.c:1258
#, c-format
msgid "problems converting file %s\n"
msgstr "problemen met conversie van bestand %s\n"
@@ -214,22 +218,22 @@ msgid ""
"\n"
msgstr ""
-#: unix2dos.c:1148
+#: unix2dos.c:1169
#, c-format
msgid "converting file %s to file %s in Mac format ...\n"
msgstr "converteren bestand %s naar bestand %s in Mac formaat ...\n"
-#: unix2dos.c:1150
+#: unix2dos.c:1171
#, c-format
msgid "converting file %s to file %s in DOS format ...\n"
msgstr "converteren bestand %s naar bestand %s in DOS formaat ...\n"
-#: unix2dos.c:1228
+#: unix2dos.c:1249
#, c-format
msgid "converting file %s to Mac format ...\n"
msgstr "converteren bestand %s naar Mac formaat ...\n"
-#: unix2dos.c:1230
+#: unix2dos.c:1251
#, c-format
msgid "converting file %s to DOS format ...\n"
msgstr "converteren bestand %s naar DOS formaat ...\n"
@@ -283,7 +287,7 @@ msgid ""
" -n, --newfile write to new file\n"
" infile original file in new file mode\n"
" outfile output file in new file mode\n"
-" -o, --oldfile write to old file\n"
+" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old file mode\n"
" -q, --quiet quiet mode, suppress all warnings\n"
" always on in stdio mode\n"
@@ -311,7 +315,7 @@ msgstr ""
" -n, --newfile schrijf naar nieuw bestand\n"
" invoerbestand origineel bestand in nieuw-bestand-modus\n"
" uitvoerbestand uitvoerbestand in nieuw-bestand-modus\n"
-" -o, --oldfile overschrijf oud bestand\n"
+" -o, --oldfile overschrijf oud bestand (standaard)\n"
" bestand ... te converteren bestanden in oud-bestand-modus\n"
" -q, --quiet stille werking, onderdruk alle waarschuwingen\n"
" altijd aan in stdio modus\n"
@@ -320,6 +324,15 @@ msgstr ""
#: common.c:225
#, c-format
msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le Veronderstel dat het invoerformaat UTF-16LE is\n"
+" -ub, --assume-utf16be Veronderstel dat het invoerformaat UTF-16BE is\n"
+
+#: common.c:230
+#, c-format
+msgid ""
" -F, --follow-symlink follow symbolic links and convert the targets\n"
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
@@ -332,73 +345,77 @@ msgstr ""
" -S, --skip-symlink laat symbolische koppelingen en doelen ongewijzigd "
"(standaard)\n"
-#: common.c:231
+#: common.c:236
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version toon versie nummer\n"
-#: common.c:243
+#: common.c:249
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 bit versie (WATCOMC).\n"
-#: common.c:245
+#: common.c:251
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 bit versie (TURBOC).\n"
-#: common.c:247
+#: common.c:253
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 bit versie (WATCOMC).\n"
-#: common.c:249
+#: common.c:255
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 bit versie (DJGPP).\n"
-#: common.c:251
+#: common.c:257
msgid "MSYS version.\n"
msgstr "MSYS versie.\n"
-#: common.c:253
+#: common.c:259
msgid "Cygwin version.\n"
msgstr "Cygwin versie.\n"
-#: common.c:255
+#: common.c:261
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 bit versie (MinGW-w64).\n"
-#: common.c:257
+#: common.c:263
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 bit versie (WATCOMC).\n"
-#: common.c:259
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows 32 bit versie (MinGW-w64).\n"
+
+#: common.c:267
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 bit versie (MinGW).\n"
-#: common.c:261
+#: common.c:269
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 bit versie (MSVC %d).\n"
-#: common.c:263
+#: common.c:271
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 bit versie (MSVC %d).\n"
-#: common.c:265
+#: common.c:273
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 versie (WATCOMC).\n"
-#: common.c:267
+#: common.c:275
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 versie (EMX).\n"
-#: common.c:270
+#: common.c:278
msgid "With Unicode UTF-16 support.\n"
msgstr "Met Unicode UTF-16 ondersteuning.\n"
-#: common.c:272
+#: common.c:280
msgid "Without Unicode UTF-16 support.\n"
msgstr "Zonder Unicode UTF-16 ondersteuning.\n"
-#: common.c:275
+#: common.c:283
msgid "With native language support.\n"
msgstr "Met moedertaal ondersteuning.\n"
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..decd45f
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,443 @@
+# Russian messages for dos2unix
+# Copyright (C) 2013 THE dos'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the dos2unix package.
+# Andrei Uhlik <uglika@gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dos 2unix-6.0.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-11-26 23:08+0100\n"
+"PO-Revision-Date: 2013-02-24 19:53+0300\n"
+"Last-Translator: root <uglika@gmail.com>\n"
+"Language-Team: Russian\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"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:76
+msgid ""
+"Copyright (C) 2009-2013 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-2013 Erwin Waterlander\n"
+"Авторское право (C) 1998 Christian Wurll (Version 3.1)\n"
+"Авторское право (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n"
+"Авторское право (C) 1994-1995 Benjamin Lin\n"
+"Все права защищены.\n"
+"\n"
+
+#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185
+#, c-format
+msgid "Binary symbol 0x00%02X found at line %d\n"
+msgstr "Бинарный символ 0x00%02X, обнаруженный в строке %d\n"
+
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391
+#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "не удалось записать в выходной файл: %s\n"
+
+#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443
+#, c-format
+msgid "program error, invalid conversion mode %d\n"
+msgstr "ошибка в программе, неверный режим преобразования %d\n"
+
+#: dos2unix.c:317 unix2dos.c:311
+#, c-format
+msgid "using code page %d.\n"
+msgstr "используется кодировка %d.\n"
+
+#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384
+#, c-format
+msgid "Binary symbol 0x%02X found at line %d\n"
+msgstr "Бинарный символ 0x%02X, обнаруженный в строке %d\n"
+
+#: dos2unix.c:516 unix2dos.c:531
+#, c-format
+msgid "Failed to open temporary output file: %s\n"
+msgstr "Не удалось открыть временный выходной файл: %s\n"
+
+#: dos2unix.c:523 unix2dos.c:538
+#, c-format
+msgid "using %s as temporary file\n"
+msgstr "использование %s в качестве временного файла\n"
+
+#: dos2unix.c:636 unix2dos.c:651
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Не удалось записать во временный выходной файл %s: %s\n"
+
+#: dos2unix.c:671 unix2dos.c:686
+#, c-format
+msgid "Failed to change the permissions of temporary output file %s: %s\n"
+msgstr ""
+"Не удалось изменить права доступа ко временному выходному файлу %s: %s\n"
+
+#: dos2unix.c:690 unix2dos.c:705
+#, c-format
+msgid "Failed to change the owner and group of temporary output file %s: %s\n"
+msgstr ""
+"Не удалось изменить владельца и группу временного выходного файла %s: %s\n"
+
+#: dos2unix.c:743 unix2dos.c:758
+#, c-format
+msgid "problems resolving symbolic link '%s'\n"
+msgstr "конфликт при разрешении символической ссылки '%s'\n"
+
+#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793
+#, c-format
+msgid " output file remains in '%s'\n"
+msgstr " выходной файл остается в '%s'\n"
+
+#: dos2unix.c:773 unix2dos.c:788
+#, c-format
+msgid "problems renaming '%s' to '%s': %s\n"
+msgstr "проблемы при переименовании '%s' в '%s': %s\n"
+
+#: dos2unix.c:776 unix2dos.c:791
+#, c-format
+msgid " which is the target of symbolic link '%s'\n"
+msgstr " который является целью символической ссылки '%s'\n"
+
+#: dos2unix.c:874 unix2dos.c:889
+msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
+msgstr ""
+"ошибка: Значение переменной среды DOS2UNIX_LOCALEDIR слишком длинное.\n"
+
+#: dos2unix.c:977 dos2unix.c:1014 unix2dos.c:992 unix2dos.c:1029
+#, c-format
+msgid "active code page: %d\n"
+msgstr "активная кодовая страница: %d\n"
+
+#: dos2unix.c:1024 unix2dos.c:1039
+#, c-format
+msgid "invalid %s conversion mode specified\n"
+msgstr "задан неправильный %s режим преобразования\n"
+
+#: dos2unix.c:1034 unix2dos.c:1049
+#, c-format
+msgid "option '%s' requires an argument\n"
+msgstr "для опции '%s' требуется аргумент\n"
+
+#: dos2unix.c:1047 dos2unix.c:1061 dos2unix.c:1255 unix2dos.c:1062
+#: unix2dos.c:1076 unix2dos.c:1276
+#, c-format
+msgid "target of file %s not specified in new file mode\n"
+msgstr "цель файла %s не задана в новом режиме файла\n"
+
+#: dos2unix.c:1091 dos2unix.c:1175 unix2dos.c:1106 unix2dos.c:1193
+#, c-format
+msgid "Skipping %s, not a regular file.\n"
+msgstr "Пропуск %s, не является подходящим файлом.\n"
+
+#: dos2unix.c:1098 unix2dos.c:1113
+#, c-format
+msgid "Skipping %s, output file %s is a symbolic link.\n"
+msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n"
+
+#: dos2unix.c:1105 dos2unix.c:1189 unix2dos.c:1120 unix2dos.c:1207
+#, c-format
+msgid "Skipping symbolic link %s, target is not a regular file.\n"
+msgstr "Пропуск символической ссылки %s, цель не является подходящим файлом.\n"
+
+#: dos2unix.c:1112 unix2dos.c:1127
+#, c-format
+msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
+msgstr ""
+"Пропуск %s, цель символической ссылки %s не является подходящим файлом.\n"
+
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
+#, c-format
+msgid "Skipping binary file %s\n"
+msgstr "Пропуск бинарного файла %s\n"
+
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
+#, c-format
+msgid "code page %d is not supported.\n"
+msgstr "кодовая страница %d не поддерживается.\n"
+
+#: dos2unix.c:1133 dos2unix.c:1210 unix2dos.c:1148 unix2dos.c:1228
+#, c-format
+msgid ""
+"Skipping UTF-16 file %s, the current locale character encoding is not "
+"UTF-8.\n"
+msgstr "Пропуск UTF-16 файла %s, текущая символьная кодировка не UTF-8.\n"
+
+#: dos2unix.c:1140 dos2unix.c:1217 unix2dos.c:1155 unix2dos.c:1235
+#, 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"
+
+#: dos2unix.c:1147 dos2unix.c:1224 unix2dos.c:1162 unix2dos.c:1242
+#, c-format
+msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
+msgstr "Пропуск UTF-16 файла %s, возникла ошибка преобразования UTF-16.\n"
+
+#: dos2unix.c:1153
+#, c-format
+msgid "converting file %s to file %s in Unix format ...\n"
+msgstr "преобразование файла %s в файл %s в формат Unix ...\n"
+
+#: dos2unix.c:1160 unix2dos.c:1178
+#, c-format
+msgid "problems converting file %s to file %s\n"
+msgstr "проблемы при преобразовании файла %s в файл %s\n"
+
+#: dos2unix.c:1182 unix2dos.c:1200
+#, c-format
+msgid "Skipping symbolic link %s.\n"
+msgstr "Пропуск символической ссылки %s.\n"
+
+#: dos2unix.c:1230
+#, c-format
+msgid "converting file %s to Unix format ...\n"
+msgstr "преобразование файла %s в формат Unix ...\n"
+
+#: dos2unix.c:1237 unix2dos.c:1258
+#, c-format
+msgid "problems converting file %s\n"
+msgstr "проблемы при преобразовании файла %s\n"
+
+#: unix2dos.c:66
+msgid ""
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
+"Copyright (C) 1994-1995 Benjamin Lin\n"
+"All rights reserved.\n"
+"\n"
+msgstr ""
+"Авторское право (C) 2009-2013 Erwin Waterlander\n"
+"Авторское право (C) 1994-1995 Benjamin Lin\n"
+"Все права защищены.\n"
+"\n"
+
+#: unix2dos.c:1169
+#, c-format
+msgid "converting file %s to file %s in Mac format ...\n"
+msgstr "преобразование файла %s в файл %s в формат Mac ...\n"
+
+#: unix2dos.c:1171
+#, c-format
+msgid "converting file %s to file %s in DOS format ...\n"
+msgstr "преобразование файла %s в файл %s в формат DOS ...\n"
+
+#: unix2dos.c:1249
+#, c-format
+msgid "converting file %s to Mac format ...\n"
+msgstr "преобразование файла %s в формат Mac ...\n"
+
+#: unix2dos.c:1251
+#, c-format
+msgid "converting file %s to DOS format ...\n"
+msgstr "преобразование файла %s в формат DOS ...\n"
+
+#: common.c:169
+msgid ""
+"Redistribution and use in source and binary forms, with or without\n"
+"modification, are permitted provided that the following conditions\n"
+"are met:\n"
+"1. Redistributions of source code must retain the above copyright\n"
+" notice, this list of conditions and the following disclaimer.\n"
+"2. Redistributions in binary form must reproduce the above copyright\n"
+" notice in the documentation and/or other materials provided with\n"
+" the distribution.\n"
+"\n"
+"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"
+"PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE\n"
+"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n"
+"CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\n"
+"OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n"
+"BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n"
+"WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n"
+"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 ""
+"Redistribution and use in source and binary forms, with or without\n"
+"modification, are permitted provided that the following conditions\n"
+"are met:\n"
+"1. Redistributions of source code must retain the above copyright\n"
+" notice, this list of conditions and the following disclaimer.\n"
+"2. Redistributions in binary form must reproduce the above copyright\n"
+" notice in the documentation and/or other materials provided with\n"
+" the distribution.\n"
+"\n"
+"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"
+"PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE\n"
+"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n"
+"CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\n"
+"OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n"
+"BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n"
+"WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n"
+"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:195
+#, c-format
+msgid ""
+"%s %s (%s)\n"
+"Usage: %s [options] [file ...] [-n infile outfile ...]\n"
+" -ascii convert only line breaks (default)\n"
+" -iso conversion between DOS and ISO-8859-1 character set\n"
+" -1252 Use Windows code page 1252 (Western European)\n"
+" -437 Use DOS code page 437 (US) (default)\n"
+" -850 Use DOS code page 850 (Western European)\n"
+" -860 Use DOS code page 860 (Portuguese)\n"
+" -863 Use DOS code page 863 (French Canadian)\n"
+" -865 Use DOS code page 865 (Nordic)\n"
+" -7 Convert 8 bit characters to 7 bit space\n"
+" -c, --convmode conversion mode\n"
+" convmode ascii, 7bit, iso, mac, default to ascii\n"
+" -f, --force force conversion of binary files\n"
+" -h, --help give this help\n"
+" -k, --keepdate keep output file date\n"
+" -L, --license display software license\n"
+" -l, --newline add additional newline\n"
+" -m, --add-bom add UTF-8 Byte Order Mark\n"
+" -n, --newfile write to new file\n"
+" infile original file in new file mode\n"
+" outfile output file in new file mode\n"
+" -o, --oldfile write to old file (default)\n"
+" file ... files to convert in old file mode\n"
+" -q, --quiet quiet mode, suppress all warnings\n"
+" always on in stdio mode\n"
+" -s, --safe skip binary files (default)\n"
+msgstr ""
+"%s %s (%s)\n"
+"Использование: %s [опции] [файл ...] [-n входной_файл выходной_файл ...]\n"
+" -ascii преобразовать только конец строки (по умолчанию)\n"
+" -iso преобразовать DOS в ISO-8859-1\n"
+" -1252 Использовать кодировку Windows 1252 (Западно-"
+"Европейский)\n"
+" -437 Использовать кодировку DOS 437 (US) (по умолчанию)\n"
+" -850 Использовать кодировку DOS 850 (Западно-Европейский)\n"
+" -860 Использовать кодировку DOS 860 (Португальский)\n"
+" -863 Использовать кодировку DOS 863 (Франко-Канадский)\n"
+" -865 Использовать кодировку DOS 865 (Скандинавский)\n"
+" -7 Преобразовать 8-битные символы в 7-битные с пробелом\n"
+" -c, --convmode режим преобразования\n"
+" convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n"
+" -f, --force управление преобразованием бинарных файлов\n"
+" -h, --help вызов справки\n"
+" -k, --keepdate сохранить дату выходного файла\n"
+" -L, --license отобразить лицензию программного обеспечения\n"
+" -l, --newline добавить дополнительный разделитель строк\n"
+" -m, --add-bom добавить UTF-8 метку порядка байтов (BOM)\n"
+" -n, --newfile записать в новый файл\n"
+" infile исходный файл с новым режимным кодом файла\n"
+" outfile выходной файл с новым режимным кодом файла\n"
+" -o, --oldfile записать в старый файл (по умолчанию)\n"
+" file ... файлы для преобразования в старый режимный код файла\n"
+" -q, --quiet тихий режим, скрыть все предупреждения\n"
+" всегда включен в режиме stdio\n"
+" -s, --safe пропустить бинарные файлы (по умолчанию)\n"
+
+#: common.c:225
+#, c-format
+msgid ""
+" -ul, --assume-utf16le Assume that the input format is UTF-16LE\n"
+" -ub, --assume-utf16be Assume that the input format is UTF-16BE\n"
+msgstr ""
+" -ul, --assume-utf16le Предположить что входной формат UTF-16LE\n"
+" -ub, --assume-utf16be Предположить что входной формат UTF-16BE\n"
+
+#: common.c:230
+#, c-format
+msgid ""
+" -F, --follow-symlink follow symbolic links and convert the targets\n"
+" -R, --replace-symlink replace symbolic links with converted files\n"
+" (original target files remain unchanged)\n"
+" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
+msgstr ""
+" -F, --follow-symlink следовать символическим ссылкам и преобразовать цели\n"
+" -R, --replace-symlink заменить символические ссылки преобразованными "
+"файлами\n"
+" (оригинальные целевые файлы останутся без изменений)\n"
+" -S, --skip-symlink оставить символические ссылки и цели без изменений "
+"(по умолчанию)\n"
+
+#: common.c:236
+#, c-format
+msgid " -V, --version display version number\n"
+msgstr " -V, --version отобразить номер версии\n"
+
+#: common.c:249
+msgid "DOS 16 bit version (WATCOMC).\n"
+msgstr "DOS 16 bit версия (WATCOMC).\n"
+
+#: common.c:251
+msgid "DOS 16 bit version (TURBOC).\n"
+msgstr "DOS 16 bit версия (TURBOC).\n"
+
+#: common.c:253
+msgid "DOS 32 bit version (WATCOMC).\n"
+msgstr "DOS 32 bit версия (WATCOMC).\n"
+
+#: common.c:255
+msgid "DOS 32 bit version (DJGPP).\n"
+msgstr "DOS 32 bit версия (DJGPP).\n"
+
+#: common.c:257
+msgid "MSYS version.\n"
+msgstr "MSYS версия.\n"
+
+#: common.c:259
+msgid "Cygwin version.\n"
+msgstr "Cygwin версия.\n"
+
+#: common.c:261
+msgid "Windows 64 bit version (MinGW-w64).\n"
+msgstr "Windows 64 bit версия (MinGW-w64).\n"
+
+#: common.c:263
+msgid "Windows 32 bit version (WATCOMC).\n"
+msgstr "Windows 32 bit версия (WATCOMC).\n"
+
+#: common.c:265
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows 32 bit версия (MinGW-w64).\n"
+
+#: common.c:267
+msgid "Windows 32 bit version (MinGW).\n"
+msgstr "Windows 32 bit версия (MinGW).\n"
+
+#: common.c:269
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows 64 bit версия (MSVC %d).\n"
+
+#: common.c:271
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows 32 bit версия (MSVC %d).\n"
+
+#: common.c:273
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "OS/2 версия (WATCOMC).\n"
+
+#: common.c:275
+msgid "OS/2 version (EMX).\n"
+msgstr "OS/2 версия (EMX).\n"
+
+#: common.c:278
+msgid "With Unicode UTF-16 support.\n"
+msgstr "С поддержкой Unicode UTF-16.\n"
+
+#: common.c:280
+msgid "Without Unicode UTF-16 support.\n"
+msgstr "Без поддержки Unicode UTF-16.\n"
+
+#: common.c:283
+msgid "With native language support.\n"
+msgstr "С поддержкой родного языка.\n"
diff --git a/test/utf16_be_nobom.txt b/test/utf16_be_nobom.txt
new file mode 100644
index 0000000..2efd41a
--- /dev/null
+++ b/test/utf16_be_nobom.txt
Binary files differ
diff --git a/test/utf16_le_nobom.txt b/test/utf16_le_nobom.txt
new file mode 100644
index 0000000..1861149
--- /dev/null
+++ b/test/utf16_le_nobom.txt
Binary files differ
diff --git a/unix2dos.c b/unix2dos.c
index d0cdf80..cd5b518 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -129,7 +129,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -182,7 +182,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -276,6 +276,8 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
switch (ipFlag->ConvMode)
{
case CONVMODE_ASCII: /* ascii */
+ case CONVMODE_UTF16LE: /* Assume UTF-16LE */
+ case CONVMODE_UTF16BE: /* Assume UTF-16BE */
ConvTable = U2DAsciiTable;
break;
case CONVMODE_7BIT: /* 7bit */
@@ -329,7 +331,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -379,7 +381,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
if (!ipFlag->Quiet)
{
fprintf(stderr, "%s: ", progname);
- fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+ fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr);
}
break;
}
@@ -569,6 +571,12 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
}
InF = read_bom(InF, &ipFlag->bomtype);
+#ifdef D2U_UNICODE
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE))
+ ipFlag->bomtype = FILE_UTF16LE;
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE))
+ ipFlag->bomtype = FILE_UTF16BE;
+#endif
#ifdef D2U_UNICODE
#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */
@@ -602,7 +610,8 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
fprintf(TempF, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */
/* Turn off ISO and 7-bit conversion for Unicode text files */
- if (ipFlag->bomtype > 0)
+ /* When we assume UTF16, don't change the conversion mode. We need to remember it. */
+ if ((ipFlag->bomtype > 0) && (ipFlag->ConvMode != CONVMODE_UTF16LE) && (ipFlag->ConvMode != CONVMODE_UTF16BE))
ipFlag->ConvMode = CONVMODE_ASCII;
/* conversion sucessful? */
@@ -822,6 +831,12 @@ int ConvertUnixToDosStdio(CFlag *ipFlag, char *progname)
#endif
read_bom(stdin, &ipFlag->bomtype);
+#ifdef D2U_UNICODE
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE))
+ ipFlag->bomtype = FILE_UTF16LE;
+ if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE))
+ ipFlag->bomtype = FILE_UTF16BE;
+#endif
if ((ipFlag->add_bom) || (ipFlag->bomtype > 0))
fprintf(stdout, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */
@@ -991,6 +1006,12 @@ int main (int argc, char *argv[])
pFlag->ConvMode = CONVMODE_865;
else if (strcmp(argv[ArgIdx],"-1252") == 0)
pFlag->ConvMode = CONVMODE_1252;
+#ifdef D2U_UNICODE
+ else if ((strcmp(argv[ArgIdx],"-ul") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16le") == 0))
+ pFlag->ConvMode = CONVMODE_UTF16LE;
+ else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0))
+ pFlag->ConvMode = CONVMODE_UTF16BE;
+#endif
else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0))
{
if (++ArgIdx < argc)
diff --git a/version.mk b/version.mk
index 36981c6..fffe11a 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-DOS2UNIX_VERSION = 6.0.3
-DOS2UNIX_VERSION_SHORT = 603
-DOS2UNIX_DATE = 2013-01-25
+DOS2UNIX_VERSION = 6.0.4
+DOS2UNIX_VERSION_SHORT = 604
+DOS2UNIX_DATE = 2013-12-30
DOS2UNIX_AUTHOR = 'Erwin Waterlander'
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:26:04 +0000