diff options
82 files changed, 8609 insertions, 5889 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index e8f400e..fd2b188 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,33 @@ +2017-10-10 Erwin Waterlander <waterlan@xs4all.nl> + * Version 7.4.0 + +2017-09-24 Sebastian Rasmussen + * Fixed typos in code and documentation. + +2017-09-11 Erwin Waterlander <waterlan@xs4all.nl> + * common.c: When --allow-chown is used put the same read/write + permissions as in new file mode. + * man/man1/dos2unix.pod: Updated. + +2017-09-05 Erwin Waterlander <waterlan@xs4all.nl> + * common.c: Option -V shows if dos2unix has support for preserving + the user and group ownership of files. + * common.c: New option --allow-chown to allow file ownership change + in old file mode. Option --no-allow-chown does the opposite. + Thanks to RedHat bug: 1483633 - Add option to force in-place conversion + even if ownership cannot be preserved + https://bugzilla.redhat.com/show_bug.cgi?id=1483633 + +2017-08-05 Erwin Waterlander <waterlan@xs4all.nl> + * Makefile: Build all text and html manual files when ENABLE_NLS=1. + * Makefile: Removed unneeded tabs. + +2017-07-29 Erwin Waterlander <waterlan@xs4all.nl> + * common.c: Code cleanup. + +2017-07-08 Erwin Waterlander <waterlan@xs4all.nl> + * test/Makefile: Fix setting C.UTF-8 environment (when available). + 2017-07-04 Erwin Waterlander <waterlan@xs4all.nl> * Version 7.3.5 * Makefile: Compile with -O0 when DEBUG=1. diff --git a/INSTALL.txt b/INSTALL.txt index d392161..0832640 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -39,8 +39,8 @@ PREREQUISITES Using Microsoft Visual C++: Required - * Visual C++ : You can get a free express version via this web page: - http://www.visualstudio.com/products/visual-studio-express-vs + * Visual C++ : You can get a free community version via this web page: + https://www.visualstudio.com/vs/community/ Download Visual Studio for Windows Desktop. Visual C++ is part of Visual Studio. Out of the box compilation for 64-bit applications is supported since version 2012. @@ -230,21 +230,6 @@ DOCUMENTATION make maintainer-clean make man - Generation of correct man pages in UTF-8 format requires perl >= 5.10.1. - - The manual pages in text and html format are by default only - created in English language. To create text and html manuals - for other languages type: - - make txt - make html - - Generation of correct man pages in HTML format requires perl >= 5.18. - - Once the manuals in non-English languages have been created, - they will also be installed under share/doc/ when you type - 'make install' - Manuals in PDF format are by default not created. To create manuals in PDF format type: @@ -26,31 +26,31 @@ # # Description # -# This is a GNU Makefile that uses GNU compilers, linkers and cpp. The -# platform specific issues are determined by the various OS teets that -# rely on the uname(1) command and directory locations. +# This is a GNU Makefile that uses GNU compilers, linkers and cpp. The +# platform specific issues are determined by the various OS teets that +# rely on the uname(1) command and directory locations. # -# Set additional flags for the build with variables CFLAGS_USER, -# DEFS_USER and LDFLAGS_USER. +# Set additional flags for the build with variables CFLAGS_USER, +# DEFS_USER and LDFLAGS_USER. include version.mk -.PHONY: man txt html pdf mofiles tags merge test check +.PHONY: doc man txt html pdf mofiles tags merge test check .PRECIOUS: %.1 %.pod -CC ?= gcc -CPP ?= cpp -CPP_FLAGS_POD = ALL -STRIP = strip +CC ?= gcc +CPP ?= cpp +CPP_FLAGS_POD = ALL +STRIP = strip -PACKAGE = dos2unix -UNIX2DOS = unix2dos -MAC2UNIX = mac2unix -UNIX2MAC = unix2mac +PACKAGE = dos2unix +UNIX2DOS = unix2dos +MAC2UNIX = mac2unix +UNIX2MAC = unix2mac # Native Language Support (NLS) -ENABLE_NLS = 1 +ENABLE_NLS = 1 # Large File Support (LFS) LFS = 1 # DEBUG=1 adds the -g option to CFLAGS, for adding debug symbols. @@ -62,54 +62,60 @@ DIST_TARGET = dist-tgz EXE= -BIN = $(PACKAGE)$(EXE) -UNIX2DOS_BIN = $(UNIX2DOS)$(EXE) -MAC2UNIX_BIN = $(MAC2UNIX)$(EXE) -UNIX2MAC_BIN = $(UNIX2MAC)$(EXE) +BIN = $(PACKAGE)$(EXE) +UNIX2DOS_BIN = $(UNIX2DOS)$(EXE) +MAC2UNIX_BIN = $(MAC2UNIX)$(EXE) +UNIX2MAC_BIN = $(UNIX2MAC)$(EXE) -LINK = ln -sf -LINK_MAN = $(LINK) +LINK = ln -sf +LINK_MAN = $(LINK) -prefix = /usr -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin -datarootdir = $(prefix)/share -datadir = $(datarootdir) +prefix = /usr +exec_prefix = $(prefix) +bindir = $(exec_prefix)/bin +datarootdir = $(prefix)/share +datadir = $(datarootdir) -docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION) -docdir = $(datarootdir)/doc/$(docsubdir) -localedir = $(datarootdir)/locale -mandir = $(datarootdir)/man -man1dir = $(mandir)/man1 -manext = .1 -man1ext = .1 +docsubdir = $(PACKAGE)-$(DOS2UNIX_VERSION) +docdir = $(datarootdir)/doc/$(docsubdir) +localedir = $(datarootdir)/locale +mandir = $(datarootdir)/man +man1dir = $(mandir)/man1 +manext = .1 +man1ext = .1 ifdef ENABLE_NLS - POT = po/$(PACKAGE).pot - POFILES = $(wildcard po/??.po) $(wildcard po/??_??.po) - MOFILES = $(patsubst %.po,%.mo,$(POFILES)) - NLSSUFFIX = -nls + POT = po/$(PACKAGE).pot + POFILES = $(wildcard po/??.po) $(wildcard po/??_??.po) + MOFILES = $(patsubst %.po,%.mo,$(POFILES)) + NLSSUFFIX = -nls endif HTMLEXT = htm -# By default we generate only English text and html manuals. -DOCFILES = man/man1/$(PACKAGE).txt man/man1/$(PACKAGE).$(HTMLEXT) -INSTALL_OBJS_DOC = README.txt INSTALL.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES) +# English only documents. +INSTALL_OBJS_DOC = README.txt INSTALL.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt +# English manual +MANFILES_EN = man/man1/$(PACKAGE).1 +TXTFILES_EN = man/man1/$(PACKAGE).txt +HTMLFILES_EN = man/man1/$(PACKAGE).$(HTMLEXT) +PSFILES_EN = man/man1/$(PACKAGE).ps +PDFFILES_EN = man/man1/$(PACKAGE).pdf + +# International manuals ifdef ENABLE_NLS - MANPOTFILE = po-man/dos2unix-man.pot - MANPOFILES = $(wildcard po-man/*.po) - PODFILES = $(patsubst po-man/%.po,man/%/man1/dos2unix.pod,$(MANPOFILES)) + MANPOTFILE = po-man/dos2unix-man.pot + MANPOFILES = $(wildcard po-man/*.po) + MANPODFILES = $(patsubst po-man/%.po,man/%/man1/dos2unix.pod,$(MANPOFILES)) endif -PODFILES_ALL = man/man1/dos2unix.pod $(PODFILES) -MANFILES = $(patsubst %.pod,%.1,$(PODFILES)) -TXTFILES = $(patsubst %.pod,%.txt,$(PODFILES_ALL)) -HTMLFILES = $(patsubst %.pod,%.$(HTMLEXT),$(PODFILES_ALL)) -PSFILES = $(patsubst %.pod,%.ps,$(PODFILES_ALL)) -PDFFILES = $(patsubst %.pod,%.pdf,$(PODFILES_ALL)) +MANFILES = $(patsubst %.pod,%.1,$(MANPODFILES)) +TXTFILES = $(patsubst %.pod,%.txt,$(MANPODFILES)) +HTMLFILES = $(patsubst %.pod,%.$(HTMLEXT),$(MANPODFILES)) +PSFILES = $(patsubst %.pod,%.ps,$(MANPODFILES)) +PDFFILES = $(patsubst %.pod,%.pdf,$(MANPODFILES)) # On some systems (e.g. FreeBSD 4.10) GNU install is installed as `ginstall'. -INSTALL = install +INSTALL = install INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 @@ -117,197 +123,197 @@ INSTALL_DATA = $(INSTALL) -m 644 MKDIR = mkdir ifdef ENABLE_NLS - DOS2UNIX_NLSDEFS = -DENABLE_NLS -DLOCALEDIR=\"$(localedir)\" -DPACKAGE=\"$(PACKAGE)\" + DOS2UNIX_NLSDEFS = -DENABLE_NLS -DLOCALEDIR=\"$(localedir)\" -DPACKAGE=\"$(PACKAGE)\" endif -VERSIONSUFFIX = -bin +VERSIONSUFFIX = -bin # ......................................................... OS flags ... ifndef D2U_OS - d2u_os=$(shell uname -s) + d2u_os=$(shell uname -s) ifeq ($(findstring CYGWIN,$(d2u_os)),CYGWIN) - D2U_OS = cygwin + D2U_OS = cygwin endif ifndef D2U_OS ifeq ($(findstring MSYS,$(d2u_os)),MSYS) - D2U_OS = msys + D2U_OS = msys endif endif ifndef D2U_OS ifeq ($(findstring MINGW32,$(d2u_os)),MINGW32) - D2U_OS = mingw32 + D2U_OS = mingw32 endif endif ifndef D2U_OS ifeq ($(findstring MINGW64,$(d2u_os)),MINGW64) - D2U_OS = mingw64 + D2U_OS = mingw64 endif endif ifndef D2U_OS ifneq ($(DJGPP),) - D2U_OS = msdos + D2U_OS = msdos endif endif ifndef D2U_OS ifneq (, $(wildcard /opt/csw)) - D2U_OS = sun + D2U_OS = sun endif endif ifndef D2U_OS - D2U_OS=$(shell echo $(d2u_os) | tr [A-Z] [a-z]) + D2U_OS=$(shell echo $(d2u_os) | tr [A-Z] [a-z]) endif endif ifeq (cygwin,$(D2U_OS)) ifdef ENABLE_NLS - 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... - LINK = ln -f - # but use symbolic links for man pages, since man client - # IS a cygwin app and DOES understand symlinks. - LINK_MAN = ln -fs - # Cygwin packaging standard avoids version numbers on - # documentation directories. - docsubdir = $(PACKAGE) - MACHINE := $(subst -pc-cygwin,,$(shell gcc -dumpmachine)) - VERSIONSUFFIX = -cygwin-$(MACHINE) + 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... + LINK = ln -f + # but use symbolic links for man pages, since man client + # IS a cygwin app and DOES understand symlinks. + LINK_MAN = ln -fs + # Cygwin packaging standard avoids version numbers on + # documentation directories. + docsubdir = $(PACKAGE) + MACHINE := $(subst -pc-cygwin,,$(shell gcc -dumpmachine)) + VERSIONSUFFIX = -cygwin-$(MACHINE) endif ifeq (msys,$(D2U_OS)) - CC=gcc - EXE = .exe - MACHINE := $(subst -pc-msys,,$(shell gcc -dumpmachine)) + CC=gcc + EXE = .exe + MACHINE := $(subst -pc-msys,,$(shell gcc -dumpmachine)) # MSYS 1 does not support locales and no Unicode. ifeq ($(shell ./test/chk_loc.sh en_US.utf8),no) - UCS = - VERSIONSUFFIX = -msys1-$(MACHINE) + UCS = + VERSIONSUFFIX = -msys1-$(MACHINE) else - VERSIONSUFFIX = -msys2-$(MACHINE) + VERSIONSUFFIX = -msys2-$(MACHINE) endif ifdef ENABLE_NLS - LIBS_EXTRA = -lintl -liconv + LIBS_EXTRA = -lintl -liconv endif endif ifeq (mingw32,$(D2U_OS)) - CC=gcc - prefix=c:/usr/local - EXE = .exe - VERSIONSUFFIX = -win32 - LINK = cp -f - UNIFILE=1 - DIST_TARGET = dist-zip + CC=gcc + prefix=c:/usr/local + EXE = .exe + VERSIONSUFFIX = -win32 + LINK = cp -f + UNIFILE=1 + DIST_TARGET = dist-zip ifdef ENABLE_NLS - LIBS_EXTRA = -lintl -liconv - ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll + LIBS_EXTRA = -lintl -liconv + ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll endif ifeq ($(findstring w64-mingw32,$(shell gcc -dumpmachine)),w64-mingw32) # Mingw-w64 - CFLAGS_COMPILER = -DD2U_COMPILER=MINGW32_W64 + CFLAGS_COMPILER = -DD2U_COMPILER=MINGW32_W64 ifdef ENABLE_NLS - ZIPOBJ_EXTRA += bin/libgcc_s_dw2-1.dll bin/libwinpthread-1.dll + ZIPOBJ_EXTRA += bin/libgcc_s_dw2-1.dll bin/libwinpthread-1.dll endif - CRT_GLOB_OBJ = /mingw32/i686-w64-mingw32/lib/CRT_glob.o - LIBS_EXTRA += $(CRT_GLOB_OBJ) - CFLAGS_OS=-I/mingw32/include + CRT_GLOB_OBJ = /mingw32/i686-w64-mingw32/lib/CRT_glob.o + LIBS_EXTRA += $(CRT_GLOB_OBJ) + CFLAGS_OS=-I/mingw32/include else - CFLAGS_OS=-D_O_U16TEXT=0x20000 + CFLAGS_OS=-D_O_U16TEXT=0x20000 endif endif ifeq (mingw64,$(D2U_OS)) - CC=gcc - prefix=c:/usr/local64 - EXE = .exe - VERSIONSUFFIX = -win64 - LINK = cp -f - UNIFILE=1 - DIST_TARGET = dist-zip + CC=gcc + prefix=c:/usr/local64 + EXE = .exe + VERSIONSUFFIX = -win64 + LINK = cp -f + UNIFILE=1 + DIST_TARGET = dist-zip ifdef ENABLE_NLS - LIBS_EXTRA = -lintl -liconv - ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll + LIBS_EXTRA = -lintl -liconv + ZIPOBJ_EXTRA = bin/libintl-8.dll bin/libiconv-2.dll endif - CRT_GLOB_OBJ = /mingw64/x86_64-w64-mingw32/lib/CRT_glob.o - LIBS_EXTRA += $(CRT_GLOB_OBJ) - CFLAGS_OS=-I/mingw64/include + CRT_GLOB_OBJ = /mingw64/x86_64-w64-mingw32/lib/CRT_glob.o + LIBS_EXTRA += $(CRT_GLOB_OBJ) + CFLAGS_OS=-I/mingw64/include endif ifeq (msdos,$(D2U_OS)) - prefix=c:/dos32 - EXE = .exe - VERSIONSUFFIX = pm - LINK_MAN = cp -f - docsubdir = dos2unix - UCS = - ZIPOBJ_EXTRA = bin/cwsdpmi.exe + prefix=c:/dos32 + EXE = .exe + VERSIONSUFFIX = pm + LINK_MAN = cp -f + docsubdir = dos2unix + UCS = + ZIPOBJ_EXTRA = bin/cwsdpmi.exe ifdef ENABLE_NLS - LIBS_EXTRA = -lintl -liconv + LIBS_EXTRA = -lintl -liconv endif endif ifeq (os/2,$(D2U_OS)) - prefix=c:/usr - EXE = .exe - VERSIONSUFFIX = -os2 - LINK_MAN = cp -f - UCS = - LDFLAGS_EXTRA = -Zargs-wild - DIST_TARGET = dist-zip + prefix=c:/usr + EXE = .exe + VERSIONSUFFIX = -os2 + LINK_MAN = cp -f + UCS = + LDFLAGS_EXTRA = -Zargs-wild + DIST_TARGET = dist-zip ifdef ENABLE_NLS - LIBS_EXTRA += -lintl -liconv + LIBS_EXTRA += -lintl -liconv endif endif ifeq (freemint,$(D2U_OS)) - prefix=/usr - EXE = - VERSIONSUFFIX = -freemint - UCS= - ENABLE_NLS= + prefix=/usr + EXE = + VERSIONSUFFIX = -freemint + UCS= + ENABLE_NLS= ifdef ENABLE_NLS - LIBS_EXTRA += -lintl -liconv + LIBS_EXTRA += -lintl -liconv endif - EXTRA_DEFS += -Dfreemint -D__OS=\"freemint\" + EXTRA_DEFS += -Dfreemint -D__OS=\"freemint\" endif ifeq (freebsd,$(D2U_OS)) ifdef ENABLE_NLS - CFLAGS_OS = -I/usr/local/include - LDFLAGS_EXTRA = -L/usr/local/lib - LIBS_EXTRA = -lintl + CFLAGS_OS = -I/usr/local/include + LDFLAGS_EXTRA = -L/usr/local/lib + LIBS_EXTRA = -lintl endif endif ifeq (darwin,$(D2U_OS)) ifdef ENABLE_NLS - CFLAGS_OS = -I/usr/local/include - LDFLAGS_EXTRA = -L/usr/local/lib - LIBS_EXTRA = -lintl + CFLAGS_OS = -I/usr/local/include + LDFLAGS_EXTRA = -L/usr/local/lib + LIBS_EXTRA = -lintl endif endif ifeq (sun,$(D2U_OS)) - # Running under SunOS/Solaris - LIBS_EXTRA = -lintl + # Running under SunOS/Solaris + LIBS_EXTRA = -lintl endif ifeq (hp-ux,$(D2U_OS)) - # Running under HP-UX - EXTRA_DEFS += -Dhpux -D_HPUX_SOURCE + # Running under HP-UX + EXTRA_DEFS += -Dhpux -D_HPUX_SOURCE endif @@ -316,51 +322,52 @@ endif # PostScript and PDF generation from UTF-8 manuals is not working, # or I don't know how to do it. -CFLAGS_USER = +CFLAGS_USER = ifeq ($(DEBUG), 1) -CFLAGS ?= -O0 +CFLAGS ?= -O0 else -CFLAGS ?= -O2 +CFLAGS ?= -O2 endif -CFLAGS += -Wall -Wextra -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) +CFLAGS += -Wall -Wextra -Wconversion $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) -EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ - -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ - -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ - -DDEBUG=$(DEBUGMSG) \ - $(CFLAGS_OS) \ - $(CFLAGS_COMPILER) +EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ + -DVER_DATE=\"$(DOS2UNIX_DATE)\" \ + -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ + -DDEBUG=$(DEBUGMSG) \ + $(CFLAGS_OS) \ + $(CFLAGS_COMPILER) ifeq ($(DEBUG), 1) - EXTRA_CFLAGS += -g + EXTRA_CFLAGS += -g endif ifdef STATIC - EXTRA_CFLAGS += -static + EXTRA_CFLAGS += -static endif ifdef UCS - EXTRA_CFLAGS += -DD2U_UNICODE + EXTRA_CFLAGS += -DD2U_UNICODE endif ifdef UNIFILE - EXTRA_CFLAGS += -DD2U_UNIFILE + EXTRA_CFLAGS += -DD2U_UNIFILE endif ifdef LFS - EXTRA_CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + EXTRA_CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 endif -LDFLAGS_USER = +LDFLAGS_USER = LDFLAGS = $(RPM_OPT_FLAGS) $(LDFLAGS_EXTRA) $(LDFLAGS_USER) LIBS = $(LIBS_EXTRA) -DEFS_USER = -DEFS = $(EXTRA_DEFS) $(DEFS_USER) +DEFS_USER = +DEFS = $(EXTRA_DEFS) $(DEFS_USER) # .......................................................... targets ... -all: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) $(DOCFILES) $(MOFILES) man/man1/dos2unix.1 $(MANFILES) $(MANPOTFILE) +all: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) doc \ + mofiles man status: @echo "D2U_OS = $(D2U_OS)" @@ -438,17 +445,17 @@ man/man1/dos2unix.pod : ; mofiles: $(MOFILES) -html: $(HTMLFILES) +html: $(HTMLFILES_EN) $(HTMLFILES) -txt: $(TXTFILES) +txt: $(TXTFILES_EN) $(TXTFILES) -ps: $(PSFILES) +ps: $(PSFILES_EN) $(PSFILES) -pdf: $(PDFFILES) +pdf: $(PDFFILES_EN) $(PDFFILES) -man: man/man1/dos2unix.1 $(MANFILES) $(MANPOTFILE) +man: $(MANFILES_EN) $(MANFILES) $(MANPOTFILE) -doc: $(DOCFILES) +doc: txt html tags: $(POT) @@ -525,10 +532,14 @@ endif check: test -install: all +install-bin: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) $(MKDIR) -p -m 755 $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(UNIX2DOS_BIN) $(DESTDIR)$(bindir) +ifneq ($(DJGPP),) + cd $(DESTDIR)$(bindir); stubify -g $(MAC2UNIX_BIN) ; stubedit $(MAC2UNIX_BIN) runfile=$(BIN) + cd $(DESTDIR)$(bindir); stubify -g $(UNIX2MAC_BIN) ; stubedit $(UNIX2MAC_BIN) runfile=$(UNIX2DOS_BIN) +else ifeq ($(LINK),cp -f) $(INSTALL_PROGRAM) $(MAC2UNIX_BIN) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(UNIX2MAC_BIN) $(DESTDIR)$(bindir) @@ -536,12 +547,16 @@ else cd $(DESTDIR)$(bindir); $(LINK) $(BIN) $(MAC2UNIX_BIN) cd $(DESTDIR)$(bindir); $(LINK) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) endif +endif + + +install-man: man $(MKDIR) -p -m 755 $(DESTDIR)$(man1dir) - $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir) + $(INSTALL_DATA) $(MANFILES_EN) $(DESTDIR)$(man1dir) ifeq ($(LINK_MAN),cp -f) - $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(MAC2UNIX).1 - $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2DOS).1 - $(INSTALL_DATA) man/man1/$(PACKAGE).1 $(DESTDIR)$(man1dir)/$(UNIX2MAC).1 + $(INSTALL_DATA) $(MANFILES_EN) $(DESTDIR)$(man1dir)/$(MAC2UNIX).1 + $(INSTALL_DATA) $(MANFILES_EN) $(DESTDIR)$(man1dir)/$(UNIX2DOS).1 + $(INSTALL_DATA) $(MANFILES_EN) $(DESTDIR)$(man1dir)/$(UNIX2MAC).1 else cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(MAC2UNIX).1 cd $(DESTDIR)$(man1dir); $(LINK_MAN) $(PACKAGE).1 $(UNIX2DOS).1 @@ -553,33 +568,46 @@ ifdef ENABLE_NLS $(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 ;) +endif + +install-mo: mofiles +ifdef ENABLE_NLS @echo "-- install-mo" $(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;) $(foreach mofile, $(MOFILES), $(INSTALL_DATA) $(mofile) $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;) endif - # Run a new instance of 'make' otherwise the $$(wildcard ) function my not have been expanded, - # because the files may not have been there when make was started. - $(MAKE) install-doc - -install-doc: $(INSTALL_OBJS_DOC) +install-doc: doc @echo "-- install-doc" $(MKDIR) -p -m 755 $(DESTDIR)$(docdir) $(INSTALL_DATA) $(INSTALL_OBJS_DOC) $(DESTDIR)$(docdir) + $(INSTALL_DATA) $(TXTFILES_EN) $(DESTDIR)$(docdir) + $(INSTALL_DATA) $(HTMLFILES_EN) $(DESTDIR)$(docdir) +ifdef ENABLE_NLS + $(foreach txtfile, $(TXTFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;) + $(foreach txtfile, $(TXTFILES), $(INSTALL_DATA) $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;) + $(foreach htmlfile, $(HTMLFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) + $(foreach htmlfile, $(HTMLFILES), $(INSTALL_DATA) $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) +endif + +# No dependency. Install pdf/ps only when they have been manually generated. +install-pdf: + @echo "-- install-pdf" + $(MKDIR) -p -m 755 $(DESTDIR)$(docdir) $(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL_DATA) $(pdffile) $(DESTDIR)$(docdir) ;) $(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL_DATA) $(psfile) $(DESTDIR)$(docdir) ;) ifdef ENABLE_NLS - # Install translated manuals when they have been generated. - $(foreach txtfile, $(wildcard man/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;) - $(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL_DATA) $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;) - $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) - $(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL_DATA) $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;) $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;) $(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL_DATA) $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;) $(foreach psfile, $(wildcard man/*/man1/*.ps), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;) $(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL_DATA) $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;) endif +install: install-bin install-man install-mo install-doc + # Run a new instance of 'make' otherwise the $$(wildcard ) function my not have been expanded, + # because the files may not have been there when make was started. + $(MAKE) install-pdf + uninstall: @echo "-- target: uninstall" -rm -f $(DESTDIR)$(bindir)/$(BIN) @@ -649,23 +677,23 @@ maintainer-clean: distclean realclean: maintainer-clean -ZIPOBJ = bin/$(BIN) \ - bin/$(MAC2UNIX_BIN) \ - bin/$(UNIX2DOS_BIN) \ - bin/$(UNIX2MAC_BIN) \ - share/man/man1/$(PACKAGE).1 \ - share/man/man1/$(MAC2UNIX).1 \ - share/man/man1/$(UNIX2DOS).1 \ - share/man/man1/$(UNIX2MAC).1 \ - share/doc/$(docsubdir)/*.* \ - $(ZIPOBJ_EXTRA) +ZIPOBJ = bin/$(BIN) \ + bin/$(MAC2UNIX_BIN) \ + bin/$(UNIX2DOS_BIN) \ + bin/$(UNIX2MAC_BIN) \ + share/man/man1/$(PACKAGE).1 \ + share/man/man1/$(MAC2UNIX).1 \ + share/man/man1/$(UNIX2DOS).1 \ + share/man/man1/$(UNIX2MAC).1 \ + share/doc/$(docsubdir)/*.* \ + $(ZIPOBJ_EXTRA) ifdef ENABLE_NLS ZIPOBJ += share/locale/*/LC_MESSAGES/$(PACKAGE).mo ZIPOBJ += share/man/*/man1/$(PACKAGE).1 \ - share/man/*/man1/$(MAC2UNIX).1 \ - share/man/*/man1/$(UNIX2DOS).1 \ - share/man/*/man1/$(UNIX2MAC).1 + share/man/*/man1/$(MAC2UNIX).1 \ + share/man/*/man1/$(UNIX2DOS).1 \ + share/man/*/man1/$(UNIX2MAC).1 ZIPOBJ += share/doc/$(docsubdir)/*/* endif @@ -1,3 +1,8 @@ +2017-10-10: Version 7.4.0 + * New option --allow-chown to allow file ownership change + in old file mode. Option --no-allow-chown does the opposite. + * Code cleanup. + 2017-07-04: Version 7.3.5 * New flag 0 for option -i, --info. End information lines with a null character instead of a newline character, enabling correct file name @@ -58,7 +58,7 @@ HISTORY AUTHORS - Erwin Waterlander version 3.2 - 7.3.5 2009-2017 + Erwin Waterlander version 3.2 - 7.4.0 2009-2017 Christian Wurll version 3.1 1998 Bernd Johannes Wuebben version 3.0 1998 Benjamin Lin version 1.1 - 2.3 1994-1995 @@ -66,7 +66,7 @@ AUTHORS TRANSLATORS - Since verion 6.0.5 dos2unix is part of the Translation Project (TP). + Since version 6.0.5 dos2unix is part of the Translation Project (TP). All translations go via the Translation Project. Translation of the messages. @@ -74,8 +74,8 @@ TRANSLATORS Brazilian Portuguese Enrico Nicoletto Version 6.0.5 Brazilian Portuguese Rafael Ferreira Version 6.0.6 - 7.2 - Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.4 - Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.3 + Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.4.0 + Chinese (simplified) Tianze Wang Version 7.3.1 - 7.4.0 Chinese (traditional) mail6543210 Version 6.0.5 Danish Thomas Pryds Version 6.0.5 - 6.0.6 Danish Joe Hansen Version 7.2.3 - 7.3.4 @@ -83,7 +83,7 @@ TRANSLATORS Dutch Benno Schulenberg Version 6.0.5 - 7.3.4 Esperanto Rugxulo Version 5.1 - 6.0.4 Esperanto Benno Schulenberg Version 6.0.5 - 7.3 - French Frédéric Marchal Version 6.0.5 - 7.3.4 + French Frédéric Marchal Version 6.0.5 - 7.4.0 German Philipp Thomas Version 5.0 - 6.0.3, 7.0, 7.2.2 - 7.3.4 German Lars Wendler Version 6.0.4 @@ -92,31 +92,31 @@ TRANSLATORS Hungarian Gabor Kelemen Version 7.3.4 Japanese Yasuaki Taniguchi Version 7.1.1 Japanese Takeshi Hamasaki Version 7.3.4 - Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.3.4 - Polish Jakub Bogusz Version 6.0.5 - 7.3.4 + Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.4.0 + Polish Jakub Bogusz Version 6.0.5 - 7.4.0 Russian Андрей Углик (Andrei Uhlik) Version 6.0.4 - Russian Yuri Kozlov Version 6.0.6 - 7.3.4 + Russian Yuri Kozlov Version 6.0.6 - 7.4.0 Serbian Мирослав Николић Version 6.0.5 - 7.3.4 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.3.1 - Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.4 + Swedish Sebastian Rasmussen Version 7.3.2 - 7.4.0 Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.4 - Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.4 + Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.4.0 Translation of the manual. See http://translationproject.org/domain/dos2unix-man.html Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 7.2 - Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.5 - Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.5 + Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.4.0 + Chinese (simplified) Tianze Wang Version 7.3.1 - 7.4.0 Dutch Erwin Waterlander Version 5.1.1 - 6.0.4 Dutch Benno Schulenberg Version 6.0.5 - 7.3.3 - French Frédéric Marchal Version 6.0.5 - 7.3.5 - German Mario Blättermann Version 6.0.5 - 7.3.5 - Polish Jakub Bogusz Version 6.0.5 - 7.3.5 + French Frédéric Marchal Version 6.0.5 - 7.4.0 + German Mario Blättermann Version 6.0.5 - 7.4.0 + Polish Jakub Bogusz Version 6.0.5 - 7.4.0 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.2.1 - Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.5 + Swedish Sebastian Rasmussen Version 7.3.2 - 7.4.0 Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.5 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 Erwin Waterlander + * Copyright (C) 2009-2017 Erwin Waterlander * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,7 +56,6 @@ #ifdef D2U_UNIFILE int d2u_display_encoding = D2U_DISPLAY_ANSI ; #endif -int header_done = 0; /* Copy string src to dest, and null terminate dest. dest_size must be the buffer size of dest. */ @@ -645,6 +644,9 @@ int is_dos2unix(const char *progname) void PrintUsage(const char *progname) { D2U_ANSI_FPRINTF(stdout,_("Usage: %s [options] [file ...] [-n infile outfile ...]\n"), progname); +#ifndef NO_CHOWN + D2U_ANSI_FPRINTF(stdout,_(" --allow-chown allow file ownership change\n")); +#endif D2U_ANSI_FPRINTF(stdout,_(" -ascii convert only line breaks (default)\n")); D2U_ANSI_FPRINTF(stdout,_(" -iso conversion between DOS and ISO-8859-1 character set\n")); D2U_ANSI_FPRINTF(stdout,_(" -1252 use Windows code page 1252 (Western European)\n")); @@ -680,6 +682,9 @@ void PrintUsage(const char *progname) D2U_ANSI_FPRINTF(stdout,_(" -n, --newfile write to new file\n\ infile original file in new-file mode\n\ outfile output file in new-file mode\n")); +#ifndef NO_CHOWN + D2U_ANSI_FPRINTF(stdout,_(" --no-allow-chown don't allow file ownership change (default)\n")); +#endif D2U_ANSI_FPRINTF(stdout,_(" -o, --oldfile write to old file (default)\n\ file ... files to convert in old-file mode\n")); D2U_ANSI_FPRINTF(stdout,_(" -q, --quiet quiet mode, suppress all warnings\n")); @@ -764,6 +769,11 @@ void PrintVersion(const char *progname, const char *localedir) #else D2U_ANSI_FPRINTF(stdout,"%s", "Without native language support.\n"); #endif +#ifndef NO_CHOWN + D2U_ANSI_FPRINTF(stdout,"%s", _("With support to preserve the user and group ownership of files.\n")); +#else + D2U_ANSI_FPRINTF(stdout,"%s", _("Without support to preserve the user and group ownership of files.\n")); +#endif #ifdef ENABLE_NLS D2U_ANSI_FPRINTF(stdout,"LOCALEDIR: %s\n", localedir); #endif @@ -771,8 +781,8 @@ void PrintVersion(const char *progname, const char *localedir) } /* opens file of name ipFN in read only mode - * RetVal: NULL if failure - * file stream otherwise + * returns: NULL if failure + * file stream otherwise */ FILE* OpenInFile(char *ipFN) { @@ -788,8 +798,8 @@ FILE* OpenInFile(char *ipFN) /* opens file of name opFN in write only mode - * RetVal: NULL if failure - * file stream otherwise + * returns: NULL if failure + * file stream otherwise */ FILE* OpenOutFile(char *opFN) { @@ -804,8 +814,8 @@ FILE* OpenOutFile(char *opFN) } /* opens file descriptor in write only mode - * RetVal: NULL if failure - * file stream otherwise + * returns: NULL if failure + * file stream otherwise */ FILE* OpenOutFiled(int fd) { @@ -1004,8 +1014,8 @@ FILE* MakeTempFileFrom(const char *OutFN, char **fname_ret) * Note that if symbolic links are not supported, then 0 is always returned * and *rFN = lFN. * - * RetVal: 0 if success, and *lFN is not a symlink - * 1 if success, and *lFN is a symlink + * returns: 0 if success, and *lFN is not a symlink + * 1 if success, and *lFN is a symlink * -1 otherwise */ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progname) @@ -1290,10 +1300,15 @@ void print_bom_info (const int bomtype) } } +/* check_unicode_info() + * Print assumed encoding and read file's BOM. Return file's BOM in *bomtype_orig. + * Set ipFlag->bomtype to assumed BOM type, when file's BOM == FILE_MBS. + * Return -1 when a read error occurred, or when whar_t < 32 bit on non-Windows OS. + * Return 0 when everything is OK. + */ + int check_unicode_info(FILE *InF, CFlag *ipFlag, const char *progname, int *bomtype_orig) { - int RetVal = 0; - #ifdef D2U_UNICODE if (ipFlag->verbose > 1) { if (ipFlag->ConvMode == CONVMODE_UTF16LE) { @@ -1324,13 +1339,13 @@ int check_unicode_info(FILE *InF, CFlag *ipFlag, const char *progname, int *bomt /* A decoded UTF-16 surrogate pair must fit in a wchar_t */ ipFlag->status |= WCHAR_T_TOO_SMALL ; if (!ipFlag->error) ipFlag->error = 1; - RetVal = -1; + return -1; } } #endif #endif - return RetVal; + return 0; } int check_unicode(FILE *InF, FILE *TempF, CFlag *ipFlag, const char *ipInFN, const char *progname) @@ -1395,7 +1410,7 @@ int check_unicode(FILE *InF, FILE *TempF, CFlag *ipFlag, const char *ipInFN, co } /* convert file ipInFN and write to file ipOutFN - * RetVal: 0 if success + * returns: 0 if success * -1 otherwise */ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progname, @@ -1509,7 +1524,7 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn if (check_unicode(InF, TempF, ipFlag, ipInFN, progname)) RetVal = -1; - /* conversion sucessful? */ + /* conversion successful? */ #ifdef D2U_UNICODE if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { if ((!RetVal) && (ConvertW(InF, TempF, ipFlag, progname))) @@ -1566,14 +1581,36 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn /* Required when a different user (e.g. root) has write permission on the original file. */ /* Make sure that the original owner can still access the file. */ if (chown(TempPath, StatBuf.st_uid, StatBuf.st_gid)) { - if (ipFlag->verbose) { - ipFlag->error = errno; - errstr = strerror(errno); - D2U_UTF8_FPRINTF(stderr, "%s: ", progname); - D2U_UTF8_FPRINTF(stderr, _("Failed to change the owner and group of temporary output file %s:"), TempPath); - D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + if (ipFlag->AllowChown) { + if (ipFlag->verbose) { + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("The user and/or group ownership of file %s is not preserved.\n"), ipOutFN); + } +#ifndef NO_CHMOD + /* Set read/write permissions same as in new file mode. */ + mask = umask(0); /* get process's umask */ + umask(mask); /* set umask back to original */ + RetVal = chmod(TempPath, StatBuf.st_mode & ~mask); /* set original permissions, minus umask */ + if (RetVal) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("Failed to change the permissions of temporary output file %s:"), TempPath); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + } + } +#endif + } else { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("Failed to change the owner and group of temporary output file %s:"), TempPath); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + } + RetVal = -1; } - RetVal = -1; } } #endif @@ -1663,7 +1700,7 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn } /* convert stdin and write to stdout - * RetVal: 0 if success + * returns: 0 if success * -1 otherwise */ int ConvertStdio(CFlag *ipFlag, const char *progname, @@ -1766,7 +1803,7 @@ void print_format(const CFlag *pFlag, char *informat, char *outformat, size_t li #endif } -void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *outfile, const char *progname, const int RetVal) +void print_messages(const CFlag *pFlag, const char *infile, const char *outfile, const char *progname, const int conversion_error) { char informat[32]; char outformat[64]; @@ -1794,11 +1831,14 @@ void print_messages_newfile(const CFlag *pFlag, const char *infile, const char * D2U_UTF8_FPRINTF(stderr, _("Skipping %s, not a regular file.\n"), infile); } else if (pFlag->status & OUTPUTFILE_SYMLINK) { D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), infile, outfile); + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), infile, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s.\n"), infile); } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) { D2U_UTF8_FPRINTF(stderr,"%s: ",progname); D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); - } else if (pFlag->status & OUTPUT_TARGET_NO_REGFILE) { + } else if ((pFlag->status & OUTPUT_TARGET_NO_REGFILE) && outfile) { D2U_UTF8_FPRINTF(stderr,"%s: ",progname); D2U_UTF8_FPRINTF(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), infile, outfile); } else if (pFlag->status & BINARY_FILE) { @@ -1820,122 +1860,64 @@ void print_messages_newfile(const CFlag *pFlag, const char *infile, const char * D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname); #endif } else { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - if (informat[0] == '\0') { - if (is_dos2unix(progname)) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Unix format...\n"), infile, outfile); - } else { - if (pFlag->FromToMode == FROMTO_UNIX2MAC) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Mac format...\n"), infile, outfile); + if (!conversion_error) { + D2U_UTF8_FPRINTF(stderr,"%s: ",progname); + if (informat[0] == '\0') { + if (is_dos2unix(progname)) { + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Unix format...\n"), infile, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("converting file %s to Unix format...\n"), infile); } else { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in DOS format...\n"), infile, outfile); + if (pFlag->FromToMode == FROMTO_UNIX2MAC) { + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in Mac format...\n"), infile, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("converting file %s to Mac format...\n"), infile); + } else { + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("converting file %s to file %s in DOS format...\n"), infile, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("converting file %s to DOS format...\n"), infile); + } } - } - } else { - if (is_dos2unix(progname)) { + } else { + if (is_dos2unix(progname)) { + if (outfile) /* TRANSLATORS: 1st %s is encoding of input file. 2nd %s is name of input file. 3rd %s is encoding of output file. 4th %s is name of output file. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... */ - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Unix format...\n"), informat, infile, outformat, outfile); - } else { - if (pFlag->FromToMode == FROMTO_UNIX2MAC) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Mac format...\n"), informat, infile, outformat, outfile); - } else { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in DOS format...\n"), informat, infile, outformat, outfile); - } - } - } - if (RetVal) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("problems converting file %s to file %s\n"), infile, outfile); - } - } -} - -void print_messages_oldfile(const CFlag *pFlag, const char *infile, const char *progname, const int RetVal) -{ - char informat[10]; - char outformat[32]; -# ifdef D2U_UNIFILE - wchar_t informatw[32]; - wchar_t outformatw[64]; -#endif - - print_format(pFlag, informat, outformat, sizeof(informat), sizeof(outformat)); - -/* Change informat and outformat to UTF-8 for d2u_utf8_fprintf. */ -# ifdef D2U_UNIFILE - /* The format string is encoded in the system default - * Windows ANSI code page. May have been translated - * by gettext. Convert it to wide characters. */ - d2u_MultiByteToWideChar(CP_ACP,0, informat, -1, informatw, sizeof(informat)); - d2u_MultiByteToWideChar(CP_ACP,0, outformat, -1, outformatw, sizeof(outformat)); - /* then convert the format string to UTF-8 */ - d2u_WideCharToMultiByte(CP_UTF8, 0, informatw, -1, informat, sizeof(informat), NULL, NULL); - d2u_WideCharToMultiByte(CP_UTF8, 0, outformatw, -1, outformat, sizeof(outformat), NULL, NULL); -#endif - - if (pFlag->status & NO_REGFILE) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping %s, not a regular file.\n"), infile); - } else if (pFlag->status & OUTPUTFILE_SYMLINK) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s.\n"), infile); - } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); - } else if (pFlag->status & BINARY_FILE) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping binary file %s\n"), infile); - } else if (pFlag->status & WRONG_CODEPAGE) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); -#ifdef D2U_UNICODE - } else if (pFlag->status & WCHAR_T_TOO_SMALL) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), infile, (int)sizeof(wchar_t)); - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"), infile, pFlag->line_nr); -#else - } else if (pFlag->status & UNICODE_NOT_SUPPORTED) { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"), infile, progname); -#endif - } else { - D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - if (informat[0] == '\0') { - if (is_dos2unix(progname)) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to Unix format...\n"), infile); - } else { - if (pFlag->FromToMode == FROMTO_UNIX2MAC) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to Mac format...\n"), infile); - } else { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting file %s to DOS format...\n"), infile); - } - } - } else { - if (is_dos2unix(progname)) { + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Unix format...\n"), informat, infile, outformat, outfile); + else /* TRANSLATORS: 1st %s is encoding of input file. 2nd %s is name of input file. 3rd %s is encoding of output (input file is overwritten). E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... */ - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Unix format...\n"), informat, infile, outformat); - } else { - if (pFlag->FromToMode == FROMTO_UNIX2MAC) { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Mac format...\n"), informat, infile, outformat); + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Unix format...\n"), informat, infile, outformat); } else { - if (!RetVal) D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s DOS format...\n"), informat, infile, outformat); + if (pFlag->FromToMode == FROMTO_UNIX2MAC) { + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in Mac format...\n"), informat, infile, outformat, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s Mac format...\n"), informat, infile, outformat); + } else { + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s file %s in DOS format...\n"), informat, infile, outformat, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("converting %s file %s to %s DOS format...\n"), informat, infile, outformat); + } } } - } - if (RetVal) { + } else { D2U_UTF8_FPRINTF(stderr,"%s: ",progname); - D2U_UTF8_FPRINTF(stderr, _("problems converting file %s\n"), infile); + if (outfile) + D2U_UTF8_FPRINTF(stderr, _("problems converting file %s to file %s\n"), infile, outfile); + else + D2U_UTF8_FPRINTF(stderr, _("problems converting file %s\n"), infile); } } } @@ -1964,6 +1946,8 @@ void print_messages_info(const CFlag *pFlag, const char *infile, const char *pro void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb_dos, unsigned int lb_unix, unsigned int lb_mac) { + static int header_done = 0; + if (ipFlag->file_info & INFO_CONVERT) { if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0)) return; @@ -2167,7 +2151,7 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) return -1; } - /* info sucessful? */ + /* info successful? */ #ifdef D2U_UNICODE if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { FileInfoW(InF, ipFlag, ipInFN, bomtype_orig, progname); @@ -2187,7 +2171,6 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) int GetFileInfoStdio(CFlag *ipFlag, const char *progname) { - int RetVal = 0; int bomtype_orig = FILE_MBS; /* messages must print the real bomtype, not the assumed bomtype */ ipFlag->status = 0 ; @@ -2208,23 +2191,20 @@ int GetFileInfoStdio(CFlag *ipFlag, const char *progname) #endif if (check_unicode_info(stdin, ipFlag, progname, &bomtype_orig)) - RetVal = -1; + return -1; - /* info sucessful? */ + /* info successful? */ #ifdef D2U_UNICODE - if (!RetVal) { - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { - FileInfoW(stdin, ipFlag, "", bomtype_orig, progname); - } else { - FileInfo(stdin, ipFlag, "", bomtype_orig, progname); - } + if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { + FileInfoW(stdin, ipFlag, "", bomtype_orig, progname); + } else { + FileInfo(stdin, ipFlag, "", bomtype_orig, progname); } #else - if (!RetVal) - FileInfo(stdin, ipFlag, "", bomtype_orig, progname); + FileInfo(stdin, ipFlag, "", bomtype_orig, progname); #endif - return RetVal; + return 0; } void get_info_options(char *option, CFlag *pFlag, const char *progname) @@ -2301,7 +2281,6 @@ int parse_options(int argc, char *argv[], int ShouldExit = 0; int CanSwitchFileMode = 1; int process_options = 1; - int RetVal = 0; #ifdef D2U_UNIFILE char *ptr; #endif @@ -2358,6 +2337,12 @@ int parse_options(int argc, char *argv[], pFlag->KeepDate = 1; else if ((strcmp(argv[ArgIdx],"-f") == 0) || (strcmp(argv[ArgIdx],"--force") == 0)) pFlag->Force = 1; +#ifndef NO_CHOWN + else if (strcmp(argv[ArgIdx],"--allow-chown") == 0) + pFlag->AllowChown = 1; + else if (strcmp(argv[ArgIdx],"--no-allow-chown") == 0) + pFlag->AllowChown = 0; +#endif #ifdef D2U_UNICODE #if (defined(_WIN32) && !defined(__CYGWIN__)) else if ((strcmp(argv[ArgIdx],"-gb") == 0) || (strcmp(argv[ArgIdx],"--gb18030") == 0)) @@ -2536,33 +2521,34 @@ int parse_options(int argc, char *argv[], pFlag->stdio_mode = 0; } } else { - pFlag->stdio_mode = 0; /* not an option */ + int conversion_error; + pFlag->stdio_mode = 0; if (pFlag->NewFile) { if (CanSwitchFileMode) CanSwitchFileMode = 0; else { #ifdef D2U_UNICODE - RetVal = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert, ConvertW); + conversion_error = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert, ConvertW); #else - RetVal = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert); + conversion_error = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert); #endif if (pFlag->verbose) - print_messages_newfile(pFlag, argv[ArgIdx-1], argv[ArgIdx], progname, RetVal); + print_messages(pFlag, argv[ArgIdx-1], argv[ArgIdx], progname, conversion_error); CanSwitchFileMode = 1; } } else { if (pFlag->file_info) { - RetVal = GetFileInfo(argv[ArgIdx], pFlag, progname); + conversion_error = GetFileInfo(argv[ArgIdx], pFlag, progname); print_messages_info(pFlag, argv[ArgIdx], progname); } else { #ifdef D2U_UNICODE - RetVal = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert, ConvertW); + conversion_error = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert, ConvertW); #else - RetVal = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert); + conversion_error = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert); #endif if (pFlag->verbose) - print_messages_oldfile(pFlag, argv[ArgIdx], progname, RetVal); + print_messages(pFlag, argv[ArgIdx], NULL, progname, conversion_error); } } } @@ -2744,7 +2730,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname) * Surrogate halves in UTF-8 are invalid. See also * http://en.wikipedia.org/wiki/UTF-8#Invalid_code_points * http://tools.ietf.org/html/rfc3629#page-5 - * It is a bug in (some implemenatations of) wcstombs(). + * It is a bug in (some implementations of) wcstombs(). * On Cygwin 1.7 wcstombs() produces correct UTF-8 from UTF-16 surrogate pairs. */ /* Decode UTF-16 surrogate pair */ @@ -235,6 +235,7 @@ typedef struct int FromToMode; /* 0: dos2unix/unix2dos, 1: mac2unix/unix2mac */ int NewLine; /* if TRUE, then additional newline */ int Force; /* if TRUE, force conversion of all files. */ + int AllowChown; /* if TRUE, allow file ownership change in old file mode. */ int Follow; /* 0: skip symlink, 1: follow symbolic link, 2: replace symlink. */ int status; int stdio_mode; /* if TRUE, stdio mode */ @@ -73,9 +73,8 @@ dist: $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) ZIPFILE=${ZIPFILE} docsubdir=$(docsubdir) SHELL=$(D2U_MAKESHELL)
strip:
- $(MAKE) strip LINK="$(LINK)" LINK_MAN="cp -f" EXE=.exe STRIP=$(STRIP)
+ $(MAKE) strip LINK="$(LINK)" LINK_MAN="cp -f" EXE=.exe STRIP=$(STRIP) SHELL=$(D2U_MAKESHELL)
# Fix time stamps. Otherwise make install may rebuild mac2unix unix2mac.
-# Now make install can be done in MSYS. In djgpp bash install is problematic.
sleep 10
touch mac2unix.exe
touch unix2mac.exe
@@ -77,7 +77,7 @@ static int D2U7BitTable[256] = /* CP437 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso437Table[256] = { @@ -100,7 +100,7 @@ static int D2UIso437Table[256] = }; /* CP850 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso850Table[256] = { @@ -123,7 +123,7 @@ static int D2UIso850Table[256] = }; /* CP860 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso860Table[256] = { @@ -146,7 +146,7 @@ static int D2UIso860Table[256] = }; /* CP863 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso863Table[256] = { @@ -169,7 +169,7 @@ static int D2UIso863Table[256] = }; /* CP865 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso865Table[256] = { @@ -192,7 +192,7 @@ static int D2UIso865Table[256] = }; /* CP1252 -> ISO-8859-1 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int D2UIso1252Table[256] = { diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1 index 88754fc..ae04531 100644 --- a/man/de/man1/dos2unix.1 +++ b/man/de/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -142,6 +142,17 @@ oder im Neue-Datei-Modus: .Vb 1 \& dos2unix \-n \-\- \-bla ausgabe.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +erlaubt die Änderung des Eigentümers der Datei im Alte-Datei-Modus. +.Sp +Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht ab, wenn +der Eigentümer und die Gruppe der Originaldatei im Alte-Datei-Modus nicht +erhalten werden kann. Die Umwandlung wird fortgesetzt und die umgewandelte +Datei erhält den gleichen neuen Eigentümer, als wäre sie im Neue-Datei-Modus +umgewandelt worden. Siehe auch die Optionen \f(CW\*(C`\-o\*(C'\fR und \f(CW\*(C`\-n\*(C'\fR. Diese Option +ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des +Eigentümers und der Gruppe von Dateien verfügt. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus. @@ -295,10 +306,11 @@ anzupassen. Einer oder mehrere Schalter können hinzugefügt werden. .RS 4 .IP "\fB0\fR" 4 .IX Item "0" -Print the file information lines followed by a null character instead of a -newline character. This enables correct interpretation of file names with -spaces or quotes when flag c is used. Use this flag in combination with -\&\fIxargs\fR\|(1) option \f(CW\*(C`\-0\*(C'\fR or \f(CW\*(C`\-\-null\*(C'\fR. +gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am Ende anstelle +eines Zeilenvorschub-Zeichens aus. Dies ermöglicht die korrekte +Interpretation von Leer\- und Anführungszeichen in Dateinamen, wenn der +Schalter c verwendet wird. Verwenden Sie diesen Schalter in Kombination mit +der \fIxargs\fR\|(1)\-Option \f(CW\*(C`\-0\*(C'\fR oder \f(CW\*(C`\-\-null\*(C'\fR. .IP "\fBd\fR" 4 .IX Item "d" gibt die Anzahl der DOS\-Zeilenumbrüche aus. @@ -414,6 +426,16 @@ Der Benutzer, der die Umwandlung im Neue-Datei-Modus startet, wird Besitzer der umgewandelten Datei. Die Lese\- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der \fIumask\fR\|(1) der Person ermittelt, die die Umwandlung ausgeführt hat. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +verhindert die Änderung des Eigentümers der Datei im Alte-Datei-Modus +(Voreinstellung). +.Sp +bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der +Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Siehe auch die +Optionen \f(CW\*(C`\-o\*(C'\fR und \f(CW\*(C`\-n\*(C'\fR. Diese Option ist nur verfügbar, wenn dos2unix über +Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien +verfügt. .IP "\fB\-o, \-\-oldfile \s-1DATEI\s0 …\fR" 4 .IX Item "-o, --oldfile DATEI …" Alte-Datei-Modus. Die \s-1DATEI\s0 wird umgewandelt und durch die Ausgabedatei @@ -431,6 +453,32 @@ die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib\- und Leserechten wird nur unter Unix unterstützt. +.Sp +Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung von +Eigentümer und Gruppe von Dateien verfügt, rufen Sie \f(CW\*(C`dos2unix \-V\*(C'\fR auf. +.Sp +Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe der +Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und die +Originaldatei bleibt intakt. War die Umwandlung erfolgreich, wird die +Originaldatei durch die temporäre Datei ersetzt. Sie können Schreibrechte +für die Originaldatei haben, aber keine Rechte, um die gleichen +Eigentumsverhältnisse wie die der Originaldatei für die temporäre Datei +festzulegen. Das bedeutet, dass Sie Eigentümer und Gruppe der Originaldatei +nicht bewahren können. In diesem Fall können Sie die Option +\&\f(CW\*(C`\-\-allow\-chown\*(C'\fR verwenden, um die Umwandlung fortzusetzen: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Eine weitere Option ist der Neue-Datei-Modus: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +Der Vorteil der Option \f(CW\*(C`\-\-allow\-chown\*(C'\fR ist, dass Sie Platzhalter verwenden +können und die Eigentumsverhältnisse bewahrt bleiben, sofern möglich. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm index 3a8e1d7..027cd0e 100644 --- a/man/de/man1/dos2unix.htm +++ b/man/de/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title> +<title>dos2unix 7.4.0 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -bla ausgabe.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>erlaubt die Änderung des Eigentümers der Datei im Alte-Datei-Modus.</p> + +<p>Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht ab, wenn der Eigentümer und die Gruppe der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Die Umwandlung wird fortgesetzt und die umgewandelte Datei erhält den gleichen neuen Eigentümer, als wäre sie im Neue-Datei-Modus umgewandelt worden. Siehe auch die Optionen <code>-o</code> und <code>-n</code>. Diese Option ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien verfügt.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -237,7 +245,7 @@ <dt id="pod0"><b>0</b></dt> <dd> -<p>Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option <code>-0</code> or <code>--null</code>.</p> +<p>gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am Ende anstelle eines Zeilenvorschub-Zeichens aus. Dies ermöglicht die korrekte Interpretation von Leer- und Anführungszeichen in Dateinamen, wenn der Schalter c verwendet wird. Verwenden Sie diesen Schalter in Kombination mit der xargs(1)-Option <code>-0</code> oder <code>--null</code>.</p> </dd> <dt id="d"><b>d</b></dt> @@ -363,6 +371,14 @@ <p>Der Benutzer, der die Umwandlung im Neue-Datei-Modus startet, wird Besitzer der umgewandelten Datei. Die Lese- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>verhindert die Änderung des Eigentümers der Datei im Alte-Datei-Modus (Voreinstellung).</p> + +<p>bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Siehe auch die Optionen <code>-o</code> und <code>-n</code>. Diese Option ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien verfügt.</p> + +</dd> <dt id="o---oldfile-DATEI"><b>-o, --oldfile DATEI …</b></dt> <dd> @@ -370,6 +386,18 @@ <p>Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese- und Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt.</p> +<p>Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung von Eigentümer und Gruppe von Dateien verfügt, rufen Sie <code>dos2unix -V</code> auf.</p> + +<p>Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe der Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und die Originaldatei bleibt intakt. War die Umwandlung erfolgreich, wird die Originaldatei durch die temporäre Datei ersetzt. Sie können Schreibrechte für die Originaldatei haben, aber keine Rechte, um die gleichen Eigentumsverhältnisse wie die der Originaldatei für die temporäre Datei festzulegen. Das bedeutet, dass Sie Eigentümer und Gruppe der Originaldatei nicht bewahren können. In diesem Fall können Sie die Option <code>--allow-chown</code> verwenden, um die Umwandlung fortzusetzen:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Eine weitere Option ist der Neue-Datei-Modus:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>Der Vorteil der Option <code>--allow-chown</code> ist, dass Sie Platzhalter verwenden können und die Eigentumsverhältnisse bewahrt bleiben, sofern möglich.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/de/man1/dos2unix.pod b/man/de/man1/dos2unix.pod index b8618c5..43af7b6 100644 --- a/man/de/man1/dos2unix.pod +++ b/man/de/man1/dos2unix.pod @@ -81,6 +81,18 @@ oder im Neue-Datei-Modus: dos2unix -n -- -bla ausgabe.txt +=item B<--allow-chown> + +erlaubt die Änderung des Eigentümers der Datei im Alte-Datei-Modus. + +Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht ab, wenn +der Eigentümer und die Gruppe der Originaldatei im Alte-Datei-Modus nicht +erhalten werden kann. Die Umwandlung wird fortgesetzt und die umgewandelte +Datei erhält den gleichen neuen Eigentümer, als wäre sie im Neue-Datei-Modus +umgewandelt worden. Siehe auch die Optionen C<-o> und C<-n>. Diese Option +ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des +Eigentümers und der Gruppe von Dateien verfügt. + =item B<-ascii> wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus. @@ -258,10 +270,11 @@ anzupassen. Einer oder mehrere Schalter können hinzugefügt werden. =item B<0> -Print the file information lines followed by a null character instead of a -newline character. This enables correct interpretation of file names with -spaces or quotes when flag c is used. Use this flag in combination with -xargs(1) option C<-0> or C<--null>. +gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am Ende anstelle +eines Zeilenvorschub-Zeichens aus. Dies ermöglicht die korrekte +Interpretation von Leer- und Anführungszeichen in Dateinamen, wenn der +Schalter c verwendet wird. Verwenden Sie diesen Schalter in Kombination mit +der xargs(1)-Option C<-0> oder C<--null>. =item B<d> @@ -378,6 +391,17 @@ der umgewandelten Datei. Die Lese- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat. +=item B<--no-allow-chown> + +verhindert die Änderung des Eigentümers der Datei im Alte-Datei-Modus +(Voreinstellung). + +bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der +Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Siehe auch die +Optionen C<-o> und C<-n>. Diese Option ist nur verfügbar, wenn dos2unix über +Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien +verfügt. + =item B<-o, --oldfile DATEI …> Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei @@ -396,6 +420,28 @@ Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt. +Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung von +Eigentümer und Gruppe von Dateien verfügt, rufen Sie C<dos2unix -V> auf. + +Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe der +Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und die +Originaldatei bleibt intakt. War die Umwandlung erfolgreich, wird die +Originaldatei durch die temporäre Datei ersetzt. Sie können Schreibrechte +für die Originaldatei haben, aber keine Rechte, um die gleichen +Eigentumsverhältnisse wie die der Originaldatei für die temporäre Datei +festzulegen. Das bedeutet, dass Sie Eigentümer und Gruppe der Originaldatei +nicht bewahren können. In diesem Fall können Sie die Option +C<--allow-chown> verwenden, um die Umwandlung fortzusetzen: + + dos2unix --allow-chown foo.txt + +Eine weitere Option ist der Neue-Datei-Modus: + + dos2unix -n foo.txt foo.txt + +Der Vorteil der Option C<--allow-chown> ist, dass Sie Platzhalter verwenden +können und die Eigentumsverhältnisse bewahrt bleiben, sofern möglich. + =item B<-q, --quiet> Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt diff --git a/man/de/man1/dos2unix.txt b/man/de/man1/dos2unix.txt index f088a3a..3899dae 100644 --- a/man/de/man1/dos2unix.txt +++ b/man/de/man1/dos2unix.txt @@ -57,6 +57,18 @@ OPTIONEN dos2unix -n -- -bla ausgabe.txt + --allow-chown + erlaubt die Änderung des Eigentümers der Datei im Alte-Datei-Modus. + + Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht + ab, wenn der Eigentümer und die Gruppe der Originaldatei im + Alte-Datei-Modus nicht erhalten werden kann. Die Umwandlung wird + fortgesetzt und die umgewandelte Datei erhält den gleichen neuen + Eigentümer, als wäre sie im Neue-Datei-Modus umgewandelt worden. + Siehe auch die Optionen "-o" und "-n". Diese Option ist nur + verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des + Eigentümers und der Gruppe von Dateien verfügt. + -ascii wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus. @@ -210,10 +222,11 @@ OPTIONEN Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden. - 0 Print the file information lines followed by a null character - instead of a newline character. This enables correct - interpretation of file names with spaces or quotes when flag c - is used. Use this flag in combination with xargs(1) option -0 or + 0 gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am + Ende anstelle eines Zeilenvorschub-Zeichens aus. Dies ermöglicht + die korrekte Interpretation von Leer- und Anführungszeichen in + Dateinamen, wenn der Schalter c verwendet wird. Verwenden Sie + diesen Schalter in Kombination mit der xargs(1)-Option -0 oder "--null". d gibt die Anzahl der DOS-Zeilenumbrüche aus. @@ -307,6 +320,16 @@ OPTIONEN aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat. + --no-allow-chown + verhindert die Änderung des Eigentümers der Datei im + Alte-Datei-Modus (Voreinstellung). + + bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe + der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. + Siehe auch die Optionen "-o" und "-n". Diese Option ist nur + verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des + Eigentümers und der Gruppe von Dateien verfügt. + -o, --oldfile DATEI … Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in @@ -326,6 +349,31 @@ OPTIONEN Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt. + Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung + von Eigentümer und Gruppe von Dateien verfügt, rufen Sie "dos2unix + -V" auf. + + Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe + der Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und + die Originaldatei bleibt intakt. War die Umwandlung erfolgreich, + wird die Originaldatei durch die temporäre Datei ersetzt. Sie können + Schreibrechte für die Originaldatei haben, aber keine Rechte, um die + gleichen Eigentumsverhältnisse wie die der Originaldatei für die + temporäre Datei festzulegen. Das bedeutet, dass Sie Eigentümer und + Gruppe der Originaldatei nicht bewahren können. In diesem Fall + können Sie die Option "--allow-chown" verwenden, um die Umwandlung + fortzusetzen: + + dos2unix --allow-chown foo.txt + + Eine weitere Option ist der Neue-Datei-Modus: + + dos2unix -n foo.txt foo.txt + + Der Vorteil der Option "--allow-chown" ist, dass Sie Platzhalter + verwenden können und die Eigentumsverhältnisse bewahrt bleiben, + sofern möglich. + -q, --quiet Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt werden. Der Rückgabewert ist 0, außer wenn fehlerhafte diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1 index 0a284ef..fac2120 100644 --- a/man/es/man1/dos2unix.1 +++ b/man/es/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -140,6 +140,16 @@ O en modo de archivo nuevo: .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Allow file ownership change in old file mode. +.Sp +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR +and \f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for +preserving the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Sólo convierte los salto de línea. Éste es el modo de conversión por @@ -405,6 +415,14 @@ La persona que inicia la conversión en el modo de archivo nuevo (emparejado) será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la \fIumask\fR\|(1) de la persona que ejecute la conversión. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Don't allow file ownership change in old file mode (default). +.Sp +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. .IP "\fB\-o, \-\-oldfile \s-1ARCHIVO ...\s0\fR" 4 .IX Item "-o, --oldfile ARCHIVO ..." Modo de archivo antiguo. Convierte el archivo \s-1ARCHIVO\s0 y lo sobrescribe con @@ -421,6 +439,31 @@ archivo. Cambiar el grupo podría ser un riesgo de seguridad, ya que el archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix. +.Sp +To check if dos2unix has support for preserving the user and group ownership +of files type \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option \f(CW\*(C`\-\-allow\-chown\*(C'\fR to continue with the conversion: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Another option is to use new file mode: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +The advantage of the \f(CW\*(C`\-\-allow\-chown\*(C'\fR option is that you can use wildcards, +and the ownership properties will be preserved when possible. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Modo silencioso. Suprime todas las advertencias y mensajes. El valor diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm index 92f7867..351dc20 100644 --- a/man/es/man1/dos2unix.htm +++ b/man/es/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title> +<title>dos2unix 7.4.0 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Allow file ownership change in old file mode.</p> + +<p>When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>La persona que inicia la conversión en el modo de archivo nuevo (emparejado) será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la umask(1) de la persona que ejecute la conversión.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Don't allow file ownership change in old file mode (default).</p> + +<p>Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="o---oldfile-ARCHIVO"><b>-o, --oldfile ARCHIVO ...</b></dt> <dd> @@ -370,6 +386,18 @@ <p>En modo de archivo antiguo (in situ), el archivo convertido tiene el mismo propietario, grupo y permisos de lectura/escritura que el archivo original. Lo mismo aplica cuando el archivo es convertido por otro usuario que tiene permiso de lectura en el archivo (p.e. usuario root). La conversión será abortada cuando no sea posible preservar los valores originales. Cambiar el propietario implicaría que el propietario original ya no podrá leer el archivo. Cambiar el grupo podría ser un riesgo de seguridad, ya que el archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix.</p> +<p>To check if dos2unix has support for preserving the user and group ownership of files type <code>dos2unix -V</code>.</p> + +<p>Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option <code>--allow-chown</code> to continue with the conversion:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Another option is to use new file mode:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>The advantage of the <code>--allow-chown</code> option is that you can use wildcards, and the ownership properties will be preserved when possible.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod index bbf14b6..c17696e 100644 --- a/man/es/man1/dos2unix.pod +++ b/man/es/man1/dos2unix.pod @@ -79,6 +79,17 @@ O en modo de archivo nuevo: dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +Allow file ownership change in old file mode. + +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options C<-o> +and C<-n>. This option is only available if dos2unix has support for +preserving the user and group ownership of files. + =item B<-ascii> Sólo convierte los salto de línea. Éste es el modo de conversión por @@ -369,6 +380,15 @@ será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la umask(1) de la persona que ejecute la conversión. +=item B<--no-allow-chown> + +Don't allow file ownership change in old file mode (default). + +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options C<-o> and C<-n>. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. + =item B<-o, --oldfile ARCHIVO ...> Modo de archivo antiguo. Convierte el archivo ARCHIVO y lo sobrescribe con @@ -386,6 +406,27 @@ archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix. +To check if dos2unix has support for preserving the user and group ownership +of files type C<dos2unix -V>. + +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option C<--allow-chown> to continue with the conversion: + + dos2unix --allow-chown foo.txt + +Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + +The advantage of the C<--allow-chown> option is that you can use wildcards, +and the ownership properties will be preserved when possible. + =item B<-q, --quiet> Modo silencioso. Suprime todas las advertencias y mensajes. El valor diff --git a/man/es/man1/dos2unix.txt b/man/es/man1/dos2unix.txt index 2dee0e6..ce207aa 100644 --- a/man/es/man1/dos2unix.txt +++ b/man/es/man1/dos2unix.txt @@ -55,6 +55,17 @@ PARÁMETROS dos2unix -n -- -foo out.txt + --allow-chown + Allow file ownership change in old file mode. + + When this option is used, the conversion will not be aborted when + the user and/or group ownership of the original file can't be + preserved in old file mode. Conversion will continue and the + converted file will get the same new ownership as if it was + converted in new file mode. See also options "-o" and "-n". This + option is only available if dos2unix has support for preserving the + user and group ownership of files. + -ascii Sólo convierte los salto de línea. Éste es el modo de conversión por defecto. @@ -298,6 +309,14 @@ PARÁMETROS del archivo original menos la umask(1) de la persona que ejecute la conversión. + --no-allow-chown + Don't allow file ownership change in old file mode (default). + + Abort conversion when the user and/or group ownership of the + original file can't be preserved in old file mode. See also options + "-o" and "-n". This option is only available if dos2unix has support + for preserving the user and group ownership of files. + -o, --oldfile ARCHIVO ... Modo de archivo antiguo. Convierte el archivo ARCHIVO y lo sobrescribe con la salida. El programa por defecto se ejecuta en @@ -315,6 +334,29 @@ PARÁMETROS propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix. + To check if dos2unix has support for preserving the user and group + ownership of files type "dos2unix -V". + + Conversion is always done via a temporary file. When an error occurs + halfway the conversion, the temporary file is deleted and the + original file stays intact. When the conversion is successful, the + original file is replaced with the temporary file. You may have + write permission on the original file, but no permission to put the + same user and/or group ownership properties on the temporary file as + the original file has. This means you are not able to preserve the + user and/or group ownership of the original file. In this case you + can use option "--allow-chown" to continue with the conversion: + + dos2unix --allow-chown foo.txt + + Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + + The advantage of the "--allow-chown" option is that you can use + wildcards, and the ownership properties will be preserved when + possible. + -q, --quiet Modo silencioso. Suprime todas las advertencias y mensajes. El valor retornado es cero. Excepto cuando se emplean parámetros incorrectos. diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1 index 5cde5bd..b61dd06 100644 --- a/man/fr/man1/dos2unix.1 +++ b/man/fr/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -141,6 +141,18 @@ Ou dans le style des nouveaux fichiers: .Vb 1 \& dos2unix \-n \-\- \-foo sortie.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Autoriser le changement de propriétaire dans l'ancien mode de fichier. +.Sp +Quand cette option est utilisée, la conversion n'est pas interrompue si +l'utilisateur ou le groupe propriétaire du fichier original ne peut pas être +préservé dans l'ancien mode de fichier. La conversion continuera et le +fichier converti aura le même nouveau propriétaire que si il avait été +converti par le nouveau mode de fichier. Voyez aussi les options \f(CW\*(C`\-o\*(C'\fR et +\&\f(CW\*(C`\-n\*(C'\fR. Cette option est uniquement disponible si dos2unix dispose des +fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des +fichiers. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Convertit uniquement les sauts de lignes. C'est le mode de conversion par @@ -406,18 +418,28 @@ ni \s-1UTF\-8\s0 ni \s-1UTF\-16\s0 ni \s-1GB18030.\s0 Consultez également la se .IX Item "-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …" Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier \s-1FICHIER_SORTIE.\s0 Les noms des fichiers doivent être -indiqués par paires. Les jokers \fIne\fR doivent \fIpas\fR être utilisés ou vous -\&\fIperdrez\fR vos fichiers. +indiqués par paires. Les caractères de remplacement \fIne\fR doivent \fIpas\fR +être utilisés ou vous \fIperdrez\fR vos fichiers. .Sp La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le \fIumask\fR\|(1) de la personne qui exécute la conversion. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Ne pas autoriser le changement du propriétaire du fichier dans l'ancien mode +de fichier (par défaut). +.Sp +Interrompt la conversion si l'utilisateur ou le groupe propriétaire du +fichier original ne peuvent pas être préservés dans l'ancien mode de +fichier. Voyez aussi les options \f(CW\*(C`\-o\*(C'\fR et \f(CW\*(C`\-n\*(C'\fR. Cette option est uniquement +présente si dos2unix dispose des fonctionnalités pour préserver +l'utilisateur ou le groupe propriétaire des fichiers. .IP "\fB\-o, \-\-oldfile \s-1FICHIER\s0 …\fR" 4 .IX Item "-o, --oldfile FICHIER …" Ancien mode de fichiers. Convertit le fichier \s-1FICHIER\s0 et écrit la sortie -dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent -être utilisés. +dedans. Le programme fonctionne dans ce mode par défaut. Les noms avec des +caractères de remplacement peuvent être utilisés. .Sp Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier @@ -430,6 +452,34 @@ n'est plus en mesure de lire le fichier. Le changement de groupe pourrait en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix. +.Sp +Pour vérifier si dos2unix dispose des fonctions pour préserver l'utilisateur +et le groupe propriétaire du fichier, tapez \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +La conversion est toujours réalisée via un fichier temporaire. Quand une +erreur survient au milieu de la conversion, le fichier temporaire est effacé +et le fichier original reste inchangé. Quand la conversion réussi, le +fichier original est remplacé par le fichier temporaire. Vous pourriez avoir +la permission d'écrire dans le fichier original mais ne pas avoir la +permission de remplacer les propriétés de l'utilisateur et du groupe +propriétaires sur le fichier temporaire telles qu'elles sont définies sur le +fichier original. Cela signifie que vous n'êtes pas en mesure de préserver +l'utilisateur ou le groupe propriétaire du fichier original. Dans ce cas, +vous pouvez utiliser l'option \f(CW\*(C`\-\-allow\-chown\*(C'\fR pour continuer la conversion. +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown toto.txt +.Ve +.Sp +Une autre option consiste à utiliser le nouveau mode de fichier: +.Sp +.Vb 1 +\& dos2unix \-n toto.txt toto.txt +.Ve +.Sp +L'avantage de l'option \f(CW\*(C`\-\-allow\-chown\*(C'\fR est que vous pouvez utiliser des +caractères de remplacement et les propriétaires seront préservés dans la +mesure du possible. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Mode silencieux. Supprime les avertissements et les messages. La valeur de diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm index fae2880..57a09d9 100644 --- a/man/fr/man1/dos2unix.htm +++ b/man/fr/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title> +<title>dos2unix 7.4.0 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo sortie.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Autoriser le changement de propriétaire dans l'ancien mode de fichier.</p> + +<p>Quand cette option est utilisée, la conversion n'est pas interrompue si l'utilisateur ou le groupe propriétaire du fichier original ne peut pas être préservé dans l'ancien mode de fichier. La conversion continuera et le fichier converti aura le même nouveau propriétaire que si il avait été converti par le nouveau mode de fichier. Voyez aussi les options <code>-o</code> et <code>-n</code>. Cette option est uniquement disponible si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -358,18 +366,38 @@ <dt id="n---newfile-FICHIER_ENTRE-FICHIER_SORTIE"><b>-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …</b></dt> <dd> -<p>Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les jokers <i>ne</i> doivent <i>pas</i> être utilisés ou vous <i>perdrez</i> vos fichiers.</p> +<p>Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les caractères de remplacement <i>ne</i> doivent <i>pas</i> être utilisés ou vous <i>perdrez</i> vos fichiers.</p> <p>La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le umask(1) de la personne qui exécute la conversion.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Ne pas autoriser le changement du propriétaire du fichier dans l'ancien mode de fichier (par défaut).</p> + +<p>Interrompt la conversion si l'utilisateur ou le groupe propriétaire du fichier original ne peuvent pas être préservés dans l'ancien mode de fichier. Voyez aussi les options <code>-o</code> et <code>-n</code>. Cette option est uniquement présente si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers.</p> + +</dd> <dt id="o---oldfile-FICHIER"><b>-o, --oldfile FICHIER …</b></dt> <dd> -<p>Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent être utilisés.</p> +<p>Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les noms avec des caractères de remplacement peuvent être utilisés.</p> <p>Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier original. Idem quand le fichier est converti par un utilisateur qui a la permission d'écrire dans le fichier (par exemple, root). La conversion est interrompue si il n'est pas possible de conserver les valeurs d'origine. Le changement de propriétaire pourrait signifier que le propriétaire original n'est plus en mesure de lire le fichier. Le changement de groupe pourrait être un risque pour la sécurité. Le fichier pourrait être rendu accessible en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix.</p> +<p>Pour vérifier si dos2unix dispose des fonctions pour préserver l'utilisateur et le groupe propriétaire du fichier, tapez <code>dos2unix -V</code>.</p> + +<p>La conversion est toujours réalisée via un fichier temporaire. Quand une erreur survient au milieu de la conversion, le fichier temporaire est effacé et le fichier original reste inchangé. Quand la conversion réussi, le fichier original est remplacé par le fichier temporaire. Vous pourriez avoir la permission d'écrire dans le fichier original mais ne pas avoir la permission de remplacer les propriétés de l'utilisateur et du groupe propriétaires sur le fichier temporaire telles qu'elles sont définies sur le fichier original. Cela signifie que vous n'êtes pas en mesure de préserver l'utilisateur ou le groupe propriétaire du fichier original. Dans ce cas, vous pouvez utiliser l'option <code>--allow-chown</code> pour continuer la conversion.</p> + +<pre><code> dos2unix --allow-chown toto.txt</code></pre> + +<p>Une autre option consiste à utiliser le nouveau mode de fichier:</p> + +<pre><code> dos2unix -n toto.txt toto.txt</code></pre> + +<p>L'avantage de l'option <code>--allow-chown</code> est que vous pouvez utiliser des caractères de remplacement et les propriétaires seront préservés dans la mesure du possible.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/fr/man1/dos2unix.pod b/man/fr/man1/dos2unix.pod index b3e7e6d..5a8bd33 100644 --- a/man/fr/man1/dos2unix.pod +++ b/man/fr/man1/dos2unix.pod @@ -80,6 +80,19 @@ Ou dans le style des nouveaux fichiers: dos2unix -n -- -foo sortie.txt +=item B<--allow-chown> + +Autoriser le changement de propriétaire dans l'ancien mode de fichier. + +Quand cette option est utilisée, la conversion n'est pas interrompue si +l'utilisateur ou le groupe propriétaire du fichier original ne peut pas être +préservé dans l'ancien mode de fichier. La conversion continuera et le +fichier converti aura le même nouveau propriétaire que si il avait été +converti par le nouveau mode de fichier. Voyez aussi les options C<-o> et +C<-n>. Cette option est uniquement disponible si dos2unix dispose des +fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des +fichiers. + =item B<-ascii> Convertit uniquement les sauts de lignes. C'est le mode de conversion par @@ -369,19 +382,30 @@ ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section UNICODE. Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être -indiqués par paires. Les jokers I<ne> doivent I<pas> être utilisés ou vous -I<perdrez> vos fichiers. +indiqués par paires. Les caractères de remplacement I<ne> doivent I<pas> +être utilisés ou vous I<perdrez> vos fichiers. La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le umask(1) de la personne qui exécute la conversion. +=item B<--no-allow-chown> + +Ne pas autoriser le changement du propriétaire du fichier dans l'ancien mode +de fichier (par défaut). + +Interrompt la conversion si l'utilisateur ou le groupe propriétaire du +fichier original ne peuvent pas être préservés dans l'ancien mode de +fichier. Voyez aussi les options C<-o> et C<-n>. Cette option est uniquement +présente si dos2unix dispose des fonctionnalités pour préserver +l'utilisateur ou le groupe propriétaire des fichiers. + =item B<-o, --oldfile FICHIER …> Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie -dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent -être utilisés. +dedans. Le programme fonctionne dans ce mode par défaut. Les noms avec des +caractères de remplacement peuvent être utilisés. Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier @@ -395,6 +419,30 @@ en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix. +Pour vérifier si dos2unix dispose des fonctions pour préserver l'utilisateur +et le groupe propriétaire du fichier, tapez C<dos2unix -V>. + +La conversion est toujours réalisée via un fichier temporaire. Quand une +erreur survient au milieu de la conversion, le fichier temporaire est effacé +et le fichier original reste inchangé. Quand la conversion réussi, le +fichier original est remplacé par le fichier temporaire. Vous pourriez avoir +la permission d'écrire dans le fichier original mais ne pas avoir la +permission de remplacer les propriétés de l'utilisateur et du groupe +propriétaires sur le fichier temporaire telles qu'elles sont définies sur le +fichier original. Cela signifie que vous n'êtes pas en mesure de préserver +l'utilisateur ou le groupe propriétaire du fichier original. Dans ce cas, +vous pouvez utiliser l'option C<--allow-chown> pour continuer la conversion. + + dos2unix --allow-chown toto.txt + +Une autre option consiste à utiliser le nouveau mode de fichier: + + dos2unix -n toto.txt toto.txt + +L'avantage de l'option C<--allow-chown> est que vous pouvez utiliser des +caractères de remplacement et les propriétaires seront préservés dans la +mesure du possible. + =item B<-q, --quiet> Mode silencieux. Supprime les avertissements et les messages. La valeur de diff --git a/man/fr/man1/dos2unix.txt b/man/fr/man1/dos2unix.txt index f39f156..3fd6bf1 100644 --- a/man/fr/man1/dos2unix.txt +++ b/man/fr/man1/dos2unix.txt @@ -56,6 +56,19 @@ OPTIONS dos2unix -n -- -foo sortie.txt + --allow-chown + Autoriser le changement de propriétaire dans l'ancien mode de + fichier. + + Quand cette option est utilisée, la conversion n'est pas interrompue + si l'utilisateur ou le groupe propriétaire du fichier original ne + peut pas être préservé dans l'ancien mode de fichier. La conversion + continuera et le fichier converti aura le même nouveau propriétaire + que si il avait été converti par le nouveau mode de fichier. Voyez + aussi les options "-o" et "-n". Cette option est uniquement + disponible si dos2unix dispose des fonctionnalités pour préserver + l'utilisateur ou le groupe propriétaire des fichiers. + -ascii Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut. @@ -299,8 +312,9 @@ OPTIONS -n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE … Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des - fichiers doivent être indiqués par paires. Les jokers *ne* doivent - *pas* être utilisés ou vous *perdrez* vos fichiers. + fichiers doivent être indiqués par paires. Les caractères de + remplacement *ne* doivent *pas* être utilisés ou vous *perdrez* vos + fichiers. La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les @@ -308,10 +322,20 @@ OPTIONS permissions du fichier original moins le umask(1) de la personne qui exécute la conversion. + --no-allow-chown + Ne pas autoriser le changement du propriétaire du fichier dans + l'ancien mode de fichier (par défaut). + + Interrompt la conversion si l'utilisateur ou le groupe propriétaire + du fichier original ne peuvent pas être préservés dans l'ancien mode + de fichier. Voyez aussi les options "-o" et "-n". Cette option est + uniquement présente si dos2unix dispose des fonctionnalités pour + préserver l'utilisateur ou le groupe propriétaire des fichiers. + -o, --oldfile FICHIER … Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les - jokers peuvent être utilisés. + noms avec des caractères de remplacement peuvent être utilisés. Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que @@ -326,6 +350,33 @@ OPTIONS La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix. + Pour vérifier si dos2unix dispose des fonctions pour préserver + l'utilisateur et le groupe propriétaire du fichier, tapez "dos2unix + -V". + + La conversion est toujours réalisée via un fichier temporaire. Quand + une erreur survient au milieu de la conversion, le fichier + temporaire est effacé et le fichier original reste inchangé. Quand + la conversion réussi, le fichier original est remplacé par le + fichier temporaire. Vous pourriez avoir la permission d'écrire dans + le fichier original mais ne pas avoir la permission de remplacer les + propriétés de l'utilisateur et du groupe propriétaires sur le + fichier temporaire telles qu'elles sont définies sur le fichier + original. Cela signifie que vous n'êtes pas en mesure de préserver + l'utilisateur ou le groupe propriétaire du fichier original. Dans ce + cas, vous pouvez utiliser l'option "--allow-chown" pour continuer la + conversion. + + dos2unix --allow-chown toto.txt + + Une autre option consiste à utiliser le nouveau mode de fichier: + + dos2unix -n toto.txt toto.txt + + L'avantage de l'option "--allow-chown" est que vous pouvez utiliser + des caractères de remplacement et les propriétaires seront préservés + dans la mesure du possible. + -q, --quiet Mode silencieux. Supprime les avertissements et les messages. La valeur de sortie est zéro sauf quand de mauvaises options sont diff --git a/man/man1/Makefile b/man/man1/Makefile index 5f16bef..78d34d7 100644 --- a/man/man1/Makefile +++ b/man/man1/Makefile @@ -2,48 +2,48 @@ # # Copyright information # -# Copyright (C) 2010 Jari Aalto -# Copyright (C) 2010-2017 Erwin Waterlander +# Copyright (C) 2010 Jari Aalto +# Copyright (C) 2010-2017 Erwin Waterlander # # License # -# Redistribution and use in source and binary forms, with or -# without modification, are permitted provided that the -# following conditions are met: +# Redistribution and use in source and binary forms, with or +# without modification, are permitted provided that the +# following conditions are met: # -# 1. Redistributions of source code must retain the above -# copyright notice, this list of conditions and the following -# disclaimer. +# 1. Redistributions of source code must retain the above +# copyright notice, this list of conditions and the following +# disclaimer. # -# 2. Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. +# 2. Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials +# provided with the distribution. # -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OF THIS -# FILE OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OF THIS +# FILE OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +# DAMAGE. # -# The license text is copy of the FreeBSD License available at -# <http://www.gnu.org/copyleft/gpl.html> with following -# modifications: wording "THIS SOFTWARE IS PROVIDED BY THE -# FREEBSD PROJECT" was changed to "THIS SOFTWARE IS PROVIDED 'AS -# IS'" and wording "IN NO EVENT SHALL THE FREEBSD PROJECT" was -# changed to "IN NO EVENT SHALL THE AUTHOR(S)" +# The license text is copy of the FreeBSD License available at +# <http://www.gnu.org/copyleft/gpl.html> with following +# modifications: wording "THIS SOFTWARE IS PROVIDED BY THE +# FREEBSD PROJECT" was changed to "THIS SOFTWARE IS PROVIDED 'AS +# IS'" and wording "IN NO EVENT SHALL THE FREEBSD PROJECT" was +# changed to "IN NO EVENT SHALL THE AUTHOR(S)" # # Description # -# Convert *.pod files to manual pages. +# Convert *.pod files to manual pages. ifneq (,) This makefile requires GNU Make. @@ -54,21 +54,21 @@ include ../../version.mk .PRECIOUS: %.pod # This variable *must* be set when calling -PACKAGE ?= dos2unix +PACKAGE ?= dos2unix # Optional variables to set -MANSECT ?= 1 -PODCENTER ?= $(DOS2UNIX_DATE) +MANSECT ?= 1 +PODCENTER ?= $(DOS2UNIX_DATE) # Directories -MANSRC = -MANDEST = $(MANSRC) +MANSRC = +MANDEST = $(MANSRC) -MANPOD = $(MANSRC)$(PACKAGE).pod -MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT) +MANPOD = $(MANSRC)$(PACKAGE).pod +MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT) -POD2MAN = pod2man -POD2MAN_FLAGS = +POD2MAN = pod2man +POD2MAN_FLAGS = POFILES = $(wildcard ../../po-man/*.po) PODFILES = $(patsubst ../../po-man/%.po,../%/man1/dos2unix.pod,$(POFILES)) diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1 index 3d8d5bb..a10ae8c 100644 --- a/man/man1/dos2unix.1 +++ b/man/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -131,6 +131,16 @@ Or in new file mode: .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Allow file ownership change in old file mode. +.Sp +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR and +\&\f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for preserving +the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Convert only line breaks. This is the default conversion mode. @@ -387,6 +397,14 @@ The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the \fIumask\fR\|(1) of the person who runs the conversion. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Don't allow file ownership change in old file mode (default). +.Sp +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This +option is only available if dos2unix has support for preserving the user +and group ownership of files. .IP "\fB\-o, \-\-oldfile \s-1FILE ...\s0\fR" 4 .IX Item "-o, --oldfile FILE ..." Old file mode. Convert file \s-1FILE\s0 and overwrite output to it. The program @@ -400,6 +418,31 @@ values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix. +.Sp +To check if dos2unix has support for preserving the user and group ownership of +files type \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced with +the temporary file. You may have write permission on the original file, but no +permission to put the same user and/or group ownership properties on the +temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case you +can use option \f(CW\*(C`\-\-allow\-chown\*(C'\fR to continue with the conversion: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Another option is to use new file mode: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +The advantage of the \f(CW\*(C`\-\-allow\-chown\*(C'\fR option is that you can use wildcards, +and the ownership properties will be preserved when possible. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Quiet mode. Suppress all warnings and messages. The return value is zero. diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm index 2ec7172..9ff6a3d 100644 --- a/man/man1/dos2unix.htm +++ b/man/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - DOS/MAC to UNIX and vice versa text file format converter</title> +<title>dos2unix 7.4.0 - DOS/MAC to UNIX and vice versa text file format converter</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Allow file ownership change in old file mode.</p> + +<p>When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Don't allow file ownership change in old file mode (default).</p> + +<p>Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="o---oldfile-FILE"><b>-o, --oldfile FILE ...</b></dt> <dd> @@ -370,6 +386,18 @@ <p>In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix.</p> +<p>To check if dos2unix has support for preserving the user and group ownership of files type <code>dos2unix -V</code>.</p> + +<p>Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option <code>--allow-chown</code> to continue with the conversion:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Another option is to use new file mode:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>The advantage of the <code>--allow-chown</code> option is that you can use wildcards, and the ownership properties will be preserved when possible.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod index 7d85d71..d95750c 100644 --- a/man/man1/dos2unix.pod +++ b/man/man1/dos2unix.pod @@ -105,6 +105,17 @@ Or in new file mode: dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +Allow file ownership change in old file mode. + +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options C<-o> and +C<-n>. This option is only available if dos2unix has support for preserving +the user and group ownership of files. + =item B<-ascii> Convert only line breaks. This is the default conversion mode. @@ -382,6 +393,15 @@ of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion. +=item B<--no-allow-chown> + +Don't allow file ownership change in old file mode (default). + +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options C<-o> and C<-n>. This +option is only available if dos2unix has support for preserving the user +and group ownership of files. + =item B<-o, --oldfile FILE ...> Old file mode. Convert file FILE and overwrite output to it. The program @@ -396,6 +416,27 @@ the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix. +To check if dos2unix has support for preserving the user and group ownership of +files type C<dos2unix -V>. + +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced with +the temporary file. You may have write permission on the original file, but no +permission to put the same user and/or group ownership properties on the +temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case you +can use option C<--allow-chown> to continue with the conversion: + + dos2unix --allow-chown foo.txt + +Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + +The advantage of the C<--allow-chown> option is that you can use wildcards, +and the ownership properties will be preserved when possible. + =item B<-q, --quiet> Quiet mode. Suppress all warnings and messages. The return value is zero. diff --git a/man/man1/dos2unix.txt b/man/man1/dos2unix.txt index aaefb7c..0fc7c98 100644 --- a/man/man1/dos2unix.txt +++ b/man/man1/dos2unix.txt @@ -50,6 +50,17 @@ OPTIONS dos2unix -n -- -foo out.txt + --allow-chown + Allow file ownership change in old file mode. + + When this option is used, the conversion will not be aborted when + the user and/or group ownership of the original file can't be + preserved in old file mode. Conversion will continue and the + converted file will get the same new ownership as if it was + converted in new file mode. See also options "-o" and "-n". This + option is only available if dos2unix has support for preserving the + user and group ownership of files. + -ascii Convert only line breaks. This is the default conversion mode. @@ -285,6 +296,14 @@ OPTIONS the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion. + --no-allow-chown + Don't allow file ownership change in old file mode (default). + + Abort conversion when the user and/or group ownership of the + original file can't be preserved in old file mode. See also options + "-o" and "-n". This option is only available if dos2unix has support + for preserving the user and group ownership of files. + -o, --oldfile FILE ... Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used. @@ -299,6 +318,29 @@ OPTIONS readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix. + To check if dos2unix has support for preserving the user and group + ownership of files type "dos2unix -V". + + Conversion is always done via a temporary file. When an error occurs + halfway the conversion, the temporary file is deleted and the + original file stays intact. When the conversion is successful, the + original file is replaced with the temporary file. You may have + write permission on the original file, but no permission to put the + same user and/or group ownership properties on the temporary file as + the original file has. This means you are not able to preserve the + user and/or group ownership of the original file. In this case you + can use option "--allow-chown" to continue with the conversion: + + dos2unix --allow-chown foo.txt + + Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + + The advantage of the "--allow-chown" option is that you can use + wildcards, and the ownership properties will be preserved when + possible. + -q, --quiet Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used. diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1 index 2f07060..bd35c55 100644 --- a/man/nl/man1/dos2unix.1 +++ b/man/nl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -142,6 +142,16 @@ Of in nieuw-bestand-modus: .Vb 1 \& dos2unix \-n \-\- \-foo uit.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Allow file ownership change in old file mode. +.Sp +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR +and \f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for +preserving the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Alleen regeleindes converteren. Dit is de standaardconversiemodus. @@ -407,6 +417,14 @@ De gebruiker die de conversie start in nieuw-bestand (gepaarde) modus wordt de eigenaar van het geconverteerde bestand. De lees/schrijf\-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de \fIumask\fR\|(1) van de gebruiker die de conversie draait. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Don't allow file ownership change in old file mode (default). +.Sp +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. .IP "\fB\-o\fR, \fB\-\-oldfile \s-1BESTAND\s0\fR ..." 4 .IX Item "-o, --oldfile BESTAND ..." Oud-bestand-modus. Het bestand \s-1BESTAND\s0 converteren en overschrijven. Dit @@ -422,6 +440,31 @@ het bestand niet meer kan lezen. Verandering van groep zou een veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf\-rechten wordt alleen ondersteund op Unix. +.Sp +To check if dos2unix has support for preserving the user and group ownership +of files type \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option \f(CW\*(C`\-\-allow\-chown\*(C'\fR to continue with the conversion: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Another option is to use new file mode: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +The advantage of the \f(CW\*(C`\-\-allow\-chown\*(C'\fR option is that you can use wildcards, +and the ownership properties will be preserved when possible. .IP "\fB\-q\fR, \fB\-\-quiet\fR" 4 .IX Item "-q, --quiet" Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm index b482cdd..c079b9a 100644 --- a/man/nl/man1/dos2unix.htm +++ b/man/nl/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title> +<title>dos2unix 7.4.0 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo uit.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Allow file ownership change in old file mode.</p> + +<p>When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>De gebruiker die de conversie start in nieuw-bestand (gepaarde) modus wordt de eigenaar van het geconverteerde bestand. De lees/schrijf-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Don't allow file ownership change in old file mode (default).</p> + +<p>Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="o---oldfile-BESTAND"><b>-o</b>, <b>--oldfile BESTAND</b> ...</dt> <dd> @@ -370,6 +386,18 @@ <p>In oud-bestand (vervangende) modus krijgt het geconverteerde bestand dezelfde eigenaar, groep en lees/schrijf-rechten als het originele bestand. Ook wanneer het bestand wordt omgezet door een andere gebruiker die schrijfrechten heeft op het bestand (b.v. gebruiker root). De omzetting wordt afgebroken wanneer het niet mogelijk is de originele waardes te behouden. Verandering van eigenaar kan betekenen dat de originele eigenaar het bestand niet meer kan lezen. Verandering van groep zou een veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix.</p> +<p>To check if dos2unix has support for preserving the user and group ownership of files type <code>dos2unix -V</code>.</p> + +<p>Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option <code>--allow-chown</code> to continue with the conversion:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Another option is to use new file mode:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>The advantage of the <code>--allow-chown</code> option is that you can use wildcards, and the ownership properties will be preserved when possible.</p> + </dd> <dt id="q---quiet"><b>-q</b>, <b>--quiet</b></dt> <dd> diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod index 4e398da..d6f77cf 100644 --- a/man/nl/man1/dos2unix.pod +++ b/man/nl/man1/dos2unix.pod @@ -81,6 +81,17 @@ Of in nieuw-bestand-modus: dos2unix -n -- -foo uit.txt +=item B<--allow-chown> + +Allow file ownership change in old file mode. + +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options C<-o> +and C<-n>. This option is only available if dos2unix has support for +preserving the user and group ownership of files. + =item B<-ascii> Alleen regeleindes converteren. Dit is de standaardconversiemodus. @@ -371,6 +382,15 @@ de eigenaar van het geconverteerde bestand. De lees/schrijf-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait. +=item B<--no-allow-chown> + +Don't allow file ownership change in old file mode (default). + +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options C<-o> and C<-n>. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. + =item B<-o>, B<--oldfile BESTAND> ... Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit @@ -387,6 +407,27 @@ veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix. +To check if dos2unix has support for preserving the user and group ownership +of files type C<dos2unix -V>. + +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option C<--allow-chown> to continue with the conversion: + + dos2unix --allow-chown foo.txt + +Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + +The advantage of the C<--allow-chown> option is that you can use wildcards, +and the ownership properties will be preserved when possible. + =item B<-q>, B<--quiet> Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, diff --git a/man/nl/man1/dos2unix.txt b/man/nl/man1/dos2unix.txt index 0f59ae2..611bd5f 100644 --- a/man/nl/man1/dos2unix.txt +++ b/man/nl/man1/dos2unix.txt @@ -56,6 +56,17 @@ OPTIES dos2unix -n -- -foo uit.txt + --allow-chown + Allow file ownership change in old file mode. + + When this option is used, the conversion will not be aborted when + the user and/or group ownership of the original file can't be + preserved in old file mode. Conversion will continue and the + converted file will get the same new ownership as if it was + converted in new file mode. See also options "-o" and "-n". This + option is only available if dos2unix has support for preserving the + user and group ownership of files. + -ascii Alleen regeleindes converteren. Dit is de standaardconversiemodus. @@ -298,6 +309,14 @@ OPTIES toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait. + --no-allow-chown + Don't allow file ownership change in old file mode (default). + + Abort conversion when the user and/or group ownership of the + original file can't be preserved in old file mode. See also options + "-o" and "-n". This option is only available if dos2unix has support + for preserving the user and group ownership of files. + -o, --oldfile BESTAND ... Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit is de standaard modus. Jokertekens kunnen gebruikt worden. @@ -314,6 +333,29 @@ OPTIES bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix. + To check if dos2unix has support for preserving the user and group + ownership of files type "dos2unix -V". + + Conversion is always done via a temporary file. When an error occurs + halfway the conversion, the temporary file is deleted and the + original file stays intact. When the conversion is successful, the + original file is replaced with the temporary file. You may have + write permission on the original file, but no permission to put the + same user and/or group ownership properties on the temporary file as + the original file has. This means you are not able to preserve the + user and/or group ownership of the original file. In this case you + can use option "--allow-chown" to continue with the conversion: + + dos2unix --allow-chown foo.txt + + Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + + The advantage of the "--allow-chown" option is that you can use + wildcards, and the ownership properties will be preserved when + possible. + -q, --quiet Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven. diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1 index 48870a6..212cfa4 100644 --- a/man/pl/man1/dos2unix.1 +++ b/man/pl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -138,6 +138,16 @@ Lub w trybie nowego pliku: .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Zezwolenie na zmianę właściciela w trybie starego pliku. +.Sp +W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma +możliwości zachowania właściciela i/lub grupy oryginalnego pliku w trybie +starego pliku. Konwersja będzie kontynuowana, a przekonwertowany plik będzie +miał tego samego właściciela, jakiego by miał w trybie nowego +pliku. P. także opcje \f(CW\*(C`\-o\*(C'\fR i \f(CW\*(C`\-n\*(C'\fR. Opcja jest dostępna tylko wtedy, gdy +dos2unix ma obsługę zachowywania użytkownika i grupy plików. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. @@ -402,6 +412,15 @@ Osoba uruchamiająca konwersję w trybie nowego pliku (par) będzie właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu \fIumask\fR\|(1) osoby uruchamiającej konwersję. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku +(domyślne). +.Sp +Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku nie +może być zachowana w trybie starego pliku. P. także opcje \f(CW\*(C`\-o\*(C'\fR oraz +\&\f(CW\*(C`\-n\*(C'\fR. Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę zachowywania +użytkownika i grupy plików. .IP "\fB\-o, \-\-oldfile \s-1PLIK ...\s0\fR" 4 .IX Item "-o, --oldfile PLIK ..." Tryb starego pliku. Konwersja \s-1PLIKU\s0 i nadpisanie go wyjściem. Program działa @@ -416,6 +435,31 @@ właściciela mogłaby oznaczać, że pierwotny właściciel nie może już odcz pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby być czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie. +.Sp +Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i grupy +plików, można napisać \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. Jeśli w +trakcie konwersji wystąpi błąd, plik tymczasowy jest usuwany, a plik +oryginalny pozostaje nietknięty. Jeśli konwersja się powiedzie, plik +oryginalny jest zastępowany plikiem tymczasowym. Można mieć prawa zapisu do +pliku oryginalnego, ale brak uprawnień, aby nadać tego samego właściciela +i/lub grupę, co plik oryginalny, plikowi tymczasowemu. Oznacza to, że nie +można zachować użytkownika i/lub grupy oryginalnego pliku. W takim przypadku +można użyć opcji \f(CW\*(C`\-\-allow\-chown\*(C'\fR, aby kontynuować konwersję: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Inny sposób to użycie trybu nowego pliku: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +Zaletą opcji \f(CW\*(C`\-\-allow\-chown\*(C'\fR jest możliwość użycia masek oraz zachowanie +właściciela w miarę możliwości. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm index 5047110..5ec7ec9 100644 --- a/man/pl/man1/dos2unix.htm +++ b/man/pl/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title> +<title>dos2unix 7.4.0 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Zezwolenie na zmianę właściciela w trybie starego pliku.</p> + +<p>W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma możliwości zachowania właściciela i/lub grupy oryginalnego pliku w trybie starego pliku. Konwersja będzie kontynuowana, a przekonwertowany plik będzie miał tego samego właściciela, jakiego by miał w trybie nowego pliku. P. także opcje <code>-o</code> i <code>-n</code>. Opcja jest dostępna tylko wtedy, gdy dos2unix ma obsługę zachowywania użytkownika i grupy plików.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>Osoba uruchamiająca konwersję w trybie nowego pliku (par) będzie właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku (domyślne).</p> + +<p>Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku nie może być zachowana w trybie starego pliku. P. także opcje <code>-o</code> oraz <code>-n</code>. Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę zachowywania użytkownika i grupy plików.</p> + +</dd> <dt id="o---oldfile-PLIK"><b>-o, --oldfile PLIK ...</b></dt> <dd> @@ -370,6 +386,18 @@ <p>W trybie starego pliku (w miejscu) przekonwertowany plik otrzymuje tego samego właściciela, grupę oraz prawa odczytu/zapisu, jak plik oryginalny - także wtedy, gdy plik jest konwertowany przez innego użytkownika, mającego prawo zapisu do pliku (np. przez użytkownika root). Konwersja zostanie przerwana, jeśli nie będzie możliwe zachowanie oryginalnych wartości. Zmiana właściciela mogłaby oznaczać, że pierwotny właściciel nie może już odczytać pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby być czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie.</p> +<p>Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i grupy plików, można napisać <code>dos2unix -V</code>.</p> + +<p>Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. Jeśli w trakcie konwersji wystąpi błąd, plik tymczasowy jest usuwany, a plik oryginalny pozostaje nietknięty. Jeśli konwersja się powiedzie, plik oryginalny jest zastępowany plikiem tymczasowym. Można mieć prawa zapisu do pliku oryginalnego, ale brak uprawnień, aby nadać tego samego właściciela i/lub grupę, co plik oryginalny, plikowi tymczasowemu. Oznacza to, że nie można zachować użytkownika i/lub grupy oryginalnego pliku. W takim przypadku można użyć opcji <code>--allow-chown</code>, aby kontynuować konwersję:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Inny sposób to użycie trybu nowego pliku:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>Zaletą opcji <code>--allow-chown</code> jest możliwość użycia masek oraz zachowanie właściciela w miarę możliwości.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/pl/man1/dos2unix.pod b/man/pl/man1/dos2unix.pod index 6377579..ac2c8d1 100644 --- a/man/pl/man1/dos2unix.pod +++ b/man/pl/man1/dos2unix.pod @@ -77,6 +77,17 @@ Lub w trybie nowego pliku: dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +Zezwolenie na zmianę właściciela w trybie starego pliku. + +W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma +możliwości zachowania właściciela i/lub grupy oryginalnego pliku w trybie +starego pliku. Konwersja będzie kontynuowana, a przekonwertowany plik będzie +miał tego samego właściciela, jakiego by miał w trybie nowego +pliku. P. także opcje C<-o> i C<-n>. Opcja jest dostępna tylko wtedy, gdy +dos2unix ma obsługę zachowywania użytkownika i grupy plików. + =item B<-ascii> Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. @@ -366,6 +377,16 @@ właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję. +=item B<--no-allow-chown> + +Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku +(domyślne). + +Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku nie +może być zachowana w trybie starego pliku. P. także opcje C<-o> oraz +C<-n>. Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę zachowywania +użytkownika i grupy plików. + =item B<-o, --oldfile PLIK ...> Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa @@ -381,6 +402,27 @@ pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby by czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie. +Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i grupy +plików, można napisać C<dos2unix -V>. + +Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. Jeśli w +trakcie konwersji wystąpi błąd, plik tymczasowy jest usuwany, a plik +oryginalny pozostaje nietknięty. Jeśli konwersja się powiedzie, plik +oryginalny jest zastępowany plikiem tymczasowym. Można mieć prawa zapisu do +pliku oryginalnego, ale brak uprawnień, aby nadać tego samego właściciela +i/lub grupę, co plik oryginalny, plikowi tymczasowemu. Oznacza to, że nie +można zachować użytkownika i/lub grupy oryginalnego pliku. W takim przypadku +można użyć opcji C<--allow-chown>, aby kontynuować konwersję: + + dos2unix --allow-chown foo.txt + +Inny sposób to użycie trybu nowego pliku: + + dos2unix -n foo.txt foo.txt + +Zaletą opcji C<--allow-chown> jest możliwość użycia masek oraz zachowanie +właściciela w miarę możliwości. + =item B<-q, --quiet> Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem diff --git a/man/pl/man1/dos2unix.txt b/man/pl/man1/dos2unix.txt index 4d1beb6..0024edb 100644 --- a/man/pl/man1/dos2unix.txt +++ b/man/pl/man1/dos2unix.txt @@ -54,6 +54,17 @@ OPCJE dos2unix -n -- -foo out.txt + --allow-chown + Zezwolenie na zmianę właściciela w trybie starego pliku. + + W przypadku użycia tej opcji, konwersja nie zostanie przerwana, + jeśli nie ma możliwości zachowania właściciela i/lub grupy + oryginalnego pliku w trybie starego pliku. Konwersja będzie + kontynuowana, a przekonwertowany plik będzie miał tego samego + właściciela, jakiego by miał w trybie nowego pliku. P. także opcje + "-o" i "-n". Opcja jest dostępna tylko wtedy, gdy dos2unix ma + obsługę zachowywania użytkownika i grupy plików. + -ascii Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji. @@ -294,6 +305,15 @@ OPCJE pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję. + --no-allow-chown + Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku + (domyślne). + + Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku + nie może być zachowana w trybie starego pliku. P. także opcje "-o" + oraz "-n". Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę + zachowywania użytkownika i grupy plików. + -o, --oldfile PLIK ... Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa domyślnie w tym trybie. Można używać masek. @@ -309,6 +329,28 @@ OPCJE czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie. + Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i + grupy plików, można napisać "dos2unix -V". + + Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. + Jeśli w trakcie konwersji wystąpi błąd, plik tymczasowy jest + usuwany, a plik oryginalny pozostaje nietknięty. Jeśli konwersja się + powiedzie, plik oryginalny jest zastępowany plikiem tymczasowym. + Można mieć prawa zapisu do pliku oryginalnego, ale brak uprawnień, + aby nadać tego samego właściciela i/lub grupę, co plik oryginalny, + plikowi tymczasowemu. Oznacza to, że nie można zachować użytkownika + i/lub grupy oryginalnego pliku. W takim przypadku można użyć opcji + "--allow-chown", aby kontynuować konwersję: + + dos2unix --allow-chown foo.txt + + Inny sposób to użycie trybu nowego pliku: + + dos2unix -n foo.txt foo.txt + + Zaletą opcji "--allow-chown" jest możliwość użycia masek oraz + zachowanie właściciela w miarę możliwości. + -q, --quiet Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem jest zero, chyba że podano błędne opcje linii poleceń. diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1 index 9b69771..98cc1d4 100644 --- a/man/pt_BR/man1/dos2unix.1 +++ b/man/pt_BR/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -117,7 +117,7 @@ saída pode ser escrita para o alvo das ligações simbólicas. Não há suporte .PP Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz -conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão +conversão no-lugar (modo de arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do \fIiso\fR @@ -139,6 +139,17 @@ Ou em modo de novo arquivo: .Vb 1 \& dos2unix \-n \-\- \-foo saída.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Permite alteração da propriedade de arquivo no modo de arquivo antigo. +.Sp +Quando esta opção é usada, a conversão não será abortada quando a +propriedade do usuário e/ou do grupo do arquivo original não puder ser +preservada no modo de arquivo antigo. A conversão continuará e o arquivo +convertido receberá a mesma propriedade nova como se tivesse convertido no +modo de novo arquivo. Veja também as opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR. Esta opção só +está disponível se o dos2unix oferecer suporte a preservação da propriedade +do usuário e do grupo de arquivos. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Converte apenas as quebras de linhas. Esse é o modo de conversão padrão. @@ -400,13 +411,22 @@ Modo de novo arquivo. Converte o arquivo \s-1ARQENT\s0 e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa \fInão\fR deveriam ser usados ou você \fIvai\fR perder seus arquivos. .Sp -A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono -do arquivo convertido. As permissões de leitura/escrita do novo arquivo +A pessoa que começa a conversão em modo de novo arquivo (pareado) será o +dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a \fIumask\fR\|(1) da pessoa que executa a conversão. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Não permite alteração da propriedade do arquivo no modo de arquivo antigo +(padrão). +.Sp +Aborta a conversão quando a propriedade do usuário e/ou do grupo do arquivo +original não puder ser preservada no modo de arquivo antigo. Veja também as +opções \f(CW\*(C`\-o\*(C'\fR e \f(CW\*(C`\-n\*(C'\fR. Esta opção só está disponível se o dos2unix oferecer +suporte à preservação da propriedade do usuário e do grupo de arquivos. .IP "\fB\-o, \-\-oldfile \s-1ARQUIVO ...\s0\fR" 4 .IX Item "-o, --oldfile ARQUIVO ..." -Modo arquivo antigo. Converte o arquivo \s-1ARQUIVO\s0 e o sobrescreve com a +Modo de arquivo antigo. Converte o arquivo \s-1ARQUIVO\s0 e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados. .Sp @@ -419,6 +439,32 @@ significar que o dono original não é mais capaz de ler o arquivo. Alteração do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix. +.Sp +Para verificar se dos2unix oferece suporte à preservação da propriedade de +usuário e de grupo de arquivos, digite \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +A conversão sempre é feita através de um arquivo temporário. Quando um erro +ocorre no meio da conversão, o arquivo temporário é excluído e o arquivo +original permanece intacto. Quando a conversão é bem sucedida, o arquivo +original é substituído pelo arquivo temporário. Você pode ter permissão de +gravação no arquivo original, mas nenhuma permissão para colocar a mesma +propriedade de usuário e/ou de grupo no arquivo temporário como o arquivo +original. Isso significa que você não consegue preservar a propriedade de +usuário e/ou de grupo do arquivo original. Neste caso, você pode usar a +opção \f(CW\*(C`\-allow\-chown\*(C'\fR para continuar com a conversão: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Outra opção é usar o novo modo de arquivo: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +A vantagem da opção \f(CW\*(C`\-\-allow\-chown\*(C'\fR é que você pode usar coringas e as +informações de propriedade serão preservadas quando possível. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Modo quieto. Suprime todos os avios e mensagens. O valor retornado é diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm index 161aec4..85caa86 100644 --- a/man/pt_BR/man1/dos2unix.htm +++ b/man/pt_BR/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title> +<title>dos2unix 7.4.0 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -60,7 +60,7 @@ <p>Ligações simbólicas e seus alvos são por padrão mantidas intocáveis. Ligações simbólicas podem opcionalmente ser substituídas, ou a saída pode ser escrita para o alvo das ligações simbólicas. Não há suporte às ligações simbólicas do Windows.</p> -<p>Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções <code>-o</code> e <code>-n</code>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do <i>iso</i> enquanto esta versão usa o do <i>ascii</i>.</p> +<p>Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo de arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções <code>-o</code> e <code>-n</code>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do <i>iso</i> enquanto esta versão usa o do <i>ascii</i>.</p> <h1 id="OPES">OPÇÕES</h1> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo saída.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Permite alteração da propriedade de arquivo no modo de arquivo antigo.</p> + +<p>Quando esta opção é usada, a conversão não será abortada quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. A conversão continuará e o arquivo convertido receberá a mesma propriedade nova como se tivesse convertido no modo de novo arquivo. Veja também as opções <code>-o</code> e <code>-n</code>. Esta opção só está disponível se o dos2unix oferecer suporte a preservação da propriedade do usuário e do grupo de arquivos.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -360,16 +368,36 @@ <p>Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa <i>não</i> deveriam ser usados ou você <i>vai</i> perder seus arquivos.</p> -<p>A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão.</p> +<p>A pessoa que começa a conversão em modo de novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão.</p> + +</dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Não permite alteração da propriedade do arquivo no modo de arquivo antigo (padrão).</p> + +<p>Aborta a conversão quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. Veja também as opções <code>-o</code> e <code>-n</code>. Esta opção só está disponível se o dos2unix oferecer suporte à preservação da propriedade do usuário e do grupo de arquivos.</p> </dd> <dt id="o---oldfile-ARQUIVO"><b>-o, --oldfile ARQUIVO ...</b></dt> <dd> -<p>Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados.</p> +<p>Modo de arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados.</p> <p>No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo dono, grupo e permissões de leitura/escrita que o arquivo original. Também, quando o arquivo é convertido por outro usuário que tenha permissões de escrita no arquivo (ex.: usuário root). A conversão será abortada quando não for possível preservar os valores originais. Alteração do dono pode significar que o dono original não é mais capaz de ler o arquivo. Alteração do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix.</p> +<p>Para verificar se dos2unix oferece suporte à preservação da propriedade de usuário e de grupo de arquivos, digite <code>dos2unix -V</code>.</p> + +<p>A conversão sempre é feita através de um arquivo temporário. Quando um erro ocorre no meio da conversão, o arquivo temporário é excluído e o arquivo original permanece intacto. Quando a conversão é bem sucedida, o arquivo original é substituído pelo arquivo temporário. Você pode ter permissão de gravação no arquivo original, mas nenhuma permissão para colocar a mesma propriedade de usuário e/ou de grupo no arquivo temporário como o arquivo original. Isso significa que você não consegue preservar a propriedade de usuário e/ou de grupo do arquivo original. Neste caso, você pode usar a opção <code>-allow-chown</code> para continuar com a conversão:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Outra opção é usar o novo modo de arquivo:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>A vantagem da opção <code>--allow-chown</code> é que você pode usar coringas e as informações de propriedade serão preservadas quando possível.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod index 732928b..03df2d8 100644 --- a/man/pt_BR/man1/dos2unix.pod +++ b/man/pt_BR/man1/dos2unix.pod @@ -56,7 +56,7 @@ saída pode ser escrita para o alvo das ligações simbólicas. Não há suporte Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz -conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão +conversão no-lugar (modo de arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do I<iso> @@ -78,6 +78,18 @@ Ou em modo de novo arquivo: dos2unix -n -- -foo saída.txt +=item B<--allow-chown> + +Permite alteração da propriedade de arquivo no modo de arquivo antigo. + +Quando esta opção é usada, a conversão não será abortada quando a +propriedade do usuário e/ou do grupo do arquivo original não puder ser +preservada no modo de arquivo antigo. A conversão continuará e o arquivo +convertido receberá a mesma propriedade nova como se tivesse convertido no +modo de novo arquivo. Veja também as opções C<-o> e C<-n>. Esta opção só +está disponível se o dos2unix oferecer suporte a preservação da propriedade +do usuário e do grupo de arquivos. + =item B<-ascii> Converte apenas as quebras de linhas. Esse é o modo de conversão padrão. @@ -363,14 +375,24 @@ Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa I<não> deveriam ser usados ou você I<vai> perder seus arquivos. -A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono -do arquivo convertido. As permissões de leitura/escrita do novo arquivo +A pessoa que começa a conversão em modo de novo arquivo (pareado) será o +dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão. +=item B<--no-allow-chown> + +Não permite alteração da propriedade do arquivo no modo de arquivo antigo +(padrão). + +Aborta a conversão quando a propriedade do usuário e/ou do grupo do arquivo +original não puder ser preservada no modo de arquivo antigo. Veja também as +opções C<-o> e C<-n>. Esta opção só está disponível se o dos2unix oferecer +suporte à preservação da propriedade do usuário e do grupo de arquivos. + =item B<-o, --oldfile ARQUIVO ...> -Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a +Modo de arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados. @@ -384,6 +406,28 @@ do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix. +Para verificar se dos2unix oferece suporte à preservação da propriedade de +usuário e de grupo de arquivos, digite C<dos2unix -V>. + +A conversão sempre é feita através de um arquivo temporário. Quando um erro +ocorre no meio da conversão, o arquivo temporário é excluído e o arquivo +original permanece intacto. Quando a conversão é bem sucedida, o arquivo +original é substituído pelo arquivo temporário. Você pode ter permissão de +gravação no arquivo original, mas nenhuma permissão para colocar a mesma +propriedade de usuário e/ou de grupo no arquivo temporário como o arquivo +original. Isso significa que você não consegue preservar a propriedade de +usuário e/ou de grupo do arquivo original. Neste caso, você pode usar a +opção C<-allow-chown> para continuar com a conversão: + + dos2unix --allow-chown foo.txt + +Outra opção é usar o novo modo de arquivo: + + dos2unix -n foo.txt foo.txt + +A vantagem da opção C<--allow-chown> é que você pode usar coringas e as +informações de propriedade serão preservadas quando possível. + =item B<-q, --quiet> Modo quieto. Suprime todos os avios e mensagens. O valor retornado é diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt index 2efd403..f87ba78 100644 --- a/man/pt_BR/man1/dos2unix.txt +++ b/man/pt_BR/man1/dos2unix.txt @@ -37,11 +37,11 @@ DESCRIÇÃO Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa - versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto - a versão original do SunOS/Solaris fornecia suporte apenas a conversão - pareada (modo de novo arquivo). Veja também as opções "-o" e "-n". Uma - outra diferença é que a versão SunOS/Solaris usa, por padrão, a - conversão de modo do *iso* enquanto esta versão usa o do *ascii*. + versão faz conversão no-lugar (modo de arquivo antigo) por padrão, + enquanto a versão original do SunOS/Solaris fornecia suporte apenas a + conversão pareada (modo de novo arquivo). Veja também as opções "-o" e + "-n". Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, + a conversão de modo do *iso* enquanto esta versão usa o do *ascii*. OPÇÕES -- Trata as opções seguintes como nomes de arquivos. Use essa opção se @@ -55,6 +55,18 @@ OPÇÕES dos2unix -n -- -foo saída.txt + --allow-chown + Permite alteração da propriedade de arquivo no modo de arquivo + antigo. + + Quando esta opção é usada, a conversão não será abortada quando a + propriedade do usuário e/ou do grupo do arquivo original não puder + ser preservada no modo de arquivo antigo. A conversão continuará e o + arquivo convertido receberá a mesma propriedade nova como se tivesse + convertido no modo de novo arquivo. Veja também as opções "-o" e + "-n". Esta opção só está disponível se o dos2unix oferecer suporte a + preservação da propriedade do usuário e do grupo de arquivos. + -ascii Converte apenas as quebras de linhas. Esse é o modo de conversão padrão. @@ -296,15 +308,25 @@ OPÇÕES em pares e nome coringa *não* deveriam ser usados ou você *vai* perder seus arquivos. - A pessoa que começa a conversão em modo novo arquivo (pareado) será - o dono do arquivo convertido. As permissões de leitura/escrita do - novo arquivo serão as permissões do arquivo original menos a + A pessoa que começa a conversão em modo de novo arquivo (pareado) + será o dono do arquivo convertido. As permissões de leitura/escrita + do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão. + --no-allow-chown + Não permite alteração da propriedade do arquivo no modo de arquivo + antigo (padrão). + + Aborta a conversão quando a propriedade do usuário e/ou do grupo do + arquivo original não puder ser preservada no modo de arquivo antigo. + Veja também as opções "-o" e "-n". Esta opção só está disponível se + o dos2unix oferecer suporte à preservação da propriedade do usuário + e do grupo de arquivos. + -o, --oldfile ARQUIVO ... - Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com - a saída. O programa, por padrão, executa neste modo. Nomes coringas - podem ser usados. + Modo de arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve + com a saída. O programa, por padrão, executa neste modo. Nomes + coringas podem ser usados. No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo dono, grupo e permissões de leitura/escrita que o arquivo @@ -317,6 +339,29 @@ OPÇÕES cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix. + Para verificar se dos2unix oferece suporte à preservação da + propriedade de usuário e de grupo de arquivos, digite "dos2unix -V". + + A conversão sempre é feita através de um arquivo temporário. Quando + um erro ocorre no meio da conversão, o arquivo temporário é excluído + e o arquivo original permanece intacto. Quando a conversão é bem + sucedida, o arquivo original é substituído pelo arquivo temporário. + Você pode ter permissão de gravação no arquivo original, mas nenhuma + permissão para colocar a mesma propriedade de usuário e/ou de grupo + no arquivo temporário como o arquivo original. Isso significa que + você não consegue preservar a propriedade de usuário e/ou de grupo + do arquivo original. Neste caso, você pode usar a opção + "-allow-chown" para continuar com a conversão: + + dos2unix --allow-chown foo.txt + + Outra opção é usar o novo modo de arquivo: + + dos2unix -n foo.txt foo.txt + + A vantagem da opção "--allow-chown" é que você pode usar coringas e + as informações de propriedade serão preservadas quando possível. + -q, --quiet Modo quieto. Suprime todos os avios e mensagens. O valor retornado é zero. Exceto quando opções de linha de comando erradas forem usadas. diff --git a/man/sv/man1/dos2unix.1 b/man/sv/man1/dos2unix.1 index c4f9969..c468fec 100644 --- a/man/sv/man1/dos2unix.1 +++ b/man/sv/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -137,6 +137,17 @@ Eller i nyfilsläge: .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Tillåt ändring av ägarskap för fil i gammalt filläge. +.Sp +När denna flagga används, kommer konverteringen inte att avbrytas när +användar\- och/eller gruppägarskap för originalfilen inte kan bevaras i +gammalt filläget. Konverteringen kommer att fortsätta och den konverterade +filen kommer att få samma nya ägarskap som om den konverterades i +nyfilsläge. Se också flaggorna \f(CW\*(C`\-o\*(C'\fR och \f(CW\*(C`\-n\*(C'\fR. Denna flagga är endast +tillgänglig om dos2unix har stöd för att bevara användar\- och gruppägarskap +för filer. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Konvertera enbart radbrytningar. Detta är standardkonverteringsläget. @@ -398,6 +409,14 @@ Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att bli ägaren till den konverterade filen. Läs\-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus \&\fIumask\fR\|(1) för användaren som kör konverteringen. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Tillåt inte ändring av ägarskap i gammalt filläge (standard) +.Sp +Avbryt konvertering när användar\- och/eller gruppägarskap för originalfilen +inte kan bevaras i gammalt filläge. Se också flaggorna \f(CW\*(C`\-o\*(C'\fR och +\&\f(CW\*(C`\-n\*(C'\fR. Denna flagga är endast tillgänglig om dos2unix har stöd för att +bevara användar\- och gruppägarskap för filer. .IP "\fB\-o, \-\-oldfile \s-1FIL\s0 …\fR" 4 .IX Item "-o, --oldfile FIL …" Gammalfilsläge. Konvertera filen \s-1FIL\s0 och skriv över den med @@ -413,6 +432,32 @@ originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs\-/skrivbehörigheter finns bara i Unix. +.Sp +För att kontrollera om dos2unix har stöd för att bevara användar\- och +gruppägarskap för filer skriv \f(CW\*(C`dosunix \-V\*(C'\fR. +.Sp +Konvertering görs alltid via en temporärfil. När ett fel inträffar halvvägs +i konverteringen tas den temporära filen bort och originalfilen finns kvar +intakt. Om konverteringen är framgångsrik kommer originalfilen att ersättas +med temporärfilen. Du kanske har skrivrättigheter till originalfilen men +inte rättigheter att ställa in samma användar\- och/eller +grupprättighetsegenskaper på temporärfilen som originalfilen har. Detta +innebär att du inte kan bevara användar\- och/eller gruppägarskapet för +originalfilen. I detta fall kan du använda flaggan \f(CW\*(C`\-\-allow\-chown\*(C'\fR för att +fortsätta konverteringen: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Ett annat alternativ är att använda nyfilsläge: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +Fördelen med flaggan \f(CW\*(C`\-\-allow\-chown\*(C'\fR är att du kan använda jokertecken och +att ägarskapsegenskaper om möjligt kommer att bevaras. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är diff --git a/man/sv/man1/dos2unix.htm b/man/sv/man1/dos2unix.htm index 6467372..298efc3 100644 --- a/man/sv/man1/dos2unix.htm +++ b/man/sv/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa</title> +<title>dos2unix 7.4.0 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Tillåt ändring av ägarskap för fil i gammalt filläge.</p> + +<p>När denna flagga används, kommer konverteringen inte att avbrytas när användar- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläget. Konverteringen kommer att fortsätta och den konverterade filen kommer att få samma nya ägarskap som om den konverterades i nyfilsläge. Se också flaggorna <code>-o</code> och <code>-n</code>. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap för filer.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Tillåt inte ändring av ägarskap i gammalt filläge (standard)</p> + +<p>Avbryt konvertering när användar- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläge. Se också flaggorna <code>-o</code> och <code>-n</code>. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap för filer.</p> + +</dd> <dt id="o---oldfile-FIL"><b>-o, --oldfile FIL …</b></dt> <dd> @@ -370,6 +386,18 @@ <p>I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen konverteras av en annan användare som har skrivbehörighet för filen (t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix.</p> +<p>För att kontrollera om dos2unix har stöd för att bevara användar- och gruppägarskap för filer skriv <code>dosunix -V</code>.</p> + +<p>Konvertering görs alltid via en temporärfil. När ett fel inträffar halvvägs i konverteringen tas den temporära filen bort och originalfilen finns kvar intakt. Om konverteringen är framgångsrik kommer originalfilen att ersättas med temporärfilen. Du kanske har skrivrättigheter till originalfilen men inte rättigheter att ställa in samma användar- och/eller grupprättighetsegenskaper på temporärfilen som originalfilen har. Detta innebär att du inte kan bevara användar- och/eller gruppägarskapet för originalfilen. I detta fall kan du använda flaggan <code>--allow-chown</code> för att fortsätta konverteringen:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Ett annat alternativ är att använda nyfilsläge:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>Fördelen med flaggan <code>--allow-chown</code> är att du kan använda jokertecken och att ägarskapsegenskaper om möjligt kommer att bevaras.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/sv/man1/dos2unix.pod b/man/sv/man1/dos2unix.pod index 40b9a86..43eb1b1 100644 --- a/man/sv/man1/dos2unix.pod +++ b/man/sv/man1/dos2unix.pod @@ -76,6 +76,18 @@ Eller i nyfilsläge: dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +Tillåt ändring av ägarskap för fil i gammalt filläge. + +När denna flagga används, kommer konverteringen inte att avbrytas när +användar- och/eller gruppägarskap för originalfilen inte kan bevaras i +gammalt filläget. Konverteringen kommer att fortsätta och den konverterade +filen kommer att få samma nya ägarskap som om den konverterades i +nyfilsläge. Se också flaggorna C<-o> och C<-n>. Denna flagga är endast +tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap +för filer. + =item B<-ascii> Konvertera enbart radbrytningar. Detta är standardkonverteringsläget. @@ -362,6 +374,15 @@ bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen. +=item B<--no-allow-chown> + +Tillåt inte ändring av ägarskap i gammalt filläge (standard) + +Avbryt konvertering när användar- och/eller gruppägarskap för originalfilen +inte kan bevaras i gammalt filläge. Se också flaggorna C<-o> och +C<-n>. Denna flagga är endast tillgänglig om dos2unix har stöd för att +bevara användar- och gruppägarskap för filer. + =item B<-o, --oldfile FIL …> Gammalfilsläge. Konvertera filen FIL och skriv över den med @@ -378,6 +399,28 @@ en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix. +För att kontrollera om dos2unix har stöd för att bevara användar- och +gruppägarskap för filer skriv C<dosunix -V>. + +Konvertering görs alltid via en temporärfil. När ett fel inträffar halvvägs +i konverteringen tas den temporära filen bort och originalfilen finns kvar +intakt. Om konverteringen är framgångsrik kommer originalfilen att ersättas +med temporärfilen. Du kanske har skrivrättigheter till originalfilen men +inte rättigheter att ställa in samma användar- och/eller +grupprättighetsegenskaper på temporärfilen som originalfilen har. Detta +innebär att du inte kan bevara användar- och/eller gruppägarskapet för +originalfilen. I detta fall kan du använda flaggan C<--allow-chown> för att +fortsätta konverteringen: + + dos2unix --allow-chown foo.txt + +Ett annat alternativ är att använda nyfilsläge: + + dos2unix -n foo.txt foo.txt + +Fördelen med flaggan C<--allow-chown> är att du kan använda jokertecken och +att ägarskapsegenskaper om möjligt kommer att bevaras. + =item B<-q, --quiet> Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är diff --git a/man/sv/man1/dos2unix.txt b/man/sv/man1/dos2unix.txt index 1293743..2df1103 100644 --- a/man/sv/man1/dos2unix.txt +++ b/man/sv/man1/dos2unix.txt @@ -54,6 +54,17 @@ FLAGGOR dos2unix -n -- -foo out.txt + --allow-chown + Tillåt ändring av ägarskap för fil i gammalt filläge. + + När denna flagga används, kommer konverteringen inte att avbrytas + när användar- och/eller gruppägarskap för originalfilen inte kan + bevaras i gammalt filläget. Konverteringen kommer att fortsätta och + den konverterade filen kommer att få samma nya ägarskap som om den + konverterades i nyfilsläge. Se också flaggorna "-o" och "-n". Denna + flagga är endast tillgänglig om dos2unix har stöd för att bevara + användar- och gruppägarskap för filer. + -ascii Konvertera enbart radbrytningar. Detta är standardkonverteringsläget. @@ -292,6 +303,14 @@ FLAGGOR behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen. + --no-allow-chown + Tillåt inte ändring av ägarskap i gammalt filläge (standard) + + Avbryt konvertering när användar- och/eller gruppägarskap för + originalfilen inte kan bevaras i gammalt filläge. Se också flaggorna + "-o" och "-n". Denna flagga är endast tillgänglig om dos2unix har + stöd för att bevara användar- och gruppägarskap för filer. + -o, --oldfile FIL … Gammalfilsläge. Konvertera filen FIL och skriv över den med utmatningen. Programmet kör i detta läge som standard. Jokertecken i @@ -308,6 +327,30 @@ FLAGGOR användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix. + För att kontrollera om dos2unix har stöd för att bevara användar- + och gruppägarskap för filer skriv "dosunix -V". + + Konvertering görs alltid via en temporärfil. När ett fel inträffar + halvvägs i konverteringen tas den temporära filen bort och + originalfilen finns kvar intakt. Om konverteringen är framgångsrik + kommer originalfilen att ersättas med temporärfilen. Du kanske har + skrivrättigheter till originalfilen men inte rättigheter att ställa + in samma användar- och/eller grupprättighetsegenskaper på + temporärfilen som originalfilen har. Detta innebär att du inte kan + bevara användar- och/eller gruppägarskapet för originalfilen. I + detta fall kan du använda flaggan "--allow-chown" för att fortsätta + konverteringen: + + dos2unix --allow-chown foo.txt + + Ett annat alternativ är att använda nyfilsläge: + + dos2unix -n foo.txt foo.txt + + Fördelen med flaggan "--allow-chown" är att du kan använda + jokertecken och att ägarskapsegenskaper om möjligt kommer att + bevaras. + -q, --quiet Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är noll. Utom när felaktiga kommandoradsflaggor används. diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1 index 7cb6f66..8145a15 100644 --- a/man/uk/man1/dos2unix.1 +++ b/man/uk/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -141,6 +141,16 @@ SunOS/Solaris передбачено підтримку лише парного .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +Allow file ownership change in old file mode. +.Sp +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options \f(CW\*(C`\-o\*(C'\fR +and \f(CW\*(C`\-n\*(C'\fR. This option is only available if dos2unix has support for +preserving the user and group ownership of files. .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" Виконати лише перетворення символів розриву рядків. Типовий режим @@ -412,6 +422,14 @@ Unix: на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус \fIumask\fR\|(1) для користувача, яким було розпочато перетворення. +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +Don't allow file ownership change in old file mode (default). +.Sp +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options \f(CW\*(C`\-o\*(C'\fR and \f(CW\*(C`\-n\*(C'\fR. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. .IP "\fB\-o, \-\-oldfile ФАЙЛ ...\fR" 4 .IX Item "-o, --oldfile ФАЙЛ ..." Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати @@ -428,6 +446,31 @@ Unix: із безпекою, оскільки файл може стати доступним для читання користувачам, які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix. +.Sp +To check if dos2unix has support for preserving the user and group ownership +of files type \f(CW\*(C`dos2unix \-V\*(C'\fR. +.Sp +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option \f(CW\*(C`\-\-allow\-chown\*(C'\fR to continue with the conversion: +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +Another option is to use new file mode: +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +The advantage of the \f(CW\*(C`\-\-allow\-chown\*(C'\fR option is that you can use wildcards, +and the ownership properties will be preserved when possible. .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" Режим без виведення повідомлень. Програма не виводитиме жодних попереджень diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm index 9e4b7b6..1d078f3 100644 --- a/man/uk/man1/dos2unix.htm +++ b/man/uk/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title> +<title>dos2unix 7.4.0 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -78,6 +78,14 @@ <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>Allow file ownership change in old file mode.</p> + +<p>When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>Власником перетвореного файла буде призначено користувача, яким було розпочато перетворення у режимі нового файла (парному режимі). Права доступу на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення.</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>Don't allow file ownership change in old file mode (default).</p> + +<p>Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options <code>-o</code> and <code>-n</code>. This option is only available if dos2unix has support for preserving the user and group ownership of files.</p> + +</dd> <dt id="o---oldfile"><b>-o, --oldfile ФАЙЛ ...</b></dt> <dd> @@ -370,6 +386,18 @@ <p>У застарілому режимі (режимі заміщення) перетворений файл належатиме тому самому власнику і групі і матиме ті самі права доступу на читання або запис, що і початковий файл. Крім того, якщо перетворення файла виконується іншим користувачем, який має права доступу на запис до файла (наприклад користувачем root), перетворення буде перервано, якщо зберегти початкові значення не вдасться. Зміна власника може означати неможливість читання файла для його початкового власника. Зміна групи може призвести до проблем із безпекою, оскільки файл може стати доступним для читання користувачам, які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix.</p> +<p>To check if dos2unix has support for preserving the user and group ownership of files type <code>dos2unix -V</code>.</p> + +<p>Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option <code>--allow-chown</code> to continue with the conversion:</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>Another option is to use new file mode:</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>The advantage of the <code>--allow-chown</code> option is that you can use wildcards, and the ownership properties will be preserved when possible.</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/uk/man1/dos2unix.pod b/man/uk/man1/dos2unix.pod index 864e0eb..a1225b8 100644 --- a/man/uk/man1/dos2unix.pod +++ b/man/uk/man1/dos2unix.pod @@ -80,6 +80,17 @@ SunOS/Solaris передбачено підтримку лише парного dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +Allow file ownership change in old file mode. + +When this option is used, the conversion will not be aborted when the user +and/or group ownership of the original file can't be preserved in old file +mode. Conversion will continue and the converted file will get the same new +ownership as if it was converted in new file mode. See also options C<-o> +and C<-n>. This option is only available if dos2unix has support for +preserving the user and group ownership of files. + =item B<-ascii> Виконати лише перетворення символів розриву рядків. Типовий режим @@ -376,6 +387,15 @@ UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE. початкового файла мінус umask(1) для користувача, яким було розпочато перетворення. +=item B<--no-allow-chown> + +Don't allow file ownership change in old file mode (default). + +Abort conversion when the user and/or group ownership of the original file +can't be preserved in old file mode. See also options C<-o> and C<-n>. This +option is only available if dos2unix has support for preserving the user and +group ownership of files. + =item B<-o, --oldfile ФАЙЛ ...> Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати @@ -393,6 +413,27 @@ UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE. які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix. +To check if dos2unix has support for preserving the user and group ownership +of files type C<dos2unix -V>. + +Conversion is always done via a temporary file. When an error occurs halfway +the conversion, the temporary file is deleted and the original file stays +intact. When the conversion is successful, the original file is replaced +with the temporary file. You may have write permission on the original file, +but no permission to put the same user and/or group ownership properties on +the temporary file as the original file has. This means you are not able to +preserve the user and/or group ownership of the original file. In this case +you can use option C<--allow-chown> to continue with the conversion: + + dos2unix --allow-chown foo.txt + +Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + +The advantage of the C<--allow-chown> option is that you can use wildcards, +and the ownership properties will be preserved when possible. + =item B<-q, --quiet> Режим без виведення повідомлень. Програма не виводитиме жодних попереджень diff --git a/man/uk/man1/dos2unix.txt b/man/uk/man1/dos2unix.txt index 27dfbdf..cb5a265 100644 --- a/man/uk/man1/dos2unix.txt +++ b/man/uk/man1/dos2unix.txt @@ -58,6 +58,17 @@ dos2unix -n -- -foo out.txt + --allow-chown + Allow file ownership change in old file mode. + + When this option is used, the conversion will not be aborted when + the user and/or group ownership of the original file can't be + preserved in old file mode. Conversion will continue and the + converted file will get the same new ownership as if it was + converted in new file mode. See also options "-o" and "-n". This + option is only available if dos2unix has support for preserving the + user and group ownership of files. + -ascii Виконати лише перетворення символів розриву рядків. Типовий режим перетворення. @@ -310,6 +321,14 @@ прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення. + --no-allow-chown + Don't allow file ownership change in old file mode (default). + + Abort conversion when the user and/or group ownership of the + original file can't be preserved in old file mode. See also options + "-o" and "-n". This option is only available if dos2unix has support + for preserving the user and group ownership of files. + -o, --oldfile ФАЙЛ ... Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати його вміст. Типово, програма працює у цьому режимі. @@ -328,6 +347,29 @@ збереження прав власності та прав доступу до файла передбачено лише у Unix. + To check if dos2unix has support for preserving the user and group + ownership of files type "dos2unix -V". + + Conversion is always done via a temporary file. When an error occurs + halfway the conversion, the temporary file is deleted and the + original file stays intact. When the conversion is successful, the + original file is replaced with the temporary file. You may have + write permission on the original file, but no permission to put the + same user and/or group ownership properties on the temporary file as + the original file has. This means you are not able to preserve the + user and/or group ownership of the original file. In this case you + can use option "--allow-chown" to continue with the conversion: + + dos2unix --allow-chown foo.txt + + Another option is to use new file mode: + + dos2unix -n foo.txt foo.txt + + The advantage of the "--allow-chown" option is that you can use + wildcards, and the ownership properties will be preserved when + possible. + -q, --quiet Режим без виведення повідомлень. Програма не виводитиме жодних попереджень або повідомлень про помилки. Повернутим значенням завжди diff --git a/man/zh_CN/man1/dos2unix.1 b/man/zh_CN/man1/dos2unix.1 index 7e770a6..a1d9148 100644 --- a/man/zh_CN/man1/dos2unix.1 +++ b/man/zh_CN/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2017-07-04" "dos2unix" "2017-07-04" +.TH dos2unix 1 "2017-10-10" "dos2unix" "2017-10-10" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -113,11 +113,17 @@ Dos2unix由SunOS/Solaris下的版本改写而成。这两个版本间有一个 \& dos2unix \-\- \-foo .Ve .Sp -或者在新文件模式中： +或者在新文件模式下： .Sp .Vb 1 \& dos2unix \-n \-\- \-foo out.txt .Ve +.IP "\fB\-\-allow\-chown\fR" 4 +.IX Item "--allow-chown" +在旧文件模式下，允许修改文件的所有者。 +.Sp +若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项\f(CW\*(C`\-o\*(C'\fR 和 \f(CW\*(C`\-n\*(C'\fR。仅当 +dos2unix 支持保护文件的属主/属组时才能使用该选项。 .IP "\fB\-ascii\fR" 4 .IX Item "-ascii" 只转换断行符。这是默认的转换模式。 @@ -330,11 +336,36 @@ utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType 新文件模式。转换输入文件并写入到输出文件。文件名必须成对给出，并且 \fI不能\fR 使用通配符，否则你 \fI将会\fR丢失文件。 .Sp 使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 \fIumask\fR\|(1) 得到。 +.IP "\fB\-\-no\-allow\-chown\fR" 4 +.IX Item "--no-allow-chown" +在旧文件模式下，不允许修改文件的所有者（默认选项）。 +.Sp +当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见\f(CW\*(C`\-o\*(C'\fR 和 \f(CW\*(C`\-n\*(C'\fR选项。仅当 dos2unix +支持保护文件的属主/属组时才能使用该选项。 .IP "\fB\-o, \-\-oldfile 文件 ...\fR" 4 .IX Item "-o, --oldfile 文件 ..." 旧文件模式。转换并将输出覆盖到源文件。程序默认使用此模式，允许使用通配符。 .Sp 在旧文件（替换）模式下，被转换的文件的所有者、组和读/写权限保持不变。当文件被其他具有写权限的用户（如root）转换时，情况也是如此。如果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有Unix才支持转换时保留所有者、组和读/写权限。 +.Sp +若要查看 dos2unix 是否支持保护文件的所有者，请输入\f(CW\*(C`dos2unix \-V\*(C'\fR。 +.Sp +dos2unix +在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在这一过程中，如果 +dos2unix +无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情况下，可以使用\f(CW\*(C`\-\-allow\-chown\*(C'\fR选项来继续进行转换： +.Sp +.Vb 1 +\& dos2unix \-\-allow\-chown foo.txt +.Ve +.Sp +或者在新文件模式下： +.Sp +.Vb 1 +\& dos2unix \-n foo.txt foo.txt +.Ve +.Sp +使用\f(CW\*(C`\-\-allow\-chown\*(C'\fR选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。 .IP "\fB\-q, \-\-quiet\fR" 4 .IX Item "-q, --quiet" 安静模式。不显示任何警告或信息。返回值为0，除非命令行选项有误。 diff --git a/man/zh_CN/man1/dos2unix.htm b/man/zh_CN/man1/dos2unix.htm index c81a5f7..0460336 100644 --- a/man/zh_CN/man1/dos2unix.htm +++ b/man/zh_CN/man1/dos2unix.htm @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>dos2unix 7.3.5 - DOS/Mac - Unix文件格式转换器</title> +<title>dos2unix 7.4.0 - DOS/Mac - Unix文件格式转换器</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:ASSI@cygwin.nonet" /> </head> @@ -73,11 +73,19 @@ <pre><code> dos2unix -- -foo</code></pre> -<p>或者在新文件模式中：</p> +<p>或者在新文件模式下：</p> <pre><code> dos2unix -n -- -foo out.txt</code></pre> </dd> +<dt id="allow-chown"><b>--allow-chown</b></dt> +<dd> + +<p>在旧文件模式下，允许修改文件的所有者。</p> + +<p>若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项<code>-o</code> 和 <code>-n</code>。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。</p> + +</dd> <dt id="ascii"><b>-ascii</b></dt> <dd> @@ -363,6 +371,14 @@ <p>使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 umask(1) 得到。</p> </dd> +<dt id="no-allow-chown"><b>--no-allow-chown</b></dt> +<dd> + +<p>在旧文件模式下，不允许修改文件的所有者（默认选项）。</p> + +<p>当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见<code>-o</code> 和 <code>-n</code>选项。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。</p> + +</dd> <dt id="o---oldfile"><b>-o, --oldfile 文件 ...</b></dt> <dd> @@ -370,6 +386,18 @@ <p>在旧文件（替换）模式下，被转换的文件的所有者、组和读/写权限保持不变。当文件被其他具有写权限的用户（如root）转换时，情况也是如此。如果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有Unix才支持转换时保留所有者、组和读/写权限。</p> +<p>若要查看 dos2unix 是否支持保护文件的所有者，请输入<code>dos2unix -V</code>。</p> + +<p>dos2unix 在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在这一过程中，如果 dos2unix 无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情况下，可以使用<code>--allow-chown</code>选项来继续进行转换：</p> + +<pre><code> dos2unix --allow-chown foo.txt</code></pre> + +<p>或者在新文件模式下：</p> + +<pre><code> dos2unix -n foo.txt foo.txt</code></pre> + +<p>使用<code>--allow-chown</code>选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。</p> + </dd> <dt id="q---quiet"><b>-q, --quiet</b></dt> <dd> diff --git a/man/zh_CN/man1/dos2unix.pod b/man/zh_CN/man1/dos2unix.pod index f5ffca5..1a50d15 100644 --- a/man/zh_CN/man1/dos2unix.pod +++ b/man/zh_CN/man1/dos2unix.pod @@ -53,10 +53,17 @@ C<-o> 和 C<-n>。还有一个区别是SunOS/Solaris下的版本默认使用 I<i dos2unix -- -foo -或者在新文件模式中： +或者在新文件模式下： dos2unix -n -- -foo out.txt +=item B<--allow-chown> + +在旧文件模式下，允许修改文件的所有者。 + +若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项C<-o> 和 C<-n>。仅当 +dos2unix 支持保护文件的属主/属组时才能使用该选项。 + =item B<-ascii> 只转换断行符。这是默认的转换模式。 @@ -292,12 +299,34 @@ B<unix2dos>：只有Unix断行符会被转换为两个DOS断行符。在Mac模 使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 umask(1) 得到。 +=item B<--no-allow-chown> + +在旧文件模式下，不允许修改文件的所有者（默认选项）。 + +当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见C<-o> 和 C<-n>选项。仅当 dos2unix +支持保护文件的属主/属组时才能使用该选项。 + =item B<-o, --oldfile 文件 ...> 旧文件模式。转换并将输出覆盖到源文件。程序默认使用此模式，允许使用通配符。 在旧文件（替换）模式下，被转换的文件的所有者、组和读/写权限保持不变。当文件被其他具有写权限的用户（如root）转换时，情况也是如此。如果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有Unix才支持转换时保留所有者、组和读/写权限。 +若要查看 dos2unix 是否支持保护文件的所有者，请输入C<dos2unix -V>。 + +dos2unix +在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在这一过程中，如果 +dos2unix +无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情况下，可以使用C<--allow-chown>选项来继续进行转换： + + dos2unix --allow-chown foo.txt + +或者在新文件模式下： + + dos2unix -n foo.txt foo.txt + +使用C<--allow-chown>选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。 + =item B<-q, --quiet> 安静模式。不显示任何警告或信息。返回值为0，除非命令行选项有误。 diff --git a/man/zh_CN/man1/dos2unix.txt b/man/zh_CN/man1/dos2unix.txt index 57949c1..5446d17 100644 --- a/man/zh_CN/man1/dos2unix.txt +++ b/man/zh_CN/man1/dos2unix.txt @@ -30,10 +30,16 @@ dos2unix -- -foo - 或者在新文件模式中： + 或者在新文件模式下： dos2unix -n -- -foo out.txt + --allow-chown + 在旧文件模式下，允许修改文件的所有者。 + + 若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项"-o" 和 "-n"。仅当 + dos2unix 支持保护文件的属主/属组时才能使用该选项。 + -ascii 只转换断行符。这是默认的转换模式。 @@ -217,6 +223,12 @@ 使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 umask(1) 得到。 + --no-allow-chown + 在旧文件模式下，不允许修改文件的所有者（默认选项）。 + + 当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见"-o" 和 "-n"选项。仅当 dos2unix + 支持保护文件的属主/属组时才能使用该选项。 + -o, --oldfile 文件 ... 旧文件模式。转换并将输出覆盖到源文件。程序默认使用此模式，允许使用通配符。 @@ -224,6 +236,22 @@ 果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有U nix才支持转换时保留所有者、组和读/写权限。 + 若要查看 dos2unix 是否支持保护文件的所有者，请输入"dos2unix -V"。 + + dos2unix + 在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在 + 这一过程中，如果 dos2unix + 无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情 + 况下，可以使用"--allow-chown"选项来继续进行转换： + + dos2unix --allow-chown foo.txt + + 或者在新文件模式下： + + dos2unix -n foo.txt foo.txt + + 使用"--allow-chown"选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。 + -q, --quiet 安静模式。不显示任何警告或信息。返回值为0，除非命令行选项有误。 diff --git a/po-man/de.po b/po-man/de.po index 211bc80..fd0cb4d 100644 --- a/po-man/de.po +++ b/po-man/de.po @@ -5,9 +5,9 @@ # Mario Blättermann <mario.blaettermann@gmail.com>, 2014-2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.3.5-beta4\n" -"POT-Creation-Date: 2017-06-20 22:03+0200\n" -"PO-Revision-Date: 2017-05-19 18:59+0200\n" +"Project-Id-Version: dos2unix-man-7.3.6-beta4\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" +"PO-Revision-Date: 2017-09-27 20:43+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.3\n" #. type: =head1 #: dos2unix.pod:52 @@ -126,256 +126,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "erlaubt die Änderung des Eigentümers der Datei im Alte-Datei-Modus." + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Wenn diese Option verwendet wird, dann bricht die Umwandlung nicht ab, wenn der Eigentümer und die Gruppe der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Die Umwandlung wird fortgesetzt und die umgewandelte Datei erhält den gleichen neuen Eigentümer, als wäre sie im Neue-Datei-Modus umgewandelt worden. Siehe auch die Optionen C<-o> und C<-n>. Diese Option ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien verfügt." + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "wandelt aus dem DOS- in den ISO-8859-1-Zeichensatz um. Weitere Informationen hierzu finden Sie im Abschnitt UMWANDLUNGSMODI." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "verwendet die Windows-Codepage 1252 (Westeuropäisch)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "verwendet die DOS-Codepage 437 (US). Dies ist die vorgegebene Codepage für die ISO-Umwandlung." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "verwendet die DOS-Codepage 850 (Westeuropäisch)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "verwendet die DOS-Codepage 860 (Portugiesisch)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "verwendet die DOS-Codepage 863 (Kanadisches Französisch)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "verwendet die DOS-Codepage 865 (Skandinavisch)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "wandelt 8bit-Zeichen in ein 7bit-Bitmuster um." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "erhält die Markierung der Bytereihenfolge (BOM). Wenn die Eingabedatei eine BOM enthält, wird ebenfalls eine BOM in die Ausgabedatei geschrieben. Dies ist das Standardverhalten beim Umwandeln von DOS-Zeilenumbrüchen. Siehe auch die Option C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode UMWANDLUNGSMODUS>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann I<ascii>, I<7bit>, I<iso> oder I<mac> sein, wobei I<ascii> die Vorgabe ist." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc KODIERUNG>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "legt die Kodierung des angezeigten Texts fest. KODIERUNG kann I<ansi>, I<unicode>, I<unicodebom>, I<utf8> oder <utf8bom> sein, wobei I<ansi> die Vorgabe ist." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Diese Option ist nur in dos2unix für Windows mit Unterstützung für Unicode-Dateinamen verfügbar. Sie bleibt wirkungslos, wenn die tatsächlichen Dateinamen gelesen und geschrieben werden, lediglich bei der Darstellung wird sie berücksichtigt." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Es gibt verschiedene Möglichkeiten, Text in einer Windows-Konsole basierend auf dessen Kodierung darzustellen. Alle haben verschiedene Vor- und Nachteile." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "Die Standardmethode von dos2unix ist die Verwendung von ANSI-kodiertem Text, der Vorteil ist deren Abwärtskompatibilität. Dies funktioniert mit Raster- und TrueType-Schriften. In manchen Gebieten müssen Sie mit dem Befehl C<chcp> die aktive DOS-OEM-Codepage in die -System-ANSI-Codepage des Systems ändern, da dos2unix Letztere verwendet." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "Der Nachteil von ANSI ist, dass internationale Dateinamen nicht korrekt dargestellt werden, wenn darin Zeichen enthalten sind, die nicht in der im System voreingestellten Codepage enthalten sind. Stattdessen wird entweder ein Fragezeichen oder ein falsches Zeichen angezeigt. Sofern Sie nicht mit fremden Dateinamen arbeiten, ist diese Methode in Ordnung." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "Der Vorteil von Unicode (dem Windows-Namen für UTF-16) ist die üblicherweise korrekte Textdarstellung. Eine Änderung der aktiven Codepage ist nicht erforderlich. Sie müssen die Schriftart der Konsole auf eine TrueType-Schrift einstellen, damit internationale Zeichen richtig angezeigt werden können. Sollte ein Zeichen in einer TrueType-Schrift nicht enthalten sein, wird ein kleines Quadrat angezeigt, das gelegentlich noch ein Fragezeichen enthält." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "Wenn Sie die ConEmu-Konsole nutzen, wird der gesamte Text korrekt dargestellt, da ConEmu automatisch eine passende Schrift wählt." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Nachteilig für Unicode ist, dass es nicht zu ASCII kompatibel ist. Die Ausgabe ist schwer zu verarbeiten, wenn sie in ein anderes Programm oder eine Datei weitergeleitet wird." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Wenn die Methode C<unicodebom> verwendet wird, dann wird dem Unicode-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist für korrekte um- oder Weiterleitung in der PowerShell notwendig." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "Der Vorteil von UTF-8 ist die ASCII-Kompatibilität. Sie müssen die Schriftart der Konsole auf eine TrueType-Schrift setzen. Dadurch wird der Text ähnlich wie in der C<unicode>-Kodierung dargestellt." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "Der Nachteil ist die falsche Darstellung aller Nicht-ASCII-Zeichen, wenn Sie die Standard-Rasterschrift verwenden. Nicht nur Unicode-Dateinamen, sondern auch übersetzte Meldungen werden unlesbar. Auf einem Windows-System, das für eine ostasiatische Region eingerichtet wurde, wird die Konsole bei der Anzeige von Meldungen deutlich flackern." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "In einer ConEmu-Konsole funktioniert die UTF-8-Kodierung gut." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Wenn die Methode C<utf8bom> verwendet wird, dann wird dem UTF-8-Text eine BOM (Markierung der Bytereihenfolge) vorangestellt. Eine BOM ist ist für korrekte um- oder Weiterleitung in der PowerShell notwendig." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "Die Standardkodierung kann durch Setzen der Umgebungsvariable DOS2UNIX_DISPLAY_ENC auf C<unicode>, C<unicodebom>, C<utf8> oder C<utf8> geändert werden." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "erzwingt die Umwandlung von Binärdateien." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "wandelt unter Windows UTF-16-Dateien standardmäßig in UTF-8 um, ungeachtet der Einstellung der Locale. Verwenden Sie diese Option zum umwandeln von Utf-16-Dateien in GB18030. Diese Option ist nur unter Windows verfügbar. Siehe auch Abschnitt GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "zeigt eine Hilfe an und beendet das Programm." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[SCHALTER], --info[=SCHALTER] DATEI>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "zeigt Dateiinformationen an. Es wird keine Umwandlung vorgenommen." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Die Ausgabe der Informationen geschieht in der folgenden Reihenfolge: Anzahl der DOS-Zeilenumbrüche, Anzahl der Unix-Zeilenumbrüche, Anzahl der Mac-Zeilenumbrüche, Markierung der Bytereihenfolge, Text- oder Binärformat, Dateiname." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Beispielausgabe:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -399,122 +414,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Beachten sie, dass manchmal eine Binärdatei fälschlicherweise als Textdatei erkannt wird. Siehe auch Option C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Optionale zusätzliche Schalter können gesetzt werden, um die Ausgabe anzupassen. Einer oder mehrere Schalter können hinzugefügt werden." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" -msgstr "" +msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." -msgstr "" +msgstr "gibt die Zeilen zur Dateiinformation mit einem Null-Zeichen am Ende anstelle eines Zeilenvorschub-Zeichens aus. Dies ermöglicht die korrekte Interpretation von Leer- und Anführungszeichen in Dateinamen, wenn der Schalter c verwendet wird. Verwenden Sie diesen Schalter in Kombination mit der xargs(1)-Option C<-0> oder C<--null>." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "gibt die Anzahl der DOS-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "gibt die Anzahl der Unix-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "gibt die Anzahl der Mac-Zeilenumbrüche aus." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "gibt die Markierung der Bytereihenfolge aus." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "zeigt an, ob es sich um eine Text- oder eine Binärdatei handelt." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "gibt nur die Dateien aus, die umgewandelt werden würden." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Mit dem Schalter C<c> gibt dos2unix nur die Dateien aus, die DOS-Zeilenumbrüche enthalten, unix2dos nur die Dateien mit Unix-Zeilenumbrüchen." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "gibt eine Kopfzeile aus." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "zeigt Dateinamen ohne Pfade an." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Beispiele:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Informationen zu allen *.txt-Dateien anzeigen:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -524,12 +539,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Nur die Anzahl der DOS-Zeilenumbrüche und Unix-Zeilenumbrüche anzeigen:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -539,12 +554,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Nur die Markierung der Bytereihenfolge anzeigen:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -554,12 +569,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Die Dateien auflisten, die DOS-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -569,12 +584,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Die Dateien auflisten, die Unix-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -584,348 +599,397 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Nur Dateien umwandeln, die DOS-Zeilenumbrüche enthalten und die anderen Dateien unverändert belassen:" #. type: verbatim -#: dos2unix.pod:337 -#, fuzzy, no-wrap -#| msgid "" -#| " dos2unix -ic *.txt | xargs dos2unix\n" -#| "\n" +#: dos2unix.pod:348 +#, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" "\n" msgstr "" -" find . -name '*.txt' |xargs dos2unix\n" +" dos2unix -ic0 *.txt | xargs -0 dos2unix\n" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Nach Textdateien suchen, die DOS-Zeilenumbrüche enthalten:" #. type: verbatim -#: dos2unix.pod:341 -#, fuzzy, no-wrap -#| msgid "" -#| " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" -#| "\n" +#: dos2unix.pod:352 +#, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" "\n" msgstr "" -" find . -name '*.txt' -print0 |xargs -0 dos2unix\n" +" find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "übernimmt den Zeitstempel der Eingabedatei in die Ausgabedatei." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "zeigt die Lizenz des Programms an." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "fügt eine zusätzliche neue Zeile hinzu." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Nur DOS-Zeilenumbrüche werden in Unix-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Mac-Zeilenumbrüche in Unix-Zeilenumbrüche umgewandelt." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Nur Unix-Zeilenumbrüche werden in DOS-Zeilenumbrüche umgewandelt. Im Mac-Modus werden nur Unix-Zeilenumbrüche in Mac-Zeilenumbrüche umgewandelt." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "schreibt eine Markierung der Bytereihenfolge (BOM) in die Ausgabedatei. In der Voreinstellung wird eine UTF-8-BOM geschrieben." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Wenn die Eingabedatei in UTF-16 kodiert ist und die Option C<-u> verwendet wird, wird eine UTF-16-BOM geschrieben." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8, UTF-16 oder GB 18030 ist. Weitere Informationen finden Sie im Abschnitt UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile EINGABEDATEI AUSGABEDATEI …>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die AUSGABEDATEI geschrieben. Die Dateinamen müssen paarweise angegeben werden. Platzhalter sollten I<nicht> verwendet werden, sonst werden Sie Ihre Dateien I<verlieren>." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Der Benutzer, der die Umwandlung im Neue-Datei-Modus startet, wird Besitzer der umgewandelten Datei. Die Lese- und Schreibrechte werden aus den Zugriffsrechten der Originaldatei minus der umask(1) der Person ermittelt, die die Umwandlung ausgeführt hat." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "verhindert die Änderung des Eigentümers der Datei im Alte-Datei-Modus (Voreinstellung)." + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "bricht die Umwandlung ab, wenn der Eigentümer und/oder die Gruppe der Originaldatei im Alte-Datei-Modus nicht erhalten werden kann. Siehe auch die Optionen C<-o> und C<-n>. Diese Option ist nur verfügbar, wenn dos2unix über Unterstützung für die Erhaltung des Eigentümers und der Gruppe von Dateien verfügt." + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile DATEI …>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Alte-Datei-Modus. Die DATEI wird umgewandelt und durch die Ausgabedatei überschrieben. Per Vorgabe werden Umwandlungen in diesem Modus ausgeführt. Platzhalter sind verwendbar." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese- und Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und Schreib- und Leserechten wird nur unter Unix unterstützt." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "Um herauszufinden, ob dos2unix über Unterstützung für die Erhaltung von Eigentümer und Gruppe von Dateien verfügt, rufen Sie C<dos2unix -V> auf." + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "Die Umwandlung führt stets über eine temporäre Datei. Tritt im Laufe der Umwandlung ein Fehler auf, wird die temporäre Datei gelöscht und die Originaldatei bleibt intakt. War die Umwandlung erfolgreich, wird die Originaldatei durch die temporäre Datei ersetzt. Sie können Schreibrechte für die Originaldatei haben, aber keine Rechte, um die gleichen Eigentumsverhältnisse wie die der Originaldatei für die temporäre Datei festzulegen. Das bedeutet, dass Sie Eigentümer und Gruppe der Originaldatei nicht bewahren können. In diesem Fall können Sie die Option C<--allow-chown> verwenden, um die Umwandlung fortzusetzen:" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "Eine weitere Option ist der Neue-Datei-Modus:" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n foo.txt foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "Der Vorteil der Option C<--allow-chown> ist, dass Sie Platzhalter verwenden können und die Eigentumsverhältnisse bewahrt bleiben, sofern möglich." + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Stiller Modus, in dem alle Warnungen und sonstige Meldungen unterdrückt werden. Der Rückgabewert ist 0, außer wenn fehlerhafte Befehlszeilenoptionen angegeben werden." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "entfernt die Markierung der Bytereihenfolge (BOM). Es wird keine BOM in die Ausgabedatei geschrieben. Dies ist das Standardverhalten beim Umwandeln von Unix-Zeilenumbrüchen. Siehe auch die Option C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "überspringt Binärdateien (Vorgabe)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binärdateien werden übersprungen, damit unerwünschtes Fehlverhalten vermieden wird. Denken Sie daran, dass die Erkennung nicht 100% sicher funktioniert. Die übergebenen Dateien werden auf Binärsymbole überprüft, die typischerweise in Textdateien nicht vorkommen. Es ist jedoch möglich, dass eine Binärdatei ausschließlich gewöhnliche Textzeichen enthält. Eine solche Binärdatei wird dann fälschlicherweise als Textdatei angesehen." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "erhält die originale UTF-16-Kodierung der Eingabedatei. Die Ausgabedatei wird in der gleichen UTF-16-Kodierung geschrieben (Little-Endian- oder Big-Endian-Bytereihenfolge) wie die Eingabedatei. Dies verhindert die Umwandlung in UTF-8. Eine UTF-16-BOM wird dementsprechend geschrieben. Diese Option kann durch Angabe der Option C<-ascii> deaktiviert werden." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "nimmt an, dass die Eingabedatei das Format UTF-16LE hat." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Wenn die Eingabedatei eine Markierung der Bytereihenfolge enthält (BOM), dann hat die BOM Vorrang vor dieser Option." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Durch eine falsche Annahme (die Eingabedatei war nicht in UTF-16LE kodiert) mit erfolgreicher Umwandlung erhalten Sie eine UTF-8-Ausgabedatei mit fehlerhaftem Text. Sie können die fehlgeschlagene Umwandlung mit iconv(1) rückgängig machen, indem Sie die Rückumwandlung von UTF-8 nach UTF-16LE vornehmen. Dadurch gewinnen Sie die Originaldatei zurück." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "Die Annahme von UTF-16LE wirkt wie ein I<Umwandlungsmodus>. Beim Wechsel zum vorgegebenen I<ascii>-Modus wird die UTF16LE-Annahme deaktiviert." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "nimmt an, dass die Eingabedatei das Format UTF-16BE hat." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Diese Option ist gleichbedeutend mit C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den Markierungen der Bytereihenfolge (BOM) und zur Anzahl der umgewandelten Zeilenumbrüche angezeigt." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "folgt symbolischen Links und wandelt die Zieldateien um." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "ersetzt symbolische Links durch die umgewandelten Dateien (die originalen Zieldateien bleiben unverändert)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "erhält symbolische Links als solche und lässt die Ziele unverändert (Vorgabe)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "zeigt Versionsinformationen an und beendet das Programm." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "Im Normalmodus werden Zeilenumbrüche von DOS nach Unix und umgekehrt umgewandelt. Mac-Zeilenumbrüche werden nicht verändert." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "Im Mac-Modus werden Zeilenumbrüche von Mac nach Unix und umgekehrt umgewandelt. DOS-Zeilenumbrüche werden nicht verändert." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Um das Programm im Mac-Modus auszuführen, verwenden Sie die Befehlszeilenoption C<-c mac> oder die Befehle C<mac2unix> oder C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "UMWANDLUNGSMODI" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "Im C<ascii>-Modus werden nur Zeilenumbrüche umgewandelt. Dies ist der vorgegebene Umwandlungsmodus." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Obwohl der Name dieses Modus auf ASCII hinweist, welches ein 7-bit-Standard ist, bezieht sich der eigentliche Modus auf 8 Bit. Verwenden Sie diesen Modus immer dann, wenn Sie Unicode-Dateien in UTF-8-Kodierung umwandeln." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "In diesem Modus werden alle Nicht-ASCII-Zeichen aus 8 Bit in das 7-Bit-Bitmuster umgewandelt." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Die Zeichen werden aus dem DOS-Zeichensatz (der Codepage) in den ISO-Zeichensatz ISO-8859-1 (Latin-1) in Unix umgewandelt. DOS-Zeichen ohne Äquivalent in ISO-8859-1, für die die Umwandlung nicht möglich ist, werden durch einen Punkt ersetzt. Gleiches gilt für ISO-8859-1-Zeichen ohne DOS-Gegenstück." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Wenn nur die Option C<-iso> angegeben ist, versucht dos2unix die aktive Codepage selbst zu ermitteln. Sollte dies nicht möglich sein, wird die Standard-Codepage CP437 verwendet, welche hauptsächlich in den USA eingesetzt wird. Um eine bestimmte Codepage zu erzwingen, verwenden Sie die Optionen C<-437> (US), C<-850> (Westeuropäisch), C<-860> (Portugiesisch), C<-863> (Kanadisches Französisch) oder C<-865> (Skandinavisch). Die Windows-Codepage CP1252 (Westeuropäisch) wird durch die Option C<-1252> unterstützt." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Wenden Sie niemals die ISO-Umwandlung auf Unicode-Textdateien an. In UTF-8 kodierte Dateien werden dadurch beschädigt." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Einige Beispiele:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Umwandlung aus der vorgegebenen DOS-Codepage nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -935,12 +999,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Umwandlung von DOS CP850 nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -950,12 +1014,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Umwandlung von Windows CP1252 nach Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -965,12 +1029,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Umwandlung von Windows CP1252 nach Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -980,12 +1044,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Umwandlung von Unix Latin-1 in die vorgegebene DOS-Codepage:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -995,12 +1059,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Umwandlung von Unix Latin-1 nach DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1010,12 +1074,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Umwandlung von Unix Latin-1 nach Windows CP1252:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1025,12 +1089,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Umwandlung von Unix UTF-8 (Unicode) nach Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1040,142 +1104,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Siehe auch L<http://czyborra.com/charsets/codepages.html> und L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Zeichenkodierungen" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Es gibt verschiedene Unicode-Zeichenkodierungen. Unter Unix und Linux sind Unicode-Dateien typischerweise in UTF-8 kodiert. Unter Windows können Textdateien in UTF-8, UTF-16 oder UTF-16 in Big-Endian-Bytereihenfolge kodiert sein, liegen aber meist im Format UTF-16 vor." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Umwandlung" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Unicode-Textdateien können DOS-, Unix- oder Mac-Zeilenumbrüche enthalten, so wie reguläre Textdateien." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alle Versionen von dos2unix und unix2dos können UTF-8-kodierte Dateien umwandeln, weil UTF-8 im Hinblick auf Abwärtskompatiblität mit ASCII entwickelt wurde." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix und unix2dos mit Unterstützung für UTF-16 können in UTF-16 kodierte Dateien in Little-Endian- und Big-Endian-Bytereihenfolge lesen. Um festzustellen, ob dos2unix mit UTF-16-Unterstützung kompiliert wurde, geben Sie C<dos2unix -V> ein." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Unter Unix/Linux werden UTF-16 kodierte Dateien standardmäßig in die Zeichenkodierung entsprechend der Locale umgewandelt. Mit dem Befehl locale(1) können Sie herausfinden, wie die Zeichenkodierung der Locale eingestellt ist. Wenn eine Umwandlung nicht möglich ist, verursacht dies einen Umwandlungsfehler, wodurch die Datei übersprungen wird." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Unter Windows werden UTF-16-Dateien standardmäßig in UTF-8 umgewandelt. In UTF-8 formatierte Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Die Kodierungen UTF-16 und UTF-8 sind vollständig kompatibel, daher wird bei der Umwandlung keinerlei Text verlorengehen. Sollte bei der Umwandlung von UTF-16 in UTF-8 ein Problem auftreten, beispielsweise wenn die UTF-16-kodierte Eingabedatei einen Fehler enthält, dann wird diese Datei übersprungen." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Wenn die Option C<-u> verwendet wird, wird die Ausgabedatei in der gleichen UTF-16-Kodierung wie die Eingabedatei geschrieben. Die Option C<-u> verhindert die Umwandlung in UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF-8-Dateien in UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Markierung der Bytereihenfolge" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "Unicode-Textdateien unter Windows haben typischerweise eine Markierung der Bytereihenfolge (BOM), da viele Windows-Programme (zum Beispiel Notepad) solche BOMs standardmäßig hinzufügen. Weitere Informationen hierzu finden Sie auf L<http://de.wikipedia.org/wiki/Byte-Reihenfolge>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Unter Unix haben Textdateien üblicherweise keine BOM. Es wird stattdessen angenommen, dass Textdateien in der Zeichenkodierung entsprechend der Spracheinstellung vorliegen." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix kann nur dann erkennen, ob eine Datei UTF-16-kodiert ist, wenn die Datei eine BOM enthält. Ist dies nicht der Fall, nimmt dos2unix an, dass es sich um eine Binärdatei handelt." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Verwenden Sie die Optionen C<-ul> oder C<-ub>, um eine UTF-16-Datei ohne BOM umzuwandeln." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix schreibt in der Voreinstellung keine BOM in die Ausgabedatei. Mit der Option C<-b> schreibt Dos2unix eine BOM, wenn die Eingabedatei ebenfalls eine BOM hat." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos schreibt in der Voreinstellung eine BOM in die Ausgabedatei, wenn die Eingabedatei ebenfalls eine solche Markierung hat. Verwenden Sie die Option C<-r>, um die BOM zu entfernen." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option C<-m> angegeben ist." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Unicode-Dateinamen unter Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix verfügt über optionale Unterstützung für das Lesen und Schreiben von Unicode-Dateinamen in der Windows-Eingabeaufforderung. Dadurch kann dos2unix Dateien öffnen, deren Namen Zeichen enthalten, die nicht zur Standard-ANSI-Codepage des Systems gehören. Geben Sie C<dos2unix -V> ein, um zu sehen, ob dos2unix für Windows mit Unterstützung für Unicode-Dateinamen erstellt wurde." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Die Anzeige von Unicode-Dateinamen in einer Windows-Konsole ist gelegentlich nicht fehlerfrei, siehe die Option C<-D>, C<--display-enc>. Die Dateinamen können falsch dargestellt werden, allerdings werden die Dateien mit deren korrekten Namen gespeichert." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Unicode-Beispiele" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Umwandlung von Windows UTF-16 (mit BOM) nach Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1185,12 +1249,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Umwandlung von Windows UTF-16LE (ohne BOM) nach Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1200,12 +1264,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-8 mit BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1215,12 +1279,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1230,47 +1294,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 ist ein Standard der chinesischen Regierung. Eine Teilmenge des in GB18030 definierten Standards ist offiziell für alle in China verkauften Softwareprodukte vorgeschrieben. Siehe auch L<http://de.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 ist vollständig zu Unicode kompatibel und kann als Unicode-Umwandlungsformat betrahctet werden. Wie auch UTF-8 ist GB18030 kompatibel zu ASCII. Ebenfalls kompatibel ist es zur Codepage 936 von Windows, auch als GBK bekannt." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "Unter Unix/Linux werden UTF-16-Dateien in GB18030 umgewandelt, wenn die Einstellung der Locale auf GB18030 gesetzt ist. Beachten Sie, dass dies nur funktioniert, wenn die Locale vom System unterstützt wird. Mit dem Befehl C<locale -a> erhalten Sie eine Liste der unterstützten Locales." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Unter Windows benötigen Sie die Option C<-gb>, um UTF-16-Dateien in GB18030 umwandeln zu können." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "In GB 18030 kodierte Dateien haben wie Unicode-Dateien eine Markierung der Bytereihenfolge (BOM)." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "BEISPIELE" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Aus der Standardeingabe lesen und in die Standardausgabe schreiben:" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1282,12 +1346,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1299,12 +1363,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "a.txt im ascii-Modus umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1314,12 +1378,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "a.txt im ascii-Modus umwandeln und ersetzen, b.txt im 7bit-Modus umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1333,12 +1397,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "a.txt aus dem Mac- in das Unix-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1350,12 +1414,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "a.txt aus dem Unix- in das Mac-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1367,12 +1431,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "a.txt unter Beibehaltung des ursprünglichen Zeitstempels umwandeln:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1384,12 +1448,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1399,12 +1463,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben, wobei e.txt den gleichen Zeitstempel erhält wie a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1414,12 +1478,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "a.txt umwandeln und ersetzen, b.txt umwandeln und das Ergebnis nach e.txt schreiben:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1431,12 +1495,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "c.txt umwandeln und das Ergebnis nach e.txt schreiben, a.txt umwandeln und ersetzen, b.txt umwandeln und ersetzen, d.txt umwandeln und das Ergebnis nach f.txt schreiben:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1446,17 +1510,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "REKURSIVE UMWANDLUNG" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "In einer Unix-Shell verwenden Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1), um Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1466,12 +1530,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Die find(1)-Option C<-print0> und die korrespondierende xargs(1)-Option C<-0> werden für Dateien benötigt, deren Namen Leerzeichen oder Anführungszeichen enthalten. Ansonsten können diese Optionen weggelassen werden. Eine weitere Möglichkeit ist, find(1) zusammen mit der Option C<-exec> zu verwenden:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1481,12 +1545,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "In einer Eingabeaufforderung kann der folgende Befehl verwendet werden:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1496,12 +1560,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "In der Windows PowerShell können Sie folgenden Befehl verwenden:" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1511,22 +1575,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "LOKALISIERUNG" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Die primäre Sprache wird durch die Umgebungsvariable LANG festgelegt. Diese Variable besteht aus mehreren Teilen: Der erste Teil besteht aus zwei Kleinbuchstaben, die den Sprachcode angeben. Der zweite Teil ist optional und bezeichnet den Ländercode in Großbuchstaben, vom davor stehenden Sprachcode durch einen Unterstrich getrennt. Der dritte Teil ist ebenfalls optional und gibt die Zeichenkodierung an, vom Ländercode durch einen Punkt getrennt. Einige Beispiele für Standard-POSIX-Shells:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1548,47 +1612,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Mit der Umgebungsvariable LANGUAGE können Sie eine Prioritätenliste für Sprachen übergeben, die Sie durch Doppelpunkte voneinander trennen. Dos2unix gibt LANGUAGE vor LANG den Vorzug, zum Beispiel bei Deutsch vor Niederländisch: C<LANGUAGE=de:nl>. Sie müssen zunächst die Lokalisierung aktivieren, indem Sie die Variable LANG (oder LC_ALL) auf einen anderen Wert als »C« setzen, bevor Sie die Liste der Sprachprioritäten mit der Variable LANGUAGE nutzen können. Weitere Informationen finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Falls Sie eine Sprache auswählen, die nicht verfügbar ist, erhalten Sie die Standardmeldungen in englischer Sprache." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Durch die Umgebungsvariable DOS2UNIX_LOCALEDIR wird LOCALEDIR während der Kompilierung übergangen. LOCALEDIR wird verwendet, um Sprachdateien zu finden. Der GNU-Standardwert ist C</usr/local/share/locale>. Die Option B<--version> zeigt das verwendete LOCALEDIR an." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Beispiel (POSIX-Shell):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1598,78 +1662,71 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "RÜCKGABEWERT" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Bei Erfolg wird 0 zurückgegeben. Bei aufgetretenen Systemfehlern wird der letzte Systemfehler zurückgegeben. Für alle anderen Fehler wird 1 zurückgegeben." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Der Rückgabewert ist im stillen Modus stets 0, außer wenn fehlerhafte Befehlszeilenoptionen verwendet werden." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://de.wikipedia.org/wiki/Textdatei>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://de.wikipedia.org/wiki/Wagenr%C3%BCcklauf>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://de.wikipedia.org/wiki/Zeilenumbruch>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTOREN" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (Mac2unix-Modus) - <wuebben@kde.org>, Christian Wurll (Extra Zeilenumbruch) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (Betreuer)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Projektseite: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge-Seite: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" - -#~ msgid "" -#~ " find -name '*.txt' | xargs dos2unix -ic\n" -#~ "\n" -#~ msgstr "" -#~ " find . -name '*.txt' |xargs dos2unix\n" -#~ "\n" diff --git a/po-man/dos2unix-man.pot b/po-man/dos2unix-man.pot index 23b9143..8b48cd1 100644 --- a/po-man/dos2unix-man.pot +++ b/po-man/dos2unix-man.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2017-07-04 21:03+0200\n" +"POT-Creation-Date: 2017-10-10 22:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -143,105 +143,126 @@ msgstr "" #. type: =item #: dos2unix.pod:108 -msgid "B<-ascii>" +msgid "B<--allow-chown>" msgstr "" #. type: textblock #: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "" + +#. type: textblock +#: dos2unix.pod:112 +msgid "" +"When this option is used, the conversion will not be aborted when the user " +"and/or group ownership of the original file can't be preserved in old file " +"mode. Conversion will continue and the converted file will get the same new " +"ownership as if it was converted in new file mode. See also options C<-o> " +"and C<-n>. This option is only available if dos2unix has support for " +"preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:119 +msgid "B<-ascii>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "" #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "" "Conversion between DOS and ISO-8859-1 character set. See also section " "CONVERSION MODES." msgstr "" #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "" #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "" "Use DOS code page 437 (US). This is the default code page used for ISO " "conversion." msgstr "" #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "" #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "" #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "" #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "" #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "" #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "" "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " "the output file. This is the default behavior when converting to DOS line " @@ -249,31 +270,31 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "" "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " "I<mac> with ascii being the default." msgstr "" #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "" "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, " "I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "" #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "" "This option is only available in dos2unix for Windows with Unicode file name " "support. This option has no effect on the actual file names read and " @@ -281,7 +302,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "" "There are several methods for displaying text in a Windows console based on " "the encoding of the text. They all have their own advantages and " @@ -289,12 +310,12 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "" "Dos2unix's default method is to use ANSI encoded text. The advantage is that " "it is backwards compatible. It works with raster and TrueType fonts. In some " @@ -304,7 +325,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "" "The disadvantage of ansi is that international file names with characters " "not inside the system default code page are not displayed properly. You will " @@ -313,12 +334,12 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "" "The advantage of unicode (the Windows name for UTF-16) encoding is that text " "is usually properly displayed. There is no need to change the active code " @@ -329,21 +350,21 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "" "When you use the ConEmu console all text is displayed properly, because " "ConEmu automatically selects a good font." msgstr "" #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "" "The disadvantage of unicode is that it is not compatible with ASCII. The " "output is not easy to handle when you redirect it to another program." msgstr "" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "" "When method C<unicodebom> is used the Unicode text will be preceded with a " "BOM (Byte Order Mark). A BOM is required for correct redirection or piping " @@ -351,12 +372,12 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "" "The advantage of utf8 is that it is compatible with ASCII. You need to set " "the console's font to a TrueType font. With a TrueType font the text is " @@ -364,7 +385,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "" "The disadvantage is that when you use the default raster font all non-ASCII " "characters are displayed wrong. Not only unicode file names, but also " @@ -374,12 +395,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "" "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM " "(Byte Order Mark). A BOM is required for correct redirection or piping in " @@ -387,7 +408,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "" "The default encoding can be changed with environment variable " "DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or " @@ -395,22 +416,22 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "" #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "" "On Windows UTF-16 files are by default converted to UTF-8, regardless of the " "locale setting. Use this option to convert UTF-16 files to GB18030. This " @@ -418,27 +439,27 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "" #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "" #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "" "The following information is printed, in this order: number of DOS line " "breaks, number of Unix line breaks, number of Mac line breaks, byte order " @@ -446,12 +467,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -466,26 +487,26 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "" "Note that sometimes a binary file can be mistaken for a text file. See also " "option C<-s>." msgstr "" #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "" "Optionally extra flags can be set to change the output. One or more flags " "can be added." msgstr "" #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "" "Print the file information lines followed by a null character instead of a " "newline character. This enables correct interpretation of file names with " @@ -494,104 +515,104 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "" #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "" #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "" #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "" #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "" #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "" #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "" "With the C<c> flag dos2unix will print only the files that contain DOS line " "breaks, unix2dos will print only file names that have Unix line breaks." msgstr "" #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "" #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -599,12 +620,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -612,12 +633,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -625,12 +646,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -638,12 +659,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -651,14 +672,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "" "Convert only files that have DOS line breaks and leave the other files " "untouched:" msgstr "" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -666,12 +687,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -679,82 +700,82 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "" #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "" #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "" #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "" "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In " "Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "" #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "" "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In " "Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "" #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "" "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " "written." msgstr "" #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "" "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM " "will be written." msgstr "" #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "" "Never use this option when the output encoding is other than UTF-8, UTF-16, " "or GB18030. See also section UNICODE." msgstr "" #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "" "New file mode. Convert file INFILE and write output to file OUTFILE. File " "names must be given in pairs and wildcard names should I<not> be used or you " @@ -762,7 +783,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "" "The person who starts the conversion in new file (paired) mode will be the " "owner of the converted file. The read/write permissions of the new file will " @@ -771,19 +792,38 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "" + +#. type: textblock +#: dos2unix.pod:400 +msgid "" +"Abort conversion when the user and/or group ownership of the original file " +"can't be preserved in old file mode. See also options C<-o> and C<-n>. This " +"option is only available if dos2unix has support for preserving the user and " +"group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "" "Old file mode. Convert file FILE and overwrite output to it. The program " "defaults to run in this mode. Wildcard names may be used." msgstr "" #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "" "In old file (in-place) mode the converted file gets the same owner, group, " "and read/write permissions as the original file. Also when the file is " @@ -796,25 +836,73 @@ msgid "" "supported on Unix." msgstr "" +#. type: textblock +#: dos2unix.pod:419 +msgid "" +"To check if dos2unix has support for preserving the user and group ownership " +"of files type C<dos2unix -V>." +msgstr "" + +#. type: textblock +#: dos2unix.pod:422 +msgid "" +"Conversion is always done via a temporary file. When an error occurs halfway " +"the conversion, the temporary file is deleted and the original file stays " +"intact. When the conversion is successful, the original file is replaced " +"with the temporary file. You may have write permission on the original file, " +"but no permission to put the same user and/or group ownership properties on " +"the temporary file as the original file has. This means you are not able to " +"preserve the user and/or group ownership of the original file. In this case " +"you can use option C<--allow-chown> to continue with the conversion:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" + +#. type: textblock +#: dos2unix.pod:437 +msgid "" +"The advantage of the C<--allow-chown> option is that you can use wildcards, " +"and the ownership properties will be preserved when possible." +msgstr "" + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "" "Quiet mode. Suppress all warnings and messages. The return value is zero. " "Except when wrong command-line options are used." msgstr "" #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "" "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This " "is the default behavior when converting to Unix line breaks. See also " @@ -822,17 +910,17 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "" "The skipping of binary files is done to avoid accidental mistakes. Be aware " "that the detection of binary files is not 100% foolproof. Input files are " @@ -842,12 +930,12 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "" "Keep the original UTF-16 encoding of the input file. The output file will be " "written in the same UTF-16 encoding, little or big endian, as the input " @@ -856,24 +944,24 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "" #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "" "When there is a Byte Order Mark in the input file the BOM has priority over " "this option." msgstr "" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "" "When you made a wrong assumption (the input file was not in UTF-16LE format) " "and the conversion succeeded, you will get an UTF-8 output file with wrong " @@ -882,126 +970,126 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "" "The assumption of UTF-16LE works as a I<conversion mode>. By switching to " "the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "" #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "" #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "" "Display verbose messages. Extra information is displayed about Byte Order " "Marks and the amount of converted line breaks." msgstr "" #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "" #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "" "Replace symbolic links with converted files (original target files remain " "unchanged)." msgstr "" #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "" #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "" #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "" "In normal mode line breaks are converted from DOS to Unix and vice versa. " "Mac line breaks are not converted." msgstr "" #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "" "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS " "line breaks are not changed." msgstr "" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "" "To run in Mac mode use the command-line option C<-c mac> or use the commands " "C<mac2unix> or C<unix2mac>." msgstr "" #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "" "In mode C<ascii> only line breaks are converted. This is the default " "conversion mode." msgstr "" #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "" "Although the name of this mode is ASCII, which is a 7 bit standard, the " "actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 " @@ -1009,24 +1097,24 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "" "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) " "are converted to a 7 bit space." msgstr "" #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "" "Characters are converted between a DOS character set (code page) and ISO " "character set ISO-8859-1 (Latin-1) on Unix. DOS characters without " @@ -1035,7 +1123,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "" "When only option C<-iso> is used dos2unix will try to determine the active " "code page. When this is not possible dos2unix will use default code page " @@ -1048,24 +1136,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "" "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 " "encoded files." msgstr "" #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -1073,12 +1161,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -1086,12 +1174,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -1099,12 +1187,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -1112,12 +1200,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1125,12 +1213,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1138,12 +1226,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1151,12 +1239,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1164,24 +1252,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "" "See also L<http://czyborra.com/charsets/codepages.html> and " "L<http://czyborra.com/charsets/iso8859.html>." msgstr "" #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "" "There exist different Unicode encodings. On Unix and Linux Unicode files are " "typically encoded in UTF-8 encoding. On Windows Unicode text files can be " @@ -1190,26 +1278,26 @@ msgid "" msgstr "" #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "" "Unicode text files can have DOS, Unix or Mac line breaks, like regular text " "files." msgstr "" #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "" "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, " "because UTF-8 was designed for backward compatibility with ASCII." msgstr "" #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "" "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big " "endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 " @@ -1217,7 +1305,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "" "On Unix/Linux UTF-16 encoded files are converted to the locale character " "encoding. Use the locale(1) command to find out what the locale character " @@ -1226,14 +1314,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "" "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted " "text files are well supported on both Windows and Unix/Linux." msgstr "" #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "" "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost " "in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for " @@ -1242,7 +1330,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "" "When option C<-u> is used, the output file will be written in the same " "UTF-16 encoding as the input file. Option C<-u> prevents conversion to " @@ -1250,22 +1338,22 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "" #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "" #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "" "On Windows Unicode text files typically have a Byte Order Mark (BOM), " "because many Windows programs (including Notepad) add BOMs by default. See " @@ -1273,14 +1361,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "" "On Unix Unicode files typically don't have a BOM. It is assumed that text " "files are encoded in the locale character encoding." msgstr "" #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "" "Dos2unix can only detect if a file is in UTF-16 format if the file has a " "BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as " @@ -1288,36 +1376,36 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "" "Dos2unix writes by default no BOM in the output file. With option C<-b> " "Dos2unix writes a BOM when the input file has a BOM." msgstr "" #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "" "Unix2dos writes by default a BOM in the output file when the input file has " "a BOM. Use option C<-r> to remove the BOM." msgstr "" #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "" #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "" "Dos2unix has optional support for reading and writing Unicode file names in " "the Windows Command Prompt. That means that dos2unix can open files that " @@ -1327,7 +1415,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "" "There are some issues with displaying Unicode file names in a Windows " "console. See option C<-D>, C<--display-enc>. The file names may be " @@ -1336,17 +1424,17 @@ msgid "" msgstr "" #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1354,12 +1442,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1367,12 +1455,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1380,12 +1468,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1393,12 +1481,12 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "" "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 " "standard is officially required for all software products sold in China. See " @@ -1406,7 +1494,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "" "GB18030 is fully compatible with Unicode, and can be considered an unicode " "transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 " @@ -1414,7 +1502,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "" "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding " "is set to GB18030. Note that this will only work if the locale is supported " @@ -1423,27 +1511,27 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "" #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "" #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1452,12 +1540,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1466,12 +1554,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1479,14 +1567,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "" "Convert and replace a.txt in ascii conversion mode, convert and replace " "b.txt in 7bit conversion mode:" msgstr "" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1496,12 +1584,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1510,12 +1598,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1524,12 +1612,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1538,12 +1626,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1551,12 +1639,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1564,12 +1652,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1578,14 +1666,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "" "Convert c.txt and write to e.txt, convert and replace a.txt, convert and " "replace b.txt, convert d.txt and write to f.txt:" msgstr "" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1593,12 +1681,12 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "" "In a Unix shell the find(1) and xargs(1) commands can be used to run " "dos2unix recursively over all text files in a directory tree. For instance " @@ -1607,7 +1695,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1615,7 +1703,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "" "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are " "needed when there are files with spaces or quotes in the name. Otherwise " @@ -1624,7 +1712,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1632,12 +1720,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1645,12 +1733,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object " @@ -1659,17 +1747,17 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "" "The primary language is selected with the environment variable LANG. The " "LANG variable consists out of several parts. The first part is in small " @@ -1680,7 +1768,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1694,26 +1782,26 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "" "For a complete list of language and country codes see the gettext manual: " "L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "" "On Unix systems you can use the command locale(1) to get locale specific " "information." msgstr "" #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "" "With the LANGUAGE environment variable you can specify a priority list of " "languages, separated by colons. Dos2unix gives preference to LANGUAGE over " @@ -1725,19 +1813,19 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "" "If you select a language which is not available you will get the standard " "English messages." msgstr "" #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "" "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during " "compilation can be overruled. LOCALEDIR is used to find the language " @@ -1746,12 +1834,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1759,56 +1847,56 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "" "On success, zero is returned. When a system error occurs the last system " "error will be returned. For other errors 1 is returned." msgstr "" #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "" "The return value is always zero in quiet mode, except when wrong " "command-line options are used." msgstr "" #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "" "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix " "mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - " @@ -1816,21 +1904,21 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "" diff --git a/po-man/es.po b/po-man/es.po index 7062ea6..3b29a90 100644 --- a/po-man/es.po +++ b/po-man/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man-7.2.1-beta1\n" -"POT-Creation-Date: 2017-06-20 22:04+0200\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" "PO-Revision-Date: 2015-03-19 09:38+0100\n" "Last-Translator: Enrique Lazcorreta Puigmartí <enrique.lazcorreta@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -129,258 +129,273 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "" + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Sólo convierte los salto de línea. Éste es el modo de conversión por defecto." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Conversión entre el conjunto de caracteres DOS e ISO-8859-1. Véase también la sección MODOS DE CONVERSIÓN." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Usa la página de códigos Windows 1252 (Europa Occidental)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Usa la página de códigos DOS 437 (EE. UU.). Está es la página de códigos usada por defecto para conversión ISO." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Usa la página de códigos DOS 850 (Europa Occidental)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Usa la página de códigos DOS 860 (Portugués)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Usa la página de códigos DOS 863 (Francocanadiense)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Usa la página de códigos DOS 865 (Nórdico)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Convierte caracteres de 8 bits al espacio de 7 bits." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Mantiene la Marca de Orden de Byte (BOM). Cuando el archivo de entrada tiene BOM, escribe BOM en el archivo de salida. Este es el comportamiento por defecto en la conversión a saltos de línea DOS. Vea también la opción C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode CONVMODE>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>, I<7bit>, I<iso>, I<mac> siendo ascii el valor por defecto." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 #, fuzzy #| msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>, I<7bit>, I<iso>, I<mac> siendo ascii el valor por defecto." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "" #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "" #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "" #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "" #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "" #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "" #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "" #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "" #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "" #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "" #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "" #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Fuerza la conversión de archivos binarios." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "En Windows los archivos UTF-16 se convierten por defecto a UTF-8, sin tener en cuenta la configuración local. Use esta opción para convertir archivos UTF-16 a GB18030. Esta opción sólo está disponible en Windows.l Véase también la sección GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Despiega la ayuda y termina el programa." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[MARCAS], --info[= MARCAS] ARCHIVO ...>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Muestra la información del archivo. No se realiza ninguna conversión." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Se muestra la siguiente información, en este orden: número de saltos de línea DOS, número de saltos de línea Unix, número de saltos de línea Mac, Marca de Orden de Byte, de texto o binario, nombre del archivo." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Ejemplo de salida:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -404,122 +419,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "" #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Se pueden utilizar marcas extras opcionales para modificar la salida. Se pueden añadir una o más marcas." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "" #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Muestra el número de saltos de línea DOS." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Muestra el número de saltos de línea Unix." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Muestra el número de saltos de línea Mac." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Muestra la Marca de Orden de Byte." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Muestra si el archivo es de texto o binario." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Muestra sólo los archivos que pueden ser convertidos." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Con la marca C<c> dos2unix sólo mostrará los archivos que contengan saltos de línea DOS, unix2dos sólo mostrará los nombres de archivo que tengan saltos de línea Unix." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "" #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Ejemplos:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Muestra información para todos los archivos *.txt:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -529,12 +544,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Muestra sólo el número de saltos de línea de DOS y de Unix:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -544,12 +559,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Muestra sólo la Marca de Orden de Byte." #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -559,12 +574,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Muestra los archivos que tienen saltos de línea DOS:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -574,12 +589,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Muestra los archivos que tienen saltos de línea Unix:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -589,12 +604,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -607,14 +622,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 #, fuzzy #| msgid "List the files that have DOS line breaks:" msgid "Find text files that have DOS line breaks:" msgstr "Muestra los archivos que tienen saltos de línea DOS:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -627,312 +642,375 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Mantiene la fecha del archivo de salida igual a la del archivo de entrada." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Muestra la licencia del programa." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Añade salto de línea adicional." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Sólo los saltos de línea DOS son cambiados por dos saltos de línea Unix. En modo Mac sólo los saltos de línea Mac son cambiados por dos saltos de línea Unix." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Sólo los saltos de línea Unix son cambiados por dos saltos de línea DOS. En modo Mac los saltos de línea Unix son cambiados por dos saltos de línea Mac." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Escribe una Marca de Orden de Bytes (BOM) en el archivo de salida. Por defecto se escribe una BOM UTF-8." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Cuando el archivo de entrada es UTF-16 y se usa la opción C<-u>, se escribirá un BOM UTF-16." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "No utilice esta opción cuando la codificación de salida sea distinta de UTF-8, UTF-16 o GB18030. Véase también la sección UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ARCHIVO_DE_ENTRADA ARCHIVO_DE_SALIDA ...>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Modo de archivo nuevo. Convierte el archivo ARCHIVO_DE_ENTRADA y escribe la salida al archivo ARCHIVO_DE_SALIDA. Los nombres de archivo deben ser dados en pares y los comodines I<no> deben ser usados o I<perderá> sus archivos." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "La persona que inicia la conversión en el modo de archivo nuevo (emparejado) será el propietario del archivo convertido. Los permisos de lectura/escritura del archivo nuevo serán los permisos del archivo original menos la umask(1) de la persona que ejecute la conversión." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "" + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ARCHIVO ...>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Modo de archivo antiguo. Convierte el archivo ARCHIVO y lo sobrescribe con la salida. El programa por defecto se ejecuta en este modo. Se pueden emplear comodines." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "En modo de archivo antiguo (in situ), el archivo convertido tiene el mismo propietario, grupo y permisos de lectura/escritura que el archivo original. Lo mismo aplica cuando el archivo es convertido por otro usuario que tiene permiso de lectura en el archivo (p.e. usuario root). La conversión será abortada cuando no sea posible preservar los valores originales. Cambiar el propietario implicaría que el propietario original ya no podrá leer el archivo. Cambiar el grupo podría ser un riesgo de seguridad, ya que el archivo podría ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "" + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:431 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n -- -foo out.txt\n" +#| "\n" +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix -n -- -foo out.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +#, fuzzy +#| msgid "Or in new file mode:" +msgid "Another option is to use new file mode:" +msgstr "O en modo de archivo nuevo:" + +#. type: verbatim +#: dos2unix.pod:435 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n a.txt e.txt\n" +#| "\n" +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n a.txt e.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "" + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Modo silencioso. Suprime todas las advertencias y mensajes. El valor retornado es cero. Excepto cuando se emplean parámetros incorrectos." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Elimina la Marca de Orden de Byte (BOM). No escribe el BOM en el archivo de salida. Este es el comportamiento por defecto al convertir a saltos de línea Unix. Vea también la opción C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Ignora los archivos binarios (por defecto)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "" #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Mantiene la codificación original UTF-16 en el archivo de entrada. El archivo de salida se escribirá con la misma codificación UTF-16, little o big endian, como el archivo de entrada. Esto impide la transformación a UTF-8. En consecuencia se escribirá un BOM UTF-16. Esta opción se puede desactivar con la opción C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Se asume que el formato de archivo de entrada es UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Cuando existe una Marca de Orden de Bytes (BOM) en el archivo de entrada, la BOM tiene prioridad sobre esta opción." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Cuando se hace una suposición incorrecta (el archivo de entrada no estaba en formato UTF-16LE) y la conversión tiene éxito, obtendrá un archivo UTF-8 de salida con el texto erróneo. La conversión errónea puede deshacerse con iconv(1) convirtiendo el archivo UTF-8 de salida de vuelta a UTF-16LE. Esto restaurará el archivo original." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "El supuesto de UTF-16LE funciona como un I<modo de conversión>. Al cambiar al modo por defecto I<ascii> el supuesto UTF-16LE es deshabilitado." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Se asume que el formato del archivo de entrada es UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Esta opción funciona igual que la opción C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Mostrar mensajes detallados. Se muestra información extra acerca de Marcas de Orden de Bytes (BOM) y el número de saltos de línea convertidos." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Sigue los enlaces simbólicos y convierte los destinos." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Reemplaza los enlaces simbólicos con los archivos convertidos (los archivos destino originales no se alteran)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "No altera los enlaces simbólicos ni sus destinos (por defecto)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Despiega la información de la versión y termina el programa." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "En modo normal los saltos de línea son convertidos de DOS a Unix y viceversa. Los saltos de línea Mac no son convertidos." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "En modo Mac los saltos de línea son convertidos de Mac a Unix y viceversa. Los saltos de línea DOS no son modificados." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Para ejecutar en modo Mac use el modificador C<-c mac> o use los comandos C<mac2unix> o C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSIÓN" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "En modo C<ascii> sólo los saltos de línea son convertidos. Éste es el modo de conversión por defecto." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Aunque el nombre de este modo es ASCII, que es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta archivos Unicode UTF-8." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "En este modo todos los caracteres no ASCII de 8 bits (con valores de 128 a 255) son convertidos al espacio de 7 bits." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Los caracteres son convertidos entre un conjunto de caracteres DOS (página de códigos) y el conjunto de caracteres ISO-8859-1 (Latín-1) de Unix. Los caracteres DOS sin equivalente ISO-8859-1, para los cuales la conversión es imposible, son convertidos en un punto. Lo mismo se aplica para caracteres ISO-8859-1 sin contraparte DOS." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Cuando sólo se emplea el parámetro C<-iso>, dos2unix intentará determinar la página de códigos activa. Cuando esto no sea posible, dos2unix utilizará la página de códigos 437 por defecto, la cual es empleada principalmente en EE. UU. Para forzar una página de códigos específica emplee los parámetros C<-437> (EE. UU.), C<-850> (Europa Occidental), C<-860> (Portugués), C<-863> (Francocanadiense), o C<-865> (Nórdico). La página de códigos Windows 1252 (Europa Occidental) también está soportada con el parámetro C<-1252>. Para acceder a otras páginas de códigos use dos2unix en combinación con iconv(1). Iconv puede convertir entre una larga lista de codificaciones de caracteres." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "No use la conversión ISO en archivos de texto Unicode. Esto corrompería los archivos codificados como UTF-8." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Convierte de la página de códigos por defecto de DOS a Latín-1 de Unix:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -942,12 +1020,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Convierte de DOS CP850 a Unix Latín-1:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -957,12 +1035,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Convierte de Windows CP1252 a Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -972,12 +1050,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Convierte de Windows CP1252 a Unix UTF-8 (Unicode)." #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -987,12 +1065,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Convierte de Unix Latin-1 a la página de códigos por defecto de DOS:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -1002,12 +1080,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Convierte de Unix Latin-1 a DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1017,12 +1095,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Convierte de Unix Latin-1 a Windows CP1252." #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1032,12 +1110,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Convierte de Unix UTF-8 (Unicode) a Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1047,142 +1125,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Véase también L<http://czyborra.com/charsets/codepages.html> y L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Codificaciones" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Existen diferentes codificaciones Unicode. En Unix y Linux los archivos Unicode son codificados comúnmente en UTF-8. En Windows los archivos de texto Unicode pueden estar codificados en UTF-8, UTF-16, o UTF-16 big endian, pero en general son codificados en formato UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Los archivos de texto Unicode pueden tener saltos de línea DOS, Unix o Mac, como cualquier archivo de texto." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Todas las versiones de dos2unix y unix2dos pueden convertir archivos codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix y unix2dos con soporte Unicode UTF-16, pueden leer archivos de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "En Unix/Linux los archivos codificados con UTF-16 se convierten a la codificación de caracteres local. Use el comando locale(1) para averiguar la codificación de caracteres local. Cuando no se puede hacer la conversión se obtendrá un error de conversión y se omitirá el archivo." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "En Windows los archivos UTF-16 se convierten por defecto a UTF-8. Los archivos de texto forrajeados con UTF-8 están soportados tanto en Windows como en Unix/Linux." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Las codificaciones UTF-16 y UTF-8 son totalmente compatibles, no se perderá ningún texto en la conversión. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por ejemplo cuando el archivo de entrada UTF-16 contiene un error, se omitirá el archivo." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Cuando se usa la opción C<-u>, el archivo de salida se escribirá en la misma codificación UTF-16 que el archivo de entrada. La opción C<-u> previene la conversión a UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix y unix2dos no tienen la opción de convertir archivos UTF-8 a UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "La conversión en modos ISO y 7-bit no funciona en archivos UTF-16." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Marca de orden de bytes" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "En Windows los archivos de texto Unicode típicamente tienen una Marca de Orden de Bytes (BOM), debido a que muchos programas de Windows (incluyendo el Bloc de Notas) añaden una BOM por defecto. Véase también L<http://es.wikipedia.org/wiki/Marca_de_orden_de_bytes_%28BOM%29>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "En Unix los archivos Unicode no suelen tener BOM. Se supone que los archivos de texto son codificados en la codificación local de caracteres." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix sólo puede detectar si un archivo está en formato UTF-16 si el archivo tiene una BOM. Cuando un archivo UTF-16 no tiene una BOM, dos2unix tratará el archivo como un archivo binario." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2Unix, por defecto, no escribe BOM en el archivo de salida. Con la opción C<-b> Dos2unix escribe el BOM cuando el archivo de entrada tiene BOM." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos escribe BOM en el archivo de salida cuando el archivo de entrada tiene BOM. Use la opción C<-r> para eliminar la BOM." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción C<-m>." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "" #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "" #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Ejemplos Unicode" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Convertir de Windows UTF-16 (con una BOM) a Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1192,12 +1270,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Convertir de Windows UTF-16LE (sin una BOM) a Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1207,12 +1285,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Convertir de Unix UTF-8 a Windows UTF-8 sin una BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1222,12 +1300,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Convertir de Unix UTF-8 a Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1237,47 +1315,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 es un estándar del gobierno chino. Todo producto software vendido en China está obligado por ley a contener un subconjunto del GB18030 estándar. Véase L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 es totalmente compatible con Unicode y puede considerarse como formato de transformación Unicode. Como ocurre con UTF-8, GB18030 es compatible con ASCII. GB18030 también es compatible con la página de códigos de Windows 936, también conocida como GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "En Unix/Linux los archivos UTF-16 se convierten a GB18030 cuando la codificación local se establece en GB18030. Tenga en cuenta que esto sólo funcionará si la configuración local es soportada por el sistema. Utilice C<locale -a> para obtener el listado de configuraciones regionales admitidas." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Use la opción C<-ul> o C<-ub> para convertir un archivo UTF-16 sin BOM." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Los archivos codificados como GB18030 pueden tener una Marca de Orden de Bytes, como ocurre con los archivos Unicode." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "EJEMPLOS" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lee la entrada desde 'stdin' y escribe la salida a 'stdout':" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -k a.txt\n" @@ -1293,12 +1371,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Convierte y reemplaza a.txt. Convierte y reemplaza b.txt:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1310,12 +1388,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1325,12 +1403,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Convierte y reemplaza a.txt empleando modo de conversión ascii, convierte y reemplaza b.txt empleando modo de conversión de 7bits:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1344,12 +1422,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Convierte a.txt del formato de Mac a Unix:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1361,12 +1439,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Convierte a.txt del formato de Unix a Mac:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1378,12 +1456,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Convierte y reemplaza a.txt manteniendo la fecha del archivo original:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1395,12 +1473,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Convierte a.txt y escribe la salida en e.txt:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1410,12 +1488,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Convierte a.txt y escribe la salida en e.txt, manteniendo la fecha de e.txt igual a la de a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1425,12 +1503,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Convierte y reemplaza a.txt, convierte b.txt y escribe en e.txt:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1442,12 +1520,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Convierte c.txt y escribe en e.txt, convierte y reemplaza a.txt, convierte y reemplaza b.txt, convierte d.txt y escribe en f.txt:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1457,19 +1535,19 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIÓN RECURSIVA" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 #, fuzzy #| msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Use dos2unix en combinación con los comandos find(1) y xargs(1) para convertir recursivamente archivos de texto contenidos en un árbol de directorios. Por ejemplo para convertir todos los archivos .txt en el árbol de directorios debajo del directorio actual escriba:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1482,12 +1560,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1500,12 +1578,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, fuzzy, no-wrap #| msgid "" #| " find . -name *.txt |xargs dos2unix\n" @@ -1518,12 +1596,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1531,22 +1609,22 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "INTERNACIONALIZACIÓN" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "El idioma principal se selecciona con la variable de entorno LANG. La variable LANG consiste de varias partes. La primer parte es el código del idioma en minúsculas. La segunda es opcional y es el código del país en mayúsculas, precedido por un guión bajo. Existe también una tercera parte opcional: la codificación de caracteres, precedida por un punto. Unos cuantos ejemplos para intérpretes de comandos tipo POSIX estándar:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1568,47 +1646,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Para obtener una lista completa de códigos de idioma y país véase el manual de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "En sistemas Unix puede emplear el comando locale(1) para obtener información específica de locale." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Con la variable de entorno LANGUAGE puede especificar una lista de prioridad de los idiomas, separados por dos puntos. Dos2unix da preferencia a LANGUAGE sobre LANG. Por ejemplo, primero neerlandés y entonces alemán: C<LANGUAGE=nl:de>. Para usar una lista de prioridad de idiomas a través de la variable LANGUAGE tiene que habilitar antes la internacionalización, asignando un valor distinto de \"C\" a LANG (o LC_ALL). Véase también el manual de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Si selecciona un idioma que no está disponible el programa funcionará en ingles." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Con la variable de entorno DOS2UNIX_LOCALEDIR el LOCALEDIR asignado durante la compilación puede ser modificado. LOCALEDIR es usado para encontrar los archivos de idioma. El valor por defecto de GNU es C</usr/local/share/locale>. El parámetro B<--version> mostrará el LOCALEDIR en uso." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Ejemplo (intérprete de comandos POSIX):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1618,72 +1696,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "VALOR DE RETORNO" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Se regresa cero cuando el programa termina exitosamente. Cuando ocurre un error del sistema se regresará el último número de error del sistema. Para otros errores se regresa 1." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "El valor de retorno es siempre cero en modo silencioso, excepto cuando se emplean parámetros incorrectos." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "ESTÁNDARES" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://es.wikipedia.org/wiki/Documento_de_texto>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://es.wikipedia.org/wiki/Retorno_de_carro>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://es.wikipedia.org/wiki/Nueva_l%C3%ADnea>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://es.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Página del proyecto: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Página de SourceForge: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "VÉASE TAMBIÉN" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/fr.po b/po-man/fr.po index 007069e..3428b40 100644 --- a/po-man/fr.po +++ b/po-man/fr.po @@ -4,9 +4,9 @@ # Frédéric Marchal <fmarchal@perso.be>, 2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.3.5-beta5\n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" -"PO-Revision-Date: 2017-06-26 19:43+0200\n" +"Project-Id-Version: dos2unix-man-7.3.6-beta4\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" +"PO-Revision-Date: 2017-09-23 13:13+0200\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Plural-Forms: nplurals=2; plural=(n >= 2);\n" #. type: =head1 #: dos2unix.pod:52 @@ -125,256 +125,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "Autoriser le changement de propriétaire dans l'ancien mode de fichier." + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Quand cette option est utilisée, la conversion n'est pas interrompue si l'utilisateur ou le groupe propriétaire du fichier original ne peut pas être préservé dans l'ancien mode de fichier. La conversion continuera et le fichier converti aura le même nouveau propriétaire que si il avait été converti par le nouveau mode de fichier. Voyez aussi les options C<-o> et C<-n>. Cette option est uniquement disponible si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers." + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Convertit uniquement les sauts de lignes. C'est le mode de conversion par défaut." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Convertit le jeu de caractères du DOS vers ISO-8859-1. Voyez aussi la section des MODES DE CONVERSION." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Utilise le code page 1252 de Windows (Europe de l'ouest)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Utilise le code page 437 du DOS (US). C'est le code page par défaut pour les conversions ISO." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Utilise le code page 850 du DOS (Europe de l'ouest)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Utilise le code page 860 du DOS (portugais)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Utilise le code page 863 du DOS (français canadien)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Utilise le code page 865 du DOS (nordique)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Convertit les caractères 8 bits vers l'espace 7 bits." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Conserve la marque d'ordre des octets (BOM). Si le fichier d'entrée a une BOM, elle est écrite dans le fichier de sortie. C'est le comportement par défaut quand les sauts de lignes sont convertis au format DOS. Consultez aussi l'option C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode MODE_CONV>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Change le mode de conversion. MODE_CONV prend l'une des valeurs: I<ascii>, I<7bit>, I<iso>, I<mac>. Ascii est la valeur par défaut." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc ENCODAGE>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Choisi l'encodage des textes affichés. L'ENCODAGE peut être : I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>. La valeur par défaut est ansi." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Cette option est uniquement disponible dans dos2unix pour Windows avec support pour les noms de fichiers Unicode. Cette option n'a aucun effet sur les noms de fichiers lus et écrits. Son effet se limite à leur affichage." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Il existe plusieurs méthodes pour afficher du texte dans une console Windows selon l'encodage du texte. Elles ont toutes leurs propres avantages et désavantages." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "La méthode par défaut de dos2unix est d'utiliser du texte encodé en ANSI. Elle a l'avantage d'être rétro compatible. Elle fonctionne avec des polices raster ou TrueType. Dans certaines régions, vous pouvez avoir besoin d'utiliser la commande C<chcp> pour remplacer le code page DOS OEM actif par le code ANSI système de Windows car dos2unix utilise le code page système de Windows." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "Le désavantage de ansi est que les noms de fichiers internationaux avec des caractères en dehors du code page système par défaut ne sont pas affichés correctement. Vous verrez un point d'interrogation ou un mauvais symbole à leur place. Cette méthode est acceptable si vous ne travaillez pas avec des noms de fichiers étrangers." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "L'avantage de l'encodage unicode (le nom de Windows pour UTF-16) est que le texte est habituellement affiché correctement. Il n'est pas nécessaire de changer le code page actif. Vous pouvez avoir besoin de remplacer la police de la console par une police TrueType pour afficher les caractères internationaux correctement. Lorsqu'un caractère n'est pas inclus dans la police TrueType, il sera généralement remplacé par un petit carré, parfois avec un point d'interrogation à l'intérieur." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "Lorsque vous utilisez la console ConEmu, les textes sont affichés correctement car ConEmu sélectionne automatiquement une bonne police." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Le désavantage de unicode est qu'il n'est pas compatible avec ASCII. La sortie n'est pas facile à gérer quand vous la redirigez vers un autre programme." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Quand la méthode C<unicodebom> est utilisée, le texte Unicode est précédé d'une BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est nécessaire pour la redirection correcte ou le pipelining dans PowerShell." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "L'avantage de utf8 est qu'il est compatible avec ASCII. Vous devez utiliser une police TrueType dans la console. Avec une police TrueType, le texte est affiché comme avec un encodage C<unicode>." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "Le désavantage est que, si vous utilisez la police raster par défaut, tous les caractères non ASCII sont mal affichés. Pas uniquement les noms de fichiers unicode ! Les messages traduits deviennent inintelligibles. Sous Windows configuré pour une région de l'est de l'Asie, vous pouvez observer énormément de scintillements dans la console quand des messages sont affichés." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "Dans une console ConEmu, l'encodage utf8 fonctionne bien." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Quand la méthode C<utf8bom> est utilisée, le texte UTF-8 est précédé d'une BOM (Byte Order Mark=marque d'ordre des octets). Une BOM est nécessaire pour la redirection correcte ou le pipelining dans PowerShell." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "L'encodage par défaut peut être changé en assignant la valeur C<unicode>, C<unicodebom>, C<utf8> ou C<utf8bom> à la variable d'environnement DOS2UNIX_DISPLAY_ENC." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Force la conversion de fichiers binaires." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "Sous Windows, les fichiers UTF-16 sont convertis en UTF-8 par défaut sans considération pour les paramètres de la localisation. Utilisez cette option pour convertir UTF-16 en GB18030. Cette option n'est disponible que sous Windows. Consultez aussi la section GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Affiche l'aide et s'arrête." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[FANIONS], --info[=FANIONS] FICHIER …>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Affiche les informations du fichier. Aucune conversion n'est réalisée." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Les informations suivantes sont affichées dans cet ordre: le nombre de sauts de ligne DOS, le nombre de sauts de ligne Unix, le nombre de sauts de ligne Mac, la marque d'ordre des octets, texte ou binaire, nom du fichier." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Exemple de sortie :" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -398,122 +413,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Notez qu'un fichier binaire peut parfois être considéré à tord comme un fichier texte. Voyez aussi l'option C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Des fanions facultatifs peuvent être ajoutés pour changer la sortie. Un ou plusieurs fanions peuvent être ajoutés." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Afficher les lignes d'information du fichier suivies d'un caractère nul au lieu d'un saut de ligne. Cela permet d'interpréter correctement les noms de fichiers avec des espaces ou des guillemets quand le fanion c est utilisé. Utilisez ce fanion avec les options C<-0> ou C<--null> de xargs(1)." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Affiche le nombre de sauts de ligne DOS." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Affiche le nombre de sauts de ligne Unix." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Affiche le nombre de sauts de ligne Mac." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Afficher la marque d'ordre des octets." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Affiche si le fichier est texte ou binaire." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Affiche uniquement les fichiers qui seraient convertis." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Avec le fanion C<c>, dos2unix n'affichera que les fichiers contenant des sauts de ligne DOS alors que unix2dos n'affichera que les noms des fichiers aillant des sauts de ligne Unix." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Afficher un en-tête." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Montrer les noms des fichiers sans le chemin." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Exemples:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Afficher les informations pour tous les fichier *.txt :" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -523,12 +538,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Afficher uniquement le nombre de sauts de ligne DOS et Unix :" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -538,12 +553,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Montrer uniquement la marque d'ordre des octets :" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -553,12 +568,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Liste les fichiers qui ont des sauts de ligne DOS :" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -568,12 +583,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Liste les fichiers qui ont des sauts de ligne Unix :" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -583,12 +598,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Ne converti que les fichiers qui ont des sauts de lignes DOS et laisse les autres fichiers inchangés:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -598,12 +613,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Trouve les fichiers texte qui ont des sauts de ligne DOS :" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -613,312 +628,367 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "La date du fichier de sortie est la même que celle du fichier d'entrée." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Affiche la licence du programme." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Ajoute des sauts de lignes additionnels." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Seuls les sauts de lignes du DOS sont changés en deux sauts de lignes de Unix. En mode Mac, seuls les sauts de lignes Mac sont changés en deux sauts de lignes Unix." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Seuls les sauts de lignes Unix sont changés en deux sauts de lignes du DOS. En mode Mac, les sauts de lignes Unix sont remplacés par deux sauts de lignes Mac." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. Par défaut une BOM UTF-8 est écrite." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Lorsque le fichier d'entrée est en UTF-16 et que l'option C<-u> est utilisée, une BOM UTF-16 est écrite." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est ni UTF-8 ni UTF-16 ni GB18030. Consultez également la section UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile FICHIER_ENTRÉE FICHIER_SORTIE …>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." -msgstr "Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les jokers I<ne> doivent I<pas> être utilisés ou vous I<perdrez> vos fichiers." +msgstr "Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être indiqués par paires. Les caractères de remplacement I<ne> doivent I<pas> être utilisés ou vous I<perdrez> vos fichiers." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "La personne qui démarre la conversion dans le nouveau mode (pairé) des fichiers sera le propriétaire du fichier converti. Les permissions de lecture/écriture du nouveau fichier seront les permissions du fichier original moins le umask(1) de la personne qui exécute la conversion." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "Ne pas autoriser le changement du propriétaire du fichier dans l'ancien mode de fichier (par défaut)." + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Interrompt la conversion si l'utilisateur ou le groupe propriétaire du fichier original ne peuvent pas être préservés dans l'ancien mode de fichier. Voyez aussi les options C<-o> et C<-n>. Cette option est uniquement présente si dos2unix dispose des fonctionnalités pour préserver l'utilisateur ou le groupe propriétaire des fichiers." + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FICHIER …>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." -msgstr "Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent être utilisés." +msgstr "Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie dedans. Le programme fonctionne dans ce mode par défaut. Les noms avec des caractères de remplacement peuvent être utilisés." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le même propriétaire, groupe et permissions lecture/écriture que le fichier original. Idem quand le fichier est converti par un utilisateur qui a la permission d'écrire dans le fichier (par exemple, root). La conversion est interrompue si il n'est pas possible de conserver les valeurs d'origine. Le changement de propriétaire pourrait signifier que le propriétaire original n'est plus en mesure de lire le fichier. Le changement de groupe pourrait être un risque pour la sécurité. Le fichier pourrait être rendu accessible en lecture par des personnes à qui il n'est pas destiné. La conservation du propriétaire, du groupe et des permissions de lecture/écriture n'est supportée que sous Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "Pour vérifier si dos2unix dispose des fonctions pour préserver l'utilisateur et le groupe propriétaire du fichier, tapez C<dos2unix -V>." + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "La conversion est toujours réalisée via un fichier temporaire. Quand une erreur survient au milieu de la conversion, le fichier temporaire est effacé et le fichier original reste inchangé. Quand la conversion réussi, le fichier original est remplacé par le fichier temporaire. Vous pourriez avoir la permission d'écrire dans le fichier original mais ne pas avoir la permission de remplacer les propriétés de l'utilisateur et du groupe propriétaires sur le fichier temporaire telles qu'elles sont définies sur le fichier original. Cela signifie que vous n'êtes pas en mesure de préserver l'utilisateur ou le groupe propriétaire du fichier original. Dans ce cas, vous pouvez utiliser l'option C<--allow-chown> pour continuer la conversion." + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown toto.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "Une autre option consiste à utiliser le nouveau mode de fichier:" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n toto.txt toto.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "L'avantage de l'option C<--allow-chown> est que vous pouvez utiliser des caractères de remplacement et les propriétaires seront préservés dans la mesure du possible." + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Mode silencieux. Supprime les avertissements et les messages. La valeur de sortie est zéro sauf quand de mauvaises options sont utilisées sur la ligne de commande." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Supprime la marque d'ordre des octets (BOM). N'écrit pas la BOM dans le fichier de sortie. Ceci est le comportement par défaut lorsque les sauts de lignes sont convertis au format Unix. Consultez aussi l'option C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Ignore les fichiers binaires (par défaut)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Ignorer les fichiers binaires sert à éviter les erreurs accidentelles. Attention que la détection de fichiers binaires n'est pas fiable à 100%. Les fichiers en entrée sont analysés pour y trouver des symboles binaires qui ne sont habituellement pas rencontrés dans des fichiers textes. Il est cependant possible qu'un fichier binaire ne contienne que des caractères textes normaux. Un tel fichier serait erronément traité comme un fichier texte." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier de sortie sera écrit dans le même encodage UTF-16 (petit ou grand boutien) que le fichier d'entrée. Ceci évite la transformation en UTF-8. Une BOM UTF-16 sera écrite en conséquent. Cette option peut être désactivée avec l'option C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Suppose que le fichier d'entrée est au format UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Quand il y a un indicateur d'ordre des octets dans le fichier d'entrée, l'indicateur a priorité sur cette option." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Si vous vous êtes trompé sur le format du fichier d'entrée (par exemple, ce n'était pas un fichier UTF16-LE) et que la conversion réussi, vous obtiendrez un fichier UTF-8 contenant le mauvais texte. Vous pouvez récupérer le fichier original avec iconv(1) en convertissant le fichier de sortie UTF-8 vers du UTF-16LE." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "La présupposition de l'UTF-16LE fonctionne comme un I<mode de conversion>. En utilisant le mode I<ascii> par défaut, UTF-16LE n'est plus présupposé." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Suppose que le fichier d'entrée est au format UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Cette option fonctionne comme l'option C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Affiche des messages verbeux. Des informations supplémentaires sont affichées à propos des marques d'ordre des octets et du nombre de sauts de lignes convertis." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Suit les liens symboliques et convertit les cibles." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Remplace les liens symboliques par les fichiers convertis (les fichiers cibles originaux restent inchangés)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Ne change pas les liens symboliques ni les cibles (par défaut)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Affiche les informations de version puis arrête." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MODE MAC" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "En mode normal, les sauts de lignes sont convertis du DOS vers Unix et inversement. Les sauts de lignes Mac ne sont pas convertis." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "En mode Mac, les sauts de lignes sont convertis du format Mac au format Unix et inversement. Les sauts de lignes DOS ne sont pas changés." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Pour fonctionner en mode Mac, utilisez l'option en ligne de commande C<-c mac> ou utilisez les commandes C<mac2unix> ou C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "MODES DE CONVERSION" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "En mode C<ascii>, seuls les sauts de lignes sont convertis. Ceci est le mode de conversion par défaut." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Bien que le nom de ce mode soit ASCII, qui est un standard 7 bits, ce mode travail en réalité sur 8 bits. Utilisez toujours ce mode lorsque vous convertissez des fichiers Unicode UTF-8." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Dans ce mode, tous les caractères 8 bits non ASCII (avec des valeurs entre 128 et 255) sont remplacés par une espace 7 bits." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Les caractères sont convertis entre un jeu de caractères DOS (code page) et le jeu de caractères ISO-8859-1 (Latin-1) de Unix. Les caractères DOS sans équivalent ISO-8859-1, pour lesquels la conversion n'est pas possible, sont remplacés par un point. La même chose est valable pour les caractères ISO-8859-1 sans équivalent DOS." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Quand seule l'option C<-iso> est utilisée, dos2unix essaie de déterminer le code page actif. Quand ce n'est pas possible, dos2unix utilise le code page CP437 par défaut qui est surtout utilisé aux USA. Pour forcer l'utilisation d'un code page spécifique, utilisez les options C<-437> (US), C<-850> (Europe de l'ouest), C<-860> (portugais), C<-863> (français canadien) ou C<-865> (nordique). Le code page CP1252 de Windows (Europe de l'ouest) est également supporté avec l'option C<-1252>. Pour d'autres codes pages, utilisez dos2unix avec iconv(1). Iconv supporte une longue liste de codages de caractères." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "N'utilisez jamais la conversion ISO sur des fichiers textes Unicode. Cela va corrompre les fichiers encodés en UTF-8." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Quelques exemples:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Convertir du code page par défaut du DOS au Latin-1 Unix :" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -928,12 +998,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Convertir du CP850 du DOS au Latin-1 Unix :" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -943,12 +1013,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Convertir du CP1252 de Windows au Latin-1 de Unix :" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -958,12 +1028,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Convertir le CP1252 de Windows en UTF-8 de Unix (Unicode) :" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -973,12 +1043,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Convertir du Latin-1 de Unix au code page par défaut de DOS :" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -988,12 +1058,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Convertir le Latin-1 de Unix en CP850 du DOS :" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1003,12 +1073,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Convertir le Latin-1 de Unix en CP1252 de Windows :" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1018,12 +1088,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Convertir le UTF-8 de Unix (Unicode) en CP1252 de Windows :" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1033,142 +1103,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Consultez aussi L<http://czyborra.com/charsets/codepages.html> et L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Codages" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Il existe plusieurs codages Unicode. Sous Unix et Linux, les fichiers sont généralement codés en UTF-8. Sous Windows, les fichiers textes Unicode peuvent être codés en UTF-8, UTF-16 ou UTF-16 gros boutien mais ils sont majoritairement codés au format UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Les fichiers textes Unicode peuvent avoir des sauts de lignes DOS, Unix ou Mac, tout comme les fichiers textes normaux." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Toutes les versions de dos2unix et unix2dos peuvent convertir des fichiers codés en UTF-8 car UTF-8 a été conçu pour être rétro-compatible avec l'ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix et unix2dos, avec le support pour l'Unicode UTF-16, peuvent lire les fichiers textes codés sous forme petit boutien ou gros boutien. Pour savoir si dos2unix a été compilé avec le support UTF-16 tapez C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Sous Unix/Linux, les fichiers encodés en UTF-16 sont convertis vers l'encodage des caractères de la localisation. Utilisez locale(1) pour découvrir quel encodage de caractères est utilisé. Lorsque la conversion n'est pas possible, une erreur de conversion est produite et le fichier est abandonné." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Sous Windows, les fichiers UTF-16 sont convertis par défaut en UTF-8. Les fichiers textes formatés en UTF-8 sont bien supportés sous Windows et Unix/Linux." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Les codages UTF-16 et UTF-8 sont parfaitement compatibles. Il n'y a pas de pertes lors de la conversion. Lorsqu'une erreur de conversion UTF-16 vers UTF-8 survient, par exemple, quand le fichier d'entrée UTF-16 contient une erreur, le fichier est ignoré." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Quand l'option C<-u> est utilisée, le fichier de sortie est écrit dans le même encodage UTF-16 que le fichier d'entrée. L'option C<-u> empêche la conversion en UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers UTF-8 en UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Marque d'ordre des octets" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "Les fichiers textes Unicode sous Windows on généralement un indicateur d'ordre des octets (BOM) car de nombreux programmes Windows (y compris Notepad) ajoutent cet indicateur par défaut. Consultez aussi L<http://fr.wikipedia.org/wiki/Indicateur_d%27ordre_des_octets>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Sous Unix, les fichiers Unicodes n'ont habituellement pas de BOM. Il est supposé que les fichiers textes sont codés selon le codage de l'environnement linguistique." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix ne peut détecter que le fichier est au format UTF-16 si le fichier n'a pas de BOM. Quand le fichier UTF-16 n'a pas cet indicateur, dos2unix voit le fichier comme un fichier binaire." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Utilisez l'option C<-ul> ou C<-ub> pour convertir un fichier UTF-16 sans BOM." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix, par défaut, n'écrit pas de BOM dans le fichier de sortie. Avec l'option C<-b>, Dos2unix écrit une BOM quand le fichier d'entrée a une BOM." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos écrit par défaut une BOM dans le fichier de sortie quand le fichier d'entrée a une BOM. Utilisez l'option C<-r> pour supprimer la BOM." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix et unix2dos écrivent toujours une BOM quand l'option C<-m> est utilisée." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Noms de fichiers unicode sous Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix supporte, en option, la lecture et l'écriture de noms de fichiers Unicode dans la ligne de commande de Windows. Cela signifie que dos2unix peut ouvrir des fichiers qui ont, dans leur nom, des caractères n'appartenant pas au code page système ANSI par défaut. Pour voir si dos2unix pour Windows a été compilé avec le support des noms de fichiers Unicode, tapez C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Il y a quelques soucis avec l'affichage de noms de fichiers Unicode dans une console Windows. Voyez l'option C<-D>, C<--display-enc>. Les noms de fichiers peuvent être mal affichés dans la console mais les fichiers seront écrits avec les bons noms." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Exemples Unicode" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Convertir de l'UTF-16 Windows (avec BOM) vers l'UTF-8 de Unix :" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1178,12 +1248,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Convertir de l'UTF-16LE de Windows (sans BOM) vers l'UTF-8 de Unix :" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1193,12 +1263,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-8 de Windows avec BOM :" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1208,12 +1278,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Convertir de l'UTF-8 de Unix vers l'UTF-16 de Windows :" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1223,47 +1293,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 est un standard du gouvernement chinois. Tout logiciel vendu en Chine doit officiellement supporter un sous ensemble obligatoire du standard GB18030. Consultez L<http://fr.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 est entièrement compatible avec Unicode et peut être considéré comme étant un format de transformation unicode. Comme UTF-8, GB18030 est compatible avec ASCII. GB18030 est aussi compatible avec le code page 936 de Windows aussi connu comme GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "Sous Unix/Linux, les fichiers UTF-16 sont convertis en GB18030 quand l'encodage de l'environnement linguistique est GB18030. Notez que cela ne fonctionnera que si l'environnement linguistique est supporté par le système. Utilisez la commande C<locale -a> pour obtenir la liste des environnements linguistiques supportés." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Sous Windows, vous avez besoin de l'option C<-gb> pour convertir UTF-16 en GB18030." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Les fichiers encodés en GB18030 peuvent avoir une marque d'ordre des octets, comme les fichiers Unicode." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "EXEMPLES" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lire l'entrée depuis « stdin » et écrire la sortie vers « stdout » :" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1275,12 +1345,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Convertir et remplacer a.txt. Convertir et remplace b.txt :" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1292,12 +1362,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Convertir et remplacer a.txt en mode de conversion ascii :" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1307,12 +1377,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Convertir et remplacer a.txt en mode de conversion ascii. Convertir et remplacer b.txt en mode de conversion 7 bits :" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1326,12 +1396,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Convertir a.txt depuis le format Mac vers le format Unix :" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1343,12 +1413,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Convertir a.txt du format Unix au format Mac :" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1360,12 +1430,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Convertir et remplacer a.txt tout en conservant la date originale :" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1377,12 +1447,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Convertir a.txt et écrire dans e.txt :" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1392,12 +1462,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Convertir a.txt et écrire dans e.txt. La date de e.txt est la même que celle de a.txt :" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1407,12 +1477,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Convertir et remplacer a.txt. Convertir b.txt et écrire dans e.txt :" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1424,12 +1494,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Convertir c.txt et écrire dans e.txt. Convertir et remplacer a.txt. Convertir et remplacer b.txt. Convertir d.txt et écrire dans f.txt :" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1439,17 +1509,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIONS RÉCURSIVES" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Dans un shell Unix, les commandes find(1) et xargs(1) peuvent être utilisées pour exécuter dos2unix récursivement sur tous les fichiers textes dans une arborescence de répertoires. Par exemple, pour convertir tous les fichiers .txt dans les répertoires sous le répertoire courant, tapez:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1459,12 +1529,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "L'option C<-print0> de find(1) et l'option correspondante C<-0> de xargs(1) sont nécessaires quand il y a des fichiers avec des espaces ou des guillemets dans leur nom. Sinon, ces options peuvent être omises. Une autre possibilité est d'utiliser find(1) avec l'option C<-exec>:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1474,12 +1544,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "En ligne de commande sous Windows, la commande suivante peut être utilisée :" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1491,12 +1561,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Les utilisateurs de PowerShell peuvent utiliser la commande suivante dans le PowerShell de Windows :" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1506,22 +1576,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "PARAMÈTRES LINGUISTIQUES" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "La langue principale est sélectionnée par la variable d'environnement LANG. La variable LANG est composée de plusieurs parties. La première partie est le code de la langue en minuscules. La deuxième partie est le code du pays en majuscules précédé d'un souligné. Elle est facultative. Il y a aussi une troisième partie facultative qui est le codage des caractères précédé par un point. Voici quelques exemples pour un shell au standard POSIX:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1543,47 +1613,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "La liste complète des codes de langues et de pays est dans le manuel de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Sur les systèmes Unix, vous pouvez utiliser la commande locale(1) pour obtenir des informations sur l'environnement linguistique." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Avec la variable d'environnement LANGUAGE, vous pouvez spécifier une liste de langues prioritaires séparées par des deux-points. Dos2unix fait passer LANGUAGE avant LANG. Par exemple, pour utiliser le français avant l'anglais: C<LANGUAGE=fr:en>. Vous devez d'abord activer l'environnement linguistique en assignant une valeur autre que « C » à LANG (ou LC_ALL). Ensuite, vous pourrez utiliser la liste de priorité avec la variable LANGUAGE. Voyez également le manuel de gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Si vous sélectionnez une langue qui n'est pas disponible, vous obtiendrez des messages en anglais standard." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Grâce à la variable d'environnement DOS2UNIX_LOCALEDIR, la variable LOCALEDIR compilée dans l'application peut être remplacée. LOCALEDIR est utilisée pour trouver les fichiers de langue. La valeur par défaut de GNU est C</usr/local/share/locale>. L'option B<--version> affiche la valeur de LOCALEDIR utilisée." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Exemple (shell POSIX):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1593,72 +1663,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "VALEUR DE RETOUR" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Zéro est retourné en cas de succès. Si une erreur système se produit, la dernière erreur système est retournée. Pour les autres erreurs, 1 est renvoyé." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "La valeur de sortie est toujours zéro en mode silencieux sauf quand de mauvaises options sont utilisées sur la ligne de commande." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://fr.wikipedia.org/wiki/Fichier_texte>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://fr.wikipedia.org/wiki/Retour_chariot>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://fr.wikipedia.org/wiki/Fin_de_ligne>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://fr.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mode mac2unix) - <wuebben@kde.org>, Christian Wurll (ajout de saut de ligne supplémentaire) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (Mainteneur)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Page du projet: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Page SourceForge: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "VOIR AUSSI" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/nl.po b/po-man/nl.po index b9b5e54..393a7db 100644 --- a/po-man/nl.po +++ b/po-man/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man-7.3.3-beta9\n" -"POT-Creation-Date: 2017-06-20 22:03+0200\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" "PO-Revision-Date: 2016-02-08 17:33+0100\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -130,256 +130,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "" + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Alleen regeleindes converteren. Dit is de standaardconversiemodus." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Conversie tussen de tekensets DOS en ISO-8859-1. Zie ook de sectie B<CONVERSIEMODI>." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Windows-codetabel 1252 (West-Europees) gebruiken." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "DOS-codetabel 437 (VS) gebruiken. Dit is de standaard codetabel die gebruikt wordt bij ISO-conversie." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "DOS-codetabel 850 (West-Europees) gebruiken." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "DOS-codetabel 860 (Portugees) gebruiken." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "DOS-codetabel 863 (Canadees Frans) gebruiken." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "DOS-codetabel 865 (Scandinavisch) gebruiken." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Lettertekens met het achtste bit gezet converteren naar spaties." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b>, B<--keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Een Byte-Order-Mark (BOM) behouden. Als het invoerbestand een BOM bevat, dan wordt ook een BOM naar het uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar DOS. Zie ook optie C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c>, B<--convmode CONVERSIEMODUS>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: I<ascii>, I<7bit>, I<iso>, of I<mac>, waarbij ascii de standaardinstelling is." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D>, B<--display-enc CODERING>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "De te gebruiken tekencodering voor weergegeven tekst. CODERING kan zijn: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, of I<utf8bom>, waarbij ansi de standaardinstelling is." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Deze optie is alleen beschikbaar in dos2unix voor Windows met Unicode-bestandsnaam-ondersteuning. Deze optie heeft geen effect op de gelezen en geschreven bestandsnamen, maar alleen op hoe deze weergegeven worden." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "" #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "" #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "" #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode>, B<unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "" #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "" #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "" #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8>, B<utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "" #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "" #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "" #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "" #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f>, B<--force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Conversie van binaire bestanden afdwingen." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb>, B<--gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "Op Windows worden UTF-16-bestanden standaard naar UTF-8 geconverteerd, ongeacht de ingestelde taalregio. Gebruik deze optie om UTF-16-bestanden naar GB18030 te converteren. Deze optie is alleen beschikbaar op Windows. Zie ook de sectie B<GB18030>." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h>, B<--help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Een hulptekst tonen." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i>[B<VLAGGEN>], B<--info>[B<=VLAGGEN>] B<BESTAND>..." #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Bestandsinformatie tonen. Er wordt niets geconverteerd." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "De volgende informatie wordt weergegeven, in deze volgorde: het aantal DOS-regeleindes, het aantal Unix-regeleindes, het aantal Mac-regeleindes, de Byte-Order-Mark, of het een tekst- of binair bestand is, en de bestandsnaam." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Voorbeelduitvoer:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -403,122 +418,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Merk op dat een binair bestand soms voor een tekstbestand aangezien kan worden. Zie ook optie C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Bij de optie kunnen één of meer vlaggen meegegeven worden om de uitvoer te beperken." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "" #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Het aantal DOS-regeleindes tonen." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Het aantal Unix-regeleindes tonen." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Het aantal Mac-regeleindes tonen." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "De Byte-Order-Mark tonen." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Tonen of het bestand tekst is of binair." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Alleen de namen tonen van de bestanden die geconverteerd zouden worden." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Met de vlag C<c> toont dos2unix alleen de bestanden die DOS-regeleindes bevatten, en unix2dos alleen de bestanden die Unix-regeleindes bevatten." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Een kopregel printen." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Bestandsnamen tonen zonder pad." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Voorbeelden:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Informatie weergeven voor alle bestanden met de extensie 'txt':" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -528,12 +543,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Alleen de aantallen DOS-regeleindes en Unix-regeleindes tonen:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -543,12 +558,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Alleen de Byte-Order-Mark tonen:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -558,12 +573,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "De bestanden opsommen die DOS-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -573,12 +588,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "De bestanden opsommen die Unix-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -588,12 +603,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Alleen bestanden die DOS-regeleindes bevatten converteren en andere bestanden ongemoeid laten:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -ic *.txt | xargs dos2unix\n" @@ -606,12 +621,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "De bestanden vinden die DOS-regeleindes bevatten:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, fuzzy, no-wrap #| msgid "" #| " find . -name '*.txt' |xargs dos2unix\n" @@ -624,312 +639,375 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k>, B<--keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Het tijdsstempel van het invoerbestand behouden voor het uitvoerbestand." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L>, B<--license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "De softwarelicentie tonen." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l>, B<--newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Een extra regeleinde toevoegen." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Alleen DOS-regeleindes worden omgezet naar twee Unix-regeleindes. In Mac-modus worden alleen Mac-regeleindes omgezet naar twee Unix-regeleindes." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Alleen Unix-regeleindes worden omgezet naar twee DOS-regeleindes. In Mac-modus worden Unix-regeleindes omgezet naar twee Mac-regeleindes." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m>, B<--add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Een Byte-Order-Mark (BOM) naar het uitvoerbestand schrijven. Standaard wordt een UTF-8-BOM geschreven." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Als het invoerbestand in UTF-16 is, en de optie C<-u> is gegeven, dan wordt een UTF-16-BOM geschreven." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8, UTF-16, of GB18030 is. Zie ook de sectie B<UNICODE>." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n>, B<--newfile INVOERBESTAND UITVOERBESTAND> ..." #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar bestand UITVOERBESTAND schrijven. Bestandsnamen moeten opgegeven worden in paren. Jokertekens moeten I<niet>gebruikt worden, anders I<verlies> je de bestanden." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "De gebruiker die de conversie start in nieuw-bestand (gepaarde) modus wordt de eigenaar van het geconverteerde bestand. De lees/schrijf-toegangsrechten van het nieuwe bestand worden de toegangsrechten van het originele bestand minus de umask(1) van de gebruiker die de conversie draait." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "" + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o>, B<--oldfile BESTAND> ..." #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit is de standaard modus. Jokertekens kunnen gebruikt worden." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "In oud-bestand (vervangende) modus krijgt het geconverteerde bestand dezelfde eigenaar, groep en lees/schrijf-rechten als het originele bestand. Ook wanneer het bestand wordt omgezet door een andere gebruiker die schrijfrechten heeft op het bestand (b.v. gebruiker root). De omzetting wordt afgebroken wanneer het niet mogelijk is de originele waardes te behouden. Verandering van eigenaar kan betekenen dat de originele eigenaar het bestand niet meer kan lezen. Verandering van groep zou een veiligheidsrisico kunnen zijn, het bestand zou leesbaar kunnen worden voor personen voor wie het niet bestemd is. Behoud van eigenaar, groep en lees/schrijf-rechten wordt alleen ondersteund op Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "" + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:431 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n -- -foo out.txt\n" +#| "\n" +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix -n -- -foo uit.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +#, fuzzy +#| msgid "Or in new file mode:" +msgid "Another option is to use new file mode:" +msgstr "Of in nieuw-bestand-modus:" + +#. type: verbatim +#: dos2unix.pod:435 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n a.txt e.txt\n" +#| "\n" +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n a.txt e.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "" + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q>, B<--quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Stille werking. Alle waarschuwingen onderdrukken. De afsluitwaarde is nul, behalve wanneer verkeerde opties worden gegeven." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r>, B<--remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Een Byte-Order-Mark (BOM) verwijderen. Er wordt geen BOM naar het uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar Unix. Zie ook optie C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s>, B<--safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Binaire bestanden overslaan (standaard)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binaire bestanden worden overgeslagen om vergissingen te voorkomen. Het detecteren van binaire bestanden is echter niet 100% betrouwbaar. Invoerbestanden worden gescand op binaire tekens die gewoonlijk niet in tekstbestanden voorkomen. Maar het is mogelijk dat een binair bestand enkel normale teksttekens bevat. Zo'n binair bestand zal dan foutief als een tekstbestand gezien worden." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u>, B<--keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "De originele UTF-16-codering van het invoerbestand behouden. Het uitvoerbestand wordt in dezelfde UTF-16-codering (little endian of big endian) geschreven als het invoerbestand. Dit voorkomt conversie naar UTF-8. Er wordt ook een corresponderende UTF-16-BOM geschreven. Deze optie kan uitgeschakeld worden met de optie C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul>, B<--assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16LE is." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Wanneer het invoerbestand een Byte-Order-Mark (BOM) bevat, dan gaat deze BOM vóór deze optie." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Wanneer een verkeerde aanname is gemaakt (het invoerbestand was geen UTF-16LE) en de conversie verliep met succes, dan krijgt u een UTF-8-bestand met verkeerde tekst. De verkeerde conversie kan ongedaan worden gemaakt door met iconv(1) het UTF-8-uitvoerbestand terug om te zetten naar UTF-16LE. Dit zal het originele bestand terug brengen." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "De aanname van UTF-16LE werkt als een I<conversiemodus>. Door de standaardmodus I<ascii> in te schakelen wordt de UTF-16LE-veronderstelling uitgeschakeld." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub>, B<--assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Veronderstellen dat de indeling van het invoerbestand UTF-16BE is." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Deze optie werkt hetzelfde als optie C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v>, B<--verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Extra meldingen weergeven. Er wordt extra informatie getoond over Byte-Order-Marks en het aantal geconverteerde regeleindes." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F>, B<--follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Symbolische koppelingen volgen en de doelen converteren." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R>, B<--replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Symbolische koppelingen vervangen door geconverteerde bestanden (de originele doelbestanden blijven ongewijzigd)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S>, B<--skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Symbolische koppelingen en doelen ongewijzigd laten (standaard)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V>, B<--version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Versie-informatie tonen." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "In normale modus worden DOS-regeleindes naar Unix omgezet en vice versa. Mac-regeleindes worden niet omgezet." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "In Mac-modus worden Mac-regeleindes naar Unix omgezet en vice versa. DOS-regeleindes blijven ongewijzigd." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Om in Mac-modus te draaien kunt u de opdrachtregeloptie C<-c mac> gebruiken, of de opdrachten C<mac2unix> of C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "CONVERSIEMODI" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "In modus C<ascii> worden alleen regeleindes omgezet. Dit is de standaardmodus." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Hoewel de naam van deze modus ASCII is, wat een 7-bits standaard is, is de werkelijke modus 8-bits. Gebruik altijd deze modus wanneer u Unicode UTF-8-bestanden omzet." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Alle 8-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7-bits spatie." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Tekens worden omgezet tussen een DOS-tekenset (codetabel) en de ISO-tekenset ISO-8859-1 (Latin-1) op Unix. DOS-tekens zonder een ISO-8859-1-equivalent, waarvoor dus geen omzetting mogelijk is, worden omgezet in een punt. Hetzelfde geldt voor ISO-8859-1-tekens zonder DOS-tegenhanger." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Wanneer alleen optie C<-iso> gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt codetabel CP437 gebruikt, die vooral in de VS gebruikt wordt. Om een bepaalde codetabel te forceren, kunt u de opties C<-850> (West-Europees), C<-860> (Portugees), C<-863> (Canadees Frans) of C<-865> (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie C<-1252>. Gebruik voor andere codetabellen dos2unix in combinatie met iconv(1). Iconv kan omzetten tussen een lange lijst tekensetcoderingen." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Gebruik ISO-conversie nooit op Unicode-tekstbestanden. Het zal UTF-8-gecodeerde bestanden beschadigen." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Enkele voorbeelden:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Omzetten van de standaard DOS-codetabel naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -939,12 +1017,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Omzetten van DOS CP850 naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -954,12 +1032,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Omzetten van Windows CP1252 naar Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -969,12 +1047,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Omzetten van Windows CP1252 naar Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -984,12 +1062,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Omzetten van Unix Latin-1 naar de standaard DOS-codetabel:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -999,12 +1077,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Omzetten van Unix Latin-1 naar DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1014,12 +1092,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Omzetten van Unix Latin-1 naar Windows CP1252:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1029,12 +1107,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Omzetten van Unix UTF-8 (Unicode) naar Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1044,142 +1122,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Zie ook L<http://czyborra.com/charsets/codepages.html> en L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Coderingen" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Er bestaan verschillende Unicode-coderingen. Op Unix en Linux zijn Unicode-bestanden typisch gecodeerd in UTF-8. Op Windows kunnen Unicode-tekstbestanden gecodeerd zijn in UTF-8, UTF-16 of UTF-16 big endian, maar ze zijn meestal gecodeerd in UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Conversie" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Unicode-tekstbestanden kunnen DOS-, Unix- of Mac-regeleindes hebben, net als reguliere tekstbestanden." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alle versies van dos2unix en unix2dos kunnen UTF-8-gecodeerde bestanden omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix en unix2dos met Unicode UTF-16-ondersteuning kunnen little en big endian UTF-16-gecodeerde tekstbestanden lezen. Om er achter te komen of dos2unix gebouwd is met UTF-16- ondersteuning, typt u C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Op Unix/Linux worden UTF-16-bestanden geconverteerd naar de codering van de ingestelde taalregio. Gebruik de opdracht B<locale>(1) om te zien wat de ingestelde codering is. Wanneer conversie niet mogelijk is, treedt er een fout op en wordt het bestand overgeslagen." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Op Windows worden UTF-16-bestanden standaard naar UTF-8 geconverteerd. UTF-8-tekstbestanden worden alom goed ondersteund, zowel op Windows als Unix/Linux." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "De UTF-16- en UTF-8-coderingen zijn volledig compatibel, er gaat bij het converteren niets verloren. Als er tijdens de conversie van UTF-16 naar UTF-8 een fout optreedt, bijvoorbeeld omdat het UTF-16-invoerbestand een fout bevat, dan wordt het bestand overgeslagen." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Wanneer C<-u> gebruikt wordt, wordt het uitvoerbestand in dezelfde UTF-16-codering geschreven als het invoerbestand. Optie C<-u> voorkomt conversie naar UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te converteren." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO- en 7-bits-conversie werken niet op UTF-16-bestanden." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Byte-Order-Mark" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "Op Windows bevatten Unicode-tekstbestanden gewoonlijk een Byte-Order-Mark (BOM), omdat veel Windows-programma's (inclusief Kladblok) standaard een BOM toevoegen. Zie ook L<http://en.wikipedia.org/wiki/Byte_order_mark>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Op Unix hebben Unicode-tekstbestanden meestal geen BOM. Er wordt aangenomen dat de codering van tekstbestanden gelijk is aan de tekencodering van de ingestelde taalregio." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix kan alleen detecteren of een bestand in UTF-16-codering is als het bestand een BOM bevat. Wanneer een UTF-16-bestand geen BOM heeft, ziet dos2unix het bestand als een binair bestand." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Gebruik optie C<-ul> of C<-ub> om een UTF-16-bestand zonder BOM om te zetten." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie C<-b> schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het invoerbestand een BOM bevat. Gebruik optie C<-r> om de BOM te verwijderen." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt wordt." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Unicode-bestandsnamen op Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix heeft optionele ondersteuning voor het lezen en schrijven van Unicode-bestandsnamen in de Windows Opdrachtprompt. Dit betekent dat dos2unix bestanden kan openen waarvan de naam tekens bevat die niet voorkomen in de standaard ANSI-codetabel. Om te zien of dos2unix voor Windows gecompileerd werd met ondersteuning voor Unicode-bestandsnamen, typt u C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Er zijn enige problemen met het weergeven van Unicode-bestandsnamen in een Windows-console; zie bij optie C<-D>, C<--display-enc>. De bestandsnamen kunnen verkeerd weergegeven worden, maar de bestanden zullen geschreven worden met de correcte naam." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Unicode-voorbeelden" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1189,12 +1267,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Omzetten van Windows UTF-16LE (zonder BOM) naar Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1204,12 +1282,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Omzetten van Unix UTF-8 naar Windows UTF-8 met BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1219,12 +1297,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Omzetten van Unix UTF-8 naar Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1234,47 +1312,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 is een standaard van de Chinese overheid. Een subset van de GB18030-standaard is officieel verplicht voor alle softwareproducten die in China verkocht worden. Zie ook L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 is volledig compatibel met Unicode, en kan als een Unicodetransformatie beschouwd worden. Net als UTF-8 is GB18030 compatibel met ASCII. GB18030 is ook compatibel met Windows-codetabel 936 (ook wel GBK genoemd)." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "Op Unix/Linux worden UTF-16-bestanden naar GB18030 geconverteerd wanneer de taalregio-codering GB18030 is. Merk op dat dit alleen werkt als deze taalregio-instelling door het systeem ondersteund wordt. Gebruik het commando C<locale -a> voor een overzicht van de beschikbare taalregio's." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Op Windows dient u de optie C<-gb> te gebruiken om UTF-16-bestanden naar GB18030 te converteren." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030-bestanden kunnen een Byte-Order-Mark bevatten, net als Unicode-bestanden." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "VOORBEELDEN" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer:" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, fuzzy, no-wrap #| msgid "" #| " dos2unix -ic *.txt | xargs dos2unix\n" @@ -1288,12 +1366,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Omzetten en vervangen van a.txt; omzetten en vervangen van b.txt:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1305,12 +1383,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1320,12 +1398,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus; omzetten en vervangen van b.txt in 7-bits conversiemodus:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1339,12 +1417,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Omzetten van a.txt van Mac- naar Unix-indeling:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1356,12 +1434,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Omzetten van a.txt van Unix- naar Mac-indeling:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1373,12 +1451,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Omzetten en vervangen van a.txt met behoud van origineel tijdsstempel:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1390,12 +1468,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Omzetten van a.txt en resultaat naar e.txt schrijven:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1405,12 +1483,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Omzetten van a.txt en naar e.txt schrijven, met tijdsstempel van e.txt gelijk aan die van a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1420,12 +1498,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Omzetten en vervangen van a.txt; omzetten van b.txt en naar e.txt schrijven:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1437,12 +1515,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Omzetten van c.txt en naar e.txt schrijven; omzetten en vervangen van a.txt; omzetten en vervangen van b.txt; omzetten van d.txt en naar f.txt schrijven." #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1452,19 +1530,19 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "RECURSIEVE CONVERSIE" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 #, fuzzy #| msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Gebruik dos2unix in combinatie met de opdrachten B<find>(1) en B<xargs>(1) om tekstbestanden in een mappenboom recursief om te zetten. Bijvoorbeeld om alle .txt-bestanden in de mappenboom onder de huidige map te converteren, typt u:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, fuzzy, no-wrap #| msgid "" #| " find . -name '*.txt' |xargs dos2unix\n" @@ -1477,12 +1555,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, fuzzy, no-wrap #| msgid "" #| " find . -name '*.txt' |xargs dos2unix\n" @@ -1495,12 +1573,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "In een Windows Opdrachtprompt kan de volgende opdracht gebruikt worden:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1510,12 +1588,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1523,22 +1601,22 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "LOKALISATIE" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "De primaire taal wordt geselecteerd via de omgevingsvariabele LANG. De variabele LANG bestaat uit verschillende onderdelen. Het eerste deel is in kleine letters de taalcode. Het tweede deel is optioneel en is de landcode in hoofdletters, voorafgegaan door een liggend streepje. Er is ook een optioneel derde deel: de tekencodering, voorafgegaan door een punt. Enkele voorbeelden voor een POSIX-shell:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1560,47 +1638,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Voor een complete lijst van taal- en landcodes zie de gettext-handleiding: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Op Unix-systemen kunt u de opdracht B<locale>(1) gebruiken om specifieke taalregio-informatie te verkrijgen." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Met de omgevingsvariabele LANGUAGE kunt u een prioriteitenlijst specificeren van talen, gescheiden door dubbele punten. Dos2unix geeft voorrang aan LANGUAGE boven LANG. Bijvoorbeeld, eerst Nederlands en dan Duits: C<LANGUAGE=nl:de>. U moet eerst lokalisatie in werking stellen, door het instellen van LANG (of LC_ALL) op een waarde ongelijk aan \"C\", voordat u een talen-prioriteitenlijst kunt gebruiken via de variabele LANGUAGE. Zie ook de gettext-handleiding: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Als u een taal kiest die niet beschikbaar is, worden de standaard Engelse berichten gebruikt." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Met de omgevingsvariabele DOS2UNIX_LOCALEDIR kan de LOCALEDIR die ingesteld werd tijdens compilatie worden overstemd. LOCALEDIR wordt gebruikt om de taalbestanden te vinden. De GNU standaardwaarde is C</usr/local/share/locale>. De optie B<--version> laat de gebruikte LOCALEDIR zien." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Voorbeeld (POSIX-shell):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1610,72 +1688,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "AFSLUITWAARDE" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Bij succes wordt nul teruggegeven. Wanneer een systeemfout optreedt wordt het laatste systeemfoutnummer teruggegeven. Bij andere fouten wordt 1 teruggegeven." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "De afsluitwaarde is altijd nul in de stillewerkingsmodus, behalve wanneer verkeerde opties worden gegeven." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "STANDAARDEN" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://nl.wikipedia.org/wiki/Tekstbestand>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://nl.wikipedia.org/wiki/Carriage_Return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://nl.wikipedia.org/wiki/Linefeed>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "<http://nl.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-modus) - <wuebben@kde.org>, Christian Wurll (toevoegen van extra regeleindes) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (beheerder)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Projectpagina: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge-pagina: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "ZIE OOK" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/pl.po b/po-man/pl.po index 9a2d8ed..66353c8 100644 --- a/po-man/pl.po +++ b/po-man/pl.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.3.5-beta5\n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" -"PO-Revision-Date: 2017-06-25 13:37+0200\n" +"Project-Id-Version: dos2unix-man 7.3.6-beta4\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" +"PO-Revision-Date: 2017-09-22 21:37+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -124,256 +124,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "Zezwolenie na zmianę właściciela w trybie starego pliku." + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "W przypadku użycia tej opcji, konwersja nie zostanie przerwana, jeśli nie ma możliwości zachowania właściciela i/lub grupy oryginalnego pliku w trybie starego pliku. Konwersja będzie kontynuowana, a przekonwertowany plik będzie miał tego samego właściciela, jakiego by miał w trybie nowego pliku. P. także opcje C<-o> i C<-n>. Opcja jest dostępna tylko wtedy, gdy dos2unix ma obsługę zachowywania użytkownika i grupy plików." + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Konwersja tylko znaków końca linii. Jest to domyślny tryb konwersji." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Konwersja między zestawami znaków DOS i ISO-8859-1. Więcej w sekcji TRYBY KONWERSJI." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Użycie strony kodowej DOS 437 (US). Jest to domyślna strona kodowa używana przy konwersji ISO." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Użycie strony kodowej DOS 850 (zachodnioeuropejskiej)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Użycie strony kodowej DOS 860 (portugalskiej)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Użycie strony kodowej DOS 865 (nordyckiej)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Konwersja znaków 8-bitowych do przestrzeni 7-bitowej." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Zachowanie znaku BOM (Byte Order Makr). Jeżeli plik wejściowy zawiera BOM, powoduje zapisanie go w pliku wyjściowym. Jest to domyślne zachowanie przy konwersji na DOS-owe końce linii. P. także opcja C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode TRYB_KONW>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Ustawienie trybu konwersji. TRYB_KONW to jeden z: I<ascii>, I<7bit>, I<iso>, I<mac>, przy czym domyślny jest ascii." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc KODOWANIE>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Ustawienie kodowania wyświetlanego tekstu. KODOWANIE to jedno z: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, przy czym domyślne to ansi." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Ta opcja jest dostępna wyłączenie w programie dos2unix dla Windows z obsługą nazw plików Unicode. Nie ma wpływu na same nawy odczytywanych i zapisywanych plików, a jedynie na sposób ich wyświetlania." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Istnieje kilka sposobów wyświetlania tekstu w konsoli Windows w zależności od kodowania tekstu. Wszystkie mają swoje zalety i wady." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "Domyślna metoda programu dos2unix to stosowanie tekstu kodowanego w ANSI. Zaletą jest wsteczna zgodność. Działa z fontami rastrowymi, jak i TrueType. W niektórych rejonach może być potrzeba zmiany aktywnej strony kodowej DOS OEM na systemową stronę kodową Windows ANSI przy użyciu polecenia C<chcp>, ponieważ dos2unix wykorzystuje systemową stronę kodową Windows." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "Wadą kodowania ansi jest fakt, że międzynarodowe nazwy plików ze znakami spoza domyślnej systemowej strony kodowej nie są wyświetlane właściwie. Można zamiast tego zobaczyć znak zapytania albo niewłaściwy symbol. Jeżeli nie pracujemy z obcymi nazwami plików, ta metoda jest poprawna." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "Zaletą kodowania unicode (windowsową nazwą dla UTF-16) jest (zwykle) właściwe wyświetlanie tekstu. Nie ma potrzeby zmiany aktywnej strony kodowej. Może być potrzeba zmiany fontu konsoli na font TrueType, aby znaki międzynarodowe były wyświetlane poprawnie. Jeśli znak nie jest obecny w foncie TrueType, zwykle widać mały kwadrat, czasami ze znakiem zapytania w środku." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "W przypadku używania konsoli ConEmu cały tekst jest wyświetlany poprawnie, ponieważ ConEmu automatycznie wybiera dobry font." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Wadą kodowania unicode jest niezgodność z ASCII. Wyjście nie jest łatwe do obsłużenia w przypadku przekierowania do innego programu lub pliku." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "W przypadku użycia metody C<unicodebom>, tekst w unikodzie jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w powłoce PowerShell." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "Zaletą kodowania utf8 jest zgodność z ASCII. Trzeba ustawić font konsoli na font TrueType. Przy użyciu fontu TrueType tekst jest wyświetlany podobnie do kodowania C<unicode>." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "Wadą jest fakt, że w przypadku używania domyślnego fontu rastrowego, wszystkie znaki spoza ASCII są wyświetlane niepoprawnie. Nie tylko unikodowe nazwy plików, ale także przetłumaczone komunikaty stają się nieczytelne. W Windows skonfigurowanym dla rejonu Azji Wschodniej widać dużo migotania konsoli w trakcie wyświetlania komunikatów." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "W konsoli ConEmu metoda kodowania utf8 działa dobrze." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "W przypadku użycia metody C<utf8bom>, tekst w UTF-8 jest poprzedzony znakiem BOM (Byte Order Mark). BOM jest wymagany do poprawnego przekierowania lub przekazywania przez potok w powłoce PowerShell." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "Domyślne kodowanie można zmienić przy użyciu zmiennej środowiskowej DOS2UNIX_DISPLAY_ENC, ustawiając ją na C<unicode>, C<unicodebom>, C<utf8> lub C<utf8bom>." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Wymuszenie konwersji plików binarnych." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "Pod Windows pliki w UTF-16 są domyślnie konwertowane do UTF-8, niezależnie od ustawienia lokalizacji. Ta opcja pozwala przekonwertować pliki w UTF-16 do GB18030. Opcja jest dostępna tylko pod Windows, więcej w sekcji dotyczącej GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Wyświetlenie opisu i zakończenie." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[FLAGI], --info[=FLAGI] PLIK ...>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Wyświetlenie informacji o pliku. Konwersja nie jest wykonywana." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Wypisywane są następujące informacje, w tej kolejności: liczba DOS-owych końców linii, liczba uniksowych końców linii, liczba macowych końców linii, znacznik BOM, tekstowy lub binarny, nazwa pliku." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Przykładowe wyjście:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -397,122 +412,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Uwaga: czasami plik binarny może być błędnie rozpoznany jako tekstowy. P. także opcja C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Opcjonalnie można ustawić dodatkowe flagi, aby zmienić wyjście. Można dodać jedną lub więcej flag." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Wypisanie wierszy informacji o pliku zakończonych znakiem NUL zamiast znaku nowej linii. Pozwala to na poprawną interpretację nazw plików zawierających spacje lub cudzysłowy w przypadku użycia flagi c. Flagi należy używać w połączeniu z opcją C<-0> lub C<--null> programu xargs(1)." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Wypisanie liczby DOS-owych końców linii." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Wypisanie liczby uniksowych końców linii." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Wypisanie liczby macowych końców linii." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Wypisanie znacznika BOM." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Wypisanie, czy plik jest tekstowy, czy binarny." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Wypisanie tylko plików, które zostałyby przekonwertowane." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Z flagą C<c> dos2unix wypisze tylko pliki zawierające DOS-owe końce linii, a unix2dos wypisze tylko nazwy plików zawierających uniksowe końce linii." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Wypisanie nagłówka." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Wyświetlanie nazw plików bez ścieżki." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Przykłady:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Pokazanie informacji o wszystkich plikach *.txt:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -522,12 +537,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Pokazanie tylko liczby DOS-owych i uniksowych końców linii:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -537,12 +552,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Pokazanie tylko znacznika BOM:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -552,12 +567,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Wypisanie listy plików zawierających DOS-owe końce linii:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -567,12 +582,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Wypisanie listy plików zawierających uniksowe końce linii:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -582,12 +597,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Konwersja tylko plików mających DOS-owe końce linii, pozostawienie pozostałych bez zmian:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -597,12 +612,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Wyszukanie plików tekstowych zawierających DOS-owe końce linii:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -612,312 +627,367 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Zachowanie znacznika czasu pliku wyjściowego takiego samego, jak pliku wejściowego." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Wyświetlenie licencji programu." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Dodanie dodatkowego znaku końca linii." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: tylko DOS-owe znaki końca linii są zamieniane na dwa uniksowe. W trybie Mac tylko macowe znaki końca linii są zamieniane na dwa uniksowe." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: tylko uniksowe znaki końca linii są zamieniane na dwa DOS-owe. W trybie Mac uniksowe znaki końca linii są zamieniane na dwa macowe." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjściowym. Domyślnie zapisywany jest BOM UTF-8." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Jeśli plik wejściowy jest w kodowaniu UTF-16 i użyto opcji C<-u>, zostanie zapisany BOM UTF-16." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8, UTF-16 lub GB18030. Więcej w sekcji UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile PLIK_WEJ PLIK_WYJ ...>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjścia do PLIKU_WYJ. Nazwy plików muszą być podane parami, a masek I<nie> należy używać, gdyż I<spowoduje> to utratę plików." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Osoba uruchamiająca konwersję w trybie nowego pliku (par) będzie właścicielem przekonwertowanego pliku. Prawa odczytu/zapisu nowego pliku będą pochodziły z praw pliku oryginalnego po odjęciu umask(1) osoby uruchamiającej konwersję." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "Bez zezwolenia na zmianę właściciela pliku w trybie starego pliku (domyślne)." + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Przerwanie konwersji, jeżeli użytkownik lub grupa oryginalnego pliku nie może być zachowana w trybie starego pliku. P. także opcje C<-o> oraz C<-n>. Ta opcja jest dostępna tylko jeśli dos2unix ma obsługę zachowywania użytkownika i grupy plików." + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile PLIK ...>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa domyślnie w tym trybie. Można używać masek." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "W trybie starego pliku (w miejscu) przekonwertowany plik otrzymuje tego samego właściciela, grupę oraz prawa odczytu/zapisu, jak plik oryginalny - także wtedy, gdy plik jest konwertowany przez innego użytkownika, mającego prawo zapisu do pliku (np. przez użytkownika root). Konwersja zostanie przerwana, jeśli nie będzie możliwe zachowanie oryginalnych wartości. Zmiana właściciela mogłaby oznaczać, że pierwotny właściciel nie może już odczytać pliku. Zmiana grupy mogłaby być zagrożeniem bezpieczeństwa, plik mógłby być czytelny dla nie zamierzonych osób. Zachowanie właściciela, grupy i praw odczytu/zapisu jest obsługiwane tylko na Uniksie." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "Aby sprawdzić, czy doswunix ma obsługę zachowywania użytkownika i grupy plików, można napisać C<dos2unix -V>." + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "Konwersja jest wykonywana zawsze przy użyciu pliku tymczasowego. Jeśli w trakcie konwersji wystąpi błąd, plik tymczasowy jest usuwany, a plik oryginalny pozostaje nietknięty. Jeśli konwersja się powiedzie, plik oryginalny jest zastępowany plikiem tymczasowym. Można mieć prawa zapisu do pliku oryginalnego, ale brak uprawnień, aby nadać tego samego właściciela i/lub grupę, co plik oryginalny, plikowi tymczasowemu. Oznacza to, że nie można zachować użytkownika i/lub grupy oryginalnego pliku. W takim przypadku można użyć opcji C<--allow-chown>, aby kontynuować konwersję:" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "Inny sposób to użycie trybu nowego pliku:" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n foo.txt foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "Zaletą opcji C<--allow-chown> jest możliwość użycia masek oraz zachowanie właściciela w miarę możliwości." + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Tryb cichy. Pominięcie wszystkich ostrzeżeń i komunikatów. Zwracanym kodem jest zero, chyba że podano błędne opcje linii poleceń." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Usunięcie znaków BOM (Byte Order Mark). Bez zapisywania BOM do pliku wyjściowego. Jest to domyślne zachowanie przy konwersji na uniksowe końce linii. P. także opcja C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Pominięcie plików binarnych (domyślne)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Pomijanie plików binarnych ma na celu zapobieżenie przypadkowym błędom. Uwaga: wykrywanie plików binarnych nie jest w 100% odporne na błędy. Pliki wejściowe są przeszukiwane pod kątem symboli binarnych, które zwykle nie występują w plikach tekstowych. Może się zdarzyć, że plik binarny zawiera tylko zwykłe znaki tekstowe. Taki plik binarny będzie błędnie widziany jako plik tekstowy." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Zachowanie oryginalnego kodowania pliku wejściowego UTF-16. Plik wyjściowy zostanie zapisany w tym samym kodowaniu UTF-16 (little lub big endian), co plik wejściowy. Zapobiega to przekształceniu do UTF-8. Do pliku zostanie zapisany odpowiedni znacznik BOM UTF-16. Tę opcję można wyłączyć opcją C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Przyjęcie, że format pliku wejściowego to UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Jeśli w pliku wejściowym jest znacznik BOM (Byte Order Mark), ma on priorytet nad tą opcją." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Jeśli przyjęto błędne założenie (plik wejściowy nie jest w formacie UTF-16LE), a konwersja się uda, wynikiem będzie plik wyjściowy UTF-8 ze złym tekstem. Konwersję tę można odwrócić przy użyciu polecenia iconv(1) do konwersji wyjścia UTF-8 z powrotem do UTF-16LE. Przywróci to plik oryginalny." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "Przyjęcie UTF-16LE działa jako I<tryb konwersji>. Przy przełączeniu na domyślny tryb I<ascii> przyjęcie UTF-16LE jest wyłączane." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Przyjęcie, że format pliku wejściowego to UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Ta opcja działa analogicznie do C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Wyświetlanie szczegółowych komunikatów. Wyświetlane śa dodatkowe informacje o znacznikach BOM (Byte Order Mark) oraz liczbie przekonwertowanych końców linii." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Podążanie za dowiązaniami symbolicznymi i konwertowanie ich celów" #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Zastępowanie dowiązań symbolicznych przekonwertowanymi plikami (oryginalne pliki docelowe pozostają bez zmian)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Pozostawienie dowiązań symbolicznych i celów bez zmian (domyślne)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Wyświetlenie informacji o wersji i zakończenie." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "TRYB MAC" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "W zwykłym trybie znaki końca linii są konwertowane z DOS-a do Uniksa i odwrotnie. Znaki końca linii systemu Mac nie są konwertowane." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "W trybie Mac znaki końca linii są konwertowane z formatu Maca do Uniksa i odwrotnie. Znaki końca linii systemu DOS nie są zmieniane." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Aby uruchomić program w trybie Mac, należy użyć opcji linii poleceń C<-c mac> albo użyć poleceń C<mac2unix> lub C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "TRYBY KONWERSJI" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "W trybie C<ascii> konwertowane są tylko końce linii. Jest to domyślny tryb konwersji." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Mimo że nazwa tego trybu to ASCII, które jest standardem 7-bitowym, jest to tryb 8-bitowy. Należy zawsze używać tego trybu przy konwersji plików Unicode UTF-8." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "W tym trybie wszystkie znaki 8-bitowe spoza ASCII (o wartościach od 128 do 255) są konwertowane do przestrzeni 7-bitowej." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "W tym trybie znaki są konwertowane między zestawem znaków DOS (stroną kodową) a zestawem znaków ISO-8859-1 (Latin-1) używanym na Uniksie. Znaki DOS-owe nie mające odpowiednika w ISO-8859-1, których nie da się przekonwertować, są zamieniane na kropkę. To samo dotyczy znaków ISO-8859-1 bez odpowiednika w DOS-ie." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Jeśli używana jest tylko opcja C<-iso>, dos2unix próbuje wykryć aktywną stronę kodową. Jeśli nie jest to możliwe, dos2unix używa domyślnej strony kodowej CP437, stosowanej głównie w USA. Aby wymusić określoną stronę kodową, należy użyć opcji C<-437> (US), C<-850> (zachodnioeuropejska), C<-860> (portugalska), C<-863> (kanadyjska francuska) lub C<-865> (nordycka). Ponadto obsługiwana jest strona kodowa Windows CP1252 (zachodnioeuropejska) przy użyciu opcji C<-1252>. W przypadku innych stron kodowych można użyć narzędzia dos2unix wraz z iconv(1). Iconv potrafi konwertować między wieloma kodowaniami znaków." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Nigdy nie należy używać konwersji ISO na plikach tekstowych w Unicode. Uszkodziłaby pliki kodowane UTF-8." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Kilka przykładów:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Konwersja z domyślnej strony kodowej DOS do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -927,12 +997,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Konwersja ze strony kodowej DOS CP850 do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -942,12 +1012,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego Latin-1:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -957,12 +1027,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Konwersja ze strony kodowej Windows CP1252 do uniksowego UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -972,12 +1042,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Konwersa z uniksowego Latin-1 do domyślnej strony kodowej DOS:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -987,12 +1057,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Konwersja z uniksowego Latin-1 do strony kodowej DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1002,12 +1072,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Konwersja z uniksowego Latin-1 do strony kodowej Windows CP1252:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1017,12 +1087,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Konwersja z uniksowego UTF-8 (Unicode) do strony kodowej Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1032,142 +1102,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Więcej pod adresem L<http://czyborra.com/charsets/codepages.html> oraz L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Kodowania" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Istnieją różne kodowania Unicode. Pod Uniksem i Linuksem pliki Unicode są zwykle kodowane z użyciem UTF-8. Pod Windows pliki tekstowe Unicode mogą być kodowane w UTF-8, UTF-16, UTF-16 big-endian, ale przeważnie są kodowane w UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Konwersje" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Pliki tekstowe Unicode mogą mieć znaki końca linii systemu DOS, Unix lub Mac, podobnie jak zwykłe pliki tekstowe." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Wszystkie wersje dos2unix i unix2dos potrafią konwertować pliki kodowane UTF-8, ponieważ UTF-8 jest wstecznie zgodne z ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix i unix2dos z obsługą Unicode UTF-16 potrafią odczytywać pliki tekstowe kodowane UTF-16 little- oraz big-endian. Aby sprawdzić, czy dos2unix został zbudowany z obsługą UTF-16, należy napisać C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Pod Uniksem/Linuksem pliki w kodowaniu UTF-16 są konwertowane do kodowania znaków ustawionej lokalizacji. Kodowanie znaków dla lokalizacji można sprawdzić poleceniem locale(1). Jeśli konwersja nie jest możliwa, wystąpi błąd, a plik zostanie pominięty." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Pod Windows pliki UTF-16 są domyślnie konwertowane do UTF-8. Pliki tekstkowe w kodowaniu UTF-8 są dobrze obsługiwane zarówno pod Windows, jak i Uniksem/Linuksem." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Kodowania UTF-16 i UTF-8 są w pełni zgodne, konwersja nie spowoduje utraty żadnej części tekstu. W przypadku wystąpienia błędu konwersji, na przykład w przypadku błędu w pliku wejściowym UTF-16, plik zostanie pominięty." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "W przypadku użycia opcji C<-u>, plik wejściowy zostanie zapisany w tym samym kodowaniu UTF-16, co plik wejściowy. Opcja C<-u> zapobiega konwersji do UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix oraz unix2dos nie mają opcji pozwalającej na konwersję plików UTF-8 do UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Tryby konwersji ISO i 7-bit nie działają na plikach UTF-16." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Znacznik BOM" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "W systemie Windows pliki tekstowe zwykle zawierają znacznik BOM (Byte Order Mark), ponieważ wiele programów dla Windows (w tym Notepad) dodaje domyślnie znaczniki BOM. Więcej informacji można znaleźć pod adresem L<http://pl.wikipedia.org/wiki/BOM_(informatyka)>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "Pod Uniksem pliki Unicode zwykle nie mają znacznika BOM. Pliki tekstowe są traktowane jako kodowane zgodnie z kodowaniem znaków ustawionej lokalizacji." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix potrafi wykryć tylko, czy plik jest w formacie UTF-16, jeśli zawiera znacznik BOM. Jeśli plik UTF-16 nie ma tego znacznika, dos2unix potraktuje plik jako binarny." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Do konwersji pliku UTF-16 bez znacznika BOM można użyć opcji C<-ul> lub C<-ub>." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix nie zapisuje domyślnie znaku BOM w pliku wyjściowym. Z opcją C<-b> Dos2unix zapisuje BOM, jeśli plik wejściowy zawiera BOM." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos domyślnie zapisuje znaczniki BOM w pliku wyjściowym, jeśli plik wejściowy ma BOM. Aby usunąć BOM, można użyć opcji C<-r>." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix oraz unix2dos zawsze zapisują znaczniki BOM, jeśli użyta zostanie opcja C<-m>." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Unikodowe nazwy plików w Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix ma opcjonalną obsługę odczytu i zapisu nazw plików Unicode w linii poleceń Windows. Oznacza to, że dos2unix potrafi otwierać pliki zawierające w nazwie znaki spoza domyślnej systemowej strony kodowej ANSI. Aby sprawdzić, czy dos2unix dla Windows został zbudowany z obsługą nazw plików Unicode, można wpisać C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Przy wyświetlaniu nazw plików Unicode w konsoli Windows występuje kilka problemów. Więcej informacji w opisie opcji C<-D>, C<--display-enc>. Nazwy plików mogą być wyświetlane błędnie na konsoli, ale pliki będą zapisywane z poprawną nazwą." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Przykłady Unicode" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Konwersja pliku UTF-16 (z BOM) z formatu Windows do uniksowego UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1177,12 +1247,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Konwersja pliku UTF-16LE (bez BOM) z formatu Windows do uniksowego UTF-8:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1192,12 +1262,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Konwersja z uniksowego UTF-8 do UTF-8 z BOM dla Windows:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1207,12 +1277,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Konwersja z uniksowego UTF-8 do UTF-16 dla Windows:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1222,47 +1292,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 to standard urzędowy w Chinach. Obowiązkowy podzbiór standardu GB18030 jest oficjalnym wymaganiem każdego oprogramowania sprzedawanego w Chinach. Więcej pod adresem L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 jest w pełni zgodny z Unicode i może być uważany za format transformacji unikodu. Podobnie jak UTF-8, GB18030 jest zgodny z ASCII. Jest także zgodny ze stroną kodową Windows 936, znaną też jako GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "Pod Uniksem/Linuksem pliki UTF-16 są konwertowane do GB18030, jeśli kodowanie dla lokalizacji jest ustawione na GB18030. Uwaga: będzie to działać tylko, jeśli lokalizacja jest obsługiwana przez system. Listę obsługiwanych lokalizacji można sprawdzić poleceniem C<locale -a>." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Pod Windows w celu konwersji plików UTF-16 do GB18030 należy użyć opcji C<-gb>." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Pliki w kodowaniu GB18030 mogą mieć znacznik BOM, podobnie jak pliki w Unicode." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "PRZYKŁADY" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Odczyt ze standardowego wejścia i zapis na standardowe wyjście:" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1274,12 +1344,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1291,12 +1361,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Konwersja i zastąpienie a.txt w trybie ascii:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1306,12 +1376,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Konwersja i zastąpienie a.txt w trybie ascii; konwersja i zastąpienie b.txt w trybie 7-bitowym:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1325,12 +1395,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Konwersja a.txt z formatu Mac do formatu uniksowego:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1342,12 +1412,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Konwersja a.txt z formatu uniksowego do formatu Mac:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1359,12 +1429,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Konwersja i zastąpienie a.txt z zachowaniem oryginalnego znacznika czasu:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1376,12 +1446,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Konwersja a.txt i zapis do e.txt:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1391,12 +1461,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Konwersja a.txt i zapis do e.txt z zachowaniem znacznika czasu e.txt takiego, jak a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1406,12 +1476,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Konwersja i zastąpienie a.txt; konwersja b.txt i zapis do e.txt:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1423,12 +1493,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Konwersja c.txt i zapis do e.txt; konwersja i zastąpienie a.txt; konwersja i zastąpienie b.txt; konwersja d.txt i zapis do f.txt:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1438,17 +1508,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "KONWERSJA REKURENCYJNA" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "W powłoce uniksowej można użyć poleceń find(1) i xargs(1) do rekurencyjnego uruchomienia dos2unix na wszystkich plikach tekstowych w strukturze drzewa katalogów. Na przykład, aby przekonwertować wszystkie pliki .txt w drzewie katalogów poniżej katalogu bieżącego, należy napisać:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1458,12 +1528,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Opcja C<-print0> polecenia find(1) i odpowiadająca jej opcja C<-0> polecenia xargs(1) są potrzebne, jeśli istnieją pliki ze spacjami lub cudzysłowami w nazwie. W przeciwnym wypadku opcje te można pominąć. Inny sposób to użycie find(1) z opcją C<-exec>:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1473,12 +1543,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "Z poziomu linii poleceń Windows można użyć następującego polecenia:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1488,12 +1558,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Użytkownicy powłoki PowerShell mogą użyć następującego polecenia w Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1503,22 +1573,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "LOKALIZACJA" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Główny język wybiera się zmienną środowiskową LANG. Zmienna LANG składa się z kilku części. Pierwsza część to małe litery oznaczające kod języka. Druga część jest opcjonalna i zawiera kod kraju pisany wielkimi literami, poprzedzony podkreśleniem. Jest także opcjonalna trzecia część: kodowanie znaków, poprzedzone kropką. Kilka przykładów dla powłok zgodnych ze standardem POSIX:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1540,47 +1610,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Pełną listę kodów języków i krajów można znaleźć w podręczniku do gettexta: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "W systemach uniksowych do uzyskania informacji dotyczących lokalizacji można użyć polecenia locale(1)." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Przy użyciu zmiennej środowiskowej LANGUAGE można określić listę języków wg priorytetu, oddzielonych dwukropkami. Dos2unix przyjmuje pierwszeństwo zmiennej LANGUAGE nad LANG. Na przykład, najpierw holenderski, następnie niemiecki: C<LANGUAGE=nl:de>. Aby skorzystać z listy wg priorytetów ze zmiennej LANGUAGE, trzeba najpierw włączyć lokalizację przez ustawienie zmiennej LANG (lub LC_ALL) na wartość inną niż \"C\". Więcej informacji znajduje się w podręczniku do gettexta: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "W przypadku wybrania niedostępnego języka, otrzymamy standardowe, angielskie komunikaty." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Przy użyciu zmiennej środowiskowej DOS2UNIX_LOCALEDIR, można nadpisać ustawienie LOCALEDIR z czasu kompilacji. LOCALEDIR to katalog używany do znalezienia plików lokalizacji. Domyślną wartością dla GNU jest C</usr/local/share/locale>. Opcja B<--version> wyświetla używaną wartość LOCALEDIR." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Przykład (dla powłoki POSIX):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1590,71 +1660,71 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "WARTOŚĆ ZWRACANA" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "W przypadku powodzenia zwracane jest zero. Jeśli wystąpi błąd systemowy, zwracany jest ostatni błąd systemowy. W przypadku innych błędów zwracane jest 1." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Wartość zwracana w trybie cichym to zawsze zero, z wyjątkiem sytuacji podania błędnych opcji linii poleceń." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "STANDARDY" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://pl.wikipedia.org/wiki/Plik_tekstowy>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://pl.wikipedia.org/wiki/End-of-line>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://pl.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTORZY" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin <blin@socs.uts.edu.au>; Bernd Johannes Wuebben (tryb mac2unix) <wuebben@kde.org>; Christian Wurll (dodawanie dodatkowej nowej linii) <wurll@ira.uka.de>; Erwin Waterlander <waterlan@xs4all.nl> (prowadzący)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Strona projektu: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Strona SourceForge: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "ZOBACZ TAKŻE" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/pt_BR.po b/po-man/pt_BR.po index 3b75523..5994ef5 100644 --- a/po-man/pt_BR.po +++ b/po-man/pt_BR.po @@ -2,13 +2,13 @@ # Copyright (c) 2017 Erwin Waterlander (msgids) # Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the dos2unix package. -# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015, 2016, 2017 +# Rafael Fontenelle <rffontenelle@gmail.com>, 2014-2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.3.5-beta5\n" +"Project-Id-Version: dos2unix-man 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" -"PO-Revision-Date: 2017-06-25 13:10-0200\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" +"PO-Revision-Date: 2017-09-22 23:56-0200\n" "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n" "Language: pt_BR\n" @@ -84,7 +84,7 @@ msgstr "Ligações simbólicas e seus alvos são por padrão mantidas intocávei #. type: textblock #: dos2unix.pod:84 msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>. Another difference is that the SunOS/Solaris version uses by default I<iso> mode conversion while this version uses by default I<ascii> mode conversion." -msgstr "Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do I<iso> enquanto esta versão usa o do I<ascii>." +msgstr "Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo de arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>. Uma outra diferença é que a versão SunOS/Solaris usa, por padrão, a conversão de modo do I<iso> enquanto esta versão usa o do I<ascii>." #. type: =head1 #: dos2unix.pod:92 @@ -128,256 +128,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "Permite alteração da propriedade de arquivo no modo de arquivo antigo." + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Quando esta opção é usada, a conversão não será abortada quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. A conversão continuará e o arquivo convertido receberá a mesma propriedade nova como se tivesse convertido no modo de novo arquivo. Veja também as opções C<-o> e C<-n>. Esta opção só está disponível se o dos2unix oferecer suporte a preservação da propriedade do usuário e do grupo de arquivos." + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Converte apenas as quebras de linhas. Esse é o modo de conversão padrão." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Conversão entre conjunto de caractere do DOS e ISO-8859-1. Veja também a seção MODOS DE CONVERSÃO." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Usa a página de código 1252 do Windows (Europa ocidental)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Usa a página de código 437 do DOS (EUA). Essa é a página de código padrão usada para conversão ISO." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Usa a página de código 850 do DOS (Europa ocidental)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Usa a página de código 860 do DOS (Português)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Usa a página de código 863 do DOS (Francês do Canadá)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Usa a página de código 865 do DOS (Nórdico)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Converte caracteres de 8 bits para espaço de 7 bits." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Mantém marca de ordem de bytes (BOM). Quando o arquivo de entrada possuir um BOM, escreve um BOM no arquivo de saída. Esse é o comportamento padrão ao converter para quebras de linha do DOS. Veja também a opção C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode MODOCONV>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>, I<iso>, I<mac> com ascii sendo o padrão." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc CODIFICAÇÃO>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>, I<unicode>, I<utf8>, I<utf8bom> com ansi sendo o padrão." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Essa opção está disponível apenas no dos2unix para Windows com suporte a nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de arquivos lidos e escritos, apenas em como eles são exibidos." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Há vários métodos para exibir texto em um console Windows baseado na codificação do texto. Todos eles possuem suas próprias vantagens e desvantagens." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "O método padrão do dos2unix é usar o texto codificado em ANSI. A sua vantagem é a compatibilidade reversa. Ele funciona com fontes raster e TrueType. Em algumas regiões você pode precisar alterar a página de código OEM do DOS para ANSI do sistema Windows usando o comando C<chcp>, porque dos2unix usa a página de código do sistema Windows." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "A desvantagem do ansi é que nomes de arquivos internacionais com caracteres fora a página de código padrão do sistema não são exibidos apropriadamente. Você verá um sinal de interrogação, ou um símbolo incorreto. Quando você não utiliza nomes de arquivos estrangeiros, esse método funciona bem." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "A vantagem da codificação do unicode (o nome Windows para UTF-16) é que o texto é normalmente exibido apropriadamente. Não há necessidade para alterar a página de código ativa. Você pode precisar definir a fonte do console para uma fonte TrueType para que caracteres internacionais sejam exibidos apropriadamente. Quando um caractere não está incluído na fonte TrueType, geralmente você vê um pequeno quadrado, algumas vezes com um sinal de interrogação nele." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "Quando você usa o console ConEmu todo texto é exibido apropriadamente, porque o ConEmu seleciona automaticamente um fonte boa." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é fácil de lidar quando você o redireciona para um outro programa." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Quando o método <unicodebom> é usado, o texto Unicode será precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o redirecionamento, ou \"piping\", correto no PowerShell." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "A vantagem do utf8 é que ele é compatível com ASCII. Você precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é exibido similar a uma codificação C<unicode>." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "A desvantagem é que quando você usa a fonte \"raster\" padrão, caracteres não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode, mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para uma região leste da Ásia, você pode ver muitas falhas no console quando as mensagens são exibidas." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "Em um console ConEmu, o método de codificação utf8 funciona bem." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Quando o método <utf8bom> é usado, o texto UTF-8 será precedido com um BOM (Byte Order Mark, ou marca de ordem de byte). Um BOM é necessário para o redirecionamento, ou \"piping\", correto no PowerShell." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "A codificação padrão pode ser alterada com a variável de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode>, C<unicodebom>, C<utf8> ou C<utf8bom>." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Força a conversão de arquivos binários." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "No Windows, arquivos UTF-16 são convertidos, por padrão, para UTF-8, independentemente da localização definida. Use esta opção para converter arquivos UTF-16 para GB18030. Essa opção está disponível apenas no Windows. Veja também a seção GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Exibe ajuda e sai." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[OPÇÕES], --info[=OPÇÕES] ARQUIVO ...>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Exibe informação do arquivo. Nenhuma conversão é feita." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "A seguinte informação é exibida, nesta ordem: número de quebras de linha do DOS, número de quebras de linha do Unix, número de quebras de linha do Mac, marca de ordem de byte, \"text\" ou \"binary\", nome de arquivo." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Exemplo de saída:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -401,122 +416,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Note que em algumas vezes um arquivo binário pode ser confundido com um arquivo texto. Veja também a opção C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Opcionalmente, opções extra podem ser definidas para alterar a saída. Uma ou mais opções podem ser adicionadas." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Exibe as linhas de informações de arquivo seguido por um caractere nulo em vez de um caractere de nova linha. Isso habilita interpretação correta de nomes de arquivo com espaços ou aspas quando a opção c é usada. Use essa opção na combinação com opções C<-0> ou C<--null> do xargs(1)." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Exibe o número de quebras de linhas do DOS." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Exibe o número de quebras de linhas do Unix." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Exibe o número de quebras de linhas do Mac." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Exibe a marca de ordem de byte." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Exibe se arquivo é texto ou binário." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Exibe apenas os arquivos que seriam convertidos." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Com a opção C<c>, dos2unix vai exibir apenas os arquivos que contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Exibe um cabeçalho." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Mostra nomes de arquivos sem caminho." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Exemplos:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Mostra informação sobre todos os arquivos *.txt:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -526,12 +541,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Mostra apenas o número de quebras de linha DOS e Unix:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -541,12 +556,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Mostra apenas a marca de ordem de byte:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -556,12 +571,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Lista os arquivos que possuem quebras de linha do DOS:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -571,12 +586,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Lista os arquivos que possuem quebras de linha do Unix:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -586,12 +601,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -601,12 +616,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Localiza arquivos de texto que possuam quebras de linha do DOS:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -616,312 +631,367 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Mantém a marca da data do arquivo de saída igual ao do arquivo de entrada." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Exibe a licença do programa." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Adiciona nova linha adicional." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Apenas quebras de linha do DOS são alteradas para duas quebras de linha do Unix. No modo Mac, apenas quebras de linha do Mac são alterados para duas quebras de linha do Unix." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Apenas quebras de linha do Unix são alteradas para duas quebras de linha do DOS. No modo Mac, quebras de linha do Unix são alteradas para duas quebras de linha do Mac." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Escreve uma marca de ordem de byte (BOM) no arquivo de saída. Por padrão, um BOM UTF-8 é escrito." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16 será escrito." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Nunca use essa opção quando a codificação de saída é outra além de UTF-8, UTF-16 ou GB18030. Veja também a seção UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ARQENT ARQSAÍDA ...>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída para o arquivo ARQSAÍDA. Os nomes de arquivos devem ser fornecidos em pares e nome coringa I<não> deveriam ser usados ou você I<vai> perder seus arquivos." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." -msgstr "A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão." +msgstr "A pessoa que começa a conversão em modo de novo arquivo (pareado) será o dono do arquivo convertido. As permissões de leitura/escrita do novo arquivo serão as permissões do arquivo original menos a umask(1) da pessoa que executa a conversão." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "Não permite alteração da propriedade do arquivo no modo de arquivo antigo (padrão)." + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Aborta a conversão quando a propriedade do usuário e/ou do grupo do arquivo original não puder ser preservada no modo de arquivo antigo. Veja também as opções C<-o> e C<-n>. Esta opção só está disponível se o dos2unix oferecer suporte à preservação da propriedade do usuário e do grupo de arquivos." + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ARQUIVO ...>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." -msgstr "Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados." +msgstr "Modo de arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saída. O programa, por padrão, executa neste modo. Nomes coringas podem ser usados." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo dono, grupo e permissões de leitura/escrita que o arquivo original. Também, quando o arquivo é convertido por outro usuário que tenha permissões de escrita no arquivo (ex.: usuário root). A conversão será abortada quando não for possível preservar os valores originais. Alteração do dono pode significar que o dono original não é mais capaz de ler o arquivo. Alteração do grupo pode ser um risco para a segurança, pois o arquivo pode ficar legível para pessoas cujo acesso não é desejado. Preservação do dono, grupo e permissões de leitura/escrita tem suporte apenas no Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "Para verificar se dos2unix oferece suporte à preservação da propriedade de usuário e de grupo de arquivos, digite C<dos2unix -V>." + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "A conversão sempre é feita através de um arquivo temporário. Quando um erro ocorre no meio da conversão, o arquivo temporário é excluído e o arquivo original permanece intacto. Quando a conversão é bem sucedida, o arquivo original é substituído pelo arquivo temporário. Você pode ter permissão de gravação no arquivo original, mas nenhuma permissão para colocar a mesma propriedade de usuário e/ou de grupo no arquivo temporário como o arquivo original. Isso significa que você não consegue preservar a propriedade de usuário e/ou de grupo do arquivo original. Neste caso, você pode usar a opção C<-allow-chown> para continuar com a conversão:" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "Outra opção é usar o novo modo de arquivo:" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n foo.txt foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "A vantagem da opção C<--allow-chown> é que você pode usar coringas e as informações de propriedade serão preservadas quando possível." + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Modo quieto. Suprime todos os avios e mensagens. O valor retornado é zero. Exceto quando opções de linha de comando erradas forem usadas." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Remove marca de ordem de bytes (BOM). Não escreve um BOM no arquivo de saída. Esse é o comportamento padrão ao converter para quebras de linha Unix. Veja também a opção C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Ignora arquivo binários (padrão)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "A ação de ignorar arquivos binários é feita para evitar equívocos acidentais. Fique ciente de que a detecção de arquivos binários não é 100% à prova de erros. Arquivos de entrada são analisados por símbolos binários que, geralmente, não são encontrados em arquivos textos. É possível que um arquivo binário contenha apenas caracteres de texto normais. tal arquivo binário pode ser acidentalmente visto como um arquivo de texto." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Mantém a codificação UTF-16 original do arquivo de entrada. O arquivo de saída será escrito na mesma codificação UTF-16, em little ou big endian, como o arquivo de entrada. Isso evita transformação para UTF-8. Como consequência, um BOM UTF-16 será escrito. Essa opção pode ser desabilitada com a opção C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Presume que o formato de arquivo de entrada é UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Quando há uma marca de ordem de byte no arquivo de entrada, esta tem prioridade sobre essa opção." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Quando você fizer uma presunção equivocada (o arquivo de entrada não estava no formato UTF-16LE) e a conversão funcionar, você terá um arquivo de saída UTF-8 com texto errado. Você pode desfazer a conversão errada com iconv(1) pela conversão do arquivo de saída UTF-8 de volta para UTF-16LE. Isso vai trazer de volta o arquivo para o original." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "A presunção de UTF-16LE funciona como um I<modo de conversão>. Ao alternara o modo I<ascii> padrão, a presunção de UTF-16LE é desativada." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Presume que o formato de arquivo de entrada é UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Essa opção funciona o mesmo que a opção C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem de byte e a quantidade de quebras de linha convertidas." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Segue ligações simbólicas e converte os alvos." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Substitui ligações simbólicas com arquivos convertidos (arquivos alvo originais permanecem inalterados)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Mentém ligações simbólicas e alvos inalterados (padrão)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Exibe informação da versão e sai." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "No modo normal, as quebras de linhas são convertidas de DOS para Unix e vice-versa. Quebras de linha do Mac não são convertidas." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "No modo Mac, quebras de linha são convertidas de Mac para Unix e vice-versa. Quebras de linha do DOS não são alteradas." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Para executar no modo Mac, use a opção de linha de comando C<-c mac> ou use os comandos C<mac2unix> ou C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSÃO" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "No modo C<ascii>, apenas as quebras de linha são convertidas. Esse é o modo de conversão padrão." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bits, o modo é em verdade 8 bits. Sempre use este modo quando quiser converter arquivos Unicode UTF-8." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "Neste modo todos os caracteres não-ASCII de 8 bits (com valores entre 128 e 255) são convertidos para um espaço de 7 bits." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Caracteres são convertidos entre um conjunto de caracteres do DOS (página de código) e conjunto de caracteres ISO-8859-1 (Latin-1) no Unix. Caracteres de DOS sem um equivalente ISO-8859-1, para os quais a conversão não é possível, são convertidos para um ponto. O mesmo vale para caracteres ISO-8859-1 sem a contraparte DOS." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Quando apenas a opção C<-iso> for usada, dos2unix vai tentar determinar a página de código ativa. Quando isso não for possível, dos2unix vai usar a página de código padrão CP437, a qual é usada principalmente nos EUA. Para forçar uma página de código específica, use as opções C<-437> (EUA), C<-850> (Europeu oriental), C<-860> (Português), C<-863> (Franco-canadense) ou C<-865> (Nórdico). Também há suporte à página de código do Windows CP1252 (Europeu ocidental) com a opção C<-1252>. Para outras páginas de código, use dos2unix em combinação cm iconv(1). Iconv pode converter entre uma lista grande de codificações de caracteres." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Nunca use conversão ISO em arquivos textos Unicode. Isso vai corromper os arquivos codificados em UTF-8." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Conversão da página de código padrão do DOS para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -931,12 +1001,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Conversão da CP850 do DOS para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -946,12 +1016,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Conversão da CP1252 do Windows para Latin-1 do Unix:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -961,12 +1031,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Conversão da CP1252 do Windows para UTF-8 (Unicode) do Unix:" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -976,12 +1046,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Conversão de Latin-1 do Unix para página de código padrão do DOS:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -991,12 +1061,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Conversão do Latin-1 do Unix para CP850 do DOS:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1006,12 +1076,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Conversão do Latin-1 do unix para CP1252 do Windows:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1021,12 +1091,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Conversão do UTF-8 (Unicode) do Unix para CP1252 do Windows:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1036,142 +1106,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Veja também L<http://czyborra.com/charsets/codepages.html> e L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Codificações" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Exitem codificações Unicode diferentes. No Unix e no Linux, arquivos Unicode são geralmente codificados em UTF-8. No Windows, arquivos texto Unicode podem ser codificados em UTF-8, UTF-16 ou UTF-16 big endian, mas na maioria das vezes são codificados no formato UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Conversão" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Arquivos texto em Unicode pode ter quebras de linha DOS, Unix ou Mac, como arquivos texto comuns." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Todas as versões do dos2unix e unix2dos podem converter arquivos codificados em UTF-8 porque UTF-8 foi projetado para ter compatibilidade reversa com ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix e unix2dos com suporte a Unicode UTF-16 podem ler arquivos texto codificados em little e big endian UTF-16. Para ver se dos2unix foi compilado com suporte a UTF-16, digite C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "No Unix/Linux, arquivos codificados em UTF-16 são convertidos para a codificação de caracteres do localização. Use o comando locale(1) para descobrir qual é a codificação de caracteres da localização. Quando a conversão não for possível, ocorrerá um erro e o arquivo será ignorado." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "No Windows, arquivos UTF-16 são convertidos, por padrão, para UTF-8. Arquivos texto formatados em UTF-8 possuem ótimo suporte em ambos Windows e Unix/Linux." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Codificações UTF-16 e UTF-8 são completamente compatíveis, não havendo qualquer perda de texto na conversão. Quando um erro de conversão UTF-16 para UTF-8 ocorre, por exemplo quando o arquivo de entrada UTF-16 contém um erro, o arquivo será ignorado." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Quando a opção C<-u> é usada, o arquivo de saída será escrito na mesma codificação UTF-16 que o arquivo de saída. A opção C<-u> evita conversão para UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 para UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Modo de conversão ISO e 7 bits não funcionam em arquivos UTF-16." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Marca de ordem de byte" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "No Windows, arquivos Unicode normalmente têm uma Marca de Ordem de Byte (BOM), porque muitos programas (incluindo o Bloco de Notas) adiciona BOMs por padrão. Veja também L<http://en.wikipedia.org/wiki/Byte_order_mark>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "No Unix, arquivos Unicode normalmente não têm BOM. Presume-se que arquivos texto são codificados na codificação de caracteres da localização." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2unix pode detectar apenas se um arquivo está no formato UTF-16 se o arquivo tiver BOM. Quando um arquivo UTF-16 não tiver BOM, dos2unix vai ver se o arquivo é um arquivo binário." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Use a opção C<-ul> ou C<-ub> para converter um arquivo UTF-16 sem BOM." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix escreve por padrão nenhum BOM no arquivo de saída. Com a opção C<-b>, o Dos2unix escreve um BOM quando o arquivo de entrada possuir BOM." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos escreve por padrão um BOM no arquivo de saída quando o arquivo de entrada tem BOM. Use a opção C<-m> para remover BOM." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Nomes de arquivos Unicode no Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix possui um suporte opcional para leitura e escrita de nomes de arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix pode abrir arquivos que possuam caracteres no nome que não são parte da página de código ANSI padrão do sistema. Para ver se dos2unix para Windows foi compilado com suporte a nomes de arquivos em Unicode, digite C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Há alguns problemas com a exibição de nomes de arquivos Unicode em um console Windows. Veja a opção C<-D>, C<--display-enc>. Para nomes de arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com o nome correto." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Exemplos de Unicode" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1181,12 +1251,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Conversão de UTF-16LE do Windows (sem BOM) para UTF-8 do Unix:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1196,12 +1266,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Conversão de UTF-8 Unix para UTF-8 do Windows com BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1211,12 +1281,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Conversão de UTF-8 do Unix para UTF-16 do Windows:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1226,47 +1296,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 é um padrão governamental chinês. Um subconjunto obrigatório do padrão GB18030 é exigido oficialmente para todos os produtos de software vendidos na China. Veja também L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 é completamente compatível com Unicode e pode ser considerado um formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível com ASCII. GB18030 também é compatível com a página de código 936 do Windows, também conhecida como GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a codificação da localização é definida para GB18030. Note que isso vai funcionar apenas se o sistemas oferecer suporte à localização. Use o comando C<locale -a> para obter a lista de localizações às quais há suporte." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "No Windows, você precisa usar a opção C<-gb> para converter arquivos UTF-16 para GB18030." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "Arquivos codificados em GB18030 possuem uma marca de ordem de bytes, como arquivos Unicode." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "EXEMPLOS" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Lê a entrada da \"stdin\" e escreve a saída para \"stdout\":" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1278,12 +1348,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Converte e substitui a.txt. Converte e substitui b.txt:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1295,12 +1365,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Converte e substitui a.txt no modo de conversão ascii:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1310,12 +1380,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Converte e substitui a.txt no modo de conversão ascii. Converte e substitui b.txt no modo de conversão 7bit:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1329,12 +1399,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Converte a.txt do formato do Mac para Unix:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1346,12 +1416,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Converte a.txt do formato do Unix para Mac:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1363,12 +1433,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Converte e substitui a.txt enquanto mantém a marca de data original:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1380,12 +1450,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Converte a.txt e escreve para e.txt:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1395,12 +1465,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Converte a.txt e escreve para e.txt, mantém a marca de data de e.txt igual a a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1410,12 +1480,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Converte e substitui a.txt. Converte b.txt e escreve para e.txt:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1427,12 +1497,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Converte c.txt e escreve para e.txt. Converte e substitui a.txt. Converte e substitui b.txt. Converte d.txt e escreve para f.txt:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1442,17 +1512,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "CONVERSÃO RECURSIVA" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "Em um shell Unix, os comandos find(1) e xargs(1) podem ser usados para executar recursivamente o dos2unix em todos os arquivos texto em uma árvore de diretórios. Por exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o diretório atual, digite:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1462,12 +1532,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "A opção do find(1) C<-print0> e a opção correspondente do xargs(1) C<-0> são necessárias quando houver arquivos com espaços ou aspas no nome. Do contrário, essas opções podem ser omitidas. Outra alternativa é usar find(1) com a opção C<-exec>:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1477,12 +1547,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "Em um Prompt de Comando do Windows o seguinte comando pode ser usado:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1492,12 +1562,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Usuários do PowerShell podem usar o seguinte comando no Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1507,22 +1577,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "LOCALIZAÇÃO" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "O idioma primário é selecionado com a variável de ambiente LANG. A variável LANG consiste em várias partes. A primeira parte está em letras pequenas no código do idioma. A segunda parte é opcional e é o código do país em letras maiúsculo, precedida de um sublinhado. Há também uma terceira parte opcional: codificação de caractere, precedida com um ponto. Alguns exemplos para shells do tipo padrão POSIX:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1544,47 +1614,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Para a lista completa de códigos de idioma e país, veja o manual do gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "Nos sistemas Unix, você pode usar o comando locale(1) para obter informação específica da localização." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Com a variável de ambiente LANGUAGE, você pode especificar uma lista de prioridades de idiomas, separada por vírgulas. Dos2unix fornece preferência à LANGUAGE sobre LANG. Por exemplo, primeiro holandês e, então, alemão: C<LANGUAGE=nl:de>. Você primeiro tem que habilitar localização, definindo LANG (ou LC_ALL) para um valor diferente de \"C\", antes que você possa usar uma lista de prioridade de idioma por meio da variável LANGUAGE. Veja também o manual do gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Se você selecionou um idioma que não está disponível, você vai terá as mensagens em inglês (padrão)." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Com a variável de ambiente DOS2UNIX_LOCALEDIR, o LOCALEDIR definido durante a compilação pode ser sobrescrito. LOCALEDIR é usada para localizar os arquivos de idioma. O valor padrão do GNU é C</usr/local/share/locale>. A opção B<--version> vai exibir o LOCALEDIR que é usado." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Exemplo (shell POSIX):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1594,72 +1664,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "VALOR RETORNADO" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "No sucesso, zero é retornado. Quando um erro de sistema ocorre, o último erro de sistema será retornado. Para outros erros, 1 é retornado." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "O valor retornado é sempre zero no modo quieto, exceto quando opções de linha de comando erradas são usadas." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "PADRÕES" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://en.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben (modo mac2unix) - <wuebben@kde.org>, Christian Wurll (adiciona nova linha extra) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (mantenedor)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Página do projeto: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Página do SourceForge: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "VEJA TAMBÉM" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/sv.po b/po-man/sv.po index 9a5e287..4201e2f 100644 --- a/po-man/sv.po +++ b/po-man/sv.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.3.5-beta5\n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" -"PO-Revision-Date: 2017-07-02 19:40+0800\n" +"Project-Id-Version: dos2unix-man 7.3.6-beta4\n" +"POT-Creation-Date: 2017-10-10 19:40+0200\n" +"PO-Revision-Date: 2017-09-23 01:36+0200\n" "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 2.0.3\n" #. type: =head1 #: dos2unix.pod:52 @@ -126,256 +126,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "Tillåt ändring av ägarskap för fil i gammalt filläge." + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "När denna flagga används, kommer konverteringen inte att avbrytas när användar- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläget. Konverteringen kommer att fortsätta och den konverterade filen kommer att få samma nya ägarskap som om den konverterades i nyfilsläge. Se också flaggorna C<-o> och C<-n>. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap för filer." + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Konvertera enbart radbrytningar. Detta är standardkonverteringsläget." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare stycket KONVERTERINGSLÄGEN." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Använd Windows-teckentabell 1252 (Västeuropeisk)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Använd DOS-teckentabell 437 (USA). Detta är standardteckentabellen som används för ISO-konvertering." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Använd DOS-teckentabell 850 (Västeuropeisk)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Använd DOS-teckentabell 860 (Portugisisk)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Använd DOS-teckentabell 863 (Fransk-kanadensisk)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Använd DOS-teckentabell 865 (Nordisk)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Konvertera 8-bitars tecken till 7-bitars blanksteg." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM, skriv en BOM i utfilen. Detta är standardbeteendet vid konvertering av DOS-radbrytningar. Se vidare flaggan C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode KONVERTERINGSLÄGE>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: I<ascii>, I<7bit>, I<iso>, I<mac> där ascii är standard." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc KODNING>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> där ansi är standardvalet." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses och skrivs, bara på hur de visas." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Det finns flera metoder för att visa text i en Windows-konsol baserad på vilken kodning texten har. De har alla för- och nackdelar." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "Dos2unix standardmetod är att använda ANSI-kodad text. Fördelen är att den är bakåtkompatibel. Det fungerar med raster- och TrueType-teckensnitt. I vissa regioner kan du behöva ändra den aktiva DOS OEM-teckentabellen till Windows-systemets ANSI-teckentabell genom att använda kommandot C<chcp>, eftersom dos2unix använder Windows-systemets teckentabell." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "Nackdelen med ansi är att internationella filnamn med tecken som inte finns i systemets standardteckentabell inte visas korrekt. Du kommer att se frågetecken, eller en felaktig symbol istället. När du inte arbetar med utländska filnamn är denna metoden OK." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att text vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett TrueType-teckensnitt för att få internationella tecken att visas korrekt. När ett tecken inte finns inkluderat i TrueType-teckensnittet kommer du vanligtvis att se en liten ruta, ibland med ett frågetecken inuti." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "När du använder ConEmu-konsolen kommer all text att visas korrekt eftersom ConEmu automatiskt väljer ett bra teckensnitt." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen är inte lätt att hantera när du omdirigerar den till ett annat program eller en fil." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "När metod C<unicodebom> används kommer Unicode-texten att föregås av en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt omdirigering eller rörledning i PowerShell." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "Fördelen med utf8 är att den är kompatibel med ASCII. Du måste ställa in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas på liknande sätt som med C<unicode>-kodningen." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "Nackdelen är att när du använder standardrasterteckensnittet kommer alla icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan också översatta meddelanden kommer att bli oläsbara. Under Windows som konfigurerats för Östasien kan man komma att se många blinkningar i konsolen när meddelanden visas." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "I ConEmu-konsolen fungerar utf8-kodningsmetoden väl." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "När metod C<utf8bom> används kommer UTF-8-texten att föregås av en BOM (byteordningsmarkering, Byte Order Mark). En BOM krävs för korrekt omdirigering eller rörledning i PowerShell." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom att sätta den till C<unicode>, C<unicodebom>, C<utf8> or C<utf8bom>." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Tvinga konvertering av binära filer." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "Under Windows konverteras UTF-16-filer som standard till UTF-8, oavsett vilken lokalinställning som är gjord. Använd denna flagga för att konvertera UTF-16-filer till GB18030. Denna flagga finns bara tillgänglig i Windows. Se vidare i avsnittet GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Visa hjälptext och avsluta." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[FLAGGOR], --info[=FLAGGOR] FIL ...>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Visa filinformation. Ingen konvertering görs." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar, antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen, text eller binär, filnamn." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Exempelutmatning:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -399,122 +414,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Notera att en binärfil ibland kan misstas för en textfil. Se vidare flaggan C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Skriv ut filinformationsraderna följt av ett null-tecken istället för ett nyradstecken. Detta möjliggör korrekt tolkning av filnamn med blanksteg eller citationstecken när c-flaggan används. Använd denna flagga i kombination med xargs(1):s flagga C<-0> eller C<--null>." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Skriv ut antal DOS-radbrytningar." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Skriv ut antal Unix-radbrytningar." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Skriv ut antal Mac-radbrytningar." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Skriv ut byteordningsmarkeringen." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Skriv ut om filen är text eller binär." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Skriv bara ut filerna som skulle ha konverterats." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Med C<c>-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Skriv ut rubrik." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Visa filnamn utan sökväg." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Exempel:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Visa information för alla *.txt-filer:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -524,12 +539,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -539,12 +554,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Visa bara byteordningsmarkeringen:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -554,12 +569,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Lista filerna som har DOS-radbrytningar:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -569,12 +584,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Lista filerna som har Unix-radbrytningar:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -584,12 +599,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -599,12 +614,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Hitta textfiler som har DOS-radbrytningar:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -614,312 +629,367 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Behåll infilens datumstämpel för utfilen." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Visa programmets licens." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Lägg till ytterligare nyrad." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I Mac-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I Mac-läge ändras Unix-radbrytningar till två Mac-radbrytningar." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som standard skrivs en UTF-8 BOM." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "När infilen är UTF-16, och flaggan C<-u> används, kommer en UTF-16 BOM att skrivas." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Använd aldrig denna flagga när kodningen för utmatning är något annat än UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile INFIL UTFIL …>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste ange i par och jokertecken i namnen ska I<inte> användas annars I<kommer> du att förlora filer." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Användaren som påbörjar konverteringen i nyfilsläge (parat läge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "Tillåt inte ändring av ägarskap i gammalt filläge (standard)" + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "Avbryt konvertering när användar- och/eller gruppägarskap för originalfilen inte kan bevaras i gammalt filläge. Se också flaggorna C<-o> och C<-n>. Denna flagga är endast tillgänglig om dos2unix har stöd för att bevara användar- och gruppägarskap för filer." + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FIL …>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Gammalfilsläge. Konvertera filen FIL och skriv över den med utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn får användas." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen konverteras av en annan användare som har skrivbehörighet för filen (t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "För att kontrollera om dos2unix har stöd för att bevara användar- och gruppägarskap för filer skriv C<dosunix -V>." + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "Konvertering görs alltid via en temporärfil. När ett fel inträffar halvvägs i konverteringen tas den temporära filen bort och originalfilen finns kvar intakt. Om konverteringen är framgångsrik kommer originalfilen att ersättas med temporärfilen. Du kanske har skrivrättigheter till originalfilen men inte rättigheter att ställa in samma användar- och/eller grupprättighetsegenskaper på temporärfilen som originalfilen har. Detta innebär att du inte kan bevara användar- och/eller gruppägarskapet för originalfilen. I detta fall kan du använda flaggan C<--allow-chown> för att fortsätta konverteringen:" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "Ett annat alternativ är att använda nyfilsläge:" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n foo.txt foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "Fördelen med flaggan C<--allow-chown> är att du kan använda jokertecken och att ägarskapsegenskaper om möjligt kommer att bevaras." + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är noll. Utom när felaktiga kommandoradsflaggor används." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar. Se vidare flaggan C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Hoppa över binära filer (standard)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Binärfiler hoppas över för att undvika oavsiktliga misstag. Var medveten om att detektering av binärfiler inte är 100% säker. Infiler genomsöks efter binära symboler som typiskt inte återfinns i textfiler. Det är möjligt att en binärfil enbart innehåller texttecken. En sådan binärfil kommer oavsiktligt att ses som en textfil." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med samma UTF-16-kodning som infilen, omvänd eller rak byteordning (little eller big endian). Detta förhindrar transformation till UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med C<-ascii>-flaggan." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Antag att infilsformatet är UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har BOM:en högre prioritet än denna flagga." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "När du har gjort fel antagande (infilen var inte i UTF-16LE-format) och konverteringens lyckas, kommer du att få en UTF-8 utfil med felaktig text. Du kan göra denna konvertering ogjord med iconv(1) genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att återskapa originalfilen." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "Antagandet om UTF-16LE fungerar som ett I<konverteringsläge>. Genom att växla till standard I<ascii>-läget kommer UTF-16LE antagandet att stängas av." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Antag att infilsformatet är UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Denna flagga fungerar på samma sätt som flaggan C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Visa utförliga meddelanden. Extra information visas om byteordningsmarkeringar och antalet konverterade radbrytningar." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Följ symboliska länkar och konvertera målen." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Ersätt symboliska länkar med konverterade filer (originalmålfilerna förblir oförändrade)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Behåll symboliska länkar och mål oförändrade (standard)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Visa versionsinformation och avsluta." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "MAC-LÄGE" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd kommandona C<mac2unix> eller C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "KONVERTERINGSLÄGEN" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "I läget C<ascii> konverteras enbart radbrytningar. Detta är standardkonverteringsläget." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden från 128 till 255) till ett 7-bitars blanksteg." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och ISO teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, för vilka konvertering är omöjligt, kommer att ersättas med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda standardteckentabellen CP437, vilken huvudsakligen används i USA. För att tvinga en specifik teckentabell använd flaggorna C<-437> (USA), C<-850> (Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång lista av teckenkodningar." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Några exempel:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Konvertera från DOS standardteckentabell till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -929,12 +999,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Konvertera från DOS CP850 till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -944,12 +1014,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Konvertera från Windows CP1252 till Unix Latin-1:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -959,12 +1029,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -974,12 +1044,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Konvertera från Unix Latin-1 till DOS-standardteckentabell:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -989,12 +1059,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Konvertera från Unix Latin-1 till DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1004,12 +1074,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Konvertera från Unix Latin-1 till Windows CP1252:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1019,12 +1089,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1034,142 +1104,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Se även L<http://czyborra.com/charsets/codepages.html> och L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Kodningar" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Det finns flera olika Unicode kodningar. I Unix och Linux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Konvertering" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Dos2unix och unix2dos med Unicode-UTF-16-stöd, kan läsa UTF-16-kodade textfiler i omvänd och rak byteordning (little och big endian). För att se om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Använd kommandot locale(1) för att ta reda på vilken lokalens teckenkodning är. När konvertering inte är möjlig kommer ett konverteringsfel att inträffa och filen kommer att hoppas över." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "Under Windows konverteras UTF-16-filer som standard till UTF-8. UTF-8-formaterade textfiler har bra stöd både under Windows och Unix/Linux." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "UTF-16- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel uppstår, till exempel när infilen i UTF-16-format innehåller ett fel, kommer att filen att hoppas över." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "När flaggan C<-u> används kommer utfilen att skrivas med samma UTF-16-kodning som infilen. Flaggan C<-u> förhindrar konvertering till UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer till UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Byteordningsmarkering (Byte Order Mark)" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L<http://en.wikipedia.org/wiki/Byte_order_mark>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Dos2Unix kan bara detektera om en fil är i UTF-16-format om filen har en BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen som en binärfil." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Använd flaggan C<-ul> eller C<-ub> för att konvertera en UTF-16-fil utan BOM." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan C<-b> kommer Dos2unix att skriva en BOM när infilen har en BOM." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Unix2dos skriver som standard en BOM i utfilen när infilen har en BOM. Använd flaggan C<-r> för att ta bort BOM:en." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Unicode-filnamn under Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "Dos2unix har valfritt stöd för läsning och skrivning av Unicode-filnamn i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har tecken i sina namn som inte är en del av systemets atandard ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för Unicode-filnamn skriv C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan C<-D>, C<--display-enc>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Unicode-exempel" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1179,12 +1249,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1194,12 +1264,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1209,12 +1279,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Konvertera från Unix UTF-8 till Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1224,47 +1294,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när lokalens teckenkodning är inställd på GB18030. Notera att detta endast kommer att fungera om lokalen har stöd i systemet. Använd kommandot C<locale -a> för att få en lista över de lokaler som stöds." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "Under Windows måste du använda flaggan C<-gb> för att konvertera UTF-16-filer till GB18030." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030-kodade filer kan ha en byteordningsmarkering, precis som Unicode-filer." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "EXEMPEL" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1276,12 +1346,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1293,12 +1363,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1308,12 +1378,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och ersätt b.txt i 7bit-konverteringsläge:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1327,12 +1397,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Konvertera a.txt från Mac- till Unix-format:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1344,12 +1414,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Konvertera a.txt från Unix- till Mac-format:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1361,12 +1431,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1378,12 +1448,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Konvertera a.txt och skriv till e.txt:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1393,12 +1463,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från a.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1408,12 +1478,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1425,12 +1495,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt, konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1440,17 +1510,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "REKURSIV KONVERTERING" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "I ett Unix-skal kan kommandona find(1) och xargs(1) användas för att köra dos2unix rekursivt över alla textfiler i ett katalogträd. För att till exempel konvertera alla .txt-filer i katalogträdet under den aktuella katalogen skriv:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1460,12 +1530,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Flaggan C<-print0> till find(1) och motsvarande flagga C<-0> till xargs(1) behövs när det finns filer med mellanslag eller citationstecken i namnet. Annars kan dessa flaggor utelämnas. Ett annat alternativ är att användas find(1) med flaggan C<-exec>:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1475,12 +1545,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "I en Windows-kommandoprompt kan följande kommando användas:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1490,12 +1560,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "PowerShell-användare kan använda följande kommando i Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1505,22 +1575,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "LOKALISERING" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av flera delas. Den första delen är språkkoden i gemener. Den andra delen är valfri och utgör landskoden i versaler, föregången av ett understreck. Det finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett par exempel för skal av POSIX-standard-typ:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1542,47 +1612,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C<LANGUAGE=nl:de>. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in vid kompilering åsidosättas. LOCALEDIR används för att hitta språkfiler. Standardvärdet för GNU-program är C</usr/local/share/locale>. Flaggan B<--version> kommer att visa vilken LOCALEDIR som används." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Exempel (POSIX-skal):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1592,72 +1662,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "RETURVÄRDE" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer det senaste systemfelet att returneras. För andra fel kommer 1 att returneras." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "Returvärdet är alltid noll i tyst läge, utom när felaktiga kommandoradsflaggor används." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "STANDARDER" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://en.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "FÖRFATTARE" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (upphovsman)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Projektsida: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge-sida: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "SE ÄVEN" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/uk.po b/po-man/uk.po index c7e858c..25a9052 100644 --- a/po-man/uk.po +++ b/po-man/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man 7.3.5-beta5\n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" +"POT-Creation-Date: 2017-10-10 19:41+0200\n" "PO-Revision-Date: 2017-06-25 13:27+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" @@ -128,256 +128,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "" + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "Виконати лише перетворення символів розриву рядків. Типовий режим перетворення." #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "Виконати перетворення з кодування DOS на кодування ISO-8859-1. Див. розділ щодо режимів перетворення." #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "Використати кодову таблицю 1252 Windows (західноєвропейські мови)." #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "Використовувати кодову сторінку DOS 437 (США). Це типова кодова сторінка для перетворення ISO." #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "Використовувати кодову сторінку DOS 850 (західноєвропейські мови)." #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "Використовувати сторінку DOS 860 (португальська)." #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "Використовувати сторінку DOS 863 (канадська французька)." #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr "Використовувати сторінку DOS 865 (скандинавські мови)." #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "Перетворювати 8-бітові символи на 7-бітові." #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "Зберегти позначку порядку байтів (BOM). Якщо у файлі вхідних даних є BOM, записати BOM до файла результатів. Це типова поведінка під час перетворення у формат із символами розриву рядків DOS. Див. також параметр C<-r>." #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode РЕЖИМ>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "Встановити режим перетворення. Значенням аргументу РЕЖИМ може бути один з таких рядків: I<ascii>, I<7bit>, I<iso>, I<mac>. Типовим є режим ascii." #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc КОДУВАННЯ>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "Встановити кодування показаного тексту. Можливі варіанти значень параметра КОДУВАННЯ: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom>, типовим є ansi." #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "Цей параметр доступний лише у dos2unix для Windows з підтримкою назв файлів у Unicode. Цей параметр не впливає на справжнє читання та запис назв файлів, лише на те, як буде показано ці назви." #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "Існує декілька способів показу тексту у консолі Windows, заснованих на кодуванні тексту. Усі ці способи мають свої переваги і недоліки." #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "Типовим способом для dos2unix є кодування тексту у форматі ANSI. Перевагою є зворотна сумісність. Цей варіант працює з растровими шрифтами та шрифтами TrueType. У деяких регіонах, ймовірно, вам доведеться змінити активну кодову сторінку DOS OEM на системну кодову сторінку ANSI Windows за допомогою команди C<chcp>, оскільки dos2unix використовує системну кодову сторінку Windows." #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "Недоліком ansi є те, що назви файлів із символами, яких немає у типовому системному кодуванні, буде показано неправильно. Замість цих символів ви побачите знак питання або не той символ. Якщо у вашій системі немає файлів із назвами, які містять нетипові символи, можна скористатися цим варіантом." #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode, unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "Перевагою кодування unicode (назва у Windows кодування UTF-16) є те, що зазвичай текст буде показано правильно. Змінювати активну кодову сторінку не потрібно. Ймовірно, вам потрібно встановити шрифт консолі TrueType для належного показу нестандартних символів. Якщо символ не передбачено у шрифті TrueType, зазвичай ви побачите невеличкий квадратик замість символу, іноді із знаком питання у ньому." #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "Якщо ви користуєтеся консоллю ConEmu, весь текст буде показано належним чином, оскільки ConEmu автоматично вибирає належний шрифт." #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Недоліком unicode є те, що це кодування несумісне з ASCII. Обробка виведених даних є непростою, якщо ви передаватимете ці дані до іншої програми або файла." #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Якщо використовується метод C<unicodebom>, текст у кодуванні Unicode буде оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для правильного переспрямовування або тунелювання даних у PowerShell." #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8, utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "Перевагою utf8 є те, що це кодування сумісне з ASCII. Вам слід встановити шрифт консолі TrueType. Якщо використано шрифт TrueType, текст буде показано подібно до того, як його показано, якщо визначено кодування C<unicode>." #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "Недоліком є те, що якщо ви скористаєтеся типовим растровим шрифтом, усі символи поза ASCII буде показано неправильно. Не лише назви файлів у unicode, а й перекладені повідомлення стануть непридатними до читання. У Windows, налаштованому на роботі у східно-азійському регіоні, ви можете помітити значне блимання під час показу повідомлень." #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "У консолі ConEmu добре працює спосіб кодування utf8." #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "Якщо використовується метод C<utf8bom>, текст у кодуванні UTF-8 буде оброблено з урахуванням BOM (позначки порядку байтів). BOM потрібна для правильного переспрямовування або тунелювання даних у PowerShell." #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "Типове кодування можна змінити за допомогою змінної середовища DOS2UNIX_DISPLAY_ENC встановленням для неї значення C<unicode>, C<unicodebom>, C<utf8> або C<utf8bom>." #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "Примусове перетворення двійкових файлів." #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "У Windows файли в UTF-16 типово перетворюються на файли в UTF-8, незалежно від встановленої локалі. За допомогою цього параметра ви можете наказати програмі перетворювати файли в UTF-16 на файли у GB18030. Цим параметром можна скористатися лише у Windows. Див. також розділ, присвячений GB18030." #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "Показати довідкові дані і завершити роботу." #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[ПРАПОРЦІ], --info[=ПРАПОРЦІ] ФАЙЛ ...>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "Вивести дані щодо файла. Не виконувати перетворення." #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "Буде виведено такі дані, у вказаному порядку: кількість розривів рядків у форматі DOS, кількість розривів рядків у форматі Unix, кількість розривів рядків у форматі Mac, позначка порядку байтів, текстовим чи бінарним є файл та назву файла." #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "Приклад результатів:" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -401,122 +416,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "Зауважте, що іноді бінарні файли помилково розпізнаються як текстові. Див. також параметр C<-s>." #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "Крім того, можна вказати додаткові прапорці для внесення змін у виведені дані. Можна використовувати один або декілька таких прапорців." #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "Виводити рядки даних щодо файла із завершенням на нульовий символ, а не символ розриву рядка. Це уможливлює правильну інтерпретацію назв файлів, що містять пробіли або символи лапок, якщо використано прапорець «c». Скористайтеся цим прапорцем у поєднанні із параметром C<-0> або C<--null> xargs(1)." #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "Вивести кількість символів розривів рядка DOS." #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "Вивести кількість символів розривів рядка Unix." #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "Вивести кількість символів розривів рядка Mac." #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "Вивести позначку порядку байтів." #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "Вивести дані щодо того, є файл текстовим чи бінарним." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "Вивести дані лише тих файлів, які було б перетворено." #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "Із прапорцем C<c> dos2unix виведе лише назви файлів, у яких містяться розриви рядків DOS. unix2dos виведе лише назви файлів, у яких містяться розриви рядків Unix." #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "Вивести заголовок." #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "Показувати назви файлів без шляхів." #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "Приклади:" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "Вивести дані щодо усіх файлів *.txt:" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -526,12 +541,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "Вивести кількість розривів рядків у форматі DOS і розривів рядків у форматі Unix:" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -541,12 +556,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "Вивести лише позначку порядку байтів:" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -556,12 +571,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "Вивести список файлів, у яких є символи розриву рядків DOS:" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -571,12 +586,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "Вивести список файлів, у яких використано символи розриву рядків Unix:" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -586,12 +601,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "Перетворити лише файли із розривами рядків DOS і не чіпати інших файлів:" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -601,12 +616,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "Знайти текстові файли і розривами рядків DOS:" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -616,312 +631,375 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "Зберегти часову позначку файла вхідних даних у файлі результатів перетворення." #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "Вивести умови ліцензування програми." #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "Вставити додатковий символ розриву рядка." #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>: перетворення на два символи розриву рядків Unix відбуватиметься лише для комбінацій розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Unix лише символів розриву рядків Mac." #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>: перетворення на дві комбінації розриву рядків DOS відбуватиметься лише для символів розриву рядків DOS. У режимі Mac виконуватиметься перетворення на два розриви рядків Mac лише символів розриву рядків Unix." #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "Записати до файла результатів позначку порядку байтів (BOM). Типово буде записано позначку порядку байтів UTF-8." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "Якщо дані початкового файла закодовано у UTF-16 і використано параметр C<-u>, буде дописано позначку порядку байтів UTF-16." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8, UTF-16 або GB18030. Див. також розділ щодо UNICODE." #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і записати результати до файла ВИХІДНИЙ_ФАЙЛ. Назви файлів слід вказувати парами, I<не слід> використовувати шаблони заміни, інакше вміст файлів I<буде втрачено>." #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "Власником перетвореного файла буде призначено користувача, яким було розпочато перетворення у режимі нового файла (парному режимі). Права доступу на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення." #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "" + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "" + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ФАЙЛ ...>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати його вміст. Типово, програма працює у цьому режимі. Можна використовувати шаблони заміни." #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "У застарілому режимі (режимі заміщення) перетворений файл належатиме тому самому власнику і групі і матиме ті самі права доступу на читання або запис, що і початковий файл. Крім того, якщо перетворення файла виконується іншим користувачем, який має права доступу на запис до файла (наприклад користувачем root), перетворення буде перервано, якщо зберегти початкові значення не вдасться. Зміна власника може означати неможливість читання файла для його початкового власника. Зміна групи може призвести до проблем із безпекою, оскільки файл може стати доступним для читання користувачам, які не повинні мати такі права доступу. Можливість збереження прав власності та прав доступу до файла передбачено лише у Unix." +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "" + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "" + +#. type: verbatim +#: dos2unix.pod:431 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n -- -foo out.txt\n" +#| "\n" +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix -n -- -foo out.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +#, fuzzy +#| msgid "Or in new file mode:" +msgid "Another option is to use new file mode:" +msgstr "Або у новому режимі файлів:" + +#. type: verbatim +#: dos2unix.pod:435 +#, fuzzy, no-wrap +#| msgid "" +#| " dos2unix -n a.txt e.txt\n" +#| "\n" +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n a.txt e.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "" + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "Режим без виведення повідомлень. Програма не виводитиме жодних попереджень або повідомлень про помилки. Повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка." #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "Вилучити позначку порядку байтів (BOM). Не записувати BOM до файла результатів. Це типова поведінка під час перетворення файлів з форматом розриву рядків Unix. Див. також параметр C<-b>." #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "Пропускати двійкові файли (типово)." #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "Пропускання бінарних файлів реалізовано для того, щоб уникнути випадкових помилок. Майте на увазі, що визначення бінарних файлів не є 100% точним. Програма просто шукає у файлах бінарні символи, які типово не трапляються у текстових файлах. Може так статися, що у бінарному файлі містяться лише звичайні текстові символи. Такий бінарний файл буде помилково сприйнято програмою як текстовий." #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "Зберегти початкове кодування UTF-16. Файл результатів буде записано у тому самому кодуванні UTF-16, із прямим або зворотним порядком байтів, що і початковий файл. Таким чином можна запобігти перетворенню даних у кодування UTF-8. До файла буде записано відповідну позначку порядку байтів UTF-16. Вимкнути цей параметр можна за допомогою параметра C<-ascii>." #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "Припускати, що кодуванням вхідних файлів є UTF-16LE." #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "Якщо у початковому файлі є позначка порядку байтів (BOM), її буде використано у файлі-результаті, незалежно від використання цього параметра." #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "Якщо вами було зроблено помилкове припущення щодо формату файла (файл вхідних даних насправді не є файлом у форматі UTF-16LE), і дані вдасться успішно перетворити, ви отримаєте файл у кодуванні UTF-8 з помилковим вмістом. Скасувати таке помилкове перетворення можна за допомогою зворотного перетворення iconv(1) з даних у форматі UTF-8 на дані у форматі UTF-16LE. Таким чином ви повернетеся до початкового кодування даних у файлі." #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "Припущення щодо форматування UTF-16LE працює як визначення I<режиму перетворення>. Перемиканням на типовий режим I<ascii> можна вимкнути припущення щодо форматування UTF-16LE." #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "Припускати, що вхідним форматом є UTF-16BE." #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "Цей параметр працює у спосіб, тотожний до параметра C<-ul>." #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "Виводити докладні повідомлення. Буде показано додаткові дані щодо позначок порядку байтів та кількості перетворених символів розриву рядків." #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "Переходити за символічними посиланням і перетворювати файли, на які вони вказують." #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "Замінити символічні посилання перетвореними файлами (початкові файли, на які вони вказують, змінено не буде)." #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Не змінювати символічні посилання та файли, на які вони посилаються (типово)." #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "Вивести дані щодо версії і завершити роботу." #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "РЕЖИМ MAC" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "У звичайному режимі розриви рядків DOS перетворюються на розриви рядків Unix, і навпаки. Розриви рядків Mac перетворенню не підлягають." #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "У режимі Mac розриви рядків Mac перетворюються на розриви рядків Unix, і навпаки. Розриви рядків DOS перетворенню не підлягають." #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "Щоб запустити програму у режимі перетворення Mac, скористайтеся параметром командного рядка C<-c mac> або програмами C<mac2unix> та C<unix2mac>." #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "РЕЖИМИ ПЕРЕТВОРЕННЯ" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "У режимі C<ascii> виконуватиметься лише перетворення символів розриву рядків. Цей режим є типовим режимом перетворення." #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "Хоча цей режим і називається режимом ASCII (стандарту 7-бітового кодування), насправді кодування символів у ньому є 8-бітовим. Завжди користуйтеся цим режимом для перетворення файлів у кодуванні UTF-8 (Unicode)." #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "У цьому режимі усі 8-бітові символи, які не є частиною ASCII, (з номерами від 128 до 255) буде перетворено на відповідні 7-бітові символи." #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Перетворення символів буде виконано з кодування (кодової сторінки) DOS до кодування ISO-8859-1 (Latin-1) у Unix. Символи DOS, які не мають еквівалентів у ISO-8859-1 і перетворення яких неможливе, буде перетворено на символ крапки. Те саме стосується символів ISO-8859-1, які не мають еквівалентів у DOS." #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "Якщо буде використано лише параметр C<-iso>, програма dos2unix спробує визначити активне кодування. Якщо це виявиться неможливим, dos2unix використає типове кодування CP437, яке здебільшого використовується у США. Щоб примусово визначити кодування, скористайтеся параметром C<-437> (США), C<-850> (західноєвропейські мови), C<-860> (португальська), C<-863> (канадська французька) або C<-865> (скандинавські мови). Використати кодування Windows CP1252 (західноєвропейські мови) можна за допомогою параметра C<-1252>. Для інших кодувань використовуйте поєднання dos2unix з iconv(1). Програма iconv здатна виконувати перетворення даних у доволі широкому спектрі кодувань символів." #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "Ніколи не користуйтеся перетворенням ISO для текстових файлів у форматі Unicode. Використання подібного перетворення призведе до ушкодження вмісту файлів у кодуванні UTF-8." #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "Декілька прикладів:" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -931,12 +1009,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -946,12 +1024,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix:" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -961,12 +1039,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix (Unicode):" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -976,12 +1054,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS:" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -991,12 +1069,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850:" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1006,12 +1084,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252:" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1021,12 +1099,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні Windows CP1252:" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1036,142 +1114,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "Див. також L<http://czyborra.com/charsets/codepages.html> та L<http://czyborra.com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "Кодування" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "Існує декілька різних кодувань Unicode. У Unix та Linux у файлах Unicode здебільшого використовується кодування UTF-8. У Windows для текстових файлів Unicode може бути використано кодування UTF-8, UTF-16 або UTF-16 зі зворотним порядком байтів. Втім, здебільшого, використовується формат UTF-16." #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "Перетворення" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "У текстових файлах Unicode, як і у звичайних текстових файлах, може бути використано розриви рядків DOS, Unix або Mac." #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "Усі версії dos2unix та unix2dos здатні виконувати перетворення у кодуванні UTF-8, оскільки UTF-8 було розроблено так, що зворотну сумісність з ASCII збережено." #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "Програми dos2unix та unix2dos, зібрані з підтримкою Unicode UTF-16, можуть читати текстові файли у кодуванні UTF-16 з прямим та зворотним порядком байтів. Щоб дізнатися про те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "У Unix/Linux файли у кодуванні UTF-16 перетворюються на файли у кодуванні локалі. Для визначення поточного кодування символів локалі скористайтеся командою locale(1). Якщо перетворення виявиться неможливим, програма повідомить про помилку перетворення і пропустить відповідний файл." #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "У Windows файли UTF-16 типово буде перетворено на файли UTF-8. Обидва типи систем, Windows та Unix/Linux, мають непогані можливості з підтримки файлів у форматуванні UTF-8." #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "Кодування UTF-16 та UTF-8 є повністю сумісними. Під час перетворення не буде втрачено жодної інформації. Якщо під час перетворення даних у кодуванні UTF-16 на дані у кодуванні UTF-8 трапиться помилка, наприклад, якщо у вхідному файлі UTF-16 міститиметься якась помилка, файл буде пропущено." #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "Якщо використано параметр C<-u>, файл результатів буде записано у тому самому кодуванні UTF-16, що і початковий файл. Використання параметра Option C<-u> запобігає перетворенню даних у кодування UTF-8." #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "У dos2unix та unix2dos не передбачено параметра для перетворення даних у кодуванні UTF-8 на дані у кодуванні UTF-16." #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Режим перетворення ISO та 7-бітовий режим не працюють для файлів UTF-16." #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "Позначка порядку байтів" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "У Windows до текстових файлів у кодуванні Unicode типово дописується позначка порядку байтів (BOM), оскільки багато програм Windows (зокрема Notepad) додають таку позначку автоматично. Див. також L<http://en.wikipedia.org/wiki/Byte_order_mark>." #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "У Unix файли у кодуванні Unicode типово не містять позначки порядку байтів. Вважається, що кодуванням текстових файлів є те кодування, яке визначається поточною локаллю." #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "Програма dos2unix може визначити, чи є кодуванням файла UTF-16, лише якщо у файлі міститься позначка порядку байтів. Якщо у файлі, де використано кодування UTF-16, немає такої позначки, dos2unix вважатиме такий файл двійковим (бінарним)." #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "Для перетворення файлів UTF-16 без позначки порядку байтів скористайтеся параметром C<-ul> або C<-ub>." #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "Типово dos2unix не записує до файлів результатів перетворення позначки порядку байтів (BOM). Якщо використано параметр C<-b>, dos2unix запише до файла результатів BOM, якщо BOM була у файлі початкових даних." #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "Типово unix2dos записує позначку порядку байтів (BOM) до файла результатів, якщо BOM є у початковому файлі. Скористайтеся параметром C<-r>, щоб вилучити BOM." #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "Dos2unix та unix2dos завжди записують до файла результатів позначку порядку байтів (BOM), якщо використано параметр C<-m>." #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Назви файлів у Unicode у Windows" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "У dos2unix передбачено підтримку читання і запису назв файлів Unicode у командному рядку Windows. Це означає, що dos2unix може відкривати файли, у назвах яких є символи, які не є частиною типової системної кодової сторінки ANSI. Щоб визначити, чи зібрано dos2unix для Windows з підтримкою назв файлів у кодуванні Unicode, скористайтеся командою C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "Із показом назв файлів у кодуванні Unicode у консолі Windows пов’язано декілька проблем. Див. параметр C<-D>, C<--display-enc>. Назви файлів може бути некоректно показано у консолі, але запис цих назв відбуватиметься належним чином." #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Приклади для Unicode" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "Перетворити дані з Windows UTF-16 (з позначкою порядку байтів (BOM)) у формат Unix UTF-8:" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1181,12 +1259,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі UTF-8 Unix:" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1196,12 +1274,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 без BOM:" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1211,12 +1289,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16:" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1226,47 +1304,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030 є китайським урядовим стандартом. Підтримка обов’язкової підмножини стандарту GB18030 є неодмінною вимогою до будь-яких програмних продуктів, які продаються у Китаї. Див. також L<http://en.wikipedia.org/wiki/GB_18030>." #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "Кодування GB18030 є повністю сумісним із Unicode. Його можна розглядати як формат перетворення unicode. Подібно до UTF-8, GB18030 є сумісним із ASCII. GB18030 також є сумісним із кодовою сторінкою Windows 936, яку ще називають GBK." #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "У Unix/Linux файли UTF-16 буде перетворено до кодування GB18030, якщо кодуванням локалі є GB18030. Зауважте, що це спрацює, лише якщо підтримку локалі передбачено у системі. Щоб отримати список підтримуваних локалей, скористайтеся командою C<locale -a>." #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "У Windows для перетворення файлів UTF-16 на файли GB18030 слід вказати параметр C<-gb>." #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "У файлах у кодуванні GB18030 може міститися позначка порядку байтів, так само, як у файлах у кодуванні Unicode." #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "ПРИКЛАДИ" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "Прочитати вхідні дані зі стандартного джерела (stdin) і записати результат до стандартного виведення (stdout):" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1278,12 +1356,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і замістити цей файл:" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1295,12 +1373,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii:" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1310,12 +1388,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "Перетворити дані у a.txt і замістити файл у режимі перетворення ascii. Перетворити дані у b.txt і замістити цей файл у режимі 7-бітового перетворення:" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1329,12 +1407,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "Перетворити файл a.txt з формату Mac на формат Unix:" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1346,12 +1424,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "Перетворити файл a.txt з формату Unix на формат Mac:" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1363,12 +1441,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "Перетворити дані у a.txt, замістити цей файл і зберегти часову позначку початкового файла:" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1380,12 +1458,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt:" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1395,12 +1473,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "Перетворити дані у файлі a.txt і записати результати до файла e.txt. Скопіювати часову позначку файла a.txt для файла e.txt:" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1410,12 +1488,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "Перетворити дані у a.txt і замістити цей файл. Перетворити дані у b.txt і записати результат до e.txt:" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1427,12 +1505,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "Перетворити дані у c.txt і записати результати до e.txt. Перетворити дані у a.txt і замістити ними цей файл. Перетворити дані у b.txt і замістити ними цей файл. Перетворити дані у d.txt і записати результати до f.txt:" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1442,17 +1520,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "РЕКУРСИВНЕ ПЕРЕТВОРЕННЯ" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "У оболонці UNIX можна скористатися командами find(1) і xargs(1) для запуску dos2unix рекурсивно для усіх текстових файлів у ієрархії каталогів. Наприклад, щоб виконати перетворення усіх файлів .txt у структурі підкаталогів поточного каталогу, віддайте таку команду:" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1462,12 +1540,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "Параметр find(1) C<-print0> і відповідний параметр xargs(1) C<-0> потрібні, якщо у назва файлів є пробіли або лапки. Інакше, ці параметри можна пропустити. Іншим варіантом дій є використання find(1) з параметром C<-exec>:" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1477,12 +1555,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "У командному рядку Windows можна скористатися такою командою:" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1492,12 +1570,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "Користувачі PowerShell можуть скористатися такою командою у Windows PowerShell:" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1507,22 +1585,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "ЛОКАЛІЗАЦІЯ" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "Основна мова визначається за допомогою змінної середовища LANG. Значення змінної LANG складається з декількох частин. Перша частина записується малими літерами і визначає код мови. Друга частина є необов’язковою, визначає код країни і записується прописними літерами, відокремлюється від першої частини символом підкреслювання. Передбачено також необов’язкову третю частину: кодування. Ця частина відокремлюється від другої частини крапкою. Ось декілька прикладів для командних оболонок стандартного типу POSIX:" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1544,47 +1622,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "Повний список мов та кодів країн наведено у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "У системах Unix для отримання даних щодо локалі можна скористатися командою locale(1)." #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "За допомогою змінної середовища LANGUAGE ви можете вказати список пріоритеності мов. Записи у списку слід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Наприклад, перша голландська, далі німецька: C<LANGUAGE=nl:de>. Спочатку вам слід увімкнути локалізацію, встановивши для змінної LANG (або LC_ALL) значення, відмінне від «C». Далі ви зможете використовувати список пріоритетності мов за допомогою змінної LANGUAGE. Додаткові відомості можна знайти у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "Якщо вами буде вибрано мову, перекладу якою немає, буде показано стандартні повідомлення англійською мовою." #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "Змінну LOCALEDIR, встановлену під час збирання програми, можна змінити за допомогою змінної середовища DOS2UNIX_LOCALEDIR. LOCALEDIR використовується для пошуку файлів перекладів. Типовим значенням у системах GNU є C</usr/local/share/locale>. Переглянути поточне значення змінної LOCALEDIR можна переглянути за допомогою параметра B<--version>." #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "Приклад (командна оболонка POSIX):" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1594,72 +1672,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "ПОВЕРНУТЕ ЗНАЧЕННЯ" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "Якщо завдання вдасться успішно виконати, програма поверне нульовий код виходу. Якщо станеться системна помилка, буде повернуто код цієї помилки. Якщо станеться якась інша помилка, буде повернуто код 1." #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "У режимі без повідомлень повернутим значенням завжди буде нуль, якщо вказано правильні параметри командного рядка." #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "СТАНДАРТИ" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://uk.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://uk.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://uk.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "АВТОРИ" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (режим mac2unix) - <wuebben@kde.org>, Christian Wurll (додатковий новий рядок) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (супровідник)" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Сторінка проекту: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Сторінка на SourceForge: L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "ТАКОЖ ПЕРЕГЛЯНЬТЕ" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" diff --git a/po-man/zh_CN.po b/po-man/zh_CN.po index 3b68303..ed130ac 100644 --- a/po-man/zh_CN.po +++ b/po-man/zh_CN.po @@ -4,9 +4,9 @@ # Tianze Wang <zwpwjwtz@126.com>, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-7.3.5-beta5\n" -"POT-Creation-Date: 2017-06-20 22:06+0200\n" -"PO-Revision-Date: 2017-06-26 13:21+0800\n" +"Project-Id-Version: dos2unix-man-7.3.6-beta4\n" +"POT-Creation-Date: 2017-10-10 19:40+0200\n" +"PO-Revision-Date: 2017-09-22 23:08+0200\n" "Last-Translator: Tianze Wang <zwpwjwtz@126.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0.1\n" +"X-Generator: Poedit 2.0.2\n" #. type: =head1 #: dos2unix.pod:52 @@ -112,7 +112,7 @@ msgstr "" #. type: textblock #: dos2unix.pod:104 msgid "Or in new file mode:" -msgstr "或者在新文件模式中：" +msgstr "或者在新文件模式下：" #. type: verbatim #: dos2unix.pod:106 @@ -126,256 +126,271 @@ msgstr "" #. type: =item #: dos2unix.pod:108 +msgid "B<--allow-chown>" +msgstr "B<--allow-chown>" + +#. type: textblock +#: dos2unix.pod:110 +msgid "Allow file ownership change in old file mode." +msgstr "在旧文件模式下，允许修改文件的所有者。" + +#. type: textblock +#: dos2unix.pod:112 +msgid "When this option is used, the conversion will not be aborted when the user and/or group ownership of the original file can't be preserved in old file mode. Conversion will continue and the converted file will get the same new ownership as if it was converted in new file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "若使用此选项，将允许在转换文件时原始文件的属主或属组发生变更，类似于使用新文件模式进行转换。另请参见选项C<-o> 和 C<-n>。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。" + +#. type: =item +#: dos2unix.pod:119 msgid "B<-ascii>" msgstr "B<-ascii>" #. type: textblock -#: dos2unix.pod:110 +#: dos2unix.pod:121 msgid "Convert only line breaks. This is the default conversion mode." msgstr "只转换断行符。这是默认的转换模式。" #. type: =item -#: dos2unix.pod:112 +#: dos2unix.pod:123 msgid "B<-iso>" msgstr "B<-iso>" #. type: textblock -#: dos2unix.pod:114 +#: dos2unix.pod:125 msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." msgstr "在DOS和ISO-8859-1字符集之间转换。参见 CONVERSION MODES 一节。" #. type: =item -#: dos2unix.pod:117 +#: dos2unix.pod:128 msgid "B<-1252>" msgstr "B<-1252>" #. type: textblock -#: dos2unix.pod:119 +#: dos2unix.pod:130 msgid "Use Windows code page 1252 (Western European)." msgstr "使用Windows 1252 编码页（西欧）。" #. type: =item -#: dos2unix.pod:121 +#: dos2unix.pod:132 msgid "B<-437>" msgstr "B<-437>" #. type: textblock -#: dos2unix.pod:123 +#: dos2unix.pod:134 msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." msgstr "使用DOS 437 编码页（美国）。这是ISO转换时的默认编码页。" #. type: =item -#: dos2unix.pod:125 +#: dos2unix.pod:136 msgid "B<-850>" msgstr "B<-850>" #. type: textblock -#: dos2unix.pod:127 +#: dos2unix.pod:138 msgid "Use DOS code page 850 (Western European)." msgstr "使用DOS 850 编码页（西欧）。" #. type: =item -#: dos2unix.pod:129 +#: dos2unix.pod:140 msgid "B<-860>" msgstr "B<-860>" #. type: textblock -#: dos2unix.pod:131 +#: dos2unix.pod:142 msgid "Use DOS code page 860 (Portuguese)." msgstr "使用DOS 860 编码页（葡萄牙）。" #. type: =item -#: dos2unix.pod:133 +#: dos2unix.pod:144 msgid "B<-863>" msgstr "B<-863>" #. type: textblock -#: dos2unix.pod:135 +#: dos2unix.pod:146 msgid "Use DOS code page 863 (French Canadian)." msgstr "使用DOS 863 编码页（加拿大法语）。" #. type: =item -#: dos2unix.pod:137 +#: dos2unix.pod:148 msgid "B<-865>" msgstr "B<-865>" #. type: textblock -#: dos2unix.pod:139 +#: dos2unix.pod:150 msgid "Use DOS code page 865 (Nordic)." msgstr " 使用DOS 865 编码页（北欧）。" #. type: =item -#: dos2unix.pod:141 +#: dos2unix.pod:152 msgid "B<-7>" msgstr "B<-7>" #. type: textblock -#: dos2unix.pod:143 +#: dos2unix.pod:154 msgid "Convert 8 bit characters to 7 bit space." msgstr "将8位字符转换到7位空间。" #. type: =item -#: dos2unix.pod:145 +#: dos2unix.pod:156 msgid "B<-b, --keep-bom>" msgstr "B<-b, --keep-bom>" #. type: textblock -#: dos2unix.pod:147 +#: dos2unix.pod:158 msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>." msgstr "保留字节序标记（BOM）。当输入文件含有BOM头时，也向输出文件写入BOM。这是转换到DOS断行符时的默认行为。参见选项 C<-r>。" #. type: =item -#: dos2unix.pod:151 +#: dos2unix.pod:162 msgid "B<-c, --convmode CONVMODE>" msgstr "B<-c, --convmode 转换模式>" #. type: textblock -#: dos2unix.pod:153 +#: dos2unix.pod:164 msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default." msgstr "改变转换模式。转换模式可以为：I<ascii>、I<7bit>、I<iso>或I<mac>，默认为ascii。" #. type: =item -#: dos2unix.pod:157 +#: dos2unix.pod:168 msgid "B<-D, --display-enc ENCODING>" msgstr "B<-D, --display-enc ENCODAGE>" #. type: textblock -#: dos2unix.pod:159 +#: dos2unix.pod:170 msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<unicodebom>, I<utf8>, I<utf8bom> with ansi being the default." msgstr "设置显示文本的编码。编码可以为：I<ansi>、I<unicode>、I<unicodebom>、I<utf8>、I<utf8bom>，默认为 ansi。" #. type: textblock -#: dos2unix.pod:163 +#: dos2unix.pod:174 msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed." msgstr "这一选项只对支持Unicode文件名的Windows版dos2unix有效。它对文件名的读写无效，只影响它们的显示结果。" #. type: textblock -#: dos2unix.pod:167 +#: dos2unix.pod:178 msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages." msgstr "在Windows控制台中，有几种可以根据文本编码来显示文本的方法。它们各有利弊。" #. type: =item -#: dos2unix.pod:173 +#: dos2unix.pod:184 msgid "B<ansi>" msgstr "B<ansi>" #. type: textblock -#: dos2unix.pod:175 +#: dos2unix.pod:186 msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page." msgstr "dos2unix默认使用ANSI编码文本。优点是它能提供向后兼容性，并能用于raster和TrueType字体。在一些地方，你可能需要使用 C<chcp> 命令将活动DOS OEM编码页设置为Windows系统ANSI编码页，因为dos2unix使用Windows系统编码页。" #. type: textblock -#: dos2unix.pod:181 +#: dos2unix.pod:192 msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK." msgstr "ansi的缺点是含有非系统默认编码页中字符的国际化文件名将无法被正确显示。你会看到一些问号或其他错误的字符。如果你不需要处理外文文件名，这一方法是不错的选择。" #. type: =item -#: dos2unix.pod:186 +#: dos2unix.pod:197 msgid "B<unicode, unicodebom>" msgstr "B<unicode，unicodebom>" #. type: textblock -#: dos2unix.pod:188 +#: dos2unix.pod:199 msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it." msgstr "Unicode编码（Windows中对UTF-16的称呼）的优点是文本可以被正确显示，也无需改变活动编码页。你可能需要设置终端字体为TrueType以便正确显示国际化字符。如果TrueType字体中不包含某个字符，你会看到一个小方块，有时方块中还会有一个问号。" #. type: textblock -#: dos2unix.pod:194 +#: dos2unix.pod:205 msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font." msgstr "当你使用ConEmu终端时，所以的文本将会被正确显示，因为ConEmu会自动选择合适的字体。" #. type: textblock -#: dos2unix.pod:197 +#: dos2unix.pod:208 msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program." msgstr "Unicode的缺点在于它与ASCII不兼容。当你将输出重定向到其他程序或文件时，它可能不那么容易控制" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:211 msgid "When method C<unicodebom> is used the Unicode text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "当使用 C<unicodebom> 方法时，将会在Unicode文本前添加一个BOM（字节序标记）。在PowerShell中，需要根据BOM来进行正确的重定向或管道输出。" #. type: =item -#: dos2unix.pod:205 +#: dos2unix.pod:216 msgid "B<utf8, utf8bom>" msgstr "B<utf8，utf8bom>" #. type: textblock -#: dos2unix.pod:207 +#: dos2unix.pod:218 msgid "The advantage of utf8 is that it is compatible with ASCII. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding." msgstr "utf8的优点在于它与ASCII兼容。你需要设置终端的字体为TrueType字体。使用TrueType字体可以使得文本得以正确显示，就像使用 C<unicode> 编码时那样。" #. type: textblock -#: dos2unix.pod:211 +#: dos2unix.pod:222 msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed." msgstr "缺点是当你使用默认的raster字体时，所有的非ASCII字符将无法被正确显示。不仅是unicode文件名，连翻译的消息也无法被读取。在配置为东亚地区的Windows中，当终端中显示这些消息时你可能会看到闪烁现象。" #. type: textblock -#: dos2unix.pod:217 +#: dos2unix.pod:228 msgid "In a ConEmu console the utf8 encoding method works well." msgstr "在ConEmu终端中，utf编码方式可以正常工作。" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:230 msgid "When method C<utf8bom> is used the UTF-8 text will be preceded with a BOM (Byte Order Mark). A BOM is required for correct redirection or piping in PowerShell." msgstr "当使用 C<utf8bom> 方法时，将会在Unicode文本前添加一个BOM（字节序标记）。在PowerShell中，需要根据BOM来进行正确的重定向或管道输出。" #. type: textblock -#: dos2unix.pod:226 +#: dos2unix.pod:237 msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode>, C<unicodebom>, C<utf8>, or C<utf8bom>." msgstr "默认的编码方式可以通过设置 DOS2UNIX_DISPLAY_ENC 环境变量为 C<unicode> 、C<unicodebom>、C<utf8> 或 C<utf8bom> 来改变。" #. type: =item -#: dos2unix.pod:229 +#: dos2unix.pod:240 msgid "B<-f, --force>" msgstr "B<-f, --force>" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:242 msgid "Force conversion of binary files." msgstr "强制转换二进制文件。" #. type: =item -#: dos2unix.pod:233 +#: dos2unix.pod:244 msgid "B<-gb, --gb18030>" msgstr "B<-gb, --gb18030>" #. type: textblock -#: dos2unix.pod:235 +#: dos2unix.pod:246 msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030." msgstr "在Windows中，UTF-16默认被转换为UTF-8格式，无论区域设置为何。请使用这一选项将UTF-16文件转换为GB18030格式。此选项只在Windows下有效。参加 GB18030 一节。" #. type: =item -#: dos2unix.pod:239 +#: dos2unix.pod:250 msgid "B<-h, --help>" msgstr "B<-h, --help>" #. type: textblock -#: dos2unix.pod:241 +#: dos2unix.pod:252 msgid "Display help and exit." msgstr "显示帮助，然后退出。" #. type: =item -#: dos2unix.pod:243 +#: dos2unix.pod:254 msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>" msgstr "B<-i[标志], --info[=标志] 文件 …>" #. type: textblock -#: dos2unix.pod:245 +#: dos2unix.pod:256 msgid "Display file information. No conversion is done." msgstr "显示文件信息。不进行转换。" #. type: textblock -#: dos2unix.pod:247 +#: dos2unix.pod:258 msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name." msgstr "将会显示下列信息（按顺序）：DOS断行符的数量、Unix断行符的数量、Mac断行符的数量、是否有BOM、文本/二进制、文件名。" #. type: textblock -#: dos2unix.pod:251 +#: dos2unix.pod:262 msgid "Example output:" msgstr "输出示例：" #. type: verbatim -#: dos2unix.pod:253 +#: dos2unix.pod:264 #, no-wrap msgid "" " 6 0 0 no_bom text dos.txt\n" @@ -399,122 +414,122 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:262 +#: dos2unix.pod:273 msgid "Note that sometimes a binary file can be mistaken for a text file. See also option C<-s>." msgstr "注意，二进制文件有时会被误判为文本文件。参见选项 C<-s>。" #. type: textblock -#: dos2unix.pod:264 +#: dos2unix.pod:275 msgid "Optionally extra flags can be set to change the output. One or more flags can be added." msgstr "可以为输出设置额外的标志（一个或多个）。" #. type: =item -#: dos2unix.pod:269 +#: dos2unix.pod:280 msgid "B<0>" msgstr "B<0>" #. type: textblock -#: dos2unix.pod:271 +#: dos2unix.pod:282 msgid "Print the file information lines followed by a null character instead of a newline character. This enables correct interpretation of file names with spaces or quotes when flag c is used. Use this flag in combination with xargs(1) option C<-0> or C<--null>." msgstr "使用零字符（\"\\0\"）而非换行符来分割文件信息行。用于在指定了 c 选项的情况下，正确解析含有空格或引号的文件名。请结合 xargs(1) 的选项 C<-0> 或 C<--null> 来使用。" #. type: =item -#: dos2unix.pod:276 +#: dos2unix.pod:287 msgid "B<d>" msgstr "B<d>" #. type: textblock -#: dos2unix.pod:278 +#: dos2unix.pod:289 msgid "Print number of DOS line breaks." msgstr "显示DOS断行符的数量。" #. type: =item -#: dos2unix.pod:280 +#: dos2unix.pod:291 msgid "B<u>" msgstr "B<u>" #. type: textblock -#: dos2unix.pod:282 +#: dos2unix.pod:293 msgid "Print number of Unix line breaks." msgstr "显示Unix断行符的数量。" #. type: =item -#: dos2unix.pod:284 +#: dos2unix.pod:295 msgid "B<m>" msgstr "B<m>" #. type: textblock -#: dos2unix.pod:286 +#: dos2unix.pod:297 msgid "Print number of Mac line breaks." msgstr "显示Mac断行符的数量。" #. type: =item -#: dos2unix.pod:288 +#: dos2unix.pod:299 msgid "B<b>" msgstr "B<b>" #. type: textblock -#: dos2unix.pod:290 +#: dos2unix.pod:301 msgid "Print the byte order mark." msgstr "显示BOM状况。" #. type: =item -#: dos2unix.pod:292 +#: dos2unix.pod:303 msgid "B<t>" msgstr "B<t>" #. type: textblock -#: dos2unix.pod:294 +#: dos2unix.pod:305 msgid "Print if file is text or binary." msgstr "显示文件为文本或二进制。" #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:307 msgid "B<c>" msgstr "B<c>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:309 msgid "Print only the files that would be converted." msgstr "只显示将会被转换的文件。" #. type: textblock -#: dos2unix.pod:300 +#: dos2unix.pod:311 msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks." msgstr "若设置了 C<c>标志，dos2unix将只显示含有DOS断行符的文件，unix2dos将只显示含有Unix断行符的文件。" #. type: =item -#: dos2unix.pod:303 +#: dos2unix.pod:314 msgid "B<h>" msgstr "B<h>" #. type: textblock -#: dos2unix.pod:305 +#: dos2unix.pod:316 msgid "Print a header." msgstr "显示头部。" #. type: =item -#: dos2unix.pod:307 +#: dos2unix.pod:318 msgid "B<p>" msgstr "B<p>" #. type: textblock -#: dos2unix.pod:309 +#: dos2unix.pod:320 msgid "Show file names without path." msgstr "显示不含路径的文件名。" #. type: textblock -#: dos2unix.pod:313 +#: dos2unix.pod:324 msgid "Examples:" msgstr "示例：" #. type: textblock -#: dos2unix.pod:315 +#: dos2unix.pod:326 msgid "Show information for all *.txt files:" msgstr "显示所有 *.txt 文件的信息：" #. type: verbatim -#: dos2unix.pod:317 +#: dos2unix.pod:328 #, no-wrap msgid "" " dos2unix -i *.txt\n" @@ -524,12 +539,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:319 +#: dos2unix.pod:330 msgid "Show only the number of DOS line breaks and Unix line breaks:" msgstr "只显示DOS断行符和Unix断行符的数量：" #. type: verbatim -#: dos2unix.pod:321 +#: dos2unix.pod:332 #, no-wrap msgid "" " dos2unix -idu *.txt\n" @@ -539,12 +554,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:323 +#: dos2unix.pod:334 msgid "Show only the byte order mark:" msgstr "只显示BOM状况：" #. type: verbatim -#: dos2unix.pod:325 +#: dos2unix.pod:336 #, no-wrap msgid "" " dos2unix --info=b *.txt\n" @@ -554,12 +569,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:327 +#: dos2unix.pod:338 msgid "List the files that have DOS line breaks:" msgstr "列出含有DOS断行符的文件：" #. type: verbatim -#: dos2unix.pod:329 +#: dos2unix.pod:340 #, no-wrap msgid "" " dos2unix -ic *.txt\n" @@ -569,12 +584,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:331 +#: dos2unix.pod:342 msgid "List the files that have Unix line breaks:" msgstr "列出含有Unix断行符的文件：" #. type: verbatim -#: dos2unix.pod:333 +#: dos2unix.pod:344 #, no-wrap msgid "" " unix2dos -ic *.txt\n" @@ -584,12 +599,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:335 +#: dos2unix.pod:346 msgid "Convert only files that have DOS line breaks and leave the other files untouched:" msgstr "只转换含有DOS断行符的文件，保持其他文件不变：" #. type: verbatim -#: dos2unix.pod:337 +#: dos2unix.pod:348 #, no-wrap msgid "" " dos2unix -ic0 *.txt | xargs -0 dos2unix\n" @@ -599,12 +614,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:339 +#: dos2unix.pod:350 msgid "Find text files that have DOS line breaks:" msgstr "查找含有DOS断行符的文本文件：" #. type: verbatim -#: dos2unix.pod:341 +#: dos2unix.pod:352 #, no-wrap msgid "" " find -name '*.txt' -print0 | xargs -0 dos2unix -ic\n" @@ -614,314 +629,369 @@ msgstr "" "\n" #. type: =item -#: dos2unix.pod:343 +#: dos2unix.pod:354 msgid "B<-k, --keepdate>" msgstr "B<-k, --keepdate>" #. type: textblock -#: dos2unix.pod:345 +#: dos2unix.pod:356 msgid "Keep the date stamp of output file same as input file." msgstr "将输入文件的时间戳应用到输出文件。" #. type: =item -#: dos2unix.pod:347 +#: dos2unix.pod:358 msgid "B<-L, --license>" msgstr "B<-L, --license>" #. type: textblock -#: dos2unix.pod:349 +#: dos2unix.pod:360 msgid "Display program's license." msgstr "显示程序许可证。" #. type: =item -#: dos2unix.pod:351 +#: dos2unix.pod:362 msgid "B<-l, --newline>" msgstr "B<-l, --newline>" #. type: textblock -#: dos2unix.pod:353 +#: dos2unix.pod:364 msgid "Add additional newline." msgstr "添加额外的新行。" #. type: textblock -#: dos2unix.pod:355 +#: dos2unix.pod:366 msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks." msgstr "B<dos2unix>：只有DOS断行符会被转换为两个Unix断行符。在Mac模式下，只有Mac断行符会被转换为Unix断行符。" #. type: textblock -#: dos2unix.pod:359 +#: dos2unix.pod:370 msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks." msgstr "B<unix2dos>：只有Unix断行符会被转换为两个DOS断行符。在Mac模式下，Unix断行符会被转换为两个Mac断行符。" #. type: =item -#: dos2unix.pod:362 +#: dos2unix.pod:373 msgid "B<-m, --add-bom>" msgstr "B<-m, --add-bom>" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:375 msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written." msgstr "将字节序标记（BOM）写入到输出文件。默认情况下将写入UTF-8 BOM。" #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:378 msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written." msgstr "当输入文件为UTF-16格式，并且使用了 C<-u>选项，将写入UTF-16 BOM。" #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:381 msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE." msgstr "当输出文件不是UTF-8、UTF-16或GB18030格式时，请不要使用此选项。参加 UNICODE 一节。" #. type: =item -#: dos2unix.pod:374 +#: dos2unix.pod:385 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newline 输入文件 输出文件 ...>" #. type: textblock -#: dos2unix.pod:376 +#: dos2unix.pod:387 msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files." msgstr "新文件模式。转换输入文件并写入到输出文件。文件名必须成对给出，并且 I<不能> 使用通配符，否则你 I<将会>丢失文件。" #. type: textblock -#: dos2unix.pod:380 +#: dos2unix.pod:391 msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion." msgstr "使用新文件（配对）模式转换时，命令执行者必须为文件的所有者。新文件的读/写权限将由源文件的权限减去命令执行者的 umask(1) 得到。" #. type: =item -#: dos2unix.pod:385 +#: dos2unix.pod:396 +msgid "B<--no-allow-chown>" +msgstr "B<--no-allow-chown>" + +#. type: textblock +#: dos2unix.pod:398 +msgid "Don't allow file ownership change in old file mode (default)." +msgstr "在旧文件模式下，不允许修改文件的所有者（默认选项）。" + +#. type: textblock +#: dos2unix.pod:400 +msgid "Abort conversion when the user and/or group ownership of the original file can't be preserved in old file mode. See also options C<-o> and C<-n>. This option is only available if dos2unix has support for preserving the user and group ownership of files." +msgstr "当原始文件的属主/属组无法保持不变时，停止格式转换。另请参见C<-o> 和 C<-n>选项。仅当 dos2unix 支持保护文件的属主/属组时才能使用该选项。" + +#. type: =item +#: dos2unix.pod:405 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile 文件 ...>" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:407 msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used." msgstr "旧文件模式。转换并将输出覆盖到源文件。程序默认使用此模式，允许使用通配符。" #. type: textblock -#: dos2unix.pod:390 +#: dos2unix.pod:410 msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix." msgstr "在旧文件（替换）模式下，被转换的文件的所有者、组和读/写权限保持不变。当文件被其他具有写权限的用户（如root）转换时，情况也是如此。如果无法保持这些值不变，转换将会终止。改变源文件的所有者可能造成其无法读取该文件，而改变组则可能带来安全隐患，使文件被不法分子读取。只有Unix才支持转换时保留所有者、组和读/写权限。" +#. type: textblock +#: dos2unix.pod:419 +msgid "To check if dos2unix has support for preserving the user and group ownership of files type C<dos2unix -V>." +msgstr "若要查看 dos2unix 是否支持保护文件的所有者，请输入C<dos2unix -V>。" + +#. type: textblock +#: dos2unix.pod:422 +msgid "Conversion is always done via a temporary file. When an error occurs halfway the conversion, the temporary file is deleted and the original file stays intact. When the conversion is successful, the original file is replaced with the temporary file. You may have write permission on the original file, but no permission to put the same user and/or group ownership properties on the temporary file as the original file has. This means you are not able to preserve the user and/or group ownership of the original file. In this case you can use option C<--allow-chown> to continue with the conversion:" +msgstr "dos2unix 在转换格式时会生成一个临时文件。如果在转换时出错，它会删除临时文件，从而保证原始文件不被更改；如果转换成功，将用临时文件替换原始文件。在这一过程中，如果 dos2unix 无法将临时文件的所有者设置为原始文件的所有者，那么新生成的文件也无法保留原始文件的属主/属组属性（即便您对原始文件有写入权限）。在这种情况下，可以使用C<--allow-chown>选项来继续进行转换：" + +#. type: verbatim +#: dos2unix.pod:431 +#, no-wrap +msgid "" +" dos2unix --allow-chown foo.txt\n" +"\n" +msgstr "" +" dos2unix --allow-chown foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:433 +msgid "Another option is to use new file mode:" +msgstr "或者在新文件模式下：" + +#. type: verbatim +#: dos2unix.pod:435 +#, no-wrap +msgid "" +" dos2unix -n foo.txt foo.txt\n" +"\n" +msgstr "" +" dos2unix -n foo.txt foo.txt\n" +"\n" + +#. type: textblock +#: dos2unix.pod:437 +msgid "The advantage of the C<--allow-chown> option is that you can use wildcards, and the ownership properties will be preserved when possible." +msgstr "使用C<--allow-chown>选项的好处在于：您可以使用通配符来操作文件，同时尽可能保持文件的所有者不变。" + #. type: =item -#: dos2unix.pod:399 +#: dos2unix.pod:440 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:401 +#: dos2unix.pod:442 msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." msgstr "安静模式。不显示任何警告或信息。返回值为0，除非命令行选项有误。" #. type: =item -#: dos2unix.pod:404 +#: dos2unix.pod:445 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:406 +#: dos2unix.pod:447 msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>." msgstr "移除字节序标记（BOM），不写入BOM到输出文件。这是转换到Unix断行符时的默认行为。参见选项 C<-b>。" #. type: =item -#: dos2unix.pod:410 +#: dos2unix.pod:451 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:412 +#: dos2unix.pod:453 msgid "Skip binary files (default)." msgstr "跳过二进制文件（默认）。" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:455 msgid "The skipping of binary files is done to avoid accidental mistakes. Be aware that the detection of binary files is not 100% foolproof. Input files are scanned for binary symbols which are typically not found in text files. It is possible that a binary file contains only normal text characters. Such a binary file will mistakenly be seen as a text file." msgstr "跳过二进制文件是为了避免可能的错误。请注意，对二进制文件的探测并不能做到100%准确。程序通过扫描二进制文件所特有的标记来将其与文本文件区分开来，但有的二进制文件可能只包含普通的文本字符，这样的文件就会被误判为文本文件。" #. type: =item -#: dos2unix.pod:420 +#: dos2unix.pod:461 msgid "B<-u, --keep-utf16>" msgstr "B<-u, --keep-utf16>" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:463 msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option." msgstr "保留输入文件的UTF-16编码。输出文件也使用UTF-16编码和相同的尾序。这将阻止转换到UTF-8。相应也会写入UTF-16 BOM。可以用 C<-ascii>选项来禁止。" #. type: =item -#: dos2unix.pod:427 +#: dos2unix.pod:468 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:429 +#: dos2unix.pod:470 msgid "Assume that the input file format is UTF-16LE." msgstr "假定输入文件格式为UTF-16LE。" #. type: textblock -#: dos2unix.pod:431 +#: dos2unix.pod:472 msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." msgstr "输入文件中有BOM时，将会覆盖此选项。" #. type: textblock -#: dos2unix.pod:434 +#: dos2unix.pod:475 msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file." msgstr "如果你做了错误的假设（输入文件不为UTF-16LE格式），并且转换成功，你将会得到一个错误的UTF-8格式的文件。你可以用 iconv(1) 来撤销转换，将其从UTF-8转换回UTF-16LE。这样做可以恢复源文件。" #. type: textblock -#: dos2unix.pod:439 +#: dos2unix.pod:480 msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off." msgstr "对UTF-16LE的假定将根据 l<转换模式> 来工作。若改变了默认的 l<ascii> 模式，则这一假定将会被关闭。" #. type: =item -#: dos2unix.pod:442 +#: dos2unix.pod:483 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:444 +#: dos2unix.pod:485 msgid "Assume that the input file format is UTF-16BE." msgstr "假定输入文件格式为UTF-16BE。" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:487 msgid "This option works the same as option C<-ul>." msgstr "这一选项与 C<-ul> 类似。" #. type: =item -#: dos2unix.pod:448 +#: dos2unix.pod:489 msgid "B<-v, --verbose>" msgstr "B<-v, --verbose>" #. type: textblock -#: dos2unix.pod:450 +#: dos2unix.pod:491 msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks." msgstr "显示更多信息。将会显示有关BOM和转换统计的额外信息。" #. type: =item -#: dos2unix.pod:453 +#: dos2unix.pod:494 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:455 +#: dos2unix.pod:496 msgid "Follow symbolic links and convert the targets." msgstr "追踪符号链接并转换其目标。" #. type: =item -#: dos2unix.pod:457 +#: dos2unix.pod:498 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:459 +#: dos2unix.pod:500 msgid "Replace symbolic links with converted files (original target files remain unchanged)." msgstr "将符号链接的目标替换为转换后的文件（原来的目标文件保持不变）。" #. type: =item -#: dos2unix.pod:462 +#: dos2unix.pod:503 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:464 +#: dos2unix.pod:505 msgid "Keep symbolic links and targets unchanged (default)." msgstr "保持符号链接和其目标文件不变（默认）。" #. type: =item -#: dos2unix.pod:466 +#: dos2unix.pod:507 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:509 msgid "Display version information and exit." msgstr "显示版本信息，然后退出。" #. type: =head1 -#: dos2unix.pod:472 +#: dos2unix.pod:513 msgid "MAC MODE" msgstr "Mac模式" #. type: textblock -#: dos2unix.pod:474 +#: dos2unix.pod:515 msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted." msgstr "普通模式下，断行符将被转换为DOS格式，或相反。Mac格式的断行符将不会被转换。" #. type: textblock -#: dos2unix.pod:477 +#: dos2unix.pod:518 msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed." msgstr "Mac模式下，Mac断行符将被转换为Unix格式，或相反。DOS断行符将不会被转换。" #. type: textblock -#: dos2unix.pod:480 +#: dos2unix.pod:521 msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>." msgstr "若要以Mac模式运行，请使用命令行选项 C<-c mac>，或使用命令 C<mac2unix> 或 C<unix2mac>。" #. type: =head1 -#: dos2unix.pod:483 +#: dos2unix.pod:524 msgid "CONVERSION MODES" msgstr "转换模式" #. type: =item -#: dos2unix.pod:487 +#: dos2unix.pod:528 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:489 +#: dos2unix.pod:530 msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." msgstr "在 C<ascii> 模式下，只转换断行符。 这是默认的转换模式。" #. type: textblock -#: dos2unix.pod:492 +#: dos2unix.pod:533 msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." msgstr "尽管此模式名叫“ASCII”（7位编码标准），实际上转换按照8位编码进行。转换UTF-8编码文件时请务必使用此模式。" #. type: =item -#: dos2unix.pod:496 +#: dos2unix.pod:537 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:498 +#: dos2unix.pod:539 msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." msgstr "在此模式下，所以的8位非ASCII字符（取值范围128-255）将被转换到7位编码空间。" #. type: =item -#: dos2unix.pod:501 +#: dos2unix.pod:542 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:503 +#: dos2unix.pod:544 msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart." msgstr "Unix下，将在DOS字符集（编码页）和ISO字符集 ISO-8859-1（Latin-1）之间进行转换。不具有 ISO-8859-1 中对等字符的DOS字符将会被转换为点号（“.”）。当 ISO-8859-1 字符集中没有DOS中的对等字符时也是如此。" #. type: textblock -#: dos2unix.pod:508 +#: dos2unix.pod:549 msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings." msgstr "" "当只指定了 C<-iso> 选项时，dos2unix将尝试确定当前活动代码页。若无法确定，则使用默认代码页 CP437（普遍用于美国）。若要强制指定代码页，请使用选项 C<-437>（美国）、C<-850>（西欧）、C<-860>（葡萄牙）、C<-863>（法国、加拿大）或C<-865>（北欧）。\n" "Windows CP1252代码页（西欧）也可以通过选项 C<-1252> 获得支持。若要使用其他代码页，可以结合 iconv(1) 使用dos2unix。iconv可以在很多字符编码间进行转换。" #. type: textblock -#: dos2unix.pod:517 +#: dos2unix.pod:558 msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." msgstr "不对Unicode编码文本使用ISO转换。因这一转换会导致UTF-8编码文件损坏。" #. type: textblock -#: dos2unix.pod:519 +#: dos2unix.pod:560 msgid "Some examples:" msgstr "一些示例：" #. type: textblock -#: dos2unix.pod:521 +#: dos2unix.pod:562 msgid "Convert from DOS default code page to Unix Latin-1:" msgstr "从DOS默认编码页转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:523 +#: dos2unix.pod:564 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -931,12 +1001,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:525 +#: dos2unix.pod:566 msgid "Convert from DOS CP850 to Unix Latin-1:" msgstr "从DOS CP850转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:527 +#: dos2unix.pod:568 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -946,12 +1016,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:529 +#: dos2unix.pod:570 msgid "Convert from Windows CP1252 to Unix Latin-1:" msgstr "从Windows CP1252转换到Unix Latin-1：" #. type: verbatim -#: dos2unix.pod:531 +#: dos2unix.pod:572 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -961,12 +1031,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:533 +#: dos2unix.pod:574 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):" msgstr "从WIndows CP1252转换到Unix UTF-8（Unicode）：" #. type: verbatim -#: dos2unix.pod:535 +#: dos2unix.pod:576 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -976,12 +1046,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:578 msgid "Convert from Unix Latin-1 to DOS default code page:" msgstr "从Unix Latin-1转换到DOS默认编码页：" #. type: verbatim -#: dos2unix.pod:539 +#: dos2unix.pod:580 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -991,12 +1061,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:541 +#: dos2unix.pod:582 msgid "Convert from Unix Latin-1 to DOS CP850:" msgstr "从Unix Latin-1转换到DOS CP850：" #. type: verbatim -#: dos2unix.pod:543 +#: dos2unix.pod:584 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -1006,12 +1076,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:545 +#: dos2unix.pod:586 msgid "Convert from Unix Latin-1 to Windows CP1252:" msgstr "从Unix Latin-1转换到Windows CP1252：" #. type: verbatim -#: dos2unix.pod:547 +#: dos2unix.pod:588 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -1021,12 +1091,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:549 +#: dos2unix.pod:590 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:" msgstr "从Unix UTF-8（Unicode）转换到Windows CP1252：" #. type: verbatim -#: dos2unix.pod:551 +#: dos2unix.pod:592 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -1036,142 +1106,142 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:553 +#: dos2unix.pod:594 msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>." msgstr "参见 L<http://czyborra.com/charsets/codepages.html> et L<http://czyborra.com/charsets/iso8859.html>。" #. type: =head1 -#: dos2unix.pod:558 +#: dos2unix.pod:599 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:560 +#: dos2unix.pod:601 msgid "Encodings" msgstr "编码" #. type: textblock -#: dos2unix.pod:562 +#: dos2unix.pod:603 msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format." msgstr "有几种不同的Unicode编码。对于Unix和Linux中的Unicode文件，通常为UTF-8编码。Windows中的文本文件可以是UTF-8、UTF-16或UTF-16BE编码，但大多采用UTF-16格式。" #. type: =head2 -#: dos2unix.pod:567 +#: dos2unix.pod:608 msgid "Conversion" msgstr "转换" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:610 msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." msgstr "Unicode文本文件可以含有DOS、Unix或Mac断行符，就像普通文本文件一样。" #. type: textblock -#: dos2unix.pod:572 +#: dos2unix.pod:613 msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII." msgstr "所有版本的dos2unix和unix2dos都可以转换UTF-8文件，因为UTF-8向后兼容ASCII。" #. type: textblock -#: dos2unix.pod:575 +#: dos2unix.pod:616 msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>." msgstr "含有Unicode UTF-16支持的dos2unix和unix2dos可以读取小尾序或大尾序的UTF-16编码文本。输入 C<dos2unix -V> 来确定dos2unix在编译是是否启用了UTF-16支持。" #. type: textblock -#: dos2unix.pod:579 +#: dos2unix.pod:620 msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped." msgstr "在Unix/Linux中，UTF-16编码文件将被转换为区域字符编码所指定的编码。可以使用 locale(1) 命令来查看当前的区域字符编码。若无法转换，程序将报告转换错误并跳过此文件。" #. type: textblock -#: dos2unix.pod:584 +#: dos2unix.pod:625 msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux." msgstr "在Windows中，UTF-16文件被默认转换为UTF-8格式。Windows和Unix/Linux均支持UTF-8格式的文本文件。" #. type: textblock -#: dos2unix.pod:587 +#: dos2unix.pod:628 msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped." msgstr "UTF-16和UTF-8编码相互兼容，所以彼此转换时不会丢失文本。倘若转换中出错，比如UTF-16格式的输入文件含有错误，那么该文件将被跳过。" #. type: textblock -#: dos2unix.pod:591 +#: dos2unix.pod:632 msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8." msgstr "若使用了 C<-u> 选项，输出文件将会使用和输入文件相同的UTF-16编码。C<-u>选项将阻止程序转换到UTF-8。" #. type: textblock -#: dos2unix.pod:594 +#: dos2unix.pod:635 msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." msgstr "dos2unix和unix2dos没有用于转换UTF-8到UTF-16的选项。" #. type: textblock -#: dos2unix.pod:596 +#: dos2unix.pod:637 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "ISO和7位编码模式的转换无法用于UTF-16文件。" #. type: =head2 -#: dos2unix.pod:598 +#: dos2unix.pod:639 msgid "Byte Order Mark" msgstr "字节序标记" #. type: textblock -#: dos2unix.pod:600 +#: dos2unix.pod:641 msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>." msgstr "在Windows中，文本文件一般含有字节序标记（BOM），因为很多Windows程序（包括记事本）默认添加BOM。参见 L<http://en.wikipedia.org/wiki/Byte_order_mark>。" #. type: textblock -#: dos2unix.pod:604 +#: dos2unix.pod:645 msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding." msgstr "在Unix中，Unicode文件一般不含BOM。假定文本文件使用区域字符编码设置所指定的编码。" #. type: textblock -#: dos2unix.pod:607 +#: dos2unix.pod:648 msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file." msgstr "dos2unix只能检测含有BOM文件的UTF-16格式。若UTF-16文件不含BOM，dos2unix会将其视作二进制文件。" #. type: textblock -#: dos2unix.pod:611 +#: dos2unix.pod:652 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "请使用选项 C<-ul> 或 C<-ub> 来转换不含BOM的UTF-16文件。" #. type: textblock -#: dos2unix.pod:613 +#: dos2unix.pod:654 msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM." msgstr "dos2unix默认不输出BOM。使用 C<-b> 选项可以让dos2unix将BOM添加到输出文件，如果输入文件也含有BOM的话。" #. type: textblock -#: dos2unix.pod:616 +#: dos2unix.pod:657 msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM." msgstr "unix2dos默认输出BOM，如果输入文件也含有BOM的话。使用 C<-r> 可以移除BOM。" #. type: textblock -#: dos2unix.pod:619 +#: dos2unix.pod:660 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "若使用了 C<-m> 选项，dos2unix和unix2dos将总是输出BOM。" #. type: =head2 -#: dos2unix.pod:621 +#: dos2unix.pod:662 msgid "Unicode file names on Windows" msgstr "Windows中Unicode文件的文件名" #. type: textblock -#: dos2unix.pod:623 +#: dos2unix.pod:664 msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>." msgstr "dos2unix对于Windows命令提示符中读取和写入Unicode文件名有额外的支持。这意味着dos2unix可以打开那些包含非默认系统ANSI编码页字符的文件。若要查看Windows版dos2unix在编译时是否加入了Unicode文件名支持，请输入 C<dos2unix -V>。" #. type: textblock -#: dos2unix.pod:629 +#: dos2unix.pod:670 msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name." msgstr "在Windows终端中显示Unicode文件名有一些需要注意的问题。请参见 C<-D> 和 C<--display-enc> 选项。文件名在终端中可能无法被正确显示，但写入文件时文件名仍然是正确的。" #. type: =head2 -#: dos2unix.pod:633 +#: dos2unix.pod:674 msgid "Unicode examples" msgstr "Unicode示例" #. type: textblock -#: dos2unix.pod:635 +#: dos2unix.pod:676 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:" msgstr "转换Windows UTF-16到Unix UTF-8：" #. type: verbatim -#: dos2unix.pod:637 +#: dos2unix.pod:678 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1181,12 +1251,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:639 +#: dos2unix.pod:680 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:" msgstr "转换Windows UTF-16LE（不含BOM）到Unix UTF-8：" #. type: verbatim -#: dos2unix.pod:641 +#: dos2unix.pod:682 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1196,12 +1266,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:643 +#: dos2unix.pod:684 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:" msgstr "转换Unix UTF-8到Windows UTF-8（并添加BOM）：" #. type: verbatim -#: dos2unix.pod:645 +#: dos2unix.pod:686 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1211,12 +1281,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:647 +#: dos2unix.pod:688 msgid "Convert from Unix UTF-8 to Windows UTF-16:" msgstr "转换Unix UTF-8到Windows UTF-16：" #. type: verbatim -#: dos2unix.pod:649 +#: dos2unix.pod:690 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1226,47 +1296,47 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:651 +#: dos2unix.pod:692 msgid "GB18030" msgstr "GB18030" #. type: textblock -#: dos2unix.pod:653 +#: dos2unix.pod:694 msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>." msgstr "GB18030是中国国家标准。GB18030标准的一系列子集被强制应用于中国销售的软件产品。参见 L<http://en.wikipedia.org/wiki/GB_18030>。" #. type: textblock -#: dos2unix.pod:657 +#: dos2unix.pod:698 msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK." msgstr "GB18030与Unicode完全兼容，并且可以被认为是Unicode格式的变体。和UTF-8一样，GB18030也兼容ASCII。GB18030也兼容Windows 936代码页（GBK）。" #. type: textblock -#: dos2unix.pod:661 +#: dos2unix.pod:702 msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales." msgstr "在Unix/Linux中，若区域编码被设置为GB18030，UTF-16文件将被转换为GB18030格式。注意只有当系统支持区域设置时这一才会进行这一转换。可以使用 C<locale -a> 命令来获取受支持的区域。" #. type: textblock -#: dos2unix.pod:665 +#: dos2unix.pod:706 msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030." msgstr "在Windows中，你需要使用 C<-gb> 选项来转换UTF-16文件到GB18030编码。" #. type: textblock -#: dos2unix.pod:667 +#: dos2unix.pod:708 msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files." msgstr "GB18030编码的文件和Unicode文件一样可以含有BOM。" #. type: =head1 -#: dos2unix.pod:669 +#: dos2unix.pod:710 msgid "EXAMPLES" msgstr "示例" #. type: textblock -#: dos2unix.pod:671 +#: dos2unix.pod:712 msgid "Read input from 'stdin' and write output to 'stdout':" msgstr "从标准输入读取，并输出到标准输出：" #. type: verbatim -#: dos2unix.pod:673 +#: dos2unix.pod:714 #, no-wrap msgid "" " dos2unix < a.txt\n" @@ -1278,12 +1348,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:676 +#: dos2unix.pod:717 msgid "Convert and replace a.txt. Convert and replace b.txt:" msgstr "转换并覆盖a.txt和b.txt：" #. type: verbatim -#: dos2unix.pod:678 +#: dos2unix.pod:719 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1295,12 +1365,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:681 +#: dos2unix.pod:722 msgid "Convert and replace a.txt in ascii conversion mode:" msgstr "转换并覆盖a.txt，使用ascii模式：" #. type: verbatim -#: dos2unix.pod:683 +#: dos2unix.pod:724 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1310,12 +1380,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:685 +#: dos2unix.pod:726 msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:" msgstr "转换并覆盖a.txt，使用ascii模式；转换并覆盖b.txt，使用7位编码模式：" #. type: verbatim -#: dos2unix.pod:688 +#: dos2unix.pod:729 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1329,12 +1399,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:692 +#: dos2unix.pod:733 msgid "Convert a.txt from Mac to Unix format:" msgstr "将a.txt从Mac格式转换到Unix格式：" #. type: verbatim -#: dos2unix.pod:694 +#: dos2unix.pod:735 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1346,12 +1416,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:697 +#: dos2unix.pod:738 msgid "Convert a.txt from Unix to Mac format:" msgstr "将a.txt从Unix格式转换到Mac格式：" #. type: verbatim -#: dos2unix.pod:699 +#: dos2unix.pod:740 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1363,12 +1433,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:702 +#: dos2unix.pod:743 msgid "Convert and replace a.txt while keeping original date stamp:" msgstr "转换并覆盖a.txt，保留原始时间戳：" #. type: verbatim -#: dos2unix.pod:704 +#: dos2unix.pod:745 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1380,12 +1450,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:707 +#: dos2unix.pod:748 msgid "Convert a.txt and write to e.txt:" msgstr "转换a.txt，并输出到e.txt：" #. type: verbatim -#: dos2unix.pod:709 +#: dos2unix.pod:750 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1395,12 +1465,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:711 +#: dos2unix.pod:752 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:" msgstr "转换a.txt，并输出到e.txt，同时使e.txt的时间戳和a.txt一致：" #. type: verbatim -#: dos2unix.pod:713 +#: dos2unix.pod:754 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1410,12 +1480,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:715 +#: dos2unix.pod:756 msgid "Convert and replace a.txt, convert b.txt and write to e.txt:" msgstr "转换并覆盖a.txt；转换b.txt并输出到e.txt：" #. type: verbatim -#: dos2unix.pod:717 +#: dos2unix.pod:758 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1427,12 +1497,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:720 +#: dos2unix.pod:761 msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:" msgstr "转换c.txt并输出到e.txt；转换并覆盖a.txt和b.txt；转换d.txt并输出到f.txt：" #. type: verbatim -#: dos2unix.pod:723 +#: dos2unix.pod:764 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1442,17 +1512,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:725 +#: dos2unix.pod:766 msgid "RECURSIVE CONVERSION" msgstr "递归转换" #. type: textblock -#: dos2unix.pod:727 +#: dos2unix.pod:768 msgid "In a Unix shell the find(1) and xargs(1) commands can be used to run dos2unix recursively over all text files in a directory tree. For instance to convert all .txt files in the directory tree under the current directory type:" msgstr "结合 find(1) 和 xargs(1) 使用 dos2unix 可以递归地转换目录树中的文本文件。例如，转换当前目录的目录树中所有的 .txt 文件：" #. type: verbatim -#: dos2unix.pod:731 +#: dos2unix.pod:772 #, no-wrap msgid "" " find . -name '*.txt' -print0 |xargs -0 dos2unix\n" @@ -1463,12 +1533,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:733 +#: dos2unix.pod:774 msgid "The find(1) option C<-print0> and corresponding xargs(1) option C<-0> are needed when there are files with spaces or quotes in the name. Otherwise these options can be omitted. Another option is to use find(1) with the C<-exec> option:" msgstr "若文件名中有空格或引号，则需要使用 find(1) 选项 C<-print0> 及相应的 xargs(1) 选项 C<-0>；其他情况下则可以省略它们。也可以结合 C<-exec> 选项来使用 find(1)：" #. type: verbatim -#: dos2unix.pod:737 +#: dos2unix.pod:778 #, no-wrap msgid "" " find . -name '*.txt' -exec dos2unix {} \\;\n" @@ -1478,12 +1548,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:739 +#: dos2unix.pod:780 msgid "In a Windows Command Prompt the following command can be used:" msgstr "在Windows命令提示符中，可以使用下列命令：" #. type: verbatim -#: dos2unix.pod:741 +#: dos2unix.pod:782 #, no-wrap msgid "" " for /R %G in (*.txt) do dos2unix \"%G\"\n" @@ -1493,12 +1563,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:743 +#: dos2unix.pod:784 msgid "PowerShell users can use the following command in Windows PowerShell:" msgstr "PowerShell用户可以在Windows PowerShell中使用如下命令：" #. type: verbatim -#: dos2unix.pod:745 +#: dos2unix.pod:786 #, no-wrap msgid "" " get-childitem -path . -filter '*.txt' -recurse | foreach-object {dos2unix $_.Fullname}\n" @@ -1508,22 +1578,22 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:748 +#: dos2unix.pod:789 msgid "LOCALIZATION" msgstr "区域" #. type: =item -#: dos2unix.pod:752 +#: dos2unix.pod:793 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:754 +#: dos2unix.pod:795 msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" msgstr "LANG环境变量指定了程序所使用的首选语言。它包括几个部分：第一部分是小写的语言编码，第二部分是（可选的）大写的国家/地区代码，前面用下划线连接；第三部分也是可选的，即字符编码，前面用点连接。一些POSIX规范的示例如下：" #. type: verbatim -#: dos2unix.pod:761 +#: dos2unix.pod:802 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1545,47 +1615,47 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:769 +#: dos2unix.pod:810 msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" msgstr "完整的语言和国家/地区编码可以在gettext手册中找到：L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>" #. type: textblock -#: dos2unix.pod:772 +#: dos2unix.pod:813 msgid "On Unix systems you can use the command locale(1) to get locale specific information." msgstr "在Unix系统中，你可以使用 locale(1) 命令获取特定区域的信息。" #. type: =item -#: dos2unix.pod:775 +#: dos2unix.pod:816 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:777 +#: dos2unix.pod:818 msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" msgstr "可以使用LANGUAGE变量指定一系列语言的优先级，各项之间由冒号分割。dos2unix首先使用LANGUAGE变量，其次才是LANG。例如，首选中文、其次英文：C<LANGUAGE=<zh:en>。在使用语言优先级之前，必须先启用区域化功能，即将LANG（或LC_ALL）变量设置为除了“C”以外的其他值。参见gettext手册：L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>" #. type: textblock -#: dos2unix.pod:785 +#: dos2unix.pod:826 msgid "If you select a language which is not available you will get the standard English messages." msgstr "如果你选择了一个不可用的语言，程序将会输出标准的英语信息。" #. type: =item -#: dos2unix.pod:789 +#: dos2unix.pod:830 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:791 +#: dos2unix.pod:832 msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used." msgstr "DOS2UNIX_LOCALEDIR环境变量将覆盖编译时设置的LOCALEDIR变量。LOCALEDIR被用于查找语言文件。GNU程序的默认值为 C</usr/local/share/locale>。可以使用 B<--version> 查看当前的LOCALEDIR。" #. type: textblock -#: dos2unix.pod:796 +#: dos2unix.pod:837 msgid "Example (POSIX shell):" msgstr "示例（POSIX shell）：" #. type: verbatim -#: dos2unix.pod:798 +#: dos2unix.pod:839 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1595,72 +1665,72 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:803 +#: dos2unix.pod:844 msgid "RETURN VALUE" msgstr "返回值" #. type: textblock -#: dos2unix.pod:805 +#: dos2unix.pod:846 msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned." msgstr "若成功，返回0。若出现系统错误，则返回最近一次系统错误号。若发生其他错误，返回1。" #. type: textblock -#: dos2unix.pod:808 +#: dos2unix.pod:849 msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." msgstr "在安静模式下，返回值总是为0，除非命令行选项有误。" #. type: =head1 -#: dos2unix.pod:811 +#: dos2unix.pod:852 msgid "STANDARDS" msgstr "遵循规范" #. type: textblock -#: dos2unix.pod:813 +#: dos2unix.pod:854 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:815 +#: dos2unix.pod:856 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:817 +#: dos2unix.pod:858 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://en.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:819 +#: dos2unix.pod:860 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:821 +#: dos2unix.pod:862 msgid "AUTHORS" msgstr "作者" #. type: textblock -#: dos2unix.pod:823 +#: dos2unix.pod:864 msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)" msgstr "Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben（mac2unix模式） - <wuebben@kde.org>，Christian Wurll（添加额外新行） - <wurll@ira.uka.de>，Erwin Waterlander - <waterlan@xs4all.nl>（维护者）" #. type: textblock -#: dos2unix.pod:828 +#: dos2unix.pod:869 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "项目主页：L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:830 +#: dos2unix.pod:871 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge主页：L<http://sourceforge.net/projects/dos2unix/>" #. type: =head1 -#: dos2unix.pod:832 +#: dos2unix.pod:873 msgid "SEE ALSO" msgstr "参见" #. type: textblock -#: dos2unix.pod:834 +#: dos2unix.pod:875 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-11-10 12:07+0100\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -78,17 +78,17 @@ msgstr "" "Alle rettigheder forbeholdes.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Skrivning til midlertidig outputfil %s mislykkedes:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Kunne ikke lukke inddatafil %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -111,7 +111,7 @@ msgstr "" " stilles til rådighed med distribueringen.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -137,56 +137,60 @@ msgstr "" "(GÆLDER SELV VED IGNORERING ELLER ANDET) SOM KOMMER UD AF BRUGEN AF\n" "DENNE SOFTWARE, SELVOM INFORMATION ER GIVET, AT DET VIL MEDFØRE SKADE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Brug: %s [tilvalg] [fil …] [-n indfil udfil …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii omdan kun linjeskift (standard)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso omdannelse mellem DOS- og ISO-8859-1-tegnsæt\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 brug Windows-tegnkodningstabel 1252 (Vesteuropa)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 brug DOS-tegnkodningstabel 437 (US) (standard)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 brug DOS-tegnkodningstabel 850 (Vesteuropa)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 brug DOS-tegnkodningstabel 860 (portugisisk)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 brug DOS-tegnkodningstabel 863 (fransk-canadisk)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 brug DOS-tegnkodningstabel 865 (nordisk)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 omdan 8-bit-tegn til 7-bit-plads\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behold byte-rækkefølge-markering (BOM)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behold byte-rækkefølge-markering (standard)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -194,7 +198,7 @@ msgstr "" " -c, --convmode omdannelsestilstand\n" " convmode ascii, 7bit, iso, mac, standard er ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -202,19 +206,19 @@ msgstr "" " -D, --display-enc angiv kodning for viste tekstbeskeder\n" " kodning ansi, unicode, utf8, standarden er ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force gennemtving omdannelse af binære filer\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjælpetekst\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -222,23 +226,23 @@ msgstr "" " -i, --info[=FLAG] vis filinformation\n" " fil … filer at analysere\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold outputfils dato\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license vis softwarelicens\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline tilføj ekstra linjeskift\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom tilføj byte-rækkefølge-markering (standard UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -248,7 +252,11 @@ msgstr "" " infile originalfil i ny-fil-tilstand\n" " outfile outputfil i ny-fil-tilstand\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -256,43 +264,43 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filter til omdannelse i gammel-fil-tilstand\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stilletilstand, tilbagehold alle advarsler\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom fjern byte-rækkefølge-markering (standard)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom fjern byte-rækkefølge-markering\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe spring binære filer over (standard)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behold UTF-16-kodning\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le antag at inputformatet er UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be antag at inputformatet er UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose uddybende operation\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink følg symbolske henvisninger og omdan deres mål\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -300,356 +308,369 @@ msgstr "" " -R, --replace-symlink erstat symbolske henvisninger med omdannede filer\n" " (oprindelige målfiler forbliver uændrede)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink behold symbolske henvisninger og deres mål uændrede (standard)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version vis versionsnummer\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-version (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-version (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-version (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-version (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-version.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-version.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-version (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-version (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-version (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-version (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-version (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-version (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-version (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-version (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s-version.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Med understøttelse for Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Uden Unicode UTF-16-understøttelse.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Med understøttelse for Unicode-filnavne.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Uden Unicode filnavnsunderstøttelse.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Med understøttelse for lokale sprog.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Sti til midlertidig uddatafil er for lang:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Inddatafilen %s har %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Antager UTF-16LE-kodning.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Antager UTF-16BE-kodning.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Åbning af midlertidig outputfil mislykkedes: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "bruger %s som midlertidig fil\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemer med at følge symbolsk henvisning \"%s\"\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " outputfil forbliver i \"%s\"\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "der opstod problemer under omdøbning af »%s« til »%s«:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som er målet for symbolsk henvisning \"%s\"\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Springer binær fil %s over\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "tegnkodningstabel %d understøttes ikke.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Springer UTF-16-filen %s over. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Springer UTF-16-filen %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Springer UTF-16-filen %s over. UTF-16-konvertering er ikke understøttet i denne version af %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Springer %s over, ikke en almindelig fil.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Springer %s over. Outputfil %s er en symbolsk henvisning.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Springer symbolsk henvisning %s over.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Springer symbolsk henvisning %s over. Målet er ikke en almindelig fil.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Springer %s over. Målet for symbolsk henvisning %s er ikke en almindelig fil.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "omdanner fil %s til fil %s i Unix-format …\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "omdanner fil %s til Unix-format …\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "omdanner fil %s til fil %s i Mac-format …\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "omdanner fil %s til Mac-format …\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "omdanner fil %s til fil %s i DOS-format …\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "omdanner fil %s til DOS-format …\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemer under omdannelse af fil %s til fil %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Springer symbolsk henvisning %s over.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "omdanner fil %s til Unix-format …\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "omdanner fil %s til Mac-format …\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "omdanner fil %s til DOS-format …\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "omdanner %s-filen %s til %s-Unix-format …\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "omdanner %s-filen %s til %s-Mac-format …\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "omdanner %s-filen %s til %s-DOS-format …\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemer under omdannelse af fil %s til fil %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problemer under omdannelse af fil %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "kan ikke læse fra inputfilen %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "forkert flag »%c« for tilvalget -i eller --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktuel tegnkodningstabel: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ugyldig %s omdannelsestilstand specificeret\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "tilvalg \"%s\" kræver et argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ugyldig visningskodning %s specificeret\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fil %s er ikke angivet i ny-fil-tilstand\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "kan ikke læse fra inputfil: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "kan ikke skrive til outputfil: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler lav surrogat.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler høj surrogat.\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-17 07:50+0200\n" "Last-Translator: Philipp Thomas <pth@suse.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -79,17 +79,17 @@ msgstr "" "Alle Rechte vorbehalten.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Die Eingabedatei konnte nicht geschlossen werden: %s" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -112,7 +112,7 @@ msgstr "" " Material wiedergeben.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -141,56 +141,60 @@ msgstr "" "FAHRLÄSSIGKEIT), DIE AUS DER VERWENDUNG DIESER SOFTWARE ERWÄCHST,\n" "SELBST WENN AUF DIE MÖGLICHKEIT SOLCHER SCHÄDEN HINGEWIESEN WURDE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Aufruf: %s [Optionen] [Datei …] [-n Eingabedatei Ausgabedatei …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso wandelt zwischen DOS- und ISO-8859-1-Zeichensatz um\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 verwendet DOS Codepage 437 (US) (Vorgabe)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 verwendet DOS Codepage 850 (Westeuropäisch)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 verwendet DOS Codepage 860 (Portugiesisch)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 verwendet DOS Codepage 865 (Nordisch)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -198,7 +202,7 @@ msgstr "" " -c, --convmode gibt den Umwandlungsmodus an\n" " convmode ascii, 7bit, iso, mac, Standard ist nach ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -206,19 +210,19 @@ msgstr "" " -D, --display-enc die Kodierung für angezeigte Meldungen setzen\n" " encoding ansi, unicode, utf8, Vorgabe ist ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force erzwingt die Umwandlung binärer Dateien\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 wandelt UTF-16 in GB18030 um\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help gibt diese Hilfe aus\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -226,23 +230,23 @@ msgstr "" " -i, --info[=FLAGS] Dateiinformation anzeigen\n" " Datei … zu analysierende Dateien\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate erhält das Datum der Ausgabedatei\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license gibt die Software-Lizenz aus\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline fügt einen Zeilenumbruch hinzu\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom eine Bytereihenfolge-Markierung hinzufen (Vorgabe UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -252,7 +256,11 @@ msgstr "" " Eingabedatei Originaldatei im Neue-Datei-Modus\n" " Ausgabedatei Ausgabedatei im Neue-Datei-Modus\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -260,43 +268,43 @@ msgstr "" " -o, --oldfile überschreibt die alte Datei (Vorgabe)\n" " Datei ... die im Alte-Datei-Modus umzuwandelnden Dateien\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stiller Modus, unterdrückt alle Warnungen\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe überspringt binäre Dateien (Vorgabe)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16-Kodierung beibehalten\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le setzt UTF-16LE als Eingabeformat voraus\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be setzt UTF-16BE als Eingabeformat voraus\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose ausführliche Ausgabe\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink folgt symbolischen Verknüpfungen und wandelt die Ziele um\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -304,359 +312,372 @@ msgstr "" " -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die umgewandelten\n" " Dateien (die originale Ziele bleiben unangetastet)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr "" " -S, --skip-symlink lässt symbolische Verknüpfungen und deren Ziele\n" " unangetastet (Vorgabe)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version gibt die Versionsnummer aus\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-Version (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-Version (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-Version (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-Version (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-Version.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-Version.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-Version (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-Version (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-Version (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-Version (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-Version (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-Version (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-Version (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-Version (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s-Version.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Mit Unterstützung für Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Ohne Unterstützung für Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Mit Unterstützung für Unicode-Dateinamen.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Ohne Unterstützung für Unicode-Dateinamen.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Mit Unterstützung von Landessprachen.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Der Pfad für die temporäre Ausgabedatei ist zu lang:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Das %s BOM wird geschrieben.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Die EIngabedatei %s hat ein %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "%s wird als temporäre Datei verwendet\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " Die Ausgabedatei verbleibt in »%s«\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "binäre Datei %s wird übersprungen\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "Codepage %d wird nicht unterstützt.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-Datei %s wird übersprungen, da beim Umwandeln ein Fehler in Zeile %u auftrat.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-Datei %s wird übersprungen, da die Umwandlung von UTF-16 in dieser Version von %s nicht unterstützt wird.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Symbolische Verknüpfung %s wird übersprungen, da das Ziel keine reguläre Datei ist.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine reguläre Datei.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt …\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "Datei %s wird in Datei %s im Mac-Format umgewandelt …\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s-Datei %s wird ins %s-Unix-Format umgewandelt …\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s-Datei %s wird ins %s-Mac-Format umgewandelt …\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s-Datei %s wird ins %s-DOS-Format umgewandelt …\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "Aus der Eingabedatei %s kann nicht gelesen werden:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "falsches Flag »%c« für Option -i oder --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "Aktive Codepage: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "Die Option »%s« benötigt ein Argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "Die angegebene Ausgabekodierung %s ist unzulässig\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "Aus der Eingabedatei kann nicht gelesen werden: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das Low-Surrogate fehlt.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das High-Surrogate fehlt.\n" diff --git a/po/dos2unix.pot b/po/dos2unix.pot index 81ec6ea..d50c53a 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: 2017-07-04 21:03+0200\n" +"POT-Creation-Date: 2017-10-10 22:00+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -66,17 +66,17 @@ msgid "" "\n" msgstr "" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -89,7 +89,7 @@ msgid "" "\n" msgstr "" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -104,506 +104,527 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr "" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr "" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr "" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr "" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr "" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr "" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr "" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr "" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr "" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr "" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr "" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" msgstr "" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr "" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr "" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr "" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" msgstr "" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr "" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr "" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr "" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr "" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" " outfile output file in new-file mode\n" msgstr "" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" msgstr "" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr "" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr "" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr "" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr "" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr "" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr "" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr "" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr "" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr "" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr "" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr "" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr "" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 #, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgid "Skipping symbolic link %s.\n" msgstr "" -#: common.c:1803 +#: common.c:1840 common.c:1935 #, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "" -#: common.c:1826 +#: common.c:1843 #, c-format -msgid "converting file %s to file %s in Unix format...\n" +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "" -#: common.c:1829 +#: common.c:1868 #, c-format -msgid "converting file %s to file %s in Mac format...\n" +msgid "converting file %s to file %s in Unix format...\n" msgstr "" -#: common.c:1831 +#: common.c:1870 #, c-format -msgid "converting file %s to file %s in DOS format...\n" +msgid "converting file %s to Unix format...\n" msgstr "" -#. TRANSLATORS: -#. 1st %s is encoding of input file. -#. 2nd %s is name of input file. -#. 3rd %s is encoding of output file. -#. 4th %s is name of output file. -#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1874 #, c-format -msgid "converting %s file %s to %s file %s in Unix format...\n" +msgid "converting file %s to file %s in Mac format...\n" msgstr "" -#: common.c:1845 +#: common.c:1876 #, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" +msgid "converting file %s to Mac format...\n" msgstr "" -#: common.c:1847 +#: common.c:1879 #, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" +msgid "converting file %s to file %s in DOS format...\n" msgstr "" -#: common.c:1853 +#: common.c:1881 #, c-format -msgid "problems converting file %s to file %s\n" +msgid "converting file %s to DOS format...\n" msgstr "" -#: common.c:1886 +#. TRANSLATORS: +#. 1st %s is encoding of input file. +#. 2nd %s is name of input file. +#. 3rd %s is encoding of output file. +#. 4th %s is name of output file. +#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... +#: common.c:1893 #, c-format -msgid "Skipping symbolic link %s.\n" +msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "" -#: common.c:1912 +#. TRANSLATORS: +#. 1st %s is encoding of input file. +#. 2nd %s is name of input file. +#. 3rd %s is encoding of output (input file is overwritten). +#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... +#: common.c:1900 #, c-format -msgid "converting file %s to Unix format...\n" +msgid "converting %s file %s to %s Unix format...\n" msgstr "" -#: common.c:1915 +#: common.c:1904 #, c-format -msgid "converting file %s to Mac format...\n" +msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "" -#: common.c:1917 +#: common.c:1906 #, c-format -msgid "converting file %s to DOS format...\n" +msgid "converting %s file %s to %s Mac format...\n" msgstr "" -#. TRANSLATORS: -#. 1st %s is encoding of input file. -#. 2nd %s is name of input file. -#. 3rd %s is encoding of output (input file is overwritten). -#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1909 #, c-format -msgid "converting %s file %s to %s Unix format...\n" +msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "" -#: common.c:1930 +#: common.c:1911 #, c-format -msgid "converting %s file %s to %s Mac format...\n" +msgid "converting %s file %s to %s DOS format...\n" msgstr "" -#: common.c:1932 +#: common.c:1918 #, c-format -msgid "converting %s file %s to %s DOS format...\n" +msgid "problems converting file %s to file %s\n" msgstr "" -#: common.c:1938 +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3-beta8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2015-08-23 11:37+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -80,17 +80,17 @@ msgstr "" "Ĉiuj rajtoj estas rezervitaj.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Malsukcesis skribi al provizora eliga dosiero %s:" -#: common.c:84 +#: common.c:83 #, fuzzy, c-format msgid "Failed to close input file %s:" msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -110,7 +110,7 @@ msgstr "" " la manlibro kaj/aŭ en la aliaj materialoj kiuj akompanis la distribuon.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -125,56 +125,60 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uzmaniero: %s [opcioj] [dosiero ...] [-n enigdosiero eligdosiero ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konverti nur linifinojn (defaŭlto)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso konverti inter signaroj DOS kaj ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 uzi Vindozan kodpaĝon 1252 (Okcident-Eŭropa)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 uzi DOS-kodpaĝon 437 (Usona) (defaŭlto)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 uzi DOS-kodpaĝon 850 (Okcident-Eŭropa)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 uzi DOS-kodpaĝon 860 (Portugala)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 uzi DOS-kodpaĝon 863 (Kebekia)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 uzi DOS-kodpaĝon 865 (Nordlandaj)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konverti signojn kun jesa oka bito al spacetojn\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom reteni bajtordo-markon\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom reteni bajtordo-markon (defaŭlto)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -182,7 +186,7 @@ msgstr "" " -c, --convmode uzenda konvertmoduso\n" " MODUSO 'ascii', '7bit', 'iso', aŭ 'mac' (defaŭltas al 'ascii')\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -190,19 +194,19 @@ msgstr "" " -D, --display-enc uzenda kodprezento por montritaj mesaĝoj\n" " KODPREZENTO 'ansi', 'unicode', aŭ 'utf8' (defaŭltas al 'ansi')\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force perforte konverti ankaŭ duumajn dosierojn\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverti UTF-16 al GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help montri ĉi tiun helptekston\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -210,23 +214,23 @@ msgstr "" " -i, --info[=FLAGOJ] montri (specifajn) informojn pri dosieroj\n" " DOSIERO... ekzamenendaj dosieroj\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate konservi dattempon de eliga dosiero\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license montri la permesilon de la programo\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline aldoni aldonan linifinon\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom aldoni bajtordo-markon\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -236,7 +240,11 @@ msgstr "" " ENIGDOSIERO eniga dosiero en novdosiera moduso\n" " ELIGDOSIERO eliga dosiero en novdosiera moduso\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -244,43 +252,43 @@ msgstr "" " -o, --oldfile skribi al ekzistanta dosiero (defaŭlto)\n" " DOSIERO... konvertendaj dosieroj en olddosiera moduso\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet subpremi ĉiujn avertojn\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom forigi bajtordo-markon (defaŭlto)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom forigi bajtordo-markon\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe preterpasi duumajn dosierojn (defaŭlto)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 reteni UTF-16-kodprezenton\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le trakti enigon kvazaŭ UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be trakti enigo kvazaŭ UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose parolema funkciado\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink sekvi simbolajn ligojn kaj konverti ties celojn\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -288,358 +296,371 @@ msgstr "" " -R, --replace-symlink anstataŭigi simbolajn ligojn per la konvertitaj dosieroj\n" " (la celaj dosieroj ne ŝanĝiĝas)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink ne ŝanĝi simbolajn ligojn nek ties celojn (defaŭlto)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version montri programversion\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bita versio (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bita versio (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bita versio (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bita versio (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-versio.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-versio.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bita versio (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bita versio (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bita versio (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bita versio (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bita versio (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bita versio (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versio (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versio (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s-versio.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Kun subteno por Unikoda UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Sen subteno por Unikoda UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Kun subteno por Unikodaj dosiernomoj.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Sen subteno por Unikodaj dosiernomoj.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Kun subteno por lokaĵoj.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 #, fuzzy msgid "Path for temporary output file is too long:" msgstr "Malsukcesis skribi al provizora eliga dosiero %s:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Skribiĝas %s-BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Eniga dosiero %s havas %s-BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Supoziĝas UTF-16LE-kodprezento.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Supoziĝas UTF-16BE-kodprezento.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "uziĝas %s kiel provizora dosiero\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Malsukcesis ŝanĝi la permesojn de provizora eliga dosiero %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Malsukcesis ŝanĝi posedanton kaj grupon de provizora eliga dosiero %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemoj dum redukto de simbola ligo '%s'\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " eliga dosiero restas en '%s'\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemoj dum alinomigo de '%s' al '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " kiu estas la celo de simbola ligo '%s'\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Preterpasiĝas duuma dosiero %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "Kodpaĝo %d ne subtenatas.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; la grando de 'wchar_t' estas %d bajtoj.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Preterpasiĝas %s; ĝi ne estas normala dosiero.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Preterpasiĝas %s; eliga dosiero %s estas simbola ligo.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Preterpasiĝas simbola ligo %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Preterpasiĝas simbola ligo %s; la celo ne estas normala dosiero.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Preterpasiĝas %s; la celo de simbola ligo %s ne estas normala dosiero.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s Unix-en...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konvertiĝas dosiero %s Unix-en...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s Mac-en...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konvertiĝas dosiero %s Mac-en...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konvertiĝas dosiero %s DOS-en...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Preterpasiĝas simbola ligo %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konvertiĝas dosiero %s Unix-en...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konvertiĝas dosiero %s Mac-en...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konvertiĝas dosiero %s DOS-en...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en (%3$s)...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en (%3$s)...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en (%3$s)...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problemoj dum konverto de dosiero %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "ne eblas legi el eniga dosiero %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "malĝusta flago '%c' por opcio '-i' aŭ '--info'\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktiva kodpaĝo: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "malvalida konvertmoduso %s indikatas\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcio '%s' bezonas argumenton\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "malvalida montra kodprezento %s indikatas\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "celo de dosiero %s ne indikatas (en novdosiera moduso)\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "ne eblas legi el eniga dosiero: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "ne eblas skribi al eliga dosiero: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la baza parto\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la supra parto\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.1-beta5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2015-09-20 14:17+0200\n" "Last-Translator: Enrique Lazcorreta Puigmartí <enrique.lazcorreta@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -80,18 +80,18 @@ msgstr "" "Todos los derechos reservados.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Error al escribir el archivo de salida temporal %s:" -#: common.c:84 +#: common.c:83 #, fuzzy, c-format msgid "Failed to close input file %s:" msgstr "Error al abrir el archivo de salida temporal: %s\n" # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -114,7 +114,7 @@ msgstr "" "\n" # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -140,56 +140,60 @@ msgstr "" "O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER MANERA DEL USO DE ESTE\n" "SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uso: %s [parámetros] [archivo ...] [-n archivo_de_entrada archivo_de_salida ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii solamente convierte los saltos de línea (por defecto)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso conversión entre DOS y el conjunto de caracteres ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 usa la página de códigos Windows 1252 (Europa Occidental)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 usa la página de códigos DOS 437 (EE. UU.) (por defecto)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 usa la página de códigos DOS 850 (Europa Occidental)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 usa la página de códigos DOS 860 (Portugués)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 usa la página de códigos DOS 863 (Francocanadiense)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 usa la página de códigos DOS 865 (Nórdico)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 convierte caracteres de 8 bits al espacio de 7 bits\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por defecto)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -197,7 +201,7 @@ msgstr "" " -c, --convmode modo de conversión\n" " modo_de_conversion ascii, 7bit, iso, mac, por defecto es ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -205,19 +209,19 @@ msgstr "" " -D, --display-enc establece la codificación de los mensajes de texto que se muestran\n" " codificación ansi, unicode, utf8, default to ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force fuerza la conversión de archivos binarios\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 convierte UTF-16 a GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help arroja esta ayuda\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -225,23 +229,23 @@ msgstr "" " -i, --info[=FLAGS] muestra información del archivo\n" " archivo ... archivos a analizar\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserva la fecha en el archivo de salida\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license muestra la licencia del programa\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline añade salto de línea adicional\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom añade la Marca de Orden del Byte, BOM (por defecto en UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -251,7 +255,11 @@ msgstr "" " archivo_de_entrada archivo original en el modo de archivo nuevo\n" " archivo_de_salida archivo de salida en el modo de archivo nuevo\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -259,43 +267,43 @@ msgstr "" " -o, --oldfile escribe al archivo antiguo (por defecto)\n" " archivo ... archivos a convertir en el modo de archivo antiguo\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet modo silencioso, suprime todas las advertencias\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM (por defecto)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora archivos binarios (por defecto)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 mantiene la codificación UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le supone que el formato de entrada es UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be supone que el formato de entrada es UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose operación detallada\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink sigue los enlaces simbólicos y convierte los destinos\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -303,358 +311,371 @@ msgstr "" " -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos convertidos\n" " (los archivos destino originales no son alterados)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink no altera los enlaces simbólicos ni sus destinos (por defecto)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version despliega el número de versión\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Versión DOS de 16 bit (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Versión DOS de 16 bit (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Versión DOS de 32 bit (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Versión DOS de 32 bit (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Versión para MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Versión para Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Versión Windows de 64 bit (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Versión Windows de 32 bit (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Versión Windows de 32 bit (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Versión Windows de 32 bit (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Versión Windows de 64 bit (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Versión Windows de 32 bit (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Versión para OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Versión para OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Versión para %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Con soporte Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Sin soporte Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Con soporte Unicode UTF-16.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Sin soporte Unicode UTF-16.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Con soporte de idioma materno.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 #, fuzzy msgid "Path for temporary output file is too long:" msgstr "Error al escribir el archivo de salida temporal %s:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Escribiendo BOM %s.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "El archivo de entrada %s tiene BOM %s.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Se asume codificación UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Se asume codificación UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Error al abrir el archivo de salida temporal: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como archivo temporal\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Error al cambiar los permisos del archivo temporal de salida %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemas al resolver el enlace simbólico '%s'\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " el archivo de salida permanece en '%s'\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemas al renombrar '%s' como '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " cual es el destino del enlace simbólico '%s'\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando archivo binario %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "La página de códigos %d no está soportada.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignorando archivo UTF-16 %s, el tamaño de wchar_t es %d bytes.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16 en la línea %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando archivo UTF-16 %s, la conversión a UTF-16 no está soportada en esta versión de %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, no es un archivo regular.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignorando %s, el archivo de salida %s es un enlace simbólico.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignorando enlace simbólico %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignorando enlace simbólico %s, el destino no es un archivo regular.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignorando %s, el destino del enlace simbólico %s no es un archivo regular.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "convirtiendo archivo %s a %s in formato Unix...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "convirtiendo archivo %s a formato Unix...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "convirtiendo archivo %s a %s in formato Mac...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "convirtiendo archivo %s a formato Mac...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convirtiendo archivo %s a %s en formato DOS...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "convirtiendo archivo %s a formato DOS...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemas al convertir el archivo %s a %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignorando enlace simbólico %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "convirtiendo archivo %s a formato Unix...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "convirtiendo archivo %s a formato Mac...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "convirtiendo archivo %s a formato DOS...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convirtiendo archivo %s %s a formato %s Unix...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convirtiendo archivo %s %s a formato %s Mac...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convirtiendo archivo %s %s a formato %s DOS...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemas al convertir el archivo %s a %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problemas convirtiendo el archivo %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "no puedo escribir al archivo de salida: %s" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "'%c' es un valor incorrecto para la opción -i o --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "Página de códigos activa: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "modo de conversión %s especificado es inválido\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "el parámetro '%s' requiere un argumento\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "el modo de conversión %s especificado no es válido\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto bajo.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto alto.\n" @@ -1,13 +1,13 @@ # Message français pour dos2unix. -# Copyright (C) 2016 Erwin Waterlander (msgids) +# Copyright (C) 2017 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Frédéric Marchal <fmarchal@perso.be>, 2016. +# Frédéric Marchal <fmarchal@perso.be>, 2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.4-beta4\n" +"Project-Id-Version: dos2unix-7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-13 13:32+0200\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-23 11:40+0200\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -76,17 +76,17 @@ msgstr "" "Tous droits réservés.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Échec d'écriture dans le fichier temporaire de sortie %s :" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Échec à la fermeture du fichier d'entrée %s :" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -106,7 +106,7 @@ msgstr "" "2. La distribution sous forme binaire doit reproduire le copyright ci-dessus\n" " dans la documentation ou tout autre matériel fournis avec la distribution.\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -132,56 +132,60 @@ msgstr "" "DE QUELQUE MANIÈRE D'UTILISATION DE CE LOGICIEL, MÊME SI LA POSSIBILITÉ\n" "D'UN TEL DOMMAGE A ÉTÉ ANNONCÉE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Usage: %s [options] [fichier …] [-n fichier_entrée fichier_sortie …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown autorise le changement de propriétaire du fichier\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso conversion entre les jeux de caractères DOS et ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 utilise le code page 1252 de Windows (Europe de l'ouest)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 utilise le code page 437 du DOS (US) (par défaut)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 utilise le code page 850 du DOS (Europe de l'ouest)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 utilise le code page 860 du DOS (Portugais)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 utilise le code page 863 du DOS (Français Canadien)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 utilise le code page 865 du DOS (Nordique)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 converti les caractères 8 bits vers l'espace 7 bits\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom garde la marque d'ordre des octets\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom garde la marque d'ordre des octets (par défaut)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -189,7 +193,7 @@ msgstr "" " -c, --convmode mode de conversion\n" " modeconv ascii, 7bit, iso, mac, ascii par défaut\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -197,19 +201,19 @@ msgstr "" " -D, --display-enc choisi l'encodage pour afficher les messages textes\n" " encodage ansi, unicode ou utf8 (ansi par défaut)\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force force la conversion de fichiers binaires\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 converti UTF-16 en GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help affiche ce texte d'aide\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -217,23 +221,23 @@ msgstr "" " -i, --info[=FANIONS] affiche les informations du fichier\n" " fichier … fichiers à analyser\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserve la date du fichier de sortie\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license affiche la licence du logiciel\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline ajoute des sauts de ligne supplémentaires\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom ajoute la marque d'ordre des octets (par défaut avec UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -243,7 +247,11 @@ msgstr "" " fichier_entrée fichier original dans le mode « nouveau fichier »\n" " fichier_sortie fichier de sortie dans le mode « nouveau fichier »\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown n'autorise pas le changement du propriétaire du fichier (par défaut)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -251,43 +259,43 @@ msgstr "" " -o, --oldfile écrit dans l'ancien fichier (par défaut)\n" " fichier … fichiers à convertir dans le mode « ancien fichier »\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet mode silencieux, supprime tous les avertissements\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom supprime la marque d'ordre des octets (par défaut)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom supprime la marque d'ordre des octets\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignore les fichiers binaires (par défaut)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 conserve l'encodage UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le suppose que le format d'entrée est UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be suppose que le format d'entrée est UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose opération verbeuse\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink suit les liens symboliques et converti les cibles\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -295,357 +303,370 @@ msgstr "" " -R, --replace-symlink remplace les liens symboliques par les fichiers convertis\n" " (les fichiers cibles originaux restent inchangés)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink conserve les liens symboliques et les cibles inchangés (par défaut)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version affiche le numéro de version\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Version DOS 16 bits (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Version DOS 16 bits (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Version DOS 32 bits (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Version DOS 32 bits (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Version MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Version Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Version Windows 64 bit (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Version Windows 32 bits (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Version Windows 32 bits (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Version Windows 32 bits (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Version Windows 64 bits (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Version Windows 32 bits (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Version OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Version OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Version %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Avec support pour l'Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Sans support pour l'Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Avec support pour les noms de fichiers Unicode.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Sans support pour les noms de fichiers Unicode.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Avec support pour la langue native.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Avec les fonctionnalités pour préserver l'utilisateur et le groupe propriétaires des fichiers.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Sans les fonctionnalités pour préserver l'utilisateur et le groupe propriétaires des fichiers.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Le chemin pour le fichier de sortie temporaire est trop long :" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Écriture de la BOM %s.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Le fichier d'entrée %s a une BOM %s.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Suppose un encodage UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Suppose un encodage UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "utilise %s comme fichier temporaire\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s :" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "L'utilisateur ou le groupe propriétaire du fichier %s ne sont pas préservés.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s :" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problème lors de la résolution du lien symbolique « %s »\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " le fichier de sortie reste dans « %s »\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problèmes en renommant « %s » en « %s » :" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " quelle est la cible du lien symbolique « %s »\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignore le fichier binaire %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "le code page %d n'est pas supporté.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignore le fichier UTF-16 %s, la taille de wchar_t n'est pas de %d octets.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu à la ligne %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignore le fichier UTF-16 %s, la conversion UTF-16 n'est pas supportée dans cette version de %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignore %s, pas un fichier régulier.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignore %s, le fichier de sortie %s est un lien symbolique.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignore le lien symbolique %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignore le lien symbolique %s, la cible n'est pas un fichier régulier.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignore %s, la cible du lien symbolique %s n'est pas un fichier régulier.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "conversion du fichier %s vers le fichier %s au format Unix…\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "conversion du fichier %s au format Unix…\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "conversion du fichier %s vers le fichier %s au format Mac…\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "conversion du fichier %s au format Mac…\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "conversion du fichier %s au format DOS…\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problèmes lors de la conversion du fichier %s vers le fichier %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignore le lien symbolique %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "conversion du fichier %s au format Unix…\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "conversion du fichier %s au format Mac…\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "conversion du fichier %s au format DOS…\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "conversion du fichier %s %s au format Unix %s…\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "conversion du fichier %s %s au format Mac %s…\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "conversion du fichier %s %s au format DOS %s…\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problèmes lors de la conversion du fichier %s vers le fichier %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problèmes lors de la conversion du fichier %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "impossible de lire depuis le fichier d'entrée %s :" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "mauvais fanion « %c » pour l'option -i ou --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "code page actif : %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "mode de conversion %s spécifié invalide\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "l'option « %s » requiert un argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "l'encodage %s spécifié pour l'affichage est invalide\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "la cible du fichier %s n'est pas spécifiée en mode nouveau fichier\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "impossible de lire depuis le fichier d'entrée : %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "impossible d'écrire dans le fichier de sortie : %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet bas est manquant.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet haut est manquant.\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-28 23:02+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -79,17 +79,17 @@ msgstr "" "Minden jog fenntartva.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Nem sikerült írni a(z) %s átmeneti kimeneti fájlba:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "A(z) %s bemeneti fájl bezárása sikertelen:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -111,7 +111,7 @@ msgstr "" " dokumentációban, illetve a csomaggal részét képező egyéb anyagokban.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -139,56 +139,60 @@ msgstr "" "OKOZOTT KÁRBAN (BELEÉRTVE A HANYAGSÁGOT ÉS EGYEBET), AKKOR IS, HA AZ\n" "ILYEN KÁR LEHETŐSÉGÉRE FELHÍVTÁK A FIGYELMET.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Használat: %s [kapcsolók] [fájl ...] [-n be_fájl ki_fájl ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii csak sortörések átalakítása (alapértelmezett)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso átalakítás DOS és ISO-8859-1 karakterkészlet között\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS 850-es kódlap használata (Nyugat-európai)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS 860-as kódlap használata (portugál)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS 863-as kódlap használata (francia-kanadai)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS 865-ös kódlap használata (északi)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 8-bites karakterek átalakítása 7-bitesre\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása (alapértelmezett)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -196,7 +200,7 @@ msgstr "" " -c, --convmode átalakítási mód\n" " convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -204,19 +208,19 @@ msgstr "" " -D, --display-enc megjelenített szöveges üzenetek kódolásának megadása\n" " lehetőségek: ansi, unicode, utf8, alapértelmezett: ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force bináris fájlok átalakításának kényszerítése\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 UTF-16 átalakítása GB18030-ra\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help ezen súgószöveg megjelenítése\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -224,23 +228,23 @@ msgstr "" " -i, --info[=JELZŐK] fájlinformációk megjelenítése\n" " fájl ... elemzendő fájlok\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate kimeneti fájl dátumának megtartása\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license szoftverlicenc megjelenítése\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline további új sor hozzáadása\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom bájtsorrendjel hozzáadása (alapértelmezetten UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -250,7 +254,11 @@ msgstr "" " infile eredeti fájl új-fájl módban\n" " outfile kimeneti fájl új-fájl módban\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -258,43 +266,43 @@ msgstr "" " -o, --oldfile kiírás a régi fájlba (alapértelmezett)\n" " file ... átalakítandó fájl régi-fájl módban\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom bájtsorrendjel eltávolítása (alapértelmezett)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom bájtsorrendjel eltávolítása\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe bináris fájlok kihagyása (alapértelmezett)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16 kódolás megtartása\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le feltételezze, hogy a bemeneti formátum UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be feltételezze, hogy a bemeneti formátum UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose részletes működés\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink szimbolikus linkek követése és a célok átalakítása\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -302,359 +310,372 @@ msgstr "" " -R, --replace-symlink szimbolikus linkek cseréje az átalakított fájlokkal\n" " (az eredeti célfájlok változatlanok maradnak)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr "" " -S, --skip-symlink szimbolikus linkek és célok változatlanul hagyása\n" " (alapértelmezett)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version verziószám megjelenítése\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "16-bites DOS verzió (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "16-bites DOS verzió (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "32-bites DOS verzió (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "32-bites DOS verzió (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS verzió.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin verzió.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "64-bites Windows verzió (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "32-bites Windows verzió (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "32-bites Windows verzió (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "32-bites Windows verzió (MinGW)\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "64-bites Windows verzió (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "32-bites Windows verzió (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 verzió (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2 verzió (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s verzió.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatással.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatás nélkül.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Unicode fájlnévtámogatással.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Unicode fájlnévtámogatás nélkül.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Natív nyelvi támogatással.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Az átmeneti kimeneti fájl útvonala túl hosszú:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "%s BOM írása.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "A(z) %s bemeneti fájl %s BOM-mal rendelkezik.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE kódolás feltételezése.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE kódolás feltételezése.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "%s használata átmeneti fájlként\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "hiba a(z) „%s” szimbolikus link feloldásakor\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " a kimeneti fájl itt marad: „%s”\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "hiba a(z) „%s” átnevezésekor erre: „%s”:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " ami a(z) „%s” szimbolikus link célja\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "A(z) %s bináris fájl kihagyása\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "a(z) %d kódlap nem támogatott.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, a wchar_t mérete %d bájt.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, az UTF-16 átalakítás nem támogatott a %s ezen verziójában.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "A(z) %s kihagyása, nem egy szabályos fájl.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "A(z) %s kihagyása, a(z) %s kimeneti fájl egy szimbolikus link.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "A(z) %s szimbolikus link kihagyása.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "A(z) %s szimbolikus link kihagyása, a cél nem egy szabályos fájl.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "A(z) %s kihagyása, a(z) %s szimbolikus link célja nem egy szabályos fájl.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra Unix formátumban…\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "a(z) %s fájl átalakítása Unix formátumra…\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra Mac formátumban…\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "a(z) %s fájl átalakítása Mac formátumra…\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Unix formátumban…\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "hiba a(z) %s fájl %s fájlra való átalakításakor\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "A(z) %s szimbolikus link kihagyása.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "a(z) %s fájl átalakítása Unix formátumra…\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "a(z) %s fájl átalakítása Mac formátumra…\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Unix formátumra…\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Mac formátumra…\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású DOS formátumra…\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "hiba a(z) %s fájl %s fájlra való átalakításakor\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "hiba a(z) %s fájl átalakításakor\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "nem sikerült olvasni a(z) %s bemeneti fájlból:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "hibás „%c” jelző a -i vagy --info kapcsolókhoz\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktív kódlap: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "érvénytelen %s átalakítási mód lett megadva\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "a(z) „%s” kapcsolóhoz argumentum szükséges\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "érvénytelen %s megjelenítési kódolás lett megadva\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "a(z) %s fájl célja nincs megadva az új-fájl módban\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "nem sikerült olvasni a bemeneti fájlból: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "nem sikerült írni a kimeneti fájlba: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó alacsony helyettesítő.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó magas helyettesítő.\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-15 00:11+0900\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -78,18 +78,18 @@ msgstr "" "All rights reserved.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "一時出力ファイル %s への書き込みに失敗しました:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "入力ファイル %s を閉じるのに失敗しました:" # ライセンス条項なので翻訳しません -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -112,7 +112,7 @@ msgstr "" "\n" # ライセンス条項なので翻訳しません -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -138,56 +138,60 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "使用法: %s [options] [file ...] [-n infile outfile ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 改行のみ変換する (既定)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso DOS と ISO-8859-1 文字セット間で変換する\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows コードページ 1252 (西欧) を使用する\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS コードページ 437 (US) を使用する (既定)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS コードページ 850 (西欧) を使用する\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS コードページ 860 (ポルトガル語) を使用する\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS コードページ 863 (カナダのフランス語) を使用する\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS コードページ 865 (北欧) を使用する\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 8 ビット文字を 7 ビットに変換する\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom バイト順マークを保つ\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom バイト順マークを残す (既定)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -195,7 +199,7 @@ msgstr "" " -c, --convmode 変換モード\n" " convmode ascii, 7bit, iso, mac, 既定は ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -203,19 +207,19 @@ msgstr "" " -D, --display-enc 表示されるメッセージのエンコーディングを設定する\n" " encoding ansi, unicode, utf8, デフォルトは ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force バイナリファイルを強制的に変換する\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 UTF-16 を GB18030 に変換する\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help このヘルプメッセージを表示する\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -223,23 +227,23 @@ msgstr "" " -i, --info[=FLAGS] ファイル情報を表示する\n" " file ... 分析するファイル\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate ファイルの日付を保持する\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license ソフトウェアライセンスを表示する\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 改行を追加する\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom バイト順マークを加える (UTF-8 の既定)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -249,7 +253,11 @@ msgstr "" " infile このモードでの入力ファイル\n" " outfile このモードでの出力ファイル\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -257,43 +265,43 @@ msgstr "" " -o, --oldfile 元のファイルに書き込む (既定)\n" " file ... このモードでの変換するファイル\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet 抑止モード、全ての警告を抑止する\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom バイト順マークを削除する (既定)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom バイト順マークを削除する\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe バイナリファイルをスキップする (既定)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16 エンコーディングを保つ\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 入力の形式を UTF-16LE と見なす\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 入力の形式を UTF-16BE と見なす\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose 冗長表示をする\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink シンボリックリンクを辿り、対象を変換する\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -301,357 +309,370 @@ msgstr "" " -R, --replace-symlink シンボリックリンクを変換後の対象ファイルに置換する\n" " (元の対象ファイルは変更されずそのまま残る)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink シンボリックリンクを辿らず、対象をそのままにする (既定)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version バージョン番号を表示する\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 ビットバージョン (WATCOMC)。\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 ビットバージョン (TURBOC)。\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 ビットバージョン (WATCOMC)。\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 ビットバージョン (DJGPP)。\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS バージョン。\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin バージョン。\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 ビットバージョン (MinGW-w64)。\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 ビットバージョン (WATCOMC)。\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 ビットバージョン (MinGW-w64)。\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 ビットバージョン (MinGW)。\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 ビットバージョン (MSVC %d)。\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 ビットバージョン (MSVC %d)。\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 バージョン (WATCOMC)。\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2 バージョン (EMX)。\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s バージョン。\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 サポート付き。\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 サポート無し。\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Unicode ファイル名 サポート付き。\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Unicode ファイル名 サポート無し。\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "ネイティブ言語サポート。\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "一時出力ファイルのパスが長過ぎます:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "%s BOM を書き込んでいます。\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "入力ファイル %s には %s BOM が存在します。\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE エンコーディングと見なしています。\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE エンコーディングと見なしています。\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "一時出力ファイルを開くのに失敗しました: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "%s を一時ファイルとして使用しています\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "一時出力ファイル %s のパーミッション変更に失敗しました:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "シンボリックリンク '%s' の解決中に問題が発生しました\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " 出力ファイルは '%s' に残っています\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr " '%s' から '%s' への名前変更で問題が発生しました:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " これはシンボリックリンク '%s' のターゲットです\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "バイナリファイル %s をスキップしています\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "コードページ %d はサポートされていません\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16 ファイル %s をスキップしています。wchar_t のサイズは %d バイトです。\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16 ファイル %s をスキップしています。%u 行目の UTF-16 変換でエラーが発生しました。\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換はこのバージョンの %s ではサポートされていません。\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s をスキップしています。通常ファイルではありません。\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s をスキップしています。出力ファイル %s はシンボリックリンクです。\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "シンボリックリンク %s をスキップしています。\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "シンボリックリンク %s をスキップしています。対象が通常ファイルではありません。\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s をスキップしています。シンボリックリンク %s を辿った先が通常ファイルではありません。\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "%s から %s へ Unix 形式でファイル変換しています。\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "ファイル %s を Unix 形式へ変換しています。\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "%s から %s へ Mac 形式でファイル変換しています。\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "ファイル %s を Mac 形式へ変換しています。\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "%s から %s へ DOS 形式で変換しています。\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "ファイル %s を DOS 形式へ変換しています。\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s ファイルの %s から %s ファイルの %s へ Unix 形式でファイル変換しています...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "%s ファイルの %s から %s ファイルの %s へ Mac 形式でファイル変換しています...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "%s ファイルの %s から %s ファイルの %s へ DOS 形式で変換しています...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "シンボリックリンク %s をスキップしています。\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "ファイル %s を Unix 形式へ変換しています。\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "ファイル %s を Mac 形式へ変換しています。\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "ファイル %s を DOS 形式へ変換しています。\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s ファイル %s を %s の Unix 形式へ変換しています...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "%s ファイルの %s から %s ファイルの %s へ Mac 形式でファイル変換しています...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s ファイル %s を %s の Mac 形式へ変換しています。\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "%s ファイルの %s から %s ファイルの %s へ DOS 形式で変換しています...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s ファイル %s を %s の DOS 形式へ変換しています。\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "ファイル %s 変換中に問題が発生しました。\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "入力ファイル %s から読み込めません:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "オプション -i または --info に対する間違ったフラグ '%c' です。\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "有効なコードページ: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "無効な %s 変換モードが指定されました\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "オプション '%s' には引数が必要です。\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "無効な %s 表示エンコーディングが指定されました\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "対象ファイル %s が新規ファイルモードで指定されていません\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "入力ファイルから読み込めません: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "出力ファイルに書き込めません: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "エラー: 無効なサロゲートペアです。下位サロゲートがありません。\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "エラー: 無効なサロゲートペアです。上位サロゲートがありません。\n" @@ -1,22 +1,22 @@ # Norwegian (bokmål) translation of dos2unix. # Copyright (C) 2015 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Åka Sikrom <a4@hush.com>, 2015-2016. +# Åka Sikrom <a4@hush.com>, 2015-2017. # msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.4-beta4\n" +"Project-Id-Version: dos2unix-7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-22 13:26+0100\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-25 18:43+0200\n" "Last-Translator: Åka Sikrom <a4@hush.com>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" -"Language: Norwegian Bokmål\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: dos2unix.c:79 @@ -78,17 +78,17 @@ msgstr "" "Alle rettigheter tilhører rettighetshaveren.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Klarte ikke å skrive til midlertidig utdata-fil %s." -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Klarte ikke å lukke inndatafil %s." -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -109,7 +109,7 @@ msgstr "" " distribusjonen.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -135,56 +135,60 @@ msgstr "" "PROGRAMVAREN, SELV NÅR VEDKOMMENDE ER INFORMERT OM AT SLIK SKADE KAN \n" "OPPSTÅ.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Bruk: %s [valg] [fil …] [-n inndatafil utdatafil …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown tillat endring av fileierskap\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii bare konverter linjeskift (standard)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso konverter mellom tegnsettene DOS og ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 bruk Windows-kodeside 1252 (Vesteuropeisk)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 bruk DOS-kodeside 437 (US) (standard)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 bruk DOS-kodeside 850 (vesteuropeisk)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 bruk DOS-kodeside 860 (portugisisk)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 bruk DOS-kodeside 863 (fransk-kanadisk)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 bruk DOS-kodeside 865 (nordisk)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konverter 8-bit-tegn til 7-bit\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behold «Byte Order»-merke\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behold «Byte Order»-merke (standard)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -192,7 +196,7 @@ msgstr "" " -c, --convmode konverteringsmodus\n" " convmode ascii, 7bit, iso, mac (standardmodus er ascii)\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -200,19 +204,19 @@ msgstr "" " -D, --display-enc endre koding av tekstmeldinger\n" " encoding ansi, unicode, utf8 (ansi er standard)\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force tving konvertering av binærfiler\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjelpeteksten\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -220,23 +224,23 @@ msgstr "" " -i, --info[=FLAGG] vis informasjon om fil\n" " file … filer som skal undersøkes\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold utdata-filens dato\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license vis programvarelisens\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline legg til en ekstra ny linje\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom legg til «Byte Order»-merke (standard: UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -246,7 +250,11 @@ msgstr "" " infile opprinnelig fil i ny fil-modus\n" " outfile utdata-fil i ny fil-modus\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown ikke tillat endring av fileierskap (standard)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -254,43 +262,43 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filer som skal konverteres i gammel fil-modus\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stillemodus, uten advarsler\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke (standard)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe hopp over binærfiler (standard)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behold UTF-16-koding\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le anta at inndata-formatet er UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be anta at inndata-formatet er UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose detaljert utskrift\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink følg symbolske lenker, og konverter lenkemål\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -298,357 +306,370 @@ msgstr "" " -R, --replace-symlink erstatt symbolske lenker med konverterte filer\n" " (opprinnelig målfil forblir uendret)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink hold både symbolske lenker og lenkemål uendret (standard)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version vis versjonsnummer\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-versjon (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-versjon (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-versjon (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-versjon (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-versjon.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-versjon.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-versjon (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-versjon (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-versjon (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-versjon (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-versjon (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-versjon (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versjon (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versjon (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s-versjon.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Med støtte for Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Uten støtte for Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Med støtte for Unicode-filnavn.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Uten støtte for Unicode-filnavn.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Med innebygd språkstøtte.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Med støtte for å bevare bruker- og gruppeeierskap til filer.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Uten støtte for å bevare bruker- og gruppeeierskap til filer.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Sti til midlertidig utdatafil er for lang:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver «Byte Order»-merke %s.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Inndatafil %s har %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Forventer UTF-16LE-koding.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Forventer UTF-16BE-koding.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Klarte ikke å åpne midlertidig utdata-fil: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "bruker %s som midlertidig fil\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Klarte ikke å endre rettigheter til midlertidig utdata-fil %s." -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "Bruker- og/eller gruppeeierskap til fila %s blir ikke bevart.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Klarte ikke å endre eier og gruppetilhørighet for midlertidig utdata-fil %s." -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "det oppstod problemer med å følge den symbolske lenka «%s»\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " utdata-fil blir liggende i «%s»\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "det oppstod problemer med å gi «%s» det nye navnet «%s»." -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som den symbolske lenka «%s» peker på\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Hopper over binærfil %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "kodesiden %d støttes ikke.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hopper over UTF-16-fil %s. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hopper over UTF-16-fil %s. Det oppstod en UTF-16-konverteringsfeil på linje %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hopper over fila %s. Konvertering av UTF-16 støttes ikke av denne versjonen av %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hopper over %s, som ikke er en vanlig fil.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hopper over %s. Utdata-fil %s er en symbolsk lenke.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Hopper over symbolsk lenke %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hopper over symbolsk lenke %s. Målet er ikke en vanlig fil.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hopper over %s. Målet for symbolsk lenke %s er ikke en vanlig fil.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konverterer fila %s til %s i Unix-format …\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konverterer fila %s til Unix-format …\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterer fila %s til %s Mac-format …\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konverterer fila %s til Mac-format …\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterer fila %s til %s i DOS-format …\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konverterer fila %s til DOS-format …\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "det oppstod problemer under konvertering av fila %s til %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Hopper over symbolsk lenke %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konverterer fila %s til Unix-format …\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konverterer fila %s til Mac-format …\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konverterer fila %s til DOS-format …\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterer %s-fila %s til %s-Unix-format …\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterer %s-fila %s til %s-Mac-format …\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterer %s-fila %s til %s-DOS-format …\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "det oppstod problemer under konvertering av fila %s til %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "det oppstod problemer under konvertering av fila %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "klarte ikke å lese fra inndata-fil %s." -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "«%c» er et ugyldig flagg for -i (--info)\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktiv kodeside: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "du har valgt en ugyldig %s-konverteringsmodus\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "valget «%s» krever at du bruker et argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "du har valgt en ugyldig %s-koding\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fila %s er ikke valgt i ny fil-modus\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "klarte ikke å lese fra inndata-fil: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "klarte ikke å skrive til utdata-fil: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "feil: ugyldig surrogatpar. Nedre surrogat mangler.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "feil: ugyldig surrogatpar. Øvre surrogat mangler.\n" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-20 09:58+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -83,17 +83,17 @@ msgstr "" "Alle rechten voorbehouden.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Sluiten van invoerbestand %s is mislukt:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -113,7 +113,7 @@ msgstr "" " in de documentatie en/of andere materialen die bij de uitgave horen.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -128,56 +128,60 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii alleen regeleindes converteren (standaard)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso converteren tussen de tekensets DOS en ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -185,7 +189,7 @@ msgstr "" " -c, --convmode te gebruiken conversiemodus\n" " MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -193,19 +197,19 @@ msgstr "" " -D, --display-enc te gebruiken codering voor getoonde berichten\n" " CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force conversie van binaire bestanden afdwingen\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help deze hulptekst tonen\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -213,23 +217,23 @@ msgstr "" " -i, --info[=VLAGGEN] bestandsinformatie weergeven\n" " BESTAND... te analyseren bestand(en)\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license softwarelicentie tonen\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline extra regeleinde toevoegen\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -239,7 +243,11 @@ msgstr "" " INVOERBESTAND het originele bestand in nieuwbestand-modus\n" " UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -247,43 +255,43 @@ msgstr "" " -o, --oldfile het oude bestand overschrijven (standaard)\n" " BESTAND... te converteren bestand(en) in oudbestand-modus\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet alle waarschuwingen onderdrukken\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe binaire bestanden overslaan (standaard)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16-codering behouden\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le aannemen dat de invoeropmaak UTF-16LE is\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be aannemen dat de invoeropmaak UTF-16BE is\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose gedetailleerde uitvoer produceren\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink symbolische koppelingen volgen en de doelen converteren\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -291,357 +299,370 @@ msgstr "" " -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n" " (de originele doelbestanden blijven ongewijzigd)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version programmaversie tonen\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bits versie (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bits versie (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bits versie (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bits versie (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-versie.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-versie.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bits versie (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bits versie (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bits versie (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bits versie (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bits versie (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bits versie (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versie (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versie (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s-versie.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Met ondersteuning voor Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Zonder ondersteuning voor Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Met ondersteuning voor Unicode-bestandsnamen.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Zonder ondersteuning voor Unicode-bestandsnamen.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Met ondersteuning voor taalregio's.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Pad voor tijdelijk uitvoerbestand is te lang:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Schrijven van %s-BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Invoerbestand %s heeft een %s-BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE-codering wordt aangenomen.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE-codering wordt aangenomen.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "%s wordt als tijdelijk bestand gebruikt\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemen met het herleiden van symbolische koppeling '%s'\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " uitvoerbestand blijft in '%s'\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemen met hernoemen van '%s' naar '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " welke het doel is van symbolische koppeling '%s'\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Binair bestand %s wordt overgeslagen\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "Codetabel %d wordt niet ondersteund.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; de grootte van 'wchar_t' is %d bytes.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; er is een UTF-16-conversiefout opgetreden op regel %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; UTF-16-conversie wordt niet ondersteund in deze versie van %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s wordt overgeslagen; uitvoerbestand %s is een symbolische koppeling.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Symbolische koppeling %s wordt overgeslagen.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier bestand is.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen regulier bestand is.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "converteren van bestand %s naar bestand %s in Unix-opmaak...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "converteren van bestand %s naar Unix-opmaak...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "converteren van bestand %s naar bestand %s in Mac-opmaak...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "converteren van bestand %s naar Mac-opmaak...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "converteren van bestand %s naar DOS-opmaak...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opmaak...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemen met conversie van bestand %s naar bestand %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Symbolische koppeling %s wordt overgeslagen.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "converteren van bestand %s naar Unix-opmaak...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "converteren van bestand %s naar Mac-opmaak...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "converteren van bestand %s naar DOS-opmaak...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Unix-opmaak (%3$s)...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Mac-opmaak (%3$s)...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "converteren van bestand %2$s (%1$s) naar DOS-opmaak (%3$s)...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemen met conversie van bestand %s naar bestand %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problemen met conversie van bestand %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "kan niet lezen uit invoerbestand %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "onjuiste vlag '%c' voor optie '-i' of '--info'\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "actieve codetabel: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ongeldige conversiemodus %s opgegeven\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "optie '%s' vereist een argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ongeldige weergavecodering %s opgegeven\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "doel van bestand %s is niet opgegeven in 'nieuwbestand-modus'\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "kan niet lezen uit invoerbestand: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "kan niet schrijven naar uitvoerbestand: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het lage deel ontbreekt\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n" @@ -1,13 +1,13 @@ # Polish translation for dos2unix. # This file is distributed under the same license as the dos2unix package. -# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2016. +# Jakub Bogusz <qboosh@pld-linux.org>, 2014-2017. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.4-beta4\n" +"Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-13 15:20+0200\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-22 21:34+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -75,17 +75,17 @@ msgstr "" "Wszelkie prawa zastrzeżone.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Nie udało się zapisać do tymczasowego pliku wyjściowego %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Nie udało się zamknąć pliku wejściowego %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -107,7 +107,7 @@ msgstr "" " dołączonych do dystrybucji.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -133,56 +133,60 @@ msgstr "" "W JAKIKOLWIEK SPOSÓB W WYNIKU UŻYCIA TEGO OPROGRAMOWANIA, NAWET JEŚLI\n" "OSTRZEŻONO O MOŻLIWOŚCI TAKICH SZKÓD.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Składnia: %s [opcje] [plik ...] [-n plik_wej plik_wyj ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown zezwolenie na zmianę właściciela pliku\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konwersja tylko końców linii (domyślne)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso konwersja między zestawem znaków DOS-a i ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 użycie strony kodowej DOS 437 (US; domyślna)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 użycie strony kodowej DOS 850 (zachodnioeuropejskiej)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 użycie strony kodowej DOS 860 (portugalskiej)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 użycie strony kodowej DOS 865 (nordyckiej)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark) (domyślne)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -190,7 +194,7 @@ msgstr "" " -c, --convmode tryb konwersji\n" " tryb konwersji ascii, 7bit, iso, mac; domyślnie ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -198,19 +202,19 @@ msgstr "" " -D, --display-enc ustawienie kodowania wyświetlanych komunikatów\n" " kodowanie ansi, unicode, utf8; domyślnie ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force wymuszenie konwersji plików binarnych\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konwersja UTF-16 do GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help wyświetlenie tego opisu\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -218,23 +222,23 @@ msgstr "" " -i, --info[=FLAGI] wyświetlenie informacji o pliku\n" " plik ... pliki do analizy\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate zachowanie daty pliku wyjściowego\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license wyświetlenie licencji oprogramowania\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline dodanie dodatkowego znaku nowej linii\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom dodanie znacznika BOM (domyślnie UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -244,7 +248,11 @@ msgstr "" " plik_wej plik oryginalny w trybie nowego pliku\n" " plik_wyj plik wyjściowy w trybie nowego pliku\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown bez zezwolenia na zmianę właściciela pliku (domyślne)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -252,43 +260,43 @@ msgstr "" " -o, --oldfile zapis do starego pliku (domyślne)\n" " plik ... pliki do konwersji w trybie starego pliku\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet tryb cichy, pominięcie wszystkich ostrzeżeń\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark) (domyślne)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark)\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe pomijanie plików binarnych (domyślne)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 zachowanie kodowania UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le przyjęcie formatu pliku wejściowego UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be przyjęcie formatu pliku wejściowego UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose działanie ze szczegółowym opisem\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink podążanie za dowiązaniami symbolicznymi i konwersja celów\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -296,356 +304,369 @@ msgstr "" " -R, --replace-symlink zastępowanie dowiązań symbolicznych plikami wynikowymi\n" " (oryginalne pliki docelowe pozostają bez zmian)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink bez zmian dowiązań symbolicznych i celów (domyślne)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version wyświetlenie numeru wersji\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Wersja 16-bitowa DOS (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Wersja 16-bitowa DOS (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa DOS (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Wersja 32-bitowa DOS (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Wersja MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Wersja Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Wersja 64-bitowa Windows (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa Windows (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Wersja 32-bitowa Windows (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Wersja 32-bitowa Windows (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Wersja 64-bitowa Windows (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Wersja 32-bitowa Windows (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Wersja OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Wersja OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Wersja %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Z obsługą Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Bez obsługi Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Z obsługą nazw plików w Unicode.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Bez obsługi nazw plików w Unicode.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Z obsługą języków narodowych.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Z obsługą zachowywania właściciela i grupy plików.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Bez obsługi zachowywania właściciela i grupy plików.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Ścieżka do tymczasowego pliku wyjściowego jest zbyt długa:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Zapis znacznika BOM %s.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Plik wejściowy %s zawiera znacznik BOM %s.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Przyjęto kodowanie UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Przyjęto kodowanie UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Nie udało się otworzyć tymczasowego pliku wyjściowego: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "użycie %s jako pliku tymczasowego\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nie udało się zmienić uprawnień tymczasowego pliku wyjściowego %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "Właściciel i/lub grupa pliku %s nie została zachowana.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nie udało się zmienić właściciela i grupy tymczasowego pliku wyjściowego %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemy z rozwiązaniem dowiązania symbolicznego '%s'\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " plik wyjściowy pozostaje w '%s'\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemy ze zmianą nazwy '%s' na '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " (czyli cel dowiązania symbolicznego '%s')\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Pominięto plik binarny %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "strona kodowa %d nie jest obsługiwana.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Pominięto plik UTF-16 %s, rozmiar wchar_t to %d bajt(y).\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Pominięto plik UTF-16 %s, wystąpił błąd konwersji UTF-16 w linii %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Pominięto plik UTF-16 %s, konwersja UTF-16 nie jest obsługiwana w tej wersji programu %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Pominięto %s, nie jest zwykłym plikiem.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Pominięto %s, plik wyjściowy %s jest dowiązaniem symbolicznym.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Pominięto dowiązanie symboliczne %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Pominięto dowiązanie symboliczne %s, cel nie jest zwykłym plikiem.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Pominięto %s, cel dowiązania symbolicznego %s nie jest zwykłym plikiem.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konwersja pliku %s do pliku %s w formacie uniksowym...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konwersja pliku %s do formatu uniksowego...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konwersja pliku %s do pliku %s w formacie Mac...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konwersja pliku %s do formatu Mac...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konwersja pliku %s do formatu DOS...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemy z konwersją pliku %s do pliku %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Pominięto dowiązanie symboliczne %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konwersja pliku %s do formatu uniksowego...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konwersja pliku %s do formatu Mac...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konwersja pliku %s do formatu DOS...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konwersja pliku %s %s do formatu uniksowego %s...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konwersja pliku %s %s do formatu Mac %s...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konwersja pliku %s %s do formatu DOS %s...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemy z konwersją pliku %s do pliku %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "problemy z konwersją pliku %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "nie można czytać z pliku wejściowego %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "błędna flaga '%c' dla opcji -i lub --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktywna strona kodowa: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "podano błędny tryb konwersji %s\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcja '%s' wymaga argumentu\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "podano błędne kodowanie wyświetlania %s\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "nie podano celu pliku %s w trybie nowego pliku\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "nie można czytać z pliku wejściowego: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "nie można zapisać do pliku wyjściowego: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak młodszego zamiennika.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak starszego zamiennika.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index e4f794e..e330215 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,15 +1,15 @@ # Brazilian Portuguese Translation for dos2unix. -# Copyright (C) 2016 Erwin Waterlander (msgids) -# Copyright (C) 2016 Free Software Foundation, Inc. +# Copyright (C) 2017 Erwin Waterlander (msgids) +# Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the dos2unix package. # Enrico Nicoletto <liverig@gmail.com>, 2014. -# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015, 2016. +# Rafael Fontenelle <rffontenelle@gmail.com>, 2014-2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.4-beta4\n" +"Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-15 17:44-0200\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-23 00:11-0300\n" "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n" "Language: pt_BR\n" @@ -79,17 +79,17 @@ msgstr "" "Todos os direitos reservados.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Falha ao gravar no arquivo de saída temporário %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Falha ao fechar o arquivo de entrada %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -111,7 +111,7 @@ msgstr "" " fornecidos com a distribuição.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -137,56 +137,60 @@ msgstr "" "OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, MESMO\n" "SE RESSALVADO DA POSSIBILIDADE DE TAL DANO.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown permite alteração da propriedade do arquivo\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso conversão entre conjunto de caractere do DOS e ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 usa a página de código 1252 do Windows (Europa ocidental)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 usa a página de código 437 do DOS (EUA) (padrão)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 usa a página de código 850 do DOS (Europa ocidental)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 usa a página de código 860 do DOS (Português)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 usa a página de código 863 do DOS (Francês do Canadá)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 usa a página de código 865 do DOS (Nórdico)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 converte-se caracteres de 8 bit para espaço de 7 bit\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.) (padrão)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -194,7 +198,7 @@ msgstr "" " -c, --convmode modo de conversão\n" " convmode ascii, 7bit, iso, mac, padrão para ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -202,19 +206,19 @@ msgstr "" " -D, --display-enc define codificação das mensagens de texto exibidas\n" " codificação ansi, unicode, utf8, sendo padrão o ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force força a conversão de arquivos binários\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 converte-se de UTF-16 para GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help exibe este texto de ajuda\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -222,77 +226,81 @@ msgstr "" " -i, --info[=OPÇÕES] exibe informação do arquivo\n" " file ... arquivos para analisar\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate mantém a data do arquivo de saída\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license exibe a licença do software\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline acrescenta nova linha adicional\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom adiciona marca de ordem de byte (B.O.M.) (padrão UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" " outfile output file in new-file mode\n" msgstr "" " -n, --newfile grava em novo arquivo\n" -" infile arquivo original no modo de novo arquivo\n" -" outfile arquivo de saída no modo de novo arquivo\n" +" arquivo-entrada arquivo original no modo de novo arquivo\n" +" arquivo-saída arquivo de saída no modo de novo arquivo\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown não permite alterar a propriedade do arquivo (padrão)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" msgstr "" " -o, --oldfile grava no arquivo antigo (padrão)\n" -" file ... arquivos a converter no modo de arquivo antigo\n" +" arquivo ... arquivos a converter no modo de arquivo antigo\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet modo silencioso, esconde todos os avisos\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.) (default)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.)\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora os arquivos binários (padrão)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 mantém codificação UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le supõe que o formato de entrada é UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be supõe que o formato de entrada é UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose operação detalhada\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink segue os links simbólicos e converte os destinos\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -300,359 +308,372 @@ msgstr "" " -R, --replace-symlink substitui os links simbólicos por arquivos convertidos\n" " (os arquivos originais de destino permanecem inalterados)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink mantém os links simbólicos e os destinos inalterados (padrão)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version exibe o número da versão\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS versão de 16 bit (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS versão de 16 bit (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS versão de 32 bit (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS versão de 32 bit (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Versão do MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Versão do Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows versão de 64 bit (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows versão de 32 bit (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows versão de 32 bit (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows versão de 32 bit (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows versão de 64 bit (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows versão de 32 bit (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Versão OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Versão OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Versão %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Com suporte a Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Sem suporte a Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Com suporte a nomes de arquivos em Unicode UTF-16.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Sem suporte a nomes de arquivos em Unicode UTF-16.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Com suporte ao idioma nativo.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Com suporte a preservar a propriedade de usuário e grupos de arquivos.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Sem suporte a preservar a propriedade de usuário e grupos de arquivos.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "O caminho do arquivo de saída temporário é muito grande:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Escrevendo %s BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Arquivo de entrada %s possui %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Presume codificação UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Presumo codificação UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Falha ao abrir o arquivo de saída temporário: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como arquivo de temporário\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Falha ao alterar as permissões do arquivo de saída temporário %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "A propriedade de usuário e/ou grupo do arquivo %s não é preservada.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " o arquivo de saída permanece em '%s'\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "ocorreram problemas ao renomear '%s' para '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " que é o destino do link simbólico '%s'\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando o arquivo binário %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "não há suporte a página de código %d.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Ignorando o arquivo UTF-16 %s, o tamanho de wchar_t é de %d bytes.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16 na linha %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando o arquivo UTF-16 %s, não há suporte a conversão para UTF-16 nesta versão do %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, não é um arquivo comum.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Ignorando %s, o arquivo de saída %s é um link simbólico.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignorando o link simbólico %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Ignorando o link simbólico %s, o destino não é o de um arquivo comum.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Ignorando %s, o destino do link simbólico %s não é o de um arquivo comum.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Unix...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "convertendo o arquivo %s para formato Unix...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Mac...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "convertendo o arquivo %s para formato Mac...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "convertendo o arquivo %s para formato DOS...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignorando o link simbólico %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "convertendo o arquivo %s para formato Unix...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "convertendo o arquivo %s para formato Mac...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "convertendo o arquivo %s para formato DOS...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convertendo o arquivo %s %s para formato do Unix %s...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convertendo o arquivo %s %s para formato do Mac %s...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convertendo o arquivo %s %s para formato do DOS %s...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "ocorreram problemas ao converter o arquivo %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "não foi possível gravar no arquivo de entrada %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "opção incorreta \"%c\" para opção -i ou --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "página de código ativa: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "o modo de conversão %s especificado é inválido\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "a opção '%s' requer um argumento\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "a codificação de exibição %s especificada é inválida\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "o destino do arquivo %s não foi especificado no modo de novo arquivo\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "não foi possível ler do arquivo de saída: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "não foi possível gravar no arquivo de saída: %s\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto baixo.\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto alto.\n" @@ -3,13 +3,13 @@ # This file is distributed under the same license as the dos2unix package. # # Andrei Uhlik <uglika@gmail.com>, 2013. -# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015, 2016. +# Yuri Kozlov <yuray@komyakino.ru>, 2014, 2015, 2016, 2017. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.4-beta4\n" +"Project-Id-Version: dos2unix-7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-14 07:46+0300\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-23 09:19+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" "Language: ru\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\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" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: dos2unix.c:79 #, c-format @@ -79,17 +79,17 @@ msgstr "" "Все права защищены.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Не удалось записать во временный выходной файл %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Не удалось закрыть входной файл %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -111,7 +111,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -137,56 +137,60 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Использование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown разрешить смену владельца файла\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii преобразовать только конец строки (по умолчанию)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso преобразовать DOS в ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 использовать кодировку Windows 1252 (Западно-Европейский)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 использовать кодировку DOS 437 (US) (по умолчанию)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 использовать кодировку DOS 850 (Западно-Европейский)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 использовать кодировку DOS 860 (Португальский)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 использовать кодировку DOS 863 (Франко-Канадский)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 использовать кодировку DOS 865 (Скандинавский)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 преобразовать 8-битные символы в 7-битные\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)(по умолчанию)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -194,7 +198,7 @@ msgstr "" " -c, --convmode режим преобразования\n" " convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -202,19 +206,19 @@ msgstr "" " -D, --display-enc задать кодировку отображаемых текстовых сообщений\n" " encoding ansi, unicode, utf8, по умолчанию ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force управление преобразованием двоичных файлов\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 преобразовать UTF-16 в GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help показать справку\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -222,23 +226,23 @@ msgstr "" " -i, --info[=ФЛАГИ] показать информацию о файле\n" " файл … файлы для анализа\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate сохранить дату выходного файла\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license отобразить лицензию программного обеспечения\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline добавить дополнительный разделитель строк\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom добавить метку порядка байтов (по умолчанию в UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -248,7 +252,11 @@ msgstr "" " infile исходный файл в режиме нового файла\n" " outfile выходной файл в режиме нового файла\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown не разрешать смену владельца файла (по умолчанию)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -256,43 +264,43 @@ msgstr "" " -o, --oldfile записать в старый файл (по умолчанию)\n" " file … файлы для преобразования в режиме старого файла\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet не показывать предупреждения\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom удалить метку порядка байтов (BOM) (по умолчанию)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom удалить метку порядка байтов (BOM)\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропустить двоичные файлы (по умолчанию)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 оставить кодировку UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le предположить, что входной формат UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be предположить, что входной формат UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose подробный режим\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink следовать символическим ссылкам и преобразовать цели\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -300,357 +308,370 @@ msgstr "" " -R, --replace-symlink заменить символические ссылки преобразованными файлами\n" " (оригинальные целевые файлы останутся без изменений)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink оставить символические ссылки и цели без изменений (по умолчанию)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version отобразить номер версии\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Версия для DOS, 16-битная (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Версия для DOS, 16-битная (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Версия для DOS, 32-битная (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Версия для DOS, 32-битная (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Версия с MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Версия с Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Версия для Windows, 64-битная (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Версия для Windows, 32-битная (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Версия для Windows, 32-битная (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Версия для Windows, 32-битная (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Версия для Windows, 64-битная (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Версия для Windows, 32-битная (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Версия для OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Версия для OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Версия для %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "С поддержкой Юникода UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Без поддержки Юникода UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "С поддержкой имён файлов в Юникоде.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Без поддержки имён файлов в Юникоде.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "С поддержкой родного языка.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "С поддержкой сохранения владельца и группы файлов.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Без поддержки сохранения владельца и группы файлов.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Слишком длинный путь для временного выходного файла:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Записывается %s BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Входной файл %s содержит %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Предполагается кодировка UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Предполагается кодировка UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не удалось открыть временный выходной файл: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "использование %s в качестве временного файла\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не удалось изменить права доступа ко временному выходному файлу %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "Владелец и группа файла %s не сохраняется.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не удалось изменить владельца и группу временного выходного файла %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "конфликт при разрешении символической ссылки «%s»\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " выходной файл остаётся в «%s»\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблемы при переименовании «%s» в «%s»:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " который является целью символической ссылки «%s»\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропуск двоичного файла %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "кодовая страница %d не поддерживается.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Пропуск файла %s с UTF-16, размер wchar_t составляет %d байт.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропуск файла %s с UTF-16, возникла ошибка преобразования UTF-16 в строке %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропуск файла %s с UTF-16, преобразование UTF-16 не поддерживается в этой версии %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропуск %s, не является обычным файлом.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Пропуск символической ссылки %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропуск символической ссылки %s, цель не является обычным файлом.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропуск %s, цель символической ссылки %s не является обычным файлом.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "преобразование файла %s в файл %s в формат Unix…\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "преобразование файла %s в формат Unix…\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "преобразование файла %s в файл %s в формат Mac…\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "преобразование файла %s в формат Mac…\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "преобразование файла %s в файл %s в формат DOS…\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "преобразование файла %s в формат DOS…\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат Unix…\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "проблемы при преобразовании файла %s в файл %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Пропуск символической ссылки %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "преобразование файла %s в формат Unix…\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "преобразование файла %s в формат Mac…\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "преобразование файла %s в формат DOS…\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "преобразование %s из файла %s в %s формат Unix…\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "преобразование %s из файла %s в %s формат Mac…\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "преобразование %s из файла %s в %s формат DOS…\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "проблемы при преобразовании файла %s в файл %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "проблемы при преобразовании файла %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "не удалось прочитать из входного файла %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "некорректный флаг «%c» для параметра -i или --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "активная кодовая страница: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "задан неправильный %s режим преобразования\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "для параметра «%s» требуется аргумент\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "задана неправильная кодировка отображения (%s)\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "цель файла %s не задана в режиме нового файла\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "не удалось прочитать из входного файла: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "не удалось записать в выходной файл: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует младший суррогат.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует старший суррогат.\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-29 19:36+0200\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -76,17 +76,17 @@ msgstr "" "Сва права су задржана.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Нисам успео да затворим улазну датотеку „%s“:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -102,7 +102,7 @@ msgstr "" "1. Расподела изворног кода мора да садржи горње обавештење о ауторском праву, овај списак услова и следећи опозив.\n" "2. Расподела у бинарном облику мора да понови обавештење горе наведеног ауторског права у документацији и/или у другом материјалу који долази уз дистрибуцију.\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -128,56 +128,60 @@ msgstr "" "НЕПАЖЊУ ИЛИ ДРУГО) ДОВОДЕЋИ НА БИЛО КОЈИ НАЧИН ДО ПРЕКИДА УПОТРЕБЕ\n" "ОВОГ СОФТВЕРА, ЧАК И АКО СТЕ ОБАВЕШТЕНИ О МОГУЋНОСТИ ТАКВИХ ШТЕТА.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii претвара само прекиде реда (основно)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso претварање између скупа знакова ДОС-а и ИСО-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 користи Виндоуз кодну страницу 1252 (западно-европски)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 користи ДОС кодну страницу 437 (САД) (основно)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 користи ДОС кодну страницу 850 (западно-европски)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 користи ДОС кодну страницу 860 (португалски)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 користи ДОС кодну страницу 863 (канадски француски)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 користи ДОС кодну страницу 865 (норвешки)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 претвара 8-битне знакове у 7-битне размаке\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта (основно)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -185,7 +189,7 @@ msgstr "" " -c, --convmode режим претварања\n" " режим претварања аскри, 7бита, исо, мек, подразумева аскри\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -193,19 +197,19 @@ msgstr "" " -D, --display-enc подешава кодирање приказаних порука текста\n" " кодирање „ansi“, „unicode“, „utf8“, основно је „ansi“\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force присиљава претварање бинарних датотека\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 претвара УТФ-16 у ГБ18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help приказује овај текст помоћи\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -213,23 +217,23 @@ msgstr "" " -i, --info[=ЗАСТАВЕ] приказује податке о датотеци\n" " file ... датотеке за анализу\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate задржава датум излазне датотеке\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license приказује дозволу софтвера\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline додаје додатни нови ред\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom додаје назнаку поретка бајта (основно УТФ-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -239,7 +243,11 @@ msgstr "" " улазна датотека изворна датотека у режиму нове датотеке\n" " излазна датотека излазна датотека у режиму нове датотеке\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -247,43 +255,43 @@ msgstr "" " -o, --oldfile пише у стару датотеку (основно)\n" " датотека ... датотеке за претварање у режиму старе датотеке\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet тихи режим, потискује сва упозорења\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта (основно)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe прескаче бинарне датотеке (основно)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 задржава УТФ-16 кодирање\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le подразумева да је улазни запис „UTF-16LE“\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be подразумева да је улазни запис „UTF-16BE“\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose опширне радње\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink прати симболичке везе и претвара мете\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -291,357 +299,370 @@ msgstr "" " -R, --replace-symlink замењује симболичке везе претвореним датотекама\n" " (изворне датотеке мете остају непромењене)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink задржава неизмењеним симболичке везе и мете (основно)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version приказује број издања\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "ДОС 16-битно издање (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "ДОС 16-битно издање (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "ДОС 32-битно издање (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "ДОС 32-битно издање (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "МСИС издање.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Цигвин издање.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Виндоуз 64-битно издање (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Виндоуз 32-битно издање (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Виндоуз 32-битно издање (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Виндоуз 32-битно издање (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Виндоуз 64-битно издање (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Виндоуз 32-битно издање (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "ОС/2 издање (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "ОС/2 издање (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s издање.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Са подршком Јуникода УТФ-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Без подршке Јуникода УТФ-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Са подршком назива датотеке Јуникода.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Без подршке назива датотеке Јуникода.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Са подршком матерњег језика.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Путања за привремену излазну датотеку је предуга:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Записујем %s НПБ-а.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "УТФ-16ЛЕ" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "УТФ-16БЕ" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "ГБ18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "УТФ-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Улазна датотека „%s“ има %s НПБ-а.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Подразумевам УТФ-16ЛЕ кодирање.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Подразумевам УТФ-16БЕ кодирање.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "користим „%s“ као привремену датотеку\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми решавања симболичке везе „%s“\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " излазна датотека остаје у „%s“\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми преименовања „%s“ у „%s“:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " који је мета симболичке везе „%s“\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Прескачем бинарну датотеку „%s“\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "Кодна страница „%d“ није подржана.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, величина „wchar_t“-а је %d бајта.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања у %u. реду.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, УТФ-16 претварање није подржано у овом издању „%s“.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Прескачем „%s“, није обична датотека.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Прескачем „%s“, излазна датотека „%s“ је симболичка веза.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Прескачем симболичку везу „%s“.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Прескачем симболичку везу „%s“, мета није обична датотека.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Прескачем „%s“, мета симболичке везе „%s“ није обична датотека.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Јуникса...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "претварам датотеку „%s“ у запису Јуникса...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Мека...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "претварам датотеку „%s“ у запису Мека...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису ДОС-а...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "претварам датотеку „%s“ у запису ДОС-а...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Јуникса...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Прескачем симболичку везу „%s“.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "претварам датотеку „%s“ у запису Јуникса...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "претварам датотеку „%s“ у запису Мека...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "претварам датотеку „%s“ у запису ДОС-а...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Јуникса...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Мека...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Дос-а...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "проблеми претварања датотеке „%s“\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "не могу да читам из улазне датотеке „%s“:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "погрешна заставица „%c“ за опцију „-i“ или „--info“\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "радна кодна страница: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "наведен је неисправан „%s“ режим претварања\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "опција „%s“ захтева аргумент\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "наведено је неисправно кодирање „%s“ приказа\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "не могу да читам из улазне датотеке: „%s“\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "не могу да пишем у излазну датотеку: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје нижи надометак.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје виши надометак.\n" @@ -1,14 +1,14 @@ # Swedish translation for dos2unix. -# Copyright © 2014-2016 Erwin Waterlander, et al. (msgids) +# Copyright © 2014, 2015, 2016, 2017 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Sebastian Rasmussen <sebras@gmail.com>, 2014-2016. +# Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.4-beta4\n" +"Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-07-31 15:38+0800\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-23 01:11+0200\n" "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 2.0.3\n" #: dos2unix.c:79 #, c-format @@ -77,17 +77,17 @@ msgstr "" "Alla rättigheter reserverade.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Misslyckades att skriva till temporär utmatningsfil %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Misslyckades att stänga inmatningsfil %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -109,7 +109,7 @@ msgstr "" " med distributionen.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -137,56 +137,60 @@ msgstr "" "ANVÄNDNING AV DENNA MJUKVARA, ÄVEN OM UNDERRÄTTAD OM MÖJLIGHETEN FÖR\n" "SÅDAN SKADA.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Användning: %s [flaggor] [fil …] [-n infil utfil …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown tillåt ändring av ägarskap för fil\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konvertera bara radbrytningar (standard)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso konvertering mellan DOS och ISO-8859-1 teckenuppsättningar\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 använd Windows teckentabell 1252 (västeuropeisk)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 använd DOS teckentabell 437 (USA) (standard)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 använd DOS teckentabell 850 (västeuropeisk)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 använd DOS teckentabell 860 (portugisisk)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 använd DOS teckentabell 863 (fransk-kanadensisk)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 använd DOS-teckentabell 865 (nordisk)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konvertera 8-bitars tecken till 7-bitars blanksteg\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark) (standard)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -194,7 +198,7 @@ msgstr "" " -c, --convmode konverteringsläge\n" " konverteringsläge ascii, 7bit, iso, mac, standard är ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -202,19 +206,19 @@ msgstr "" " -D, --display-enc ställ in kodning för visade textmeddelanden\n" " kodning ansi, unicode, utf8, standard är ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force tvinga konvertering av binära filer\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konvertera UTF-16 till GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help visar denna hjälptext\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -222,23 +226,23 @@ msgstr "" " -i, --info[=FLAGGOR] visa filinformation\n" " fil … filer att analysera\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behåll datum för utmatningsfilen\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license visa programvarulicensen\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline lägg till ytterligare nyrad\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom lägg till byteordningsmarkering (Byte Order Mark) (standard för UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -248,7 +252,11 @@ msgstr "" " infil originalfil i nyfilsläge\n" " utfil utmatningsfil i nyfilsläge\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown tillåt inte ändring av ägarskap för fil (standard)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -256,43 +264,43 @@ msgstr "" " -o, --oldfile skriv till den gamla filen (standard)\n" " fil … filer att konvertera i äldrefilsläge\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet tyst läge, dölj alla varningar\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark) (standard)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark)\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe hoppa över binära filer (standard)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behåll UTF-16 teckenkodning\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le förmoda att inmatningsformatet är UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be förmoda att inmatningsformatet är UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose utförlig drift\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink följ symboliska länkar och konvertera målen\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -300,356 +308,369 @@ msgstr "" " -R, --replace-symlink ersätt symboliska länkar med konverterade filer\n" " (de ursprungliga målfilerna förblir oförändrade)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink behåll symboliska länkar och mål oförändrade (standard)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version visa versionsnummer\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bitarsversion (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bitarsversion (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bitarsversion (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bitarsversion (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS-version.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin-version.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bitarsversion (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bitarsversion (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bitarsversion (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bitarsversion (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bitarsversion (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bitarsversion (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-version (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2-version (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "%s version.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Med stöd för Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Utan stöd för Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Med stöd för Unicode-filnamn.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Utan stöd för Unicode-filnamn.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Med modersmålsstöd.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Med stöd för att bevara användar- och gruppägarskap för filer.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Utan stöd för att bevara användar- och gruppägarskap för filer.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Sökväg för temporär utmatningsfil är för lång:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Infil %s har %s BOM.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Förmodar att UTF-16LE teckenkodning används.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Förmodar att UTF-16BE teckenkodning används.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Misslyckades att öppna temporär utmatningsfil: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "använder %s som temporär fil\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Misslyckades att ändra rättigheterna för temporär utmatningsfil %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "Användar- och/eller gruppägarskap för fil %s bevaras inte.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Misslyckades att ändra ägare och grupp för temporär utmatningsfil %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "fel uppstod vid upplösning av symbolisk länk ”%s”\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " utfil förblir i ”%s”\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "fel när '%s' bytte namn till '%s':" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " vilken är målet för den symboliska länken ”%s”\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Hoppar över binärfil %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "saknar stöd för teckentabell %d.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hoppar över UTF-16-fil %s, storleken på wchar_t är %d byte.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hoppar över UTF-16-fil %s, ett UTF-16-konverteringsfel inträffade på rad %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hoppar över UTF-16-fil %s, UTF-16-konvertering saknar stöd i denna version av %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hoppar över %s, är ingen vanlig fil.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hoppar över %s, utfil %s är en symbolisk länk.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Hoppar över symbolisk länk %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hoppar över symbolisk länk %s, målet är inte en vanlig fil.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hoppar över %s, målet för den symboliska länken %s är inte en vanlig fil.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konverterar fil %s till fil %s i Unix-format…\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konverterar fil %s till Unix-format…\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterar fil %s till fil %s i Mac-format…\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konverterar fil %s till Mac-format…\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterar fil %s till fil %s i DOS-format…\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konverterar fil %s till DOS-format…\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "fel vid konvertering från fil %s till fil %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Hoppar över symbolisk länk %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konverterar fil %s till Unix-format…\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konverterar fil %s till Mac-format…\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konverterar fil %s till DOS-format…\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterar %s-fil %s till %s Unix-format…\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterar %s-fil %s till %s Mac-format…\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterar %s-fil %s till %s DOS-format…\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "fel vid konvertering från fil %s till fil %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "fel vid konvertering av fil %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "kan inte läsa från inmatningsfil %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "felaktig flagga '%c' för argumentet -i eller --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "aktiv teckentabell: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ogiltigt konverteringsläge %s angivet\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "flaggan ”%s” kräver ett argument\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ogiltig %s-kodning angiven\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "målet för fil %s specificerades inte i nyfilsläge\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "kan inte läsa från inmatningsfil: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "kan inte skriva till utfil: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den lägre delen av surrogatparet saknas.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den högre delen av surrogatparet saknas.\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2016-05-13 17:31+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" @@ -79,17 +79,17 @@ msgstr "" "Усі права застережено.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Не вдалося записати дані до тимчасового файла виведення %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Не вдалося закрити файл вхідних даних %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -118,7 +118,7 @@ msgstr "" " від відповідальності у документації і/або інших супровідних матеріалах.)\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -144,56 +144,60 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Користування: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii перетворити лише символи розриву рядків (типово)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso виконати перетворення з кодування DOS до кодування ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 використати кодову таблицю 1252 Windows (західноєвропейські мови)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 використовувати кодову сторінку DOS 437 (США) (типово)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 використовувати кодову сторінку DOS 850 (західноєвропейські мови)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 використовувати сторінку DOS 860 (португальська)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 використовувати сторінку DOS 863 (канадська французька)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 використовувати сторінку DOS 865 (скандинавські мови)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 перетворювати 8-бітові символи на 7-бітові\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom зберегти позначку порядку байтів (BOM)\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom зберегти позначку порядку байтів (типово)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -201,7 +205,7 @@ msgstr "" " -c, --convmode режим перетворення\n" " режим ascii, 7bit, iso, mac, типовим є ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -209,19 +213,19 @@ msgstr "" " -D, --display-enc встановити кодування показаних текстових повідомлень,\n" " кодування ansi, unicode, utf8, типовим є ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force примусове перетворення бінарних файлів\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 перетворити UTF-16 на GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help показати це довідкове повідомлення\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -229,23 +233,23 @@ msgstr "" " -i, --info[=ПРАПОРЦІ] показати дані щодо файла\n" " файл ... файли, які слід проаналізувати\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate зберігати дату створення файла для результату\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license показати ліцензійну угоду щодо програмного забезпечення\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline вставити додатковий символ розриву рядка\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -b, --add-bom додати позначку порядку байтів (типово UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -255,7 +259,11 @@ msgstr "" " вхідний_файл початковий файл у режимі створення файлів\n" " результат файл результату у режимі створення файлів\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -263,43 +271,43 @@ msgstr "" " -o, --oldfile записати до старого файла (типово)\n" " файл ... файли, які слід перетворити у режимі без створення файлів\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet режим без повідомлень, не показувати попередження\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom вилучити позначку порядку байтів (типово)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom вилучити позначку порядку байтів (BOM)\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропускати двійкові файли (типово)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 зберегти кодування UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le припускати, що вхідним форматом є UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be припускати, що вхідним форматом є UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose режим докладних повідомлень\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink переходити за символічними посиланням і перетворювати файли, на які вони вказують\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -307,357 +315,370 @@ msgstr "" " -R, --replace-symlink замінити символічні посилання перетвореними файлами\n" " (початкові файли, на які вони вказують, змінено не буде)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink не змінювати символічні посилання та файли, на які вони посилаються (типово)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version показати дані щодо номера версії\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS, 16-бітова версія (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS, 16-бітова версія (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS, 32-бітова версія (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS, 32-бітова версія (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Версія MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Версія Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows, 64-бітова версія (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows, 32-бітова версія (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows, 32-бітова версія (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows, 32-бітова версія (MinGW)\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows, 64-бітова версія (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows, 32-бітова версія (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Версія для OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Версія для OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Версія %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "З підтримкою Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Без підтримки Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "З підтримкою назв файлів у Unicode.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Без підтримки Unicode у назвах файлів.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "З підтримкою природної мови.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Шлях до тимчасового файла виведення є надто довгим:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Записуємо позначку порядку байтів %s.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "У вхідному файлі %s позначкою порядку байтів є %s.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Припускаємо кодування UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Припускаємо кодування UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не вдалося відкрити файл для виведення тимчасових даних: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "використовуємо %s як тимчасовий файл\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не вдалося змінити права доступу до тимчасового файла виведення даних %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не вдалося змінити власника і групу тимчасового файла виведення даних %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми з обробкою символічного посилання «%s»\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " файл результатів залишився у «%s»\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми з перейменуванням «%s» на «%s»:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " на який посилається символічне посилання «%s»\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропускаємо двійковий файл %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "підтримки кодової сторінки %d не передбачено.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, розміром wchar_t є %d байтів.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, сталася помилка під час перетворення даних UTF-16 у рядку %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, перетворення UTF-16 для цієї версії %s не передбачено.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропускаємо %s, не є звичайним файлом.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропускаємо %s, файл результату, %s, є символічним посиланням.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Пропускаємо символічне посилання %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропускаємо символічне посилання %s, призначення не є звичайним файлом.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропускаємо %s, об’єкт, на який посилається символічне посилання %s, не є звичайним файлом.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "перетворюємо файл %s до формату Unix...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "перетворюємо файл %s до формату Mac...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "перетворюємо файл %s до формату DOS...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Unix...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "під час перетворення файла %s на файл %s виникли проблеми\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Пропускаємо символічне посилання %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "перетворюємо файл %s до формату Unix...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "перетворюємо файл %s до формату Mac...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "перетворюємо файл %s до формату DOS...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Unix...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Mac...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s DOS...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "під час перетворення файла %s на файл %s виникли проблеми\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "під час перетворення файла %s виникли проблеми\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "не вдалося прочитати дані із файла вхідних даних %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "помилковий прапорець «%c» для параметра -i або --info\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "активна кодова сторінка: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "вказано некоректний режим перетворення %s\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "до параметра «%s» слід вказувати аргумент\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "вказано некоректне кодування для показу %s\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "не вказано призначення для файла %s у режимі створення файлів\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "не вдалося прочитати дані із файла вхідних даних: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "не вдалося виконати запис до файла результатів: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено нижній компонент.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено верхній компонент.\n" @@ -1,14 +1,14 @@ # Vietnamese translations for dos2unix package # Bản dịch tiếng Việt cho gói dos2unix. # This file is distributed under the same license as the dos2unix package. -# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016. +# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.4-beta4\n" +"Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-05-14 08:17+0700\n" +"POT-Creation-Date: 2017-09-24 20:01+0200\n" +"PO-Revision-Date: 2017-09-23 07:05+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -79,17 +79,17 @@ msgstr "" "Giữ toàn bộ bản quyền.\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Gặp lỗi khi ghi vào tập tin đầu ra tạm thời %s:" -#: common.c:84 +#: common.c:83 #, c-format msgid "Failed to close input file %s:" msgstr "Gặp lỗi khi đóng đầu vào %s:" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -110,7 +110,7 @@ msgstr "" " bản phân phối.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -125,56 +125,60 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Cách dùng: %s [các-tùy-chọn] [tập-tin …] [-n tập-tin-vào tập-tin-ra …]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown cho phép thay đổi chủ sở hữu tập tin\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii chỉ chuyển đổi các ngắt dòng (mặc định)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso chuyển đổi giữa DOS và ISO-8859-1\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 dùng trang mã Windows 1252 (Tây Âu)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 dùng trang mã DOS 437 (US) (mặc định)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 dùng trang mã DOS 850 (Tây Âu)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 dùng trang mã DOS 860 (Bồ Đào Nha)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 dùng trang mã DOS 863 (Ca Na Đa Pháp)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 dùng trang mã DOS 865 (Bắc Âu)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 chuyển đổi các ký tự 8 bit thành 7 bit\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark”\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark” (mặc định)\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -182,7 +186,7 @@ msgstr "" " -c, --convmode chế độ chuyển đổi\n" " chế độ chuyển đổi: ascii, 7bit, iso, mac, mặc định là ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -190,19 +194,19 @@ msgstr "" " -D, --display-enc đặt bảng mã để hiển thị các thông báo\n" " bảng mã: ansi, unicode, utf8, mặc định là ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force bắt buộc chuyển đổi các tập tin nhị phân\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 đổi từ UTF-16 sang GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help hiển thị trợ giúp này\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -210,23 +214,23 @@ msgstr "" " -i, --info[=CỜ] hiển thị thông tin tập tin\n" " tập-tin … các tập tin cần phân tích\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate giữ nguyên ngày tháng tập tin đầu ra\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license hiển thị giấy phép dùng phần mềm\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline bổ xung thêm dòng mới\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom thêm “Byte Order Mark” (mặc định UTF-8)\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -236,7 +240,11 @@ msgstr "" " tập-tin-vào tập tin gốc trong chế độ tập-tin-mới\n" " tập-tin-ra tập tin đầu ra trong chế độ tập-tin-mới\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown không cho phép thay đổi chủ sở hữu tập tin (mặc định)\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -244,43 +252,43 @@ msgstr "" " -o, --oldfile ghi vào tập tin cũ (mặc định)\n" " tập-tin … các tập tin cần chuyển đổi trong chế độ tập-tin-cũ\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet chế độ im lặng, chặn mọi cảnh báo\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark” (mặc định)\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark”\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe bỏ qua tập tin nhị phân (mặc định)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 giữ bảng mã UTF-16\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le coi rằng định dạng đầu vào là UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be coi rằng định dạng đầu vào là UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose thông báo chi tiết\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink theo liên kết mềm và chuyển đổi đích\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -288,357 +296,370 @@ msgstr "" " -R, --replace-symlink thay thế liên kết mềm bằng tập tin đã chuyển đổi\n" " (các tập tin đích nguyên gốc thì để nguyên không thay đổi)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink giữ liên kết mềm và đích không thay đổi (mặc định)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version hiển thị số hiệu phiên bản\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 16 bit (WATCOMC).\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Phiên bản DOS 16 bit (TURBOC).\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 32 bit (WATCOMC).\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Phiên bản DOS 32 bit (DJGPP).\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "Phiên bản MSYS.\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Phiên bản Cygwin.\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 64 bit (MinGW-w64).\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Phiên bản Windows 32 bit (WATCOMC).\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 32 bit (MinGW-w64).\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Phiên bản Windows 32 bit (MinGW).\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 64 bit (MSVC %d).\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 32 bit (MSVC %d).\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "Phiên bản OS/2 (WATCOMC).\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "Phiên bản OS/2 (EMX).\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "Phiên bản %s.\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "Có hỗ trợ Unicode UTF-16.\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "Không hỗ trợ Unicode UTF-16.\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "Có hỗ trợ tên tập tin dạng Unicode.\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "Không hỗ trợ tên tập tin dạng Unicode.\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "Có hỗ trợ bản địa hóa ngôn ngữ.\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "Với hỗ trợ giữ nguyên người và nhóm sở hữu tập tin.\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "Không hỗ trợ giữ nguyên người và nhóm sở hữu tập tin.\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" msgstr "Đường dẫn cho tập tin xuất tạm quá dài:" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "Đang ghi %s BOM.\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Tập tin đầu vào %s có BOM %s.\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "Coi là bảng mã UTF-16LE.\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "Coi là bảng mã UTF-16BE.\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Gặp lỗi khi mở tập tin đầu ra tạm thời: %s\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "đang dùng %s làm tập tin tạm\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Gặp lỗi khi thay đổi quyền hạn của tập tin đầu ra tạm %s:" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "Người dùng và nhóm sở hữu của tập tin %s không được giữ nguyên.\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Gặp lỗi khi đổi chủ sở hữu và nhóm của tập tin đầu ra tạm %s:" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "gặp lỗi khi phân giải liên kết mềm “%s”\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " tập tin đầu ra còn trong “%s”\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "gặp lỗi khi đổi tên “%s” thành “%s”:" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " cái là đích của liên kết mềm “%s”\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "Bỏ qua tập tin nhị phân %s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "không hỗ trợ trang mã %d.\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Bỏ qua tập tin UTF-16 %s, cỡ của wchar_t không phải là %d byte.\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Bỏ qua tập tin UTF-16 %s, đã xảy ra lỗi chuyển đổi UTF-16 trên dòng %u.\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Bỏ qua tập tin UTF-16 %s, chuyển đổi UTF-16 không được hỗ trợ ở phiên bản này của %s.\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Bỏ qua %s, đây không phải là tập tin thường.\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Bỏ qua %s, tập tin đầu ra %s là một liên kết mềm.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Bỏ qua liên kết mềm %s.\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Bỏ qua liên kết mềm %s, đích của nó không phải là một tập tin thường.\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Bỏ qua liên kết mềm %s, đích %s của liên kết mềm không phải là một tập tin thường.\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s thành tập tin “%s” theo định dạng Unix…\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Unix…\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng Mac…\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Mac…\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng DOS…\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Unix %s…\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Bỏ qua liên kết mềm %s.\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Unix…\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Mac…\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Unix %s…\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Mac %s…\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng DOS %s…\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "gặp trục trặc khi chuyển đổi tập tin %s\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "không thể đọc từ tập tin đầu vào %s:" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "cờ “%c” cho tùy chọn -i hay --info bị sai\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "trang mã đang hoạt động: %d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "đã đưa ra chế độ chuyển đổi %s không hợp lệ\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "tùy chọn “%s” yêu cầu một đối số\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "đã đưa ra bảng mã hiển thị không hợp lệ %s\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "đích của tập tin %s không được chỉ định trong chế độ tập-tin-mới\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "không thể đọc từ tập tin đầu vào: %s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "không thể ghi vào tập tin đầu ra: %s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế dưới.\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế trên.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index f989095..eaa7103 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,10 +4,10 @@ # Tianze Wang <zwpwjwtz@126.com>, 2015. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" -"PO-Revision-Date: 2016-01-12 19:12+0800\n" +"POT-Creation-Date: 2017-09-20 22:02+0200\n" +"PO-Revision-Date: 2017-09-22 23:00+0200\n" "Last-Translator: Tianze Wang <zwpwjwtz@126.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 2.0.2\n" "Plural-Forms: nplurals=1; plural=0;\n" #: dos2unix.c:79 @@ -77,17 +77,17 @@ msgstr "" "保留所有权利。\n" "\n" -#: common.c:82 +#: common.c:81 #, c-format msgid "Failed to write to temporary output file %s:" -msgstr "写入临时输出文件失败%s：" +msgstr "写入临时输出文件 %s 失败：" -#: common.c:84 -#, fuzzy, c-format +#: common.c:83 +#, c-format msgid "Failed to close input file %s:" -msgstr "打开临时输出文件 %s 失败\n" +msgstr "打开输出文件 %s 失败：" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -109,7 +109,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -135,56 +135,60 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "用法：%s [选项] [文件 ...] [-n 输入文件 输出文件 ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr " --allow-chown 允许修改文件所有者\n" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 只转换换行符（默认）\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso 在 DOS 和 ISO-8859-1 字符集之间转换\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 使用Windows 1252 编码页（西欧）\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 使用DOS 437 编码页（US）（默认）\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 使用DOS 850 编码页（西欧）\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 使用DOS 860 编码页（葡萄牙）\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 使用DOS 863 编码页（加拿大法語）\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 使用DOS 865 编码页（北欧）\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 转换8 位字符到7 位空间\n" -#: common.c:658 +#: common.c:660 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom 保留UTF-8 BOM头\n" -#: common.c:660 +#: common.c:662 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr "-b, --keep-bom 保留UTF-8 BOM头（默认）\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -192,7 +196,7 @@ msgstr "" " -c, --convmode 转换模式\n" " convmode ascii、7bit、iso或mac，默认为ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -200,19 +204,19 @@ msgstr "" " -D, --display-enc 设置消息文本的编码\n" " encoding ansi、unicode或utf8，默认为ansi\n" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force 强制转换二进制文件\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 转换UTF-16为GB18030\n" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help 显示本说明文字\n" -#: common.c:674 +#: common.c:676 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -220,23 +224,23 @@ msgstr "" " -i, --info[=FLAGS] 显示文件信息\n" " 文件 ... 需要分析的文件\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate 保留输出文件时间\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license 显示软件协议\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 加入额外的换行符\n" -#: common.c:679 +#: common.c:681 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom 添加UTF-8 BOM头（默认为UTF-8）\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -246,7 +250,11 @@ msgstr "" " infile 新文件模式中的原始文件\n" " outfile 新文件模式中的输出文件\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr " --no-allow-chown 不允许修改文件所有者（默认选项）\n" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -254,43 +262,43 @@ msgstr "" " -o, --oldfile 写入原文件（默认）\n" " file ... 旧文件模式中要转换的文件\n" -#: common.c:685 +#: common.c:690 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet 安静模式，不显示所有警告\n" -#: common.c:687 +#: common.c:692 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom 移除UTF-8 BOM头（默认）\n" -#: common.c:689 +#: common.c:694 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom 移除UTF-8 BOM头\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe 跳过二进制文件(默认)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 保留UTF-16编码\n" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 假定输入文件格式为UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 假定输入文件格式为UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose 显示更多信息\n" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink 根据符号链接转换其目标文件\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -298,358 +306,370 @@ msgstr "" " -R, --replace-symlink 取代符号链接为转换后的文件\n" " (原链接目标文件保持不变)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink 保持符号链接及其目标不变（默认）\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version 显示版本号\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "16位DOS版本 (WATCOMC)。\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "16位DOS版本(TURBOC)。\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "32位DOS版本(WATCOMC)。\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "32位DOS版本(DJGPP)。\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS版本。\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin版本。\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "64位Windows版本(MinGW-w64)。\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "32位Windows版本(WATCOMC)。\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "32位Windows版本(MinGW-w64)。\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "32位Windows版本(MinGW)。\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "64位Windows版本(MSVC %d)。\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "32位Windows版本(MSVC %d)。\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 版本(WATCOMC)。\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2 版本(EMX)。\n" -#: common.c:745 +#: common.c:750 #, c-format msgid "%s version.\n" msgstr "版本 %s。\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "有Unicode UTF-16 支持。\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "无Unicode UTF-16 支持。\n" -#: common.c:757 +#: common.c:762 msgid "With Unicode file name support.\n" msgstr "有Unicode文件名支持。\n" -#: common.c:759 +#: common.c:764 msgid "Without Unicode file name support.\n" msgstr "无Unicode文件名支持。\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "含本地语言支持。\n" -#: common.c:899 -#, fuzzy +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "支持保护文件的属主和属组不被更改。\n" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "不支持保护文件的属主和属组。\n" + +#: common.c:909 msgid "Path for temporary output file is too long:" -msgstr "写入临时输出文件失败%s：" +msgstr "临时输出" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "写入 %s BOM。\n" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "GB18030" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "输入文件 %s 有 %s BOM。\n" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "假定为UTF-16LE编码。\n" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "假定为UTF-16BE编码。\n" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "打开临时输出文件 %s 失败\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作为临时文件\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "改变临时输出文件 %s 的权限失败：" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "文件 %s 的属主和/或属组已改变。\n" + +#: common.c:1609 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "改变临时输出文件 %s 的所有者和群组失败：" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "解析符号链接“%s”遇到问题\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " 输出文件“%s”未改变\n" -#: common.c:1647 +#: common.c:1684 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "重新命名“%s”到“%s”错误：" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者为符号链接'%s' 的目标\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "跳过二进制文件%s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "不支持编码页 %d。\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "跳过 UTF-16 文件 %s，wchar_t 的大小为 %d 位。\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "跳过 UTF-16 文件 %s，UTF-16 转换发生错误于第 %u 行。\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "跳过 UTF-16 文件 %s，本版本 %s 不支持UTF-16。\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "跳过 %s，不是一个普通文件。\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "跳过 %s，输出文件 %s 是一个符号链接。.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "跳过符号链接 %s。\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "跳过符号链接 %s，目标不是一个普通文件。\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "跳过 %s，符号链接 %s 目标不是一个普通文件。\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在转换文件 %s 为Unix格式到 %s...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "正在转换文件 %s 为Unix格式...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在转换文件 %s 为Mac格式到 %s...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "正在转换文件 %s 为Mac格式...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在转换文件 %s 为DOS格式到 %s...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "正在转换文件 %s 为DOS格式...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n" -#: common.c:1845 -#, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n" - -#: common.c:1847 -#, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "转换文件 %s 到 %s 错误\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "跳过符号链接 %s。\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "正在转换文件 %s 为Unix格式...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "正在转换文件 %s 为Mac格式...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "正在转换文件 %s 为DOS格式...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在转换 %s 文件 %s 为Unix格式的 %s 文件...\n" -#: common.c:1930 +#: common.c:1904 +#, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n" + +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在转换 %s 文件 %s 为Mac格式的 %s 文件...\n" -#: common.c:1932 +#: common.c:1909 +#, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n" + +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在转换 %s 文件 %s 为DOS格式的 %s 文件...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "转换文件 %s 到 %s 错误\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "转换文件 %s 出错\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, c-format msgid "can not read from input file %s:" msgstr "无法读取输入文件 %s：" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "-i/--info选项的标志“%c”错误\n" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "作用中编码页：%d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的转换模式 %s 不合法\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "选项“%s”需要一个参数\n" -#: common.c:2491 +#: common.c:2476 #, c-format msgid "invalid %s display encoding specified\n" msgstr "指定了无效的显示编码 %s\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新文件模式中未指明文件 %s 的目的位置\n" -#: common.c:2602 +#: common.c:2588 #, c-format msgid "can not read from input file: %s\n" msgstr "无法读取输入文件：%s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "无法写入输出文件：%s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "错误：无效的代理对。缺少低位字符。\n" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "错误：无效的代理对。缺少高位字符。\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 7d820b0..6d0d6bc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 6.0.5-b3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-20 19:25+0200\n" +"POT-Creation-Date: 2017-09-11 20:12+0200\n" "PO-Revision-Date: 2014-03-14 00:43+0800\n" "Last-Translator: mail6543210 <mail6543210@yahoo.com.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -77,17 +77,17 @@ msgstr "" "保留所有權利。\n" "\n" -#: common.c:82 +#: common.c:81 #, fuzzy, c-format msgid "Failed to write to temporary output file %s:" msgstr "暫存檔寫入失敗%s：%s\n" -#: common.c:84 +#: common.c:83 #, fuzzy, c-format msgid "Failed to close input file %s:" msgstr "暫存檔 %s 開啟失敗\n" -#: common.c:612 +#: common.c:611 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -109,7 +109,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:622 +#: common.c:621 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -135,58 +135,62 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:647 +#: common.c:646 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "用法: %s [選項] [file ...] [-n infile outfile ...]\n" #: common.c:648 +msgid " --allow-chown allow file ownership change\n" +msgstr "" + +#: common.c:650 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 只轉換換行字元(預設)\n" -#: common.c:649 +#: common.c:651 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso 在DOS 和ISO-8859-1 字元集間轉換\n" -#: common.c:650 +#: common.c:652 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 使用Windows 1252 編碼頁(西歐)\n" -#: common.c:651 +#: common.c:653 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 使用DOS 437 編碼頁(US) (預設)\n" -#: common.c:652 +#: common.c:654 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 使用DOS 850 編碼頁(西歐)\n" -#: common.c:653 +#: common.c:655 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 使用DOS 860 編碼頁(葡萄牙)\n" -#: common.c:654 +#: common.c:656 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 使用DOS 863 編碼頁(加拿大法語)\n" -#: common.c:655 +#: common.c:657 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 使用DOS 865 編碼頁(北歐)\n" -#: common.c:656 +#: common.c:658 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 轉換8 位元字元到7 位元空間\n" -#: common.c:658 +#: common.c:660 #, fuzzy msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:660 +#: common.c:662 #, fuzzy msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:661 +#: common.c:663 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -194,25 +198,25 @@ msgstr "" " -c, --convmode 轉換模式\n" " convmode ascii, 7bit, iso, mac, 預設為ascii\n" -#: common.c:664 +#: common.c:666 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" -#: common.c:667 +#: common.c:669 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force 強制轉換二進位檔案\n" -#: common.c:670 +#: common.c:672 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr "" -#: common.c:673 +#: common.c:675 msgid " -h, --help display this help text\n" msgstr " -h, --help 顯示本說明文字\n" -#: common.c:674 +#: common.c:676 #, fuzzy msgid "" " -i, --info[=FLAGS] display file information\n" @@ -221,24 +225,24 @@ msgstr "" " -o, --oldfile 寫入原檔案(預設)\n" " file ... 原檔模式中要轉換的檔案\n" -#: common.c:676 +#: common.c:678 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate 保留輸出檔時間\n" -#: common.c:677 +#: common.c:679 msgid " -L, --license display software license\n" msgstr " -L, --license 顯示軟體授權\n" -#: common.c:678 +#: common.c:680 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 加入額外的換行\n" -#: common.c:679 +#: common.c:681 #, fuzzy msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:680 +#: common.c:682 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -248,7 +252,11 @@ msgstr "" " infile 新檔模式中的原始檔案\n" " outfile 新檔模式中的輸出檔案\n" -#: common.c:683 +#: common.c:686 +msgid " --no-allow-chown don't allow file ownership change (default)\n" +msgstr "" + +#: common.c:688 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -256,48 +264,48 @@ msgstr "" " -o, --oldfile 寫入原檔案(預設)\n" " file ... 原檔模式中要轉換的檔案\n" -#: common.c:685 +#: common.c:690 #, fuzzy msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" " -q, --quiet 安靜模式，抑制所有警告\n" " (標準輸出入模式下永遠啟用)\n" -#: common.c:687 +#: common.c:692 #, fuzzy msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:689 +#: common.c:694 #, fuzzy msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:690 +#: common.c:695 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe 略過二進位檔案(預設)\n" -#: common.c:692 +#: common.c:697 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr "" -#: common.c:693 +#: common.c:698 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 假設輸入檔格式為UTF-16LE\n" -#: common.c:694 +#: common.c:699 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 假設輸入檔格式為UTF-16BE\n" -#: common.c:696 +#: common.c:701 msgid " -v, --verbose verbose operation\n" msgstr "" -#: common.c:698 +#: common.c:703 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink 依循符號連結轉換其目標檔案\n" -#: common.c:701 +#: common.c:706 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -305,360 +313,373 @@ msgstr "" " -R, --replace-symlink 取代符號連結為轉換後的檔案\n" " (原連結目標檔案保持不變)\n" -#: common.c:703 +#: common.c:708 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink 保持符號連結及其目標不變(預設)\n" -#: common.c:705 +#: common.c:710 msgid " -V, --version display version number\n" msgstr " -V, --version 顯示版本號碼\n" -#: common.c:717 +#: common.c:722 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 位元版本(WATCOMC)。\n" -#: common.c:719 +#: common.c:724 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 位元版本(TURBOC)。\n" -#: common.c:721 +#: common.c:726 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 位元版本(WATCOMC)。\n" -#: common.c:723 +#: common.c:728 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 位元版本(DJGPP)。\n" -#: common.c:725 +#: common.c:730 msgid "MSYS version.\n" msgstr "MSYS 版本。\n" -#: common.c:727 +#: common.c:732 msgid "Cygwin version.\n" msgstr "Cygwin 版本。\n" -#: common.c:729 +#: common.c:734 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 位元版本(MinGW-w64)。\n" -#: common.c:731 +#: common.c:736 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 位元版本(WATCOMC)。\n" -#: common.c:733 +#: common.c:738 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 位元版本(MinGW-w64)。\n" -#: common.c:735 +#: common.c:740 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 位元版本(MinGW)。\n" -#: common.c:737 +#: common.c:742 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 位元版本(MSVC %d)。\n" -#: common.c:739 +#: common.c:744 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 位元版本(MSVC %d)。\n" -#: common.c:741 +#: common.c:746 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 版本(WATCOMC)。\n" -#: common.c:743 +#: common.c:748 msgid "OS/2 version (EMX).\n" msgstr "OS/2 版本(EMX)。\n" -#: common.c:745 +#: common.c:750 #, fuzzy, c-format msgid "%s version.\n" msgstr "MSYS 版本。\n" -#: common.c:751 +#: common.c:756 msgid "With Unicode UTF-16 support.\n" msgstr "有Unicode UTF-16 支援。\n" -#: common.c:753 +#: common.c:758 msgid "Without Unicode UTF-16 support.\n" msgstr "無Unicode UTF-16 支援。\n" -#: common.c:757 +#: common.c:762 #, fuzzy msgid "With Unicode file name support.\n" msgstr "有Unicode UTF-16 支援。\n" -#: common.c:759 +#: common.c:764 #, fuzzy msgid "Without Unicode file name support.\n" msgstr "無Unicode UTF-16 支援。\n" -#: common.c:763 +#: common.c:768 msgid "With native language support.\n" msgstr "含本地語言支援。\n" -#: common.c:899 +#: common.c:773 +msgid "With support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:775 +msgid "Without support to preserve the user and group ownership of files.\n" +msgstr "" + +#: common.c:909 #, fuzzy msgid "Path for temporary output file is too long:" msgstr "暫存檔 %s 開啟失敗\n" -#: common.c:1180 common.c:1187 common.c:1194 common.c:1201 common.c:1213 -#: common.c:1220 +#: common.c:1190 common.c:1197 common.c:1204 common.c:1211 common.c:1223 +#: common.c:1230 #, c-format msgid "Writing %s BOM.\n" msgstr "" -#: common.c:1180 common.c:1233 common.c:1739 common.c:1760 +#: common.c:1190 common.c:1243 common.c:1776 common.c:1797 msgid "UTF-16LE" msgstr "" -#: common.c:1187 common.c:1236 common.c:1741 common.c:1762 +#: common.c:1197 common.c:1246 common.c:1778 common.c:1799 msgid "UTF-16BE" msgstr "" -#: common.c:1194 common.c:1213 common.c:1242 common.c:1752 +#: common.c:1204 common.c:1223 common.c:1252 common.c:1789 msgid "GB18030" msgstr "" -#: common.c:1201 common.c:1220 common.c:1239 common.c:1754 +#: common.c:1211 common.c:1230 common.c:1249 common.c:1791 msgid "UTF-8" msgstr "" -#: common.c:1265 +#: common.c:1275 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "" -#: common.c:1301 common.c:1343 +#: common.c:1316 common.c:1358 msgid "Assuming UTF-16LE encoding.\n" msgstr "" -#: common.c:1305 common.c:1347 +#: common.c:1320 common.c:1362 msgid "Assuming UTF-16BE encoding.\n" msgstr "" -#: common.c:1492 +#: common.c:1507 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "暫存檔 %s 開啟失敗\n" -#: common.c:1504 +#: common.c:1519 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作為暫存檔\n" -#: common.c:1556 +#: common.c:1571 common.c:1599 #, fuzzy, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "輸出暫存檔 %s 權限變更失敗：%s\n" -#: common.c:1573 +#: common.c:1587 +#, c-format +msgid "The user and/or group ownership of file %s is not preserved.\n" +msgstr "" + +#: common.c:1609 #, fuzzy, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "輸出暫存檔 %s 擁有者及群組變更失敗：%s\n" -#: common.c:1620 +#: common.c:1657 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "解析符號連結'%s' 發生問題\n" -#: common.c:1621 common.c:1653 +#: common.c:1658 common.c:1690 #, c-format msgid " output file remains in '%s'\n" msgstr " 輸出檔案'%s' 未改變\n" -#: common.c:1647 +#: common.c:1684 #, fuzzy, c-format msgid "problems renaming '%s' to '%s':" msgstr "重新命名「%s」到「%s」錯誤：%s\n" -#: common.c:1651 +#: common.c:1688 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者為符號連結'%s' 的目標\n" -#: common.c:1714 common.c:1806 common.c:1892 +#: common.c:1751 common.c:1846 #, c-format msgid "Skipping binary file %s\n" msgstr "略過二進位檔案%s\n" -#: common.c:1717 common.c:1809 common.c:1895 +#: common.c:1754 common.c:1849 #, c-format msgid "code page %d is not supported.\n" msgstr "未支援%d 編碼頁。\n" -#: common.c:1721 common.c:1813 common.c:1899 common.c:1959 +#: common.c:1758 common.c:1853 common.c:1941 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "略過 UTF-16 檔案 %s，wchar_t 的大小是 %d 位元組。\n" -#: common.c:1724 common.c:1816 common.c:1902 +#: common.c:1761 common.c:1856 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n" -#: common.c:1728 common.c:1820 common.c:1906 +#: common.c:1765 common.c:1860 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n" -#: common.c:1794 common.c:1883 common.c:1948 +#: common.c:1831 common.c:1930 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "略過 %s，不是一個普通檔案。\n" -#: common.c:1797 +#: common.c:1835 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "略過 %s，輸出檔 %s 是一個符號連結。.\n" -#: common.c:1800 common.c:1889 common.c:1953 +#: common.c:1837 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "略過符號連結 %s。\n" + +#: common.c:1840 common.c:1935 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "略過符號連結 %s，目標不是一個普通檔案。\n" -#: common.c:1803 +#: common.c:1843 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "略過 %s，符號連結 %s 目標不是一個普通檔案。\n" -#: common.c:1826 +#: common.c:1868 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在轉換 %s 為Unix 格式到 %s...\n" -#: common.c:1829 +#: common.c:1870 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "正在轉換 %s 為Unix 格式...\n" + +#: common.c:1874 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在轉換 %s 為Mac 格式到 %s...\n" -#: common.c:1831 +#: common.c:1876 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "正在轉換 %s 為Mac 格式...\n" + +#: common.c:1879 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在轉換 %s 為DOS 格式到 %s...\n" +#: common.c:1881 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "正在轉換 %s 為DOS 格式...\n" + #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1842 +#: common.c:1893 #, fuzzy, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在轉換 %s 為Unix 格式到 %s...\n" -#: common.c:1845 -#, fuzzy, c-format -msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "正在轉換 %s 為Mac 格式到 %s...\n" - -#: common.c:1847 -#, fuzzy, c-format -msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "正在轉換 %s 為DOS 格式到 %s...\n" - -#: common.c:1853 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "轉換檔案 %s 到 %s 錯誤\n" - -#: common.c:1886 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "略過符號連結 %s。\n" - -#: common.c:1912 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "正在轉換 %s 為Unix 格式...\n" - -#: common.c:1915 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "正在轉換 %s 為Mac 格式...\n" - -#: common.c:1917 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "正在轉換 %s 為DOS 格式...\n" - #. TRANSLATORS: #. 1st %s is encoding of input file. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1927 +#: common.c:1900 #, fuzzy, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在轉換 %s 為Unix 格式...\n" -#: common.c:1930 +#: common.c:1904 +#, fuzzy, c-format +msgid "converting %s file %s to %s file %s in Mac format...\n" +msgstr "正在轉換 %s 為Mac 格式到 %s...\n" + +#: common.c:1906 #, fuzzy, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在轉換 %s 為Mac 格式...\n" -#: common.c:1932 +#: common.c:1909 +#, fuzzy, c-format +msgid "converting %s file %s to %s file %s in DOS format...\n" +msgstr "正在轉換 %s 為DOS 格式到 %s...\n" + +#: common.c:1911 #, fuzzy, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在轉換 %s 為DOS 格式...\n" -#: common.c:1938 +#: common.c:1918 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "轉換檔案 %s 到 %s 錯誤\n" + +#: common.c:1920 #, c-format msgid "problems converting file %s\n" msgstr "轉換檔案 %s 錯誤\n" -#: common.c:2071 common.c:2121 +#: common.c:2055 common.c:2105 #, fuzzy, c-format msgid "can not read from input file %s:" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2281 +#: common.c:2261 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2406 common.c:2449 +#: common.c:2391 common.c:2434 #, c-format msgid "active code page: %d\n" msgstr "作用中編碼頁：%d\n" -#: common.c:2461 +#: common.c:2446 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的轉換模式 %s 不合法\n" -#: common.c:2469 common.c:2499 +#: common.c:2454 common.c:2484 #, c-format msgid "option '%s' requires an argument\n" msgstr "選項'%s' 需要一個引數\n" -#: common.c:2491 +#: common.c:2476 #, fuzzy, c-format msgid "invalid %s display encoding specified\n" msgstr "指定的轉換模式 %s 不合法\n" -#: common.c:2511 common.c:2524 common.c:2590 +#: common.c:2496 common.c:2509 common.c:2576 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新檔模式中未指明檔案 %s 的目的位置\n" -#: common.c:2602 +#: common.c:2588 #, fuzzy, c-format msgid "can not read from input file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2612 common.c:2624 +#: common.c:2598 common.c:2610 #, c-format msgid "can not write to output file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2699 +#: common.c:2685 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "" -#: common.c:2715 +#: common.c:2701 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "" diff --git a/test/Makefile b/test/Makefile index 6b262f2..dc77977 100644 --- a/test/Makefile +++ b/test/Makefile @@ -25,7 +25,7 @@ endif ifeq ($(UCS),1) # Check for UTF-8 locale. Try C.UTF-8 and en_US.UTF-8. -ifeq ($(shell ./chk_loc.sh X.UTF-8),yes) +ifeq ($(shell ./chk_loc.sh C.UTF-8),yes) TESTS += utf16.t export D2U_UTF8_LOCALE = C.UTF-8 else @@ -49,7 +49,9 @@ endif endif +ifndef DJGPP PROVE_OPT ?= --nocolor +endif all: test @@ -87,7 +89,7 @@ symlink: wcstombs: $(CC) -Wall -Wextra wcstombs_test.c -o wcstombs_test @echo "====> test wcstombs() UTF-8" - LC_ALL=.UTF-8 ./wcstombs_test + LC_ALL=en_US.UTF-8 ./wcstombs_test @echo "====> test wcstombs() GB18030" LC_ALL=zh_CN.GB18030 ./wcstombs_test @@ -77,7 +77,7 @@ static int U2D7BitTable [256] = /* ISO mode. ISO-8859-1 -> CP437 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso437Table[256] = { @@ -100,7 +100,7 @@ static int U2DIso437Table[256] = }; /* ISO mode. ISO-8859-1 -> CP850 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso850Table[256] = { @@ -123,7 +123,7 @@ static int U2DIso850Table[256] = }; /* ISO mode. ISO-8859-1 -> CP860 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso860Table[256] = { @@ -146,7 +146,7 @@ static int U2DIso860Table[256] = }; /* ISO mode. ISO-8859-1 -> CP863 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso863Table[256] = { @@ -169,7 +169,7 @@ static int U2DIso863Table[256] = }; /* ISO mode. ISO-8859-1 -> CP865 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso865Table[256] = { @@ -192,7 +192,7 @@ static int U2DIso865Table[256] = }; /* ISO-8859-1 -> CP1252 */ -/* Non-convertable characters are converted to a dot (\x2e) */ +/* Non-convertible characters are converted to a dot (\x2e) */ static int U2DIso1252Table[256] = { @@ -1,4 +1,4 @@ -DOS2UNIX_VERSION = 7.3.5 -DOS2UNIX_VERSION_SHORT = 735 -DOS2UNIX_DATE = 2017-07-04 +DOS2UNIX_VERSION = 7.4.0 +DOS2UNIX_VERSION_SHORT = 740 +DOS2UNIX_DATE = 2017-10-10 DOS2UNIX_AUTHOR = 'Erwin Waterlander' |