diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-20 13:28:30 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-20 13:28:33 +0900 |
| commit | 6ad0574136d3b23b486db4fa359672b9f731e235 (patch) | |
| tree | ae96a2384615b0132969083bc097c918acf4e9f7 | |
| parent | de90208a6d3f0b5c5944c4aa4d4ea95fc2611470 (diff) | |
| download | dos2unix-6ad0574136d3b23b486db4fa359672b9f731e235.tar.gz dos2unix-6ad0574136d3b23b486db4fa359672b9f731e235.tar.bz2 dos2unix-6ad0574136d3b23b486db4fa359672b9f731e235.zip | |
Imported Upstream version 7.0
Change-Id: Ib83b48cbb624fbb64cd653899c84ddffdcd21860
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
119 files changed, 13197 insertions, 8277 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 2d2f331..47d35bd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,78 @@ +2014-09-09 Erwin Waterlander <waterlan@xs4all.nl> + * Version 7.0 + +2014-09-08 Erwin Waterlander <waterlan@xs4all.nl> + * common.c: Option -V prints home page. + +2014-09-03 Erwin Waterlander <waterlan@xs4all.nl> + * dos2unix.c, unix2dos.c: Return an error number in stdio mode when the + input is binary. In stdio mode an input stream with a binary symbol + produces broken output. In file mode the binary file is skipped. + * test/misc.t: Added tests for above. + * dos2unix.c, unix2dos.c, common.c: Bug fix. System error number was not + always returned. When disk is full and output can't be written, + or when resolving a symlink fails. + +2014-09-01 Erwin Waterlander <waterlan@xs4all.nl> + * common.c: Bug fix. Option -u disabled -m for ASCII or UTF-8 input + files without BOM. Bug was introduced on 2014-08-05. + * dos2unix.c, unix2dos.c, common.c: Bug fix. An Unicode input file + disabled 7bit and iso mode also for next input files. Bug was + introduced in version 6.0.1 on 2012-03-23. + * common.c: Cleanup. Don't write BOM when conversion will be cancelled. + * test/misc.t: Added tests for the two bug fixes. + +2014-08-28 Erwin Waterlander <waterlan@xs4all.nl> + * dos2unix.c, unix2dos.c, common.c: Code cleanup. Moved more code + to common.c. + * common.c: Bug fix mac2unix help text, options -b and -r. Bug was + introduced in 6.0.6. + * *.po: Included updated pt_BR translations. + +2014-08-26 Erwin Waterlander <waterlan@xs4all.nl> + * dos2unix.c, unix2dos.c, common.c: stdio mode does not automatically + set quiet mode. stdio mode prints errors and returns error code. + * dos2unix.c, unix2dos.c: stdio mode does not automatically force + conversion of binaries. + +2014-08-25 Erwin Waterlander <waterlan@xs4all.nl> + * test/symlink.t: New tests for options -F, -R, -S + * *.po: Included updated nl,nb ,vi translations. + +2014-08-22 Erwin Waterlander <waterlan@xs4all.nl> + * *.po: Included updated nl,pl,ru translations. + +2014-08-18 Erwin Waterlander <waterlan@xs4all.nl> + * unix2dos.c: Fix: Unix2dos did not count UTF-16 line break conversions. + * INSTALL.txt: Update for running self-tests. + * *.po: Included updated fr,de,uk translations. + * test: Added more tests. + +2014-08-17 Erwin Waterlander <waterlan@xs4all.nl> + * test: Use TAP (Test Anything Protocol) to run tests. + Requires perl module perl-Test-Simple. + +2014-08-11 Erwin Waterlander <waterlan@xs4all.nl> + * test: Added automated tests. + +2014-08-10 Erwin Waterlander <waterlan@xs4all.nl> + * dos2unix.c: Bug fix: dos2unix -l created DOS line breaks + from Mac line breaks. This bug was introduced in version 3.2, + by safeconv patch. + * INSTALL.txt: Update for DJGPP. Use gcc <= 4.5.3. + +2014-08-08 Erwin Waterlander <waterlan@xs4all.nl> + * man/man1/dos2unix.pod: Update manual wrt Unicode. + * common.c: Update help message for option -m. + +2014-08-06 Erwin Waterlander <waterlan@xs4all.nl> + * New option -v, --verbose: Print extra information about + number of converted line breaks and BOMs. + +2014-08-05 Erwin Waterlander <waterlan@xs4all.nl> + * New option -u, --keep_utf16: Keep UTF-16 encoding of the + input file. This prevents transformation to UTF-8. + 2014-08-03 Erwin Waterlander <waterlan@xs4all.nl> * Version 6.0.6 @@ -24,6 +99,7 @@ * dos2unix.c: Bug fix mac2unix conversion of UTF-16 files. Mac to Unix conversion produced corrupted output. Thanks to report of Alan S. Jones. + This bug was introduced in version 6.0. 2014-05-24 Ã…ka Sikrom <a4@hush.com> * po/nb.po: New Norwegian Bokmaal translation. diff --git a/INSTALL.txt b/INSTALL.txt index 64fb68f..d63e562 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -10,12 +10,15 @@ PREREQUISITES mv, rm, uname) Optional (depending on build targets): - * perl : Practical Extraction and Report Language (perlpod) - perl >= 5.10.1 is required. + * perl : Practical Extraction and Report Language + perl >= 5.10.1 is required for rebuilding the + manual pages with perlpod. + Self-tests require module perl-Test-Simple. * gettext : Framework to help GNU packages produce multi- lingual messages. - * po4a : PO for anything. - * groff : GNU troff text formatting system. + * po4a : PO for anything, for rebuilding manuals. + * groff : GNU troff text formatting system, for + international messages and manuals. * ghostscript : An interpreter for the PostScript language and for PDF (ps2pdf) @@ -44,6 +47,11 @@ BASIC INSTALLATION make + To run the self-tests type: + + make check + + To strip the executables: make strip @@ -65,6 +73,13 @@ BASIC INSTALLATION make mostlyclean +SELF-TESTS + + To run the self-tests you need a Perl installation including + module perl-Test-Simple. + + To check the native Windows ports you need to run the tests in + the MSYS2 shell. INSTALLATION NAMES @@ -246,8 +261,10 @@ DOS PORT, 32 BIT To compile a version for DOS, get the DJGPP compiler <http://www.delorie.com/djgpp/>, and use makefile djgpp.mak. - It may be troublesome to get djgpp working correctly on a - new Windows OS. + DJGPP gcc >= 4.6 seems to cause problems. Crashes of gcc itself, + or crashing dos2unix binaries (seen in DOSBox and DOSEMU). + Use DJGPP gcc <= 4.5.3. + make -f djgpp.mak clean make -f djgpp.mak @@ -35,7 +35,7 @@ include version.mk -.PHONY: man txt html pdf mofiles tags merge +.PHONY: man txt html pdf mofiles tags merge test check .PRECIOUS: %.1 %.pod @@ -266,7 +266,7 @@ endif CFLAGS_USER = CFLAGS ?= -O2 -CFLAGS += -Wall $(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)\" \ @@ -310,16 +310,16 @@ status: @echo "LDFLAGS = $(LDFLAGS)" @echo "LIBS = $(LIBS)" -common.o : common.c common.h +common.o : common.c common.h dos2unix.h unix2dos.h version.mk $(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@ querycp.o : querycp.c querycp.h $(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@ -dos2unix.o : dos2unix.c dos2unix.h querycp.h common.h version.mk +dos2unix.o : dos2unix.c dos2unix.h querycp.h common.h $(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@ -unix2dos.o : unix2dos.c unix2dos.h querycp.h common.h version.mk +unix2dos.o : unix2dos.c unix2dos.h querycp.h common.h $(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@ $(BIN): dos2unix.o querycp.o common.o @@ -429,6 +429,11 @@ man/pt_BR/man1/$(PACKAGE).$(HTMLEXT) : man/pt_BR/man1/$(PACKAGE).pod man/uk/man1/$(PACKAGE).$(HTMLEXT) : man/uk/man1/$(PACKAGE).pod pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - програма Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у текÑтовому форматі DOS/Mac у формат Unix, Ñ– навпаки" $< > $@ +test: all + cd test; $(MAKE) test + +check: test + install: all $(MKDIR) -p -m 755 $(DESTDIR)$(bindir) $(INSTALL) -m 755 $(BIN) $(DESTDIR)$(bindir) @@ -507,6 +512,7 @@ mostlyclean: rm -f man/*/man1/*.bak man/*/man1/*~ rm -f po/*.bak po/*~ rm -f po/*.mo + cd test; $(MAKE) clean # Don't distribute PostScript and PDF manuals in the source package. # We don't want binary PDF files in the source package, because @@ -1,3 +1,17 @@ +2014-09-09: Version 7.0 + + * New: automated self-tests. + * New: option -u to keep UTF-16 encoding. + * New: option -v to print information about BOMs and converted line breaks. + * Change: stdio mode does not automatically set quiet mode. + * Change: stdio mode does not automatically force conversion of binaries. + An error is returned when the stdin stream contains a binary symbol. + * Bugfix: dos2unix -l created DOS line breaks from Mac line breaks. + * Bugfix: system error number was not always returned. + * Bugfix: an Unicode input file disabled 7bit and iso mode for next input files. + * Bugfix: mac2unix help text, options -b and -r. + * The code has been cleaned up. + 2014-08-03: Version 6.0.6 * Bugfix: mac2unix conversion produced corrupted output from UTF-16 input file. @@ -15,37 +15,48 @@ FILE LIST man/man1/dos2unix.htm : Dos2unix manual, HTML format. +PROJECT HOME PAGE + + http://waterlan.home.xs4all.nl/dos2unix.html + + HISTORY This is an update of Benjamin Lin's implementations of dos2unix and - unix2dos. Benjamin Lin's implementations of dos2unix and unix2dos are - part of several Linux distributions such as RedHat, Fedora, Suse and - others. This update includes all RedHat patches and fixes several - other problems. Internationalization has been added and ports to DOS, - Windows, Cygwin and OS/2 Warp have been made. + unix2dos. Benjamin Lin's implementations of dos2unix and unix2dos were + distributed via SunSITE.unc.edu (later MetaLab.unc.edu, now ibiblio) + and became part of several Linux distributions such as RedHat, Suse, + Gentoo, and others. This update includes all RedHat patches and fixes + several other problems. Internationalization has been added and ports + to DOS, Windows, Cygwin and OS/2 Warp have been made. These implementations of dos2unix and unix2dos have been modelled after - dos2unix/unix2dos under SunOS/Solaris. They have similar conversion - modes, namely ascii, 7bit and iso. The first versions were made by + dos2unix/unix2dos under SunOS/Solaris. The first versions were made by John Birchfield in 1989, and in 1995 rewritten from scratch by Benjamin Lin. Mac to Unix conversion was added by Bernd Johannes Wuebben in 1998, Unix to Mac conversion by Erwin Waterlander in 2010. + In 2010 the two separate dos2unix and unix2dos packages have been + bundled into a single dos2unix package (version 5.0). Support for + Unicode UTF-16 was added in 2012 (version 6.0). + + Features * Native language support. - * Automatically skips binary and non-regular files + * Automatically skips binary and non-regular files. * In-place, paired, or stdio mode conversion. * Keep original file dates option. * 7-bit and iso conversion modes like SunOS dos2unix. - * Conversion of Windows UTF-16 files to Unix UTF-8. - * Handles Unicode Byte Order Mark (BOM) + * Conversion of Unicode UTF-16 and UTF-8 files. + * Conversion of UTF-16 files to UTF-8. + * Handles Unicode Byte Order Mark (BOM). * Secure. AUTHORS - Erwin Waterlander version 3.2-6.0.6 2009-2014 + Erwin Waterlander version 3.2-7.0 2009-2014 Christian Wurll version 3.1 1998 Bernd Johannes Wuebben version 3.0 1998 Benjamin Lin version 1.1-2.3 1994-1995 @@ -60,41 +71,41 @@ TRANSLATORS See http://translationproject.org/domain/dos2unix.html Brazilian Portuguese Enrico Nicoletto Version 6.0.5 - Brazilian Portuguese Rafael Ferreira Version 6.0.6 + Brazilian Portuguese Rafael Ferreira Version 6.0.6 - 7.0 Chinese (traditional) mail6543210 Version 6.0.5 Danish Thomas Pryds Version 6.0.5 - 6.0.6 Dutch Erwin Waterlander Version 4.0 - 6.0.4 - Dutch Benno Schulenberg Version 6.0.5 + Dutch Benno Schulenberg Version 6.0.5 - 7.0 Esperanto Rugxulo Version 5.1 - 6.0.4 - Esperanto Benno Schulenberg Version 6.0.5 - French Frédéric Marchal Version 6.0.5 - 6.0.6 - German Philipp Thomas Version 5.0 - 6.0.3 + Esperanto Benno Schulenberg Version 6.0.5 - 7.0 + French Frédéric Marchal Version 6.0.5 - 7.0 + German Philipp Thomas Version 5.0 - 6.0.3, 7.0 German Lars Wendler Version 6.0.4 - German Mario Blättermann Version 6.0.6 + German Mario Blättermann Version 6.0.6 Hungarian Balázs Úr Version 6.0.5 - 6.0.6 - Norwegian Bokmaal Ã…ka Sikrom Version 6.0.6 - Polish Jakub Bogusz Version 6.0.5 - 6.0.6 + Norwegian Bokmaal Ã…ka Sikrom Version 6.0.6 - 7.0 + Polish Jakub Bogusz Version 6.0.5 - 7.0 Russian Ðндрей Углик (Andrei Uhlik) Version 6.0.4 - Russian Yuri Kozlov Version 6.0.6 + Russian Yuri Kozlov Version 6.0.6 - 7.0 Serbian МироÑлав Ðиколић Version 6.0.5 - 6.0.6 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartà Version 6.0.6 - Ukrainian Yuri Chornoivan Version 6.0.5 - 6.0.6 - Vietnamese Trần Ngá»c Quân Version 6.0.5 - 6.0.6 + Ukrainian Yuri Chornoivan Version 6.0.5 - 7.0 + Vietnamese Trần Ngá»c Quân Version 6.0.5 - 7.0 Translation of the manual. See http://translationproject.org/domain/dos2unix-man.html - Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 6.0.6 + Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 7.0 Dutch Erwin Waterlander Version 5.1.1 - 6.0.4 - Dutch Benno Schulenberg Version 6.0.5 - French Frédéric Marchal Version 6.0.5 - 6.0.6 - German Mario Blättermann Version 6.0.5 - 6.0.6 + Dutch Benno Schulenberg Version 6.0.5 - 7.0 + French Frédéric Marchal Version 6.0.5 - 7.0 + German Mario Blättermann Version 6.0.5 - 7.0 Hungarian Balázs Úr Version 6.0.6 - Polish Jakub Bogusz Version 6.0.5 - 6.0.6 + Polish Jakub Bogusz Version 6.0.5 - 7.0 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartà Version 6.0.6 - Ukrainian Yuri Chornoivan Version 6.0.5 - 6.0.6 + Ukrainian Yuri Chornoivan Version 6.0.5 - 7.0 ACKNOWLEDGEMENTS @@ -138,11 +149,13 @@ FINDUTILS CONTACT INFORMATION - Project page : http://waterlan.home.xs4all.nl/dos2unix.html + Project home page : http://waterlan.home.xs4all.nl/dos2unix.html SourceForge project page : http://sourceforge.net/projects/dos2unix/ - Freecode project page : http://freecode.com/projects/dos2unix/ Erwin Waterlander waterlan@xs4all.nl http://waterlan.home.xs4all.nl/ + If you need support you can email me directly or make a ticket on the + SourceForge project page. Help in any form is appreciated. A problem + report, a fix, or just a remark. @@ -25,10 +25,16 @@ */ #include "common.h" +#include "dos2unix.h" +#include "querycp.h" + #if defined(D2U_UNICODE) #if defined(_WIN32) || defined(__CYGWIN__) #include <windows.h> #endif +#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ +# include <langinfo.h> +#endif #endif #if defined(__GLIBC__) @@ -76,8 +82,7 @@ int symbolic_link(const char *path) #ifdef S_ISLNK struct stat buf; - if (STAT(path, &buf) == 0) - { + if (STAT(path, &buf) == 0) { if (S_ISLNK(buf.st_mode)) return(1); } @@ -96,13 +101,12 @@ int symbolic_link(const char *path) * returns 0 on success, -1 when it fails. * ******************************************************************/ -int regfile(char *path, int allowSymlinks, CFlag *ipFlag, char *progname) +int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname) { struct stat buf; char *errstr; - if (STAT(path, &buf) == 0) - { + if (STAT(path, &buf) == 0) { #if DEBUG fprintf(stderr, "%s: %s MODE 0%o ", progname, path, buf.st_mode); #ifdef S_ISSOCK @@ -136,10 +140,8 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, char *progname) else return(-1); } - else - { - if (!ipFlag->Quiet) - { + else { + if (ipFlag->verbose) { ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, path, errstr); @@ -157,22 +159,19 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, char *progname) * returns 0 on success, -1 when it fails. * ******************************************************************/ -int regfile_target(char *path, CFlag *ipFlag, char *progname) +int regfile_target(char *path, CFlag *ipFlag, const char *progname) { struct stat buf; char *errstr; - if (stat(path, &buf) == 0) - { + if (stat(path, &buf) == 0) { if (S_ISREG(buf.st_mode)) return(0); else return(-1); } - else - { - if (!ipFlag->Quiet) - { + else { + if (ipFlag->verbose) { ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, path, errstr); @@ -208,7 +207,15 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\ ")); } -void PrintUsage(char *progname) +int is_dos2unix(const char *progname) +{ + if ((strncmp(progname, "dos2unix", sizeof("dos2unix")) == 0) || (strncmp(progname, "mac2unix", sizeof("mac2unix")) == 0)) + return 1; + else + return 0; +} + +void PrintUsage(const char *progname) { printf(_("Usage: %s [options] [file ...] [-n infile outfile ...]\n"), progname); printf(_(" -ascii convert only line breaks (default)\n")); @@ -220,7 +227,7 @@ void PrintUsage(char *progname) printf(_(" -863 use DOS code page 863 (French Canadian)\n")); printf(_(" -865 use DOS code page 865 (Nordic)\n")); printf(_(" -7 convert 8 bit characters to 7 bit space\n")); - if ((strncmp(progname, "dos2unix", sizeof("mac2unix")) == 0) || (strncmp(progname, "dos2unix", sizeof("dos2unix")) == 0)) + if (is_dos2unix(progname)) printf(_(" -b, --keep-bom keep Byte Order Mark\n")); else printf(_(" -b, --keep-bom keep Byte Order Mark (default)\n")); @@ -231,23 +238,24 @@ void PrintUsage(char *progname) printf(_(" -k, --keepdate keep output file date\n")); printf(_(" -L, --license display software license\n")); printf(_(" -l, --newline add additional newline\n")); - printf(_(" -m, --add-bom add UTF-8 Byte Order Mark\n")); + printf(_(" -m, --add-bom add Byte Order Mark (default UTF-8)\n")); printf(_(" -n, --newfile write to new file\n\ infile original file in new-file mode\n\ outfile output file in new-file mode\n")); printf(_(" -o, --oldfile write to old file (default)\n\ file ... files to convert in old-file mode\n")); - printf(_(" -q, --quiet quiet mode, suppress all warnings\n\ - (always on in stdio mode)\n")); - if ((strncmp(progname, "dos2unix", sizeof("mac2unix")) == 0) || (strncmp(progname, "dos2unix", sizeof("dos2unix")) == 0)) + printf(_(" -q, --quiet quiet mode, suppress all warnings\n")); + if (is_dos2unix(progname)) printf(_(" -r, --remove-bom remove Byte Order Mark (default)\n")); else printf(_(" -r, --remove-bom remove Byte Order Mark\n")); printf(_(" -s, --safe skip binary files (default)\n")); #ifdef D2U_UNICODE + printf(_(" -u, --keep-utf16 keep UTF-16 encoding\n")); printf(_(" -ul, --assume-utf16le assume that the input format is UTF-16LE\n")); printf(_(" -ub, --assume-utf16be assume that the input format is UTF-16BE\n")); #endif + printf(_(" -v, --verbose verbose operation\n")); #ifdef S_ISLNK printf(_(" -F, --follow-symlink follow symbolic links and convert the targets\n")); #endif @@ -261,7 +269,7 @@ void PrintUsage(char *progname) #define MINGW32_W64 1 -void PrintVersion(char *progname) +void PrintVersion(const char *progname, const char *localedir) { printf("%s %s (%s)\n", progname, VER_REVISION, VER_DATE); #if DEBUG @@ -306,14 +314,12 @@ void PrintVersion(char *progname) #else printf("%s", "Without native language support.\n"); #endif -} - #ifdef ENABLE_NLS -void PrintLocaledir(char *localedir) -{ printf("LOCALEDIR: %s\n", localedir); -} #endif + printf("http://waterlan.home.xs4all.nl/dos2unix.html\n"); +} + /* opens file of name ipFN in read only mode * RetVal: NULL if failure @@ -341,8 +347,7 @@ char *dirname(char *path) if (( path == NULL) || (((ptr=strrchr(path,'/')) == NULL) && ((ptr=strrchr(path,'\\')) == NULL)) ) return "."; - else - { + else { *ptr = '\0'; return(path); } @@ -417,7 +422,7 @@ int MakeTempFileFrom(const char *OutFN, char **fname_ret) * 1 if success, and *lFN is a symlink * -1 otherwise */ -int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, char *progname) +int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progname) { int RetVal = 0; #ifdef S_ISLNK @@ -425,32 +430,26 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, char *progname) char *errstr; char *targetFN = NULL; - if (STAT(lFN, &StatBuf)) - { - if (!ipFlag->Quiet) - { + if (STAT(lFN, &StatBuf)) { + if (ipFlag->verbose) { ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, lFN, errstr); } RetVal = -1; } - else if (S_ISLNK(StatBuf.st_mode)) - { + else if (S_ISLNK(StatBuf.st_mode)) { #if USE_CANONICALIZE_FILE_NAME targetFN = canonicalize_file_name(lFN); - if (!targetFN) - { - if (!ipFlag->Quiet) - { + if (!targetFN) { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, lFN, errstr); - ipFlag->error = 1; } RetVal = -1; } - else - { + else { *rFN = targetFN; RetVal = 1; } @@ -459,33 +458,27 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, char *progname) * flaw: PATH_MAX isn't necessarily the maximum path * length -- so realpath() might fail. */ targetFN = (char *) malloc(PATH_MAX * sizeof(char)); - if (!targetFN) - { - if (!ipFlag->Quiet) - { + if (!targetFN) { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, lFN, errstr); - ipFlag->error = 1; } RetVal = -1; } - else - { + else { /* is there any platform with S_ISLNK that does not have realpath? */ char *rVal = realpath(lFN, targetFN); - if (!rVal) - { - if (!ipFlag->Quiet) - { + if (!rVal) { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: %s: %s\n", progname, lFN, errstr); - ipFlag->error = 1; } free(targetFN); RetVal = -1; } - else - { + else { *rFN = rVal; RetVal = 1; } @@ -512,47 +505,39 @@ FILE *read_bom (FILE *f, int *bomtype) *bomtype = FILE_MBS; /* Check for BOM */ - if (f != NULL) - { - if ((bom[0] = fgetc(f)) == EOF) - { + if (f != NULL) { + if ((bom[0] = fgetc(f)) == EOF) { ungetc(bom[0], f); *bomtype = FILE_MBS; return(f); } - if ((bom[0] != 0xff) && (bom[0] != 0xfe) && (bom[0] != 0xef)) - { + if ((bom[0] != 0xff) && (bom[0] != 0xfe) && (bom[0] != 0xef)) { ungetc(bom[0], f); *bomtype = FILE_MBS; return(f); } - if ((bom[1] = fgetc(f)) == EOF) - { + if ((bom[1] = fgetc(f)) == EOF) { ungetc(bom[1], f); ungetc(bom[0], f); *bomtype = FILE_MBS; return(f); } - if ((bom[0] == 0xff) && (bom[1] == 0xfe)) /* UTF16-LE */ - { + if ((bom[0] == 0xff) && (bom[1] == 0xfe)) { /* UTF16-LE */ *bomtype = FILE_UTF16LE; return(f); } - if ((bom[0] == 0xfe) && (bom[1] == 0xff)) /* UTF16-BE */ - { + if ((bom[0] == 0xfe) && (bom[1] == 0xff)) { /* UTF16-BE */ *bomtype = FILE_UTF16BE; return(f); } - if ((bom[2] = fgetc(f)) == EOF) - { + if ((bom[2] = fgetc(f)) == EOF) { ungetc(bom[2], f); ungetc(bom[1], f); ungetc(bom[0], f); *bomtype = FILE_MBS; return(f); } - if ((bom[0] == 0xef) && (bom[1] == 0xbb) && (bom[2]== 0xbf)) /* UTF-8 */ - { + if ((bom[0] == 0xef) && (bom[1] == 0xbb) && (bom[2]== 0xbf)) { /* UTF-8 */ *bomtype = FILE_UTF8; return(f); } @@ -565,6 +550,783 @@ FILE *read_bom (FILE *f, int *bomtype) return(f); } +FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname) +{ + if (ipFlag->keep_utf16) + { + switch (ipFlag->bomtype) { + case FILE_UTF16LE: /* UTF-16 Little Endian */ + fprintf(f, "%s", "\xFF\xFE"); + if (ipFlag->verbose > 1) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Writing %s BOM.\n"), "UTF-16LE"); + } + break; + case FILE_UTF16BE: /* UTF-16 Big Endian */ + fprintf(f, "%s", "\xFE\xFF"); + if (ipFlag->verbose > 1) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Writing %s BOM.\n"), "UTF-16BE"); + } + break; + default: /* UTF-8 */ + fprintf(f, "%s", "\xEF\xBB\xBF"); + if (ipFlag->verbose > 1) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Writing %s BOM.\n"), "UTF-8"); + } + ; + } + } else { + fprintf(f, "%s", "\xEF\xBB\xBF"); + if (ipFlag->verbose > 1) + { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Writing %s BOM.\n"), "UTF-8"); + } + } + return(f); +} + +void print_bom (const int bomtype, const char *filename, const char *progname) +{ + switch (bomtype) { + case FILE_UTF16LE: /* UTF-16 Little Endian */ + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Input file %s has %s BOM.\n"), filename, "UTF-16LE"); + break; + case FILE_UTF16BE: /* UTF-16 Big Endian */ + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Input file %s has %s BOM.\n"), filename, "UTF-16BE"); + break; + case FILE_UTF8: /* UTF-8 */ + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Input file %s has %s BOM.\n"), filename, "UTF-8"); + break; + default: + ; + } +} + +int check_unicode(FILE *InF, FILE *TempF, CFlag *ipFlag, const char *ipInFN, const char *progname) +{ + int RetVal = 0; + +#ifdef D2U_UNICODE + if (ipFlag->verbose > 1) { + if (ipFlag->ConvMode == CONVMODE_UTF16LE) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Assuming UTF-16LE encoding.\n") ); + } + if (ipFlag->ConvMode == CONVMODE_UTF16BE) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Assuming UTF-16BE encoding.\n") ); + } + } +#endif + InF = read_bom(InF, &ipFlag->bomtype); + if (ipFlag->verbose > 1) + print_bom(ipFlag->bomtype, ipInFN, progname); +#ifdef D2U_UNICODE + if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE)) + ipFlag->bomtype = FILE_UTF16LE; + if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE)) + ipFlag->bomtype = FILE_UTF16BE; +#endif + +#ifdef D2U_UNICODE +#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ + if (!ipFlag->keep_utf16 && ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))) { + if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0) { + /* Don't convert UTF-16 files when the locale encoding is not UTF-8 + * to prevent loss of characters. */ + ipFlag->status |= LOCALE_NOT_UTF8 ; + if (!ipFlag->error) ipFlag->error = 1; + RetVal = -1; + } + } +#endif +#if !defined(_WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */ + if (!ipFlag->keep_utf16 && ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))) { + if (sizeof(wchar_t) < 4) { + /* 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; + } + } +#endif +#endif + + if ((!RetVal) && ((ipFlag->add_bom) || ((ipFlag->keep_bom) && (ipFlag->bomtype > 0)))) + write_bom(TempF, ipFlag, progname); + + return RetVal; +} + +/* convert file ipInFN and write to file ipOutFN + * RetVal: 0 if success + * -1 otherwise + */ +int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progname, + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ) +{ + int RetVal = 0; + FILE *InF = NULL; + FILE *TempF = NULL; + char *TempPath; + char *errstr; + struct stat StatBuf; + struct utimbuf UTimeBuf; +#ifndef NO_CHMOD + mode_t mask; +#endif +#ifdef NO_MKSTEMP + FILE* fd; +#else + int fd; +#endif + char *TargetFN = NULL; + int ResolveSymlinkResult = 0; + + ipFlag->status = 0 ; + + /* Test if output file is a symbolic link */ + if (symbolic_link(ipOutFN) && !ipFlag->Follow) { + ipFlag->status |= OUTPUTFILE_SYMLINK ; + /* Not a failure, skipping input file according spec. (keep symbolic link unchanged) */ + return -1; + } + + /* Test if input file is a regular file or symbolic link */ + if (regfile(ipInFN, 1, ipFlag, progname)) { + ipFlag->status |= NO_REGFILE ; + /* Not a failure, skipping non-regular input file according spec. */ + return -1; + } + + /* Test if input file target is a regular file */ + if (symbolic_link(ipInFN) && regfile_target(ipInFN, ipFlag,progname)) { + ipFlag->status |= INPUT_TARGET_NO_REGFILE ; + /* Not a failure, skipping non-regular input file according spec. */ + return -1; + } + + /* Test if output file target is a regular file */ + if (symbolic_link(ipOutFN) && (ipFlag->Follow == SYMLINK_FOLLOW) && regfile_target(ipOutFN, ipFlag,progname)) { + ipFlag->status |= OUTPUT_TARGET_NO_REGFILE ; + /* Failure, input is regular, cannot produce output. */ + if (!ipFlag->error) ipFlag->error = 1; + return -1; + } + + /* retrieve ipInFN file date stamp */ + if (stat(ipInFN, &StatBuf)) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); + } + RetVal = -1; + } + +#ifdef NO_MKSTEMP + if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) { +#else + if((fd = MakeTempFileFrom (ipOutFN, &TempPath)) < 0) { +#endif + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Failed to open temporary output file: %s\n"), errstr); + } + RetVal = -1; + } + +#if DEBUG + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("using %s as temporary file\n"), TempPath); +#endif + + /* can open in file? */ + if (!RetVal) { + InF=OpenInFile(ipInFN); + if (InF == NULL) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); + RetVal = -1; + } + } + + /* can open output file? */ + if ((!RetVal) && (InF)) { +#ifdef NO_MKSTEMP + if ((TempF=fd) == NULL) { +#else + if ((TempF=OpenOutFile(fd)) == NULL) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s\n", progname, errstr); +#endif + fclose (InF); + InF = NULL; + RetVal = -1; + } + } + + if (!RetVal) + if (check_unicode(InF, TempF, ipFlag, ipInFN, progname)) + RetVal = -1; + + /* conversion sucessful? */ +#ifdef D2U_UNICODE + if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { + if ((!RetVal) && (ConvertW(InF, TempF, ipFlag, progname))) + RetVal = -1; + if (ipFlag->status & UNICODE_CONVERSION_ERROR) { + if (!ipFlag->error) ipFlag->error = 1; + RetVal = -1; + } + } else { + if ((!RetVal) && (Convert(InF, TempF, ipFlag, progname))) + RetVal = -1; + } +#else + if ((!RetVal) && (Convert(InF, TempF, ipFlag, progname))) + RetVal = -1; +#endif + + /* can close in file? */ + if ((InF) && (fclose(InF) == EOF)) + RetVal = -1; + + /* can close output file? */ + if (TempF) { + if (fclose(TempF) == EOF) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Failed to write to temporary output file %s: %s\n"), TempPath, errstr); + } + RetVal = -1; + } + } + +#ifdef NO_MKSTEMP + if(fd!=NULL) + fclose(fd); +#else + if(fd>=0) + close(fd); +#endif + +#ifndef NO_CHMOD + if (!RetVal) + { + if (ipFlag->NewFile == 0) { /* old-file mode */ + RetVal = chmod (TempPath, StatBuf.st_mode); /* set original permissions */ + } else { + 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); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Failed to change the permissions of temporary output file %s: %s\n"), TempPath, errstr); + } + } + } +#endif + +#ifndef NO_CHOWN + if (!RetVal && (ipFlag->NewFile == 0)) { /* old-file mode */ + /* Change owner and group of the temporary output file to the original file's uid and gid. */ + /* 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); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Failed to change the owner and group of temporary output file %s: %s\n"), TempPath, errstr); + } + RetVal = -1; + } + } +#endif + + if ((!RetVal) && (ipFlag->KeepDate)) + { + UTimeBuf.actime = StatBuf.st_atime; + UTimeBuf.modtime = StatBuf.st_mtime; + /* can change output file time to in file time? */ + if (utime(TempPath, &UTimeBuf) == -1) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); + } + RetVal = -1; + } + } + + /* any error? cleanup the temp file */ + if (RetVal && (TempPath != NULL)) { + if (unlink(TempPath) && (errno != ENOENT)) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); + } + RetVal = -1; + } + } + + /* If output file is a symbolic link, optional resolve the link and modify */ + /* the target, instead of removing the link and creating a new regular file */ + TargetFN = ipOutFN; + if (symbolic_link(ipOutFN) && !RetVal) { + ResolveSymlinkResult = 0; /* indicates that TargetFN need not be freed */ + if (ipFlag->Follow == SYMLINK_FOLLOW) { + ResolveSymlinkResult = ResolveSymbolicLink(ipOutFN, &TargetFN, ipFlag, progname); + if (ResolveSymlinkResult < 0) { + if (ipFlag->verbose) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN); + fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); + } + RetVal = -1; + } + } + } + + /* can rename temporary file to output file? */ + if (!RetVal) { +#ifdef NEED_REMOVE + if (unlink(TargetFN) && (errno != ENOENT)) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: %s: %s\n", progname, TargetFN, errstr); + } + RetVal = -1; + } +#endif + if (rename(TempPath, TargetFN) == -1) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("problems renaming '%s' to '%s': %s\n"), TempPath, TargetFN, errstr); +#ifdef S_ISLNK + if (ResolveSymlinkResult > 0) + fprintf(stderr, _(" which is the target of symbolic link '%s'\n"), ipOutFN); +#endif + fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); + } + RetVal = -1; + } + + if (ResolveSymlinkResult > 0) + free(TargetFN); + } + free(TempPath); + return RetVal; +} + +/* convert stdin and write to stdout + * RetVal: 0 if success + * -1 otherwise + */ +int ConvertStdio(CFlag *ipFlag, const char *progname, + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ) +{ + ipFlag->NewFile = 1; + ipFlag->KeepDate = 0; + +#if defined(_WIN32) && !defined(__CYGWIN__) + + /* stdin and stdout are by default text streams. We need + * to set them to binary mode. Otherwise an LF will + * automatically be converted to CR-LF on DOS/Windows. + * Erwin */ + + /* POSIX 'setmode' was deprecated by MicroSoft since + * Visual C++ 2005. Use ISO C++ conformant '_setmode' instead. */ + + _setmode(_fileno(stdout), _O_BINARY); + _setmode(_fileno(stdin), _O_BINARY); +#elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__) + setmode(fileno(stdout), O_BINARY); + setmode(fileno(stdin), O_BINARY); +#endif + + if (check_unicode(stdin, stdout, ipFlag, "stdin", progname)) + return 1; + +#ifdef D2U_UNICODE + if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) { + return ConvertW(stdin, stdout, ipFlag, progname); + } else { + return Convert(stdin, stdout, ipFlag, progname); + } +#else + return Convert(stdin, stdout, ipFlag, progname); +#endif +} + +void print_messages_stdio(const CFlag *pFlag, const char *progname) +{ + if (pFlag->status & BINARY_FILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping binary file %s\n"), "stdin"); + } else if (pFlag->status & WRONG_CODEPAGE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); + } else if (pFlag->status & LOCALE_NOT_UTF8) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), "stdin"); + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), "stdin", (int)sizeof(wchar_t)); + } else if (pFlag->status & UNICODE_CONVERSION_ERROR) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), "stdin"); + } +} + +void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *outfile, const char *progname, const int RetVal) +{ + if (pFlag->status & NO_REGFILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping %s, not a regular file.\n"), infile); + } else if (pFlag->status & OUTPUTFILE_SYMLINK) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), infile, outfile); + } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); + } else if (pFlag->status & OUTPUT_TARGET_NO_REGFILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), infile, outfile); + } else if (pFlag->status & BINARY_FILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping binary file %s\n"), infile); + } else if (pFlag->status & WRONG_CODEPAGE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); + } else if (pFlag->status & LOCALE_NOT_UTF8) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), infile); + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + fprintf(stderr,"%s: ",progname); + 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) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), infile); + } else { + fprintf(stderr,"%s: ",progname); + if (is_dos2unix(progname)) + fprintf(stderr, _("converting file %s to file %s in Unix format...\n"), infile, outfile); + else { + if (pFlag->FromToMode == FROMTO_UNIX2MAC) + fprintf(stderr, _("converting file %s to file %s in Mac format...\n"), infile, outfile); + else + fprintf(stderr, _("converting file %s to file %s in DOS format...\n"), infile, outfile); + } + if (RetVal) { + fprintf(stderr,"%s: ",progname); + 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) +{ + if (pFlag->status & NO_REGFILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping %s, not a regular file.\n"), infile); + } else if (pFlag->status & OUTPUTFILE_SYMLINK) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping symbolic link %s.\n"), infile); + } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), infile); + } else if (pFlag->status & BINARY_FILE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping binary file %s\n"), infile); + } else if (pFlag->status & WRONG_CODEPAGE) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); + } else if (pFlag->status & LOCALE_NOT_UTF8) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), infile); + } else if (pFlag->status & WCHAR_T_TOO_SMALL) { + fprintf(stderr,"%s: ",progname); + 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) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), infile); + } else { + fprintf(stderr,"%s: ",progname); + if (is_dos2unix(progname)) + fprintf(stderr, _("converting file %s to Unix format...\n"), infile); + else { + if (pFlag->FromToMode == FROMTO_UNIX2MAC) + fprintf(stderr, _("converting file %s to Mac format...\n"), infile); + else + fprintf(stderr, _("converting file %s to DOS format...\n"), infile); + } + if (RetVal) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("problems converting file %s\n"), infile); + } + } +} + +int parse_options(int argc, char *argv[], CFlag *pFlag, const char *localedir, const char *progname, + void (*PrintLicense)(void), + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ) +{ + int ArgIdx = 0; + int ShouldExit = 0; + int CanSwitchFileMode = 1; + int process_options = 1; + int RetVal = 0; + + /* variable initialisations */ + pFlag->NewFile = 0; + pFlag->verbose = 1; + pFlag->KeepDate = 0; + pFlag->ConvMode = CONVMODE_ASCII; /* default ascii */ + pFlag->NewLine = 0; + pFlag->Force = 0; + pFlag->Follow = SYMLINK_SKIP; + pFlag->status = 0; + pFlag->stdio_mode = 1; + pFlag->error = 0; + pFlag->bomtype = FILE_MBS; + pFlag->add_bom = 0; + pFlag->keep_utf16 = 0; + + while ((++ArgIdx < argc) && (!ShouldExit)) + { + /* is it an option? */ + if ((argv[ArgIdx][0] == '-') && process_options) + { + /* an option */ + if (strcmp(argv[ArgIdx],"--") == 0) + process_options = 0; + else if ((strcmp(argv[ArgIdx],"-h") == 0) || (strcmp(argv[ArgIdx],"--help") == 0)) + { + PrintUsage(progname); + return(pFlag->error); + } + else if ((strcmp(argv[ArgIdx],"-b") == 0) || (strcmp(argv[ArgIdx],"--keep-bom") == 0)) + pFlag->keep_bom = 1; + else if ((strcmp(argv[ArgIdx],"-k") == 0) || (strcmp(argv[ArgIdx],"--keepdate") == 0)) + pFlag->KeepDate = 1; + else if ((strcmp(argv[ArgIdx],"-f") == 0) || (strcmp(argv[ArgIdx],"--force") == 0)) + pFlag->Force = 1; + else if ((strcmp(argv[ArgIdx],"-s") == 0) || (strcmp(argv[ArgIdx],"--safe") == 0)) + pFlag->Force = 0; + else if ((strcmp(argv[ArgIdx],"-q") == 0) || (strcmp(argv[ArgIdx],"--quiet") == 0)) + pFlag->verbose = 0; + else if ((strcmp(argv[ArgIdx],"-v") == 0) || (strcmp(argv[ArgIdx],"--verbose") == 0)) + pFlag->verbose = 2; + else if ((strcmp(argv[ArgIdx],"-l") == 0) || (strcmp(argv[ArgIdx],"--newline") == 0)) + pFlag->NewLine = 1; + else if ((strcmp(argv[ArgIdx],"-m") == 0) || (strcmp(argv[ArgIdx],"--add-bom") == 0)) + pFlag->add_bom = 1; + else if ((strcmp(argv[ArgIdx],"-r") == 0) || (strcmp(argv[ArgIdx],"--remove-bom") == 0)) { + pFlag->keep_bom = 0; + pFlag->add_bom = 0; + } + else if ((strcmp(argv[ArgIdx],"-S") == 0) || (strcmp(argv[ArgIdx],"--skip-symlink") == 0)) + pFlag->Follow = SYMLINK_SKIP; + else if ((strcmp(argv[ArgIdx],"-F") == 0) || (strcmp(argv[ArgIdx],"--follow-symlink") == 0)) + pFlag->Follow = SYMLINK_FOLLOW; + else if ((strcmp(argv[ArgIdx],"-R") == 0) || (strcmp(argv[ArgIdx],"--replace-symlink") == 0)) + pFlag->Follow = SYMLINK_REPLACE; + else if ((strcmp(argv[ArgIdx],"-V") == 0) || (strcmp(argv[ArgIdx],"--version") == 0)) { + PrintVersion(progname, localedir); + return(pFlag->error); + } + else if ((strcmp(argv[ArgIdx],"-L") == 0) || (strcmp(argv[ArgIdx],"--license") == 0)) { + PrintLicense(); + return(pFlag->error); + } + else if (strcmp(argv[ArgIdx],"-ascii") == 0) { /* SunOS compatible options */ + pFlag->ConvMode = CONVMODE_ASCII; + pFlag->keep_utf16 = 0; + } + else if (strcmp(argv[ArgIdx],"-7") == 0) + pFlag->ConvMode = CONVMODE_7BIT; + else if (strcmp(argv[ArgIdx],"-iso") == 0) { + pFlag->ConvMode = (int)query_con_codepage(); + if (pFlag->verbose) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); + } + if (pFlag->ConvMode < 2) + pFlag->ConvMode = CONVMODE_437; + } + else if (strcmp(argv[ArgIdx],"-437") == 0) + pFlag->ConvMode = CONVMODE_437; + else if (strcmp(argv[ArgIdx],"-850") == 0) + pFlag->ConvMode = CONVMODE_850; + else if (strcmp(argv[ArgIdx],"-860") == 0) + pFlag->ConvMode = CONVMODE_860; + else if (strcmp(argv[ArgIdx],"-863") == 0) + pFlag->ConvMode = CONVMODE_863; + else if (strcmp(argv[ArgIdx],"-865") == 0) + pFlag->ConvMode = CONVMODE_865; + else if (strcmp(argv[ArgIdx],"-1252") == 0) + pFlag->ConvMode = CONVMODE_1252; +#ifdef D2U_UNICODE + else if ((strcmp(argv[ArgIdx],"-u") == 0) || (strcmp(argv[ArgIdx],"--keep-utf16") == 0)) + pFlag->keep_utf16 = 1; + else if ((strcmp(argv[ArgIdx],"-ul") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16le") == 0)) + pFlag->ConvMode = CONVMODE_UTF16LE; + else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0)) + pFlag->ConvMode = CONVMODE_UTF16BE; +#endif + else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0)) { + if (++ArgIdx < argc) { + if (strcmpi(argv[ArgIdx],"ascii") == 0) { /* Benjamin Lin's legacy options */ + pFlag->ConvMode = CONVMODE_ASCII; + pFlag->keep_utf16 = 0; + } + else if (strcmpi(argv[ArgIdx], "7bit") == 0) + pFlag->ConvMode = CONVMODE_7BIT; + else if (strcmpi(argv[ArgIdx], "iso") == 0) { + pFlag->ConvMode = (int)query_con_codepage(); + if (pFlag->verbose) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); + } + if (pFlag->ConvMode < 2) + pFlag->ConvMode = CONVMODE_437; + } + else if (strcmpi(argv[ArgIdx], "mac") == 0) { + if (is_dos2unix(progname)) + pFlag->FromToMode = FROMTO_MAC2UNIX; + else + pFlag->FromToMode = FROMTO_UNIX2MAC; + } else { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("invalid %s conversion mode specified\n"),argv[ArgIdx]); + pFlag->error = 1; + ShouldExit = 1; + pFlag->stdio_mode = 0; + } + } else { + ArgIdx--; + fprintf(stderr,"%s: ",progname); + fprintf(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]); + pFlag->error = 1; + ShouldExit = 1; + pFlag->stdio_mode = 0; + } + } + + else if ((strcmp(argv[ArgIdx],"-o") == 0) || (strcmp(argv[ArgIdx],"--oldfile") == 0)) { + /* last convert not paired */ + if (!CanSwitchFileMode) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); + pFlag->error = 1; + ShouldExit = 1; + pFlag->stdio_mode = 0; + } + pFlag->NewFile = 0; + } + + else if ((strcmp(argv[ArgIdx],"-n") == 0) || (strcmp(argv[ArgIdx],"--newfile") == 0)) { + /* last convert not paired */ + if (!CanSwitchFileMode) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); + pFlag->error = 1; + ShouldExit = 1; + pFlag->stdio_mode = 0; + } + pFlag->NewFile = 1; + } + else { /* wrong option */ + PrintUsage(progname); + ShouldExit = 1; + pFlag->error = 1; + pFlag->stdio_mode = 0; + } + } + else { + pFlag->stdio_mode = 0; + /* not an option */ + if (pFlag->NewFile) { + if (CanSwitchFileMode) + CanSwitchFileMode = 0; + else { +#ifdef D2U_UNICODE + RetVal = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert, ConvertW); +#else + RetVal = ConvertNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname, Convert); +#endif + if (pFlag->verbose) + print_messages_newfile(pFlag, argv[ArgIdx-1], argv[ArgIdx], progname, RetVal); + CanSwitchFileMode = 1; + } + } + else { +#ifdef D2U_UNICODE + RetVal = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert, ConvertW); +#else + RetVal = ConvertNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname, Convert); +#endif + if (pFlag->verbose) + print_messages_oldfile(pFlag, argv[ArgIdx], progname, RetVal); + } + } + } + + /* no file argument, use stdin and stdout */ + if (pFlag->stdio_mode) { +#ifdef D2U_UNICODE + ConvertStdio(pFlag, progname, Convert, ConvertW); +#else + ConvertStdio(pFlag, progname, Convert); +#endif + if (pFlag->verbose) + print_messages_stdio(pFlag, progname); + return pFlag->error; + } + + if (!CanSwitchFileMode) { + fprintf(stderr,"%s: ",progname); + fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); + pFlag->error = 1; + } + return pFlag->error; +} #ifdef D2U_UNICODE wint_t d2u_getwc(FILE *f, int bomtype) @@ -575,8 +1337,7 @@ wint_t d2u_getwc(FILE *f, int bomtype) if (((c_lead=fgetc(f)) == EOF) || ((c_trail=fgetc(f)) == EOF)) return(WEOF); - if (bomtype == FILE_UTF16LE) /* UTF16 little endian */ - { + if (bomtype == FILE_UTF16LE) { /* UTF16 little endian */ c_trail <<=8; wc = (wint_t)(c_trail + c_lead) ; } else { /* UTF16 big endian */ @@ -590,8 +1351,7 @@ wint_t d2u_ungetwc(wint_t wc, FILE *f, int bomtype) { int c_trail, c_lead; - if (bomtype == FILE_UTF16LE) /* UTF16 little endian */ - { + if (bomtype == FILE_UTF16LE) { /* UTF16 little endian */ c_trail = (int)(wc & 0xff00); c_trail >>=8; c_lead = (int)(wc & 0xff); @@ -614,15 +1374,29 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag) static wchar_t lead, trail; static wchar_t wstr[3]; size_t i,len; + int c_trail, c_lead; - if ((wc >= 0xd800) && (wc < 0xdc00)) - { + if (ipFlag->keep_utf16) { + if (ipFlag->bomtype == FILE_UTF16LE) { /* UTF16 little endian */ + c_trail = (int)(wc & 0xff00); + c_trail >>=8; + c_lead = (int)(wc & 0xff); + } else { /* UTF16 big endian */ + c_lead = (int)(wc & 0xff00); + c_lead >>=8; + c_trail = (int)(wc & 0xff); + } + if ((fputc(c_lead,f) == EOF) || (fputc(c_trail,f) == EOF)) + return(WEOF); + return wc; + } + + if ((wc >= 0xd800) && (wc < 0xdc00)) { /* fprintf(stderr, "UTF-16 lead %x\n",wc); */ lead = (wchar_t)wc; /* lead (high) surrogate */ return(wc); } - if ((wc >= 0xdc00) && (wc < 0xe000)) - { + if ((wc >= 0xdc00) && (wc < 0xe000)) { /* fprintf(stderr, "UTF-16 trail %x\n",wc); */ trail = (wchar_t)wc; /* trail (low) surrogate */ #if defined(_WIN32) || defined(__CYGWIN__) @@ -674,13 +1448,12 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag) /* fprintf(stderr, "len %d\n",len); */ #endif - if ( len == (size_t)(-1) ) - { /* Stop when there is a conversion error */ + if ( len == (size_t)(-1) ) { + /* Stop when there is a conversion error */ ipFlag->status |= UNICODE_CONVERSION_ERROR ; return(WEOF); } else { - for (i=0; i<len; i++) - { + for (i=0; i<len; i++) { if (fputc(mbs[i], f) == EOF) return(WEOF); } @@ -24,6 +24,9 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef __D2U_COMMON_H +#define __D2U_COMMON_H + /* define feature test macros for realpath() -- needed on */ /* systems that have S_ISLNK, but chicken/egg means we must */ /* define early, before including stdlib.h (or sys/stat.h) */ @@ -193,7 +196,7 @@ typedef struct { int NewFile; /* is in new file mode? */ - int Quiet; /* is in quiet mode? */ + int verbose; /* 0 = quiet, 1 = normal, 2 = verbose */ int KeepDate; /* should keep date stamp? */ int ConvMode; /* 0: ascii, 1: 7bit, 2: iso */ int FromToMode; /* 0: dos2unix/unix2dos, 1: mac2unix/unix2mac */ @@ -206,17 +209,18 @@ typedef struct int bomtype; /* byte order mark */ int add_bom; /* 1: write BOM */ int keep_bom; /* 1: write BOM if input file has BOM. 0: Do not write BOM */ + int keep_utf16; /* 1: write UTF-16 format when input file is UTF-16 format */ } CFlag; int symbolic_link(const char *path); -int regfile(char *path, int allowSymlinks, CFlag *ipFlag, char *progname); -int regfile_target(char *path, CFlag *ipFlag, char *progname); -void PrintUsage(char *progname); +int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname); +int regfile_target(char *path, CFlag *ipFlag, const char *progname); +void PrintUsage(const char *progname); void PrintBSDLicense(void); -void PrintVersion(char *progname); +void PrintVersion(const char *progname, const char *localedir); #ifdef ENABLE_NLS -void PrintLocaledir(char *localedir); +void PrintLocaledir(const char *localedir); #endif FILE* OpenInFile(char *ipFN); FILE* OpenOutFile(int fd); @@ -228,11 +232,37 @@ FILE* MakeTempFileFrom(const char *OutFN, char **fname_ret); #else int MakeTempFileFrom(const char *OutFN, char **fname_ret); #endif -int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, char *progname); +int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progname); FILE *read_bom (FILE *f, int *bomtype); +FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname); +void print_bom (const int bomtype, const char *filename, const char *progname); +int check_unicode(FILE *InF, FILE *TempF, CFlag *ipFlag, const char *ipInFN, const char *progname); +void print_messages_stdio(const CFlag *pFlag, const char *progname); +void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *outfile, const char *progname, const int RetVal); +void print_messages_oldfile(const CFlag *pFlag, const char *infile, const char *progname, const int RetVal); +int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progname, + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ); +int ConvertStdio(CFlag *ipFlag, const char *progname, + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ); +int parse_options(int argc, char *argv[], CFlag *pFlag, const char *localedir, const char *progname, + void (*PrintLicense)(void), + int (*Convert)(FILE*, FILE*, CFlag *, const char *) +#ifdef D2U_UNICODE + , int (*ConvertW)(FILE*, FILE*, CFlag *, const char *) +#endif + ); #ifdef D2U_UNICODE wint_t d2u_getwc(FILE *f, int bomtype); wint_t d2u_ungetwc(wint_t wc, FILE *f, int bomtype); wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag); #endif +#endif @@ -61,10 +61,10 @@ /* #define DEBUG 1 */ +#define __DOS2UNIX_C #include "common.h" #include "dos2unix.h" -#include "querycp.h" #ifdef D2U_UNICODE #if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ # include <langinfo.h> @@ -83,7 +83,7 @@ All rights reserved.\n\n")); } #ifdef D2U_UNICODE -void StripDelimiterW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, wint_t CurChar) +void StripDelimiterW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, wint_t CurChar, unsigned int *converted) { wint_t TempNextChar; /* CurChar is always CR (x0d) */ @@ -93,18 +93,20 @@ void StripDelimiterW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, wint_t CurChar) d2u_ungetwc( TempNextChar, ipInF, ipFlag->bomtype); /* put back peek char */ if ( TempNextChar != 0x0a ) { d2u_putwc( CurChar, ipOutF, ipFlag); /* Mac line, put back CR */ + } else { + (*converted)++; + if (ipFlag->NewLine) { /* add additional LF? */ + d2u_putwc(0x0a, ipOutF, ipFlag); + } } } else if ( CurChar == 0x0d ) { /* EOF: last Mac line delimiter (CR)? */ d2u_putwc( CurChar, ipOutF, ipFlag); } - if (ipFlag->NewLine) { /* add additional LF? */ - d2u_putwc(0x0a, ipOutF, ipFlag); - } } #endif -void StripDelimiter(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, int CurChar) +void StripDelimiter(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, int CurChar, unsigned int *converted) { int TempNextChar; /* CurChar is always CR (x0d) */ @@ -114,14 +116,16 @@ void StripDelimiter(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, int CurChar) ungetc( TempNextChar, ipInF ); /* put back peek char */ if ( TempNextChar != '\x0a' ) { fputc( CurChar, ipOutF ); /* Mac line, put back CR */ + } else { + (*converted)++; + if (ipFlag->NewLine) { /* add additional LF? */ + fputc('\x0a', ipOutF); + } } } else if ( CurChar == '\x0d' ) { /* EOF: last Mac line delimiter (CR)? */ fputc( CurChar, ipOutF ); } - if (ipFlag->NewLine) { /* add additional LF? */ - fputc('\x0a', ipOutF); - } } /* converts stream ipInF to UNIX format text and write to stream ipOutF @@ -129,12 +133,13 @@ void StripDelimiter(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, int CurChar) * -1 otherwise */ #ifdef D2U_UNICODE -int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) +int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname) { int RetVal = 0; wint_t TempChar; wint_t TempNextChar; - int line_nr = 1; + unsigned int line_nr = 1; + unsigned int converted = 0; char *errstr; ipFlag->status = 0; @@ -158,8 +163,8 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != 0x0c)) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr); } @@ -170,10 +175,9 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) ++line_nr; if (d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF) { RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -182,7 +186,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) break; } } else { - StripDelimiterW( ipInF, ipOutF, ipFlag, TempChar ); + StripDelimiterW( ipInF, ipOutF, ipFlag, TempChar, &converted); } } break; @@ -196,23 +200,21 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != 0x0c)) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr); } break; } - if ((TempChar != 0x0d)) - { + if ((TempChar != 0x0d)) { if (TempChar == 0x0a) /* Count all DOS and Unix line breaks */ ++line_nr; - if(d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF){ + if(d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF) { RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -231,13 +233,11 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) continue; } } - if (d2u_putwc(0x0a, ipOutF, ipFlag) == WEOF) /* MAC line end (CR). Put LF */ - { + if (d2u_putwc(0x0a, ipOutF, ipFlag) == WEOF) { /* MAC line end (CR). Put LF */ RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -245,6 +245,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) } break; } + converted++; line_nr++; /* Count all Mac line breaks */ if (ipFlag->NewLine) { /* add additional LF? */ d2u_putwc(0x0a, ipOutF, ipFlag); @@ -260,6 +261,10 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) exit(1); #endif } + if (ipFlag->verbose > 1) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Converted %d out of %d line breaks.\n"),converted, line_nr -1); + } return RetVal; } #endif @@ -268,19 +273,19 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) * RetVal: 0 if success * -1 otherwise */ -int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) +int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname) { int RetVal = 0; int TempChar; int TempNextChar; int *ConvTable; - int line_nr = 1; + unsigned int line_nr = 1; + unsigned int converted = 0; char *errstr; ipFlag->status = 0; - switch (ipFlag->ConvMode) - { + switch (ipFlag->ConvMode) { case CONVMODE_ASCII: /* ascii */ case CONVMODE_UTF16LE: /* Assume UTF-16LE, bomtype = FILE_UTF8 */ case CONVMODE_UTF16BE: /* Assume UTF-16BE, bomtype = FILE_UTF8 */ @@ -311,8 +316,11 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) ipFlag->status |= WRONG_CODEPAGE ; return(-1); } - if ((ipFlag->ConvMode > 1) && (!ipFlag->Quiet)) /* not ascii or 7bit */ - { + /* Turn off ISO and 7-bit conversion for Unicode text files */ + if (ipFlag->bomtype > 0) + ConvTable = D2UAsciiTable; + + if ((ipFlag->ConvMode > CONVMODE_7BIT) && (ipFlag->verbose)) { /* not ascii or 7bit */ fprintf(stderr, "%s: ", progname); fprintf(stderr, _("using code page %d.\n"), ipFlag->ConvMode); } @@ -324,8 +332,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) /* \x0a = Newline/Line Feed (LF) */ /* \x0d = Carriage Return (CR) */ - switch (ipFlag->FromToMode) - { + switch (ipFlag->FromToMode) { case FROMTO_DOS2UNIX: /* dos2unix */ while ((TempChar = fgetc(ipInF)) != EOF) { /* get character */ if ((ipFlag->Force == 0) && @@ -336,8 +343,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != '\x0c')) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr); } @@ -348,8 +355,8 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) ++line_nr; if (fputc(ConvTable[TempChar], ipOutF) == EOF) { RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -357,7 +364,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) break; } } else { - StripDelimiter( ipInF, ipOutF, ipFlag, TempChar ); + StripDelimiter( ipInF, ipOutF, ipFlag, TempChar, &converted); } } break; @@ -371,21 +378,20 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != '\x0c')) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr); } break; } - if ((TempChar != '\x0d')) - { + if ((TempChar != '\x0d')) { if (TempChar == '\x0a') /* Count all DOS and Unix line breaks */ ++line_nr; - if(fputc(ConvTable[TempChar], ipOutF) == EOF){ + if(fputc(ConvTable[TempChar], ipOutF) == EOF) { RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -403,17 +409,17 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) continue; } } - if (fputc('\x0a', ipOutF) == EOF) /* MAC line end (CR). Put LF */ - { + if (fputc('\x0a', ipOutF) == EOF) { /* MAC line end (CR). Put LF */ RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); } break; } + converted++; line_nr++; /* Count all Mac line breaks */ if (ipFlag->NewLine) { /* add additional LF? */ fputc('\x0a', ipOutF); @@ -429,413 +435,11 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) exit(1); #endif } - return RetVal; -} - -/* convert file ipInFN to UNIX format text and write to file ipOutFN - * RetVal: 0 if success - * -1 otherwise - */ -int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *progname) -{ - int RetVal = 0; - FILE *InF = NULL; - FILE *TempF = NULL; - char *TempPath; - char *errstr; - struct stat StatBuf; - struct utimbuf UTimeBuf; -#ifndef NO_CHMOD - mode_t mask; -#endif -#ifdef NO_MKSTEMP - FILE* fd; -#else - int fd; -#endif - char *TargetFN = NULL; - int ResolveSymlinkResult = 0; - - ipFlag->status = 0 ; - - /* Test if output file is a symbolic link */ - if (symbolic_link(ipOutFN) && !ipFlag->Follow) - { - ipFlag->status |= OUTPUTFILE_SYMLINK ; - /* Not a failure, skipping input file according spec. (keep symbolic link unchanged) */ - return -1; - } - - /* Test if input file is a regular file or symbolic link */ - if (regfile(ipInFN, 1, ipFlag, progname)) - { - ipFlag->status |= NO_REGFILE ; - /* Not a failure, skipping non-regular input file according spec. */ - return -1; - } - - /* Test if input file target is a regular file */ - if (symbolic_link(ipInFN) && regfile_target(ipInFN, ipFlag,progname)) - { - ipFlag->status |= INPUT_TARGET_NO_REGFILE ; - /* Not a failure, skipping non-regular input file according spec. */ - return -1; - } - - /* Test if output file target is a regular file */ - if (symbolic_link(ipOutFN) && (ipFlag->Follow == SYMLINK_FOLLOW) && regfile_target(ipOutFN, ipFlag,progname)) - { - ipFlag->status |= OUTPUT_TARGET_NO_REGFILE ; - /* Failure, input is regular, cannot produce output. */ - if (!ipFlag->error) ipFlag->error = 1; - return -1; - } - - /* retrieve ipInFN file date stamp */ - if (stat(ipInFN, &StatBuf)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); - } - RetVal = -1; - } - -#ifdef NO_MKSTEMP - if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) { -#else - if((fd = MakeTempFileFrom (ipOutFN, &TempPath)) < 0) { -#endif - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); + if (ipFlag->verbose > 1) { fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to open temporary output file: %s\n"), errstr); - } - RetVal = -1; - } - -#if DEBUG - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("using %s as temporary file\n"), TempPath); -#endif - - /* can open in file? */ - if (!RetVal) - { - InF=OpenInFile(ipInFN); - if (InF == NULL) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); - RetVal = -1; - } - } - - /* can open output file? */ - if ((!RetVal) && (InF)) - { -#ifdef NO_MKSTEMP - if ((TempF=fd) == NULL) - { -#else - if ((TempF=OpenOutFile(fd)) == NULL) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s\n", progname, errstr); -#endif - fclose (InF); - InF = NULL; - RetVal = -1; - } - } - - InF = read_bom(InF, &ipFlag->bomtype); -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE)) - ipFlag->bomtype = FILE_UTF16LE; - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE)) - ipFlag->bomtype = FILE_UTF16BE; -#endif - -#ifdef D2U_UNICODE -#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0) - { - /* Don't convert UTF-16 files when the locale encoding is not UTF-8 - * to prevent loss of characters. */ - ipFlag->status |= LOCALE_NOT_UTF8 ; - if (!ipFlag->error) ipFlag->error = 1; - RetVal = -1; - } - } -#endif -#if !defined(_WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */ - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if (sizeof(wchar_t) < 4) - { - /* 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; - } - } -#endif -#endif - - if ((ipFlag->add_bom) || ((ipFlag->keep_bom) && (ipFlag->bomtype > 0))) - fprintf(TempF, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */ - - /* Turn off ISO and 7-bit conversion for Unicode text files */ - /* When we assume UTF16, don't change the conversion mode. We need to remember it. */ - if ((ipFlag->bomtype > 0) && (ipFlag->ConvMode != CONVMODE_UTF16LE) && (ipFlag->ConvMode != CONVMODE_UTF16BE)) - ipFlag->ConvMode = CONVMODE_ASCII; - - /* conversion sucessful? */ -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if ((!RetVal) && (ConvertDosToUnixW(InF, TempF, ipFlag, progname))) - RetVal = -1; - if (ipFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!ipFlag->error) ipFlag->error = 1; - RetVal = -1; - } - } else { - if ((!RetVal) && (ConvertDosToUnix(InF, TempF, ipFlag, progname))) - RetVal = -1; - } -#else - if ((!RetVal) && (ConvertDosToUnix(InF, TempF, ipFlag, progname))) - RetVal = -1; -#endif - - /* can close in file? */ - if ((InF) && (fclose(InF) == EOF)) - RetVal = -1; - - /* can close output file? */ - if (TempF) - { - if (fclose(TempF) == EOF) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to write to temporary output file %s: %s\n"), TempPath, errstr); - } - RetVal = -1; - } - } - -#ifdef NO_MKSTEMP - if(fd!=NULL) - fclose(fd); -#else - if(fd>=0) - close(fd); -#endif - -#ifndef NO_CHMOD - if (!RetVal) - { - if (ipFlag->NewFile == 0) /* old-file mode */ - { - RetVal = chmod (TempPath, StatBuf.st_mode); /* set original permissions */ - } - else - { - 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->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to change the permissions of temporary output file %s: %s\n"), TempPath, errstr); - } - } - } -#endif - -#ifndef NO_CHOWN - if (!RetVal && (ipFlag->NewFile == 0)) /* old-file mode */ - { - /* Change owner and group of the temporary output file to the original file's uid and gid. */ - /* 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->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to change the owner and group of temporary output file %s: %s\n"), TempPath, errstr); - } - RetVal = -1; - } - } -#endif - - if ((!RetVal) && (ipFlag->KeepDate)) - { - UTimeBuf.actime = StatBuf.st_atime; - UTimeBuf.modtime = StatBuf.st_mtime; - /* can change output file time to in file time? */ - if (utime(TempPath, &UTimeBuf) == -1) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); - } - RetVal = -1; - } - } - - /* any error? cleanup the temp file */ - if (RetVal && (TempPath != NULL)) - { - if (unlink(TempPath) && (errno != ENOENT)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); - } - RetVal = -1; - } - } - - /* If output file is a symbolic link, optional resolve the link and modify */ - /* the target, instead of removing the link and creating a new regular file */ - TargetFN = ipOutFN; - if (symbolic_link(ipOutFN) && !RetVal) - { - ResolveSymlinkResult = 0; /* indicates that TargetFN need not be freed */ - if (ipFlag->Follow == SYMLINK_FOLLOW) - { - ResolveSymlinkResult = ResolveSymbolicLink(ipOutFN, &TargetFN, ipFlag, progname); - if (ResolveSymlinkResult < 0) - { - if (!ipFlag->Quiet) - { - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN); - fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); - } - RetVal = -1; - } + fprintf(stderr, _("Converted %d out of %d line breaks.\n"),converted, line_nr -1); } - } - - /* can rename temporary file to output file? */ - if (!RetVal) - { -#ifdef NEED_REMOVE - if (unlink(TargetFN) && (errno != ENOENT)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TargetFN, errstr); - } - RetVal = -1; - } -#endif - if (rename(TempPath, TargetFN) == -1) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("problems renaming '%s' to '%s': %s\n"), TempPath, TargetFN, errstr); -#ifdef S_ISLNK - if (ResolveSymlinkResult > 0) - fprintf(stderr, _(" which is the target of symbolic link '%s'\n"), ipOutFN); -#endif - fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); - } - RetVal = -1; - } - - if (ResolveSymlinkResult > 0) - free(TargetFN); - } - free(TempPath); - return RetVal; -} - -/* convert stdin to UNIX format text and write to stdout - * RetVal: 0 if success - * -1 otherwise - */ -int ConvertDosToUnixStdio(CFlag *ipFlag, char *progname) -{ - ipFlag->NewFile = 1; - ipFlag->Quiet = 1; - ipFlag->KeepDate = 0; - ipFlag->Force = 1; - -#if defined(_WIN32) && !defined(__CYGWIN__) - - /* stdin and stdout are by default text streams. We need - * to set them to binary mode. Otherwise an LF will - * automatically be converted to CR-LF on DOS/Windows. - * Erwin */ - - /* POSIX 'setmode' was deprecated by MicroSoft since - * Visual C++ 2005. Use ISO C++ conformant '_setmode' instead. */ - - _setmode(_fileno(stdout), _O_BINARY); - _setmode(_fileno(stdin), _O_BINARY); -#elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__) - setmode(fileno(stdout), O_BINARY); - setmode(fileno(stdin), O_BINARY); -#endif - - read_bom(stdin, &ipFlag->bomtype); -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE)) - ipFlag->bomtype = FILE_UTF16LE; - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE)) - ipFlag->bomtype = FILE_UTF16BE; -#endif - - if ((ipFlag->add_bom) || ((ipFlag->keep_bom) && (ipFlag->bomtype > 0))) - fprintf(stdout, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */ - -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - return (ConvertDosToUnixW(stdin, stdout, ipFlag, progname)); - } else { - return (ConvertDosToUnix(stdin, stdout, ipFlag, progname)); - } -#else - return (ConvertDosToUnix(stdin, stdout, ipFlag, progname)); -#endif + return RetVal; } @@ -843,16 +447,9 @@ int main (int argc, char *argv[]) { /* variable declarations */ char progname[9]; - int ArgIdx; - int CanSwitchFileMode; - int ShouldExit; - int RetVal = 0; - int process_options = 1; CFlag *pFlag; char *ptr; -#ifdef ENABLE_NLS char localedir[1024]; -#endif # ifdef __MINGW64__ int _dowildcard = -1; /* enable wildcard expansion for Win64 */ # endif @@ -864,12 +461,10 @@ int main (int argc, char *argv[]) ptr = getenv("DOS2UNIX_LOCALEDIR"); if (ptr == NULL) strcpy(localedir,LOCALEDIR); - else - { + else { if (strlen(ptr) < sizeof(localedir)) strcpy(localedir,ptr); - else - { + else { fprintf(stderr,"%s: ",progname); fprintf(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n")); strcpy(localedir,LOCALEDIR); @@ -889,25 +484,8 @@ int main (int argc, char *argv[]) /* variable initialisations */ - ArgIdx = 0; - CanSwitchFileMode = 1; - ShouldExit = 0; pFlag = (CFlag*)malloc(sizeof(CFlag)); - pFlag->NewFile = 0; - pFlag->Quiet = 0; - pFlag->KeepDate = 0; - pFlag->ConvMode = CONVMODE_ASCII; /* default ascii */ pFlag->FromToMode = FROMTO_DOS2UNIX; /* default dos2unix */ - pFlag->NewLine = 0; - pFlag->Force = 0; - pFlag->Follow = SYMLINK_SKIP; - pFlag->status = 0; - pFlag->stdio_mode = 1; - pFlag->error = 0; -#ifdef D2U_UNICODE - pFlag->bomtype = FILE_MBS; -#endif - pFlag->add_bom = 0; pFlag->keep_bom = 0; if ( ((ptr=strrchr(argv[0],'/')) == NULL) && ((ptr=strrchr(argv[0],'\\')) == NULL) ) @@ -915,354 +493,15 @@ int main (int argc, char *argv[]) else ptr++; - if ((strcmpi("mac2unix", ptr) == 0) || (strcmpi("mac2unix.exe", ptr) == 0)) - { + if ((strcmpi("mac2unix", ptr) == 0) || (strcmpi("mac2unix.exe", ptr) == 0)) { pFlag->FromToMode = FROMTO_MAC2UNIX; strcpy(progname,"mac2unix"); } - while ((++ArgIdx < argc) && (!ShouldExit)) - { - /* is it an option? */ - if ((argv[ArgIdx][0] == '-') && process_options) - { - /* an option */ - if (strcmp(argv[ArgIdx],"--") == 0) - process_options = 0; - else if ((strcmp(argv[ArgIdx],"-h") == 0) || (strcmp(argv[ArgIdx],"--help") == 0)) - { - PrintUsage(progname); - return(pFlag->error); - } - else if ((strcmp(argv[ArgIdx],"-b") == 0) || (strcmp(argv[ArgIdx],"--keep-bom") == 0)) - pFlag->keep_bom = 1; - else if ((strcmp(argv[ArgIdx],"-k") == 0) || (strcmp(argv[ArgIdx],"--keepdate") == 0)) - pFlag->KeepDate = 1; - else if ((strcmp(argv[ArgIdx],"-f") == 0) || (strcmp(argv[ArgIdx],"--force") == 0)) - pFlag->Force = 1; - else if ((strcmp(argv[ArgIdx],"-s") == 0) || (strcmp(argv[ArgIdx],"--safe") == 0)) - pFlag->Force = 0; - else if ((strcmp(argv[ArgIdx],"-q") == 0) || (strcmp(argv[ArgIdx],"--quiet") == 0)) - pFlag->Quiet = 1; - else if ((strcmp(argv[ArgIdx],"-l") == 0) || (strcmp(argv[ArgIdx],"--newline") == 0)) - pFlag->NewLine = 1; - else if ((strcmp(argv[ArgIdx],"-m") == 0) || (strcmp(argv[ArgIdx],"--add-bom") == 0)) - pFlag->add_bom = 1; - else if ((strcmp(argv[ArgIdx],"-r") == 0) || (strcmp(argv[ArgIdx],"--remove-bom") == 0)) - { - pFlag->keep_bom = 0; - pFlag->add_bom = 0; - } - else if ((strcmp(argv[ArgIdx],"-S") == 0) || (strcmp(argv[ArgIdx],"--skip-symlink") == 0)) - pFlag->Follow = SYMLINK_SKIP; - else if ((strcmp(argv[ArgIdx],"-F") == 0) || (strcmp(argv[ArgIdx],"--follow-symlink") == 0)) - pFlag->Follow = SYMLINK_FOLLOW; - else if ((strcmp(argv[ArgIdx],"-R") == 0) || (strcmp(argv[ArgIdx],"--replace-symlink") == 0)) - pFlag->Follow = SYMLINK_REPLACE; - else if ((strcmp(argv[ArgIdx],"-V") == 0) || (strcmp(argv[ArgIdx],"--version") == 0)) - { - PrintVersion(progname); -#ifdef ENABLE_NLS - PrintLocaledir(localedir); -#endif - return(pFlag->error); - } - else if ((strcmp(argv[ArgIdx],"-L") == 0) || (strcmp(argv[ArgIdx],"--license") == 0)) - { - PrintLicense(); - return(pFlag->error); - } - else if (strcmp(argv[ArgIdx],"-ascii") == 0) /* SunOS compatible options */ - pFlag->ConvMode = CONVMODE_ASCII; - else if (strcmp(argv[ArgIdx],"-7") == 0) - pFlag->ConvMode = CONVMODE_7BIT; - else if (strcmp(argv[ArgIdx],"-iso") == 0) - { - pFlag->ConvMode = (int)query_con_codepage(); - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); - } - if (pFlag->ConvMode < 2) - pFlag->ConvMode = CONVMODE_437; - } - else if (strcmp(argv[ArgIdx],"-437") == 0) - pFlag->ConvMode = CONVMODE_437; - else if (strcmp(argv[ArgIdx],"-850") == 0) - pFlag->ConvMode = CONVMODE_850; - else if (strcmp(argv[ArgIdx],"-860") == 0) - pFlag->ConvMode = CONVMODE_860; - else if (strcmp(argv[ArgIdx],"-863") == 0) - pFlag->ConvMode = CONVMODE_863; - else if (strcmp(argv[ArgIdx],"-865") == 0) - pFlag->ConvMode = CONVMODE_865; - else if (strcmp(argv[ArgIdx],"-1252") == 0) - pFlag->ConvMode = CONVMODE_1252; #ifdef D2U_UNICODE - else if ((strcmp(argv[ArgIdx],"-ul") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16le") == 0)) - pFlag->ConvMode = CONVMODE_UTF16LE; - else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0)) - pFlag->ConvMode = CONVMODE_UTF16BE; + return parse_options(argc, argv, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix, ConvertDosToUnixW); +#else + return parse_options(argc, argv, pFlag, localedir, progname, PrintLicense, ConvertDosToUnix); #endif - else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0)) - { - if (++ArgIdx < argc) - { - if (strcmpi(argv[ArgIdx],"ascii") == 0) /* Benjamin Lin's legacy options */ - pFlag->ConvMode = CONVMODE_ASCII; - else if (strcmpi(argv[ArgIdx], "7bit") == 0) - pFlag->ConvMode = CONVMODE_7BIT; - else if (strcmpi(argv[ArgIdx], "iso") == 0) - { - pFlag->ConvMode = (int)query_con_codepage(); - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); - } - if (pFlag->ConvMode < 2) - pFlag->ConvMode = CONVMODE_437; - } - else if (strcmpi(argv[ArgIdx], "mac") == 0) - pFlag->FromToMode = FROMTO_MAC2UNIX; - else - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("invalid %s conversion mode specified\n"),argv[ArgIdx]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - } - else - { - ArgIdx--; - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - } - - else if ((strcmp(argv[ArgIdx],"-o") == 0) || (strcmp(argv[ArgIdx],"--oldfile") == 0)) - { - /* last convert not paired */ - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - pFlag->NewFile = 0; - } - - else if ((strcmp(argv[ArgIdx],"-n") == 0) || (strcmp(argv[ArgIdx],"--newfile") == 0)) - { - /* last convert not paired */ - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - pFlag->NewFile = 1; - } - else { /* wrong option */ - PrintUsage(progname); - ShouldExit = 1; - pFlag->error = 1; - pFlag->stdio_mode = 0; - } - } - else - { - pFlag->stdio_mode = 0; - /* not an option */ - if (pFlag->NewFile) - { - if (CanSwitchFileMode) - CanSwitchFileMode = 0; - else - { - RetVal = ConvertDosToUnixNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname); - if (pFlag->status & NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, not a regular file.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & OUTPUTFILE_SYMLINK) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & OUTPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } else if (pFlag->status & BINARY_FILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping binary file %s\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & WRONG_CODEPAGE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); - } - } else if (pFlag->status & LOCALE_NOT_UTF8) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & WCHAR_T_TOO_SMALL) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), argv[ArgIdx-1], (int)sizeof(wchar_t)); - } - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), argv[ArgIdx-1]); - } - } else { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("converting file %s to file %s in Unix format...\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - if (RetVal) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("problems converting file %s to file %s\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } - } - CanSwitchFileMode = 1; - } - } - else - { - RetVal = ConvertDosToUnixNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname); - if (pFlag->status & NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, not a regular file.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & OUTPUTFILE_SYMLINK) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & BINARY_FILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping binary file %s\n"), argv[ArgIdx]); - } - } else if (pFlag->status & WRONG_CODEPAGE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); - } - } else if (pFlag->status & LOCALE_NOT_UTF8) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & WCHAR_T_TOO_SMALL) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), argv[ArgIdx], (int)sizeof(wchar_t)); - } - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), argv[ArgIdx]); - } - } else { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("converting file %s to Unix format...\n"), argv[ArgIdx]); - } - if (RetVal) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("problems converting file %s\n"), argv[ArgIdx]); - } - } - } - } - } - } - - /* no file argument, use stdin and stdout */ - if (pFlag->stdio_mode) - { - exit(ConvertDosToUnixStdio(pFlag, progname)); - } - - - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - } - return (pFlag->error); } @@ -28,6 +28,7 @@ #ifndef __DOS2UNIX_H #define __DOS2UNIX_H +#ifdef __DOS2UNIX_C /* ASCII mode. No conversion. */ static int D2UAsciiTable[256] = @@ -212,5 +213,12 @@ static int D2UIso1252Table[256] = '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff', }; +#endif + + +#ifdef D2U_UNICODE +int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname); +#endif +int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname); #endif diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1 index a653a1d..84174b5 100644 --- a/man/de/man1/dos2unix.1 +++ b/man/de/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -203,9 +203,14 @@ umgewandelt. Im Mac-Modus werden nur Unix\-Zeilenumbrüche in Mac\-Zeilenumbrüche umgewandelt. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -schreibt eine UTF-Markierung der Bytereihenfolge in die -Ausgabedatei. Verwenden Sie diese Option niemals, wenn die Kodierung der -Ausgabedatei nicht \s-1UTF\-8\s0 ist. Weitere Informationen finden Sie im Abschnitt +schreibt eine Markierung der Bytereihenfolge (\s-1BOM\s0) in die Ausgabedatei. In +der Voreinstellung wird eine \s-1UTF\-8\-BOM\s0 geschrieben. +.Sp +Wenn die Eingabedatei in \s-1UTF\-16\s0 kodiert ist und die Option \f(CW\*(C`\-u\*(C'\fR verwendet +wird, wird eine \s-1UTF\-16\-BOM\s0 geschrieben. +.Sp +Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei +weder \s-1UTF\-8\s0 noch \s-1UTF\-16\s0 ist. Weitere Informationen finden Sie im Abschnitt \&\s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1EINGABEDATEI AUSGABEDATEI\s0 …\fR" 4 .IX Item "-n, --newfile EINGABEDATEI AUSGABEDATEI …" @@ -248,6 +253,13 @@ Unix\-Zeilenumbrüchen. Siehe auch die Option \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" überspringt Binärdateien (Vorgabe). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +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 \s-1UTF\-8.\s0 Eine \s-1UTF\-16\-BOM\s0 wird dementsprechend geschrieben. Diese +Option kann durch Angabe der Option \f(CW\*(C`\-ascii\*(C'\fR deaktiviert werden. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" nimmt an, dass die Eingabedatei das Format \s-1UTF\-16LE\s0 hat. @@ -268,6 +280,11 @@ vorgegebenen \fIascii\fR\-Modus wird die UTF16LE\-Annahme deaktiviert. nimmt an, dass die Eingabedatei das Format \s-1UTF\-16BE\s0 hat. .Sp Diese Option ist gleichbedeutend mit \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den +Markierungen der Bytereihenfolge (\s-1BOM\s0) und zur Anzahl der umgewandelten +Zeilenumbrüche angezeigt. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" folgt symbolischen Links und wandelt die Zieldateien um. @@ -400,20 +417,24 @@ Dateien in Little\-Endian\- und Big-Endian-Bytereihenfolge lesen. Um festzustellen, ob dos2unix mit UTF\-16\-Unterstützung kompiliert wurde, geben Sie \f(CW\*(C`dos2unix \-V\*(C'\fR ein. .PP -Die Windows-Versionen von dos2unix und unix2dos wandeln UTF\-16\-kodierte -Dateien stets in UTF\-8\-Dateien um. Die entsprechenden Unix-Versionen wandeln -UTF\-16\-kodierte Dateien in die lokale Zeichenkodierung um, falls diese nicht -auf \s-1UTF\-8\s0 gesetzt ist. Verwenden Sie den Befehl \fIlocale\fR\|(1), um die lokale -Zeichenkodierung zu ermitteln. -.PP -Da in \s-1UTF\-8\s0 formatierte Textdateien sowohl unter Windows als auch unter Unix -gut unterstützt werden, haben dos2unix und unix2dos keine Option zum -Schreiben von UTF\-16\-Dateien. Alle UTF\-16\-Zeichen können verlustlos in \s-1UTF\-8\s0 -kodiert werden. UTF\-16\-Dateien werden unter Unix übersprungen, wenn die -lokale Zeichenkodierung nicht \s-1UTF\-8\s0 ist, um unbeabsichtigte Verluste von -Textteilen zu verhindern. Wenn eine Umwandlung von \s-1UTF\-16\s0 nach \s-1UTF\-8\s0 -Fehlermeldungen verursacht, zum Beispiel die UTF\-16\-Eingabedatei einen -Fehler enthält, dann wird diese Datei übersprungen. +In \s-1UTF\-16\s0 kodierte Dateien werden standardmäßig in \s-1UTF\-8\s0 umgewandelt. Unter +Unix/Linux ist es notwendig, dass die Zeichenkodierung der Locale auf \s-1UTF\-8\s0 +gesetzt ist. Mit dem Befehl \fIlocale\fR\|(1) können Sie herausfinden, wie die +Zeichenkodierung der Locale eingestellt ist. In \s-1UTF\-8\s0 formatierte +Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt. +.PP +Die Kodierungen \s-1UTF\-16\s0 und \s-1UTF\-8\s0 sind vollständig kompatibel, daher wird bei +der Umwandlung keinerlei Text verlorengehen. Sollte bei der Umwandlung von +\&\s-1UTF\-16\s0 in \s-1UTF\-8\s0 ein Problem auftreten, beispielsweise wenn die +UTF\-16\-kodierte Eingabedatei einen Fehler enthält, dann wird diese Datei +übersprungen. +.PP +Wenn die Option \f(CW\*(C`\-u\*(C'\fR verwendet wird, wird die Ausgabedatei in der gleichen +UTF\-16\-Kodierung wie die Eingabedatei geschrieben. Die Option \f(CW\*(C`\-u\*(C'\fR +verhindert die Umwandlung in \s-1UTF\-8.\s0 +.PP +Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF\-8\-Dateien +in \s-1UTF\-16.\s0 .PP Umwandlungen im \s-1ISO\-\s0 und 7bit\-Modus funktionieren mit UTF\-16\-Dateien nicht. .SS "Markierung der Bytereihenfolge" @@ -638,8 +659,6 @@ Benjamin Lin \- <blin@socs.uts.edu.au> Bernd Johannes Wuebben (mac2unix mode) Projektseite: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP SourceForge-Seite: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "SIEHE AUCH" .IX Header "SIEHE AUCH" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm index dbbc5bb..59dffaf 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 6.0.6 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>nimmt alle folgenden Optionen als Dateinamen an. Verwenden Sie diese Option, wenn Sie Dateien umwandeln wollen, deren Namen mit einem Minuszeichen beginnen. Um beispielsweise eine Datei namens »-bla« umzuwandeln, können Sie folgenden Befehl verwenden:</p> @@ -179,7 +179,11 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>schreibt eine UTF-Markierung der Bytereihenfolge in die Ausgabedatei. Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8 ist. Weitere Informationen finden Sie im Abschnitt UNICODE.</p> +<p>schreibt eine Markierung der Bytereihenfolge (BOM) in die Ausgabedatei. In der Voreinstellung wird eine UTF-8-BOM geschrieben.</p> + +<p>Wenn die Eingabedatei in UTF-16 kodiert ist und die Option <code>-u</code> verwendet wird, wird eine UTF-16-BOM geschrieben.</p> + +<p>Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt UNICODE.</p> </dd> <dt id="n---newfile-EINGABEDATEI-AUSGABEDATEI"><b>-n, --newfile EINGABEDATEI AUSGABEDATEI …</b></dt> @@ -216,6 +220,12 @@ <p>überspringt Binärdateien (Vorgabe).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code> deaktiviert werden.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Diese Option ist gleichbedeutend mit <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den Markierungen der Bytereihenfolge (BOM) und zur Anzahl der umgewandelten Zeilenumbrüche angezeigt.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>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 <code>dos2unix -V</code> ein.</p> -<p>Die Windows-Versionen von dos2unix und unix2dos wandeln UTF-16-kodierte Dateien stets in UTF-8-Dateien um. Die entsprechenden Unix-Versionen wandeln UTF-16-kodierte Dateien in die lokale Zeichenkodierung um, falls diese nicht auf UTF-8 gesetzt ist. Verwenden Sie den Befehl locale(1), um die lokale Zeichenkodierung zu ermitteln.</p> +<p>In UTF-16 kodierte Dateien werden standardmäßig in UTF-8 umgewandelt. Unter Unix/Linux ist es notwendig, dass die Zeichenkodierung der Locale auf UTF-8 gesetzt ist. Mit dem Befehl locale(1) können Sie herausfinden, wie die Zeichenkodierung der Locale eingestellt ist. In UTF-8 formatierte Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt.</p> -<p>Da in UTF-8 formatierte Textdateien sowohl unter Windows als auch unter Unix gut unterstützt werden, haben dos2unix und unix2dos keine Option zum Schreiben von UTF-16-Dateien. Alle UTF-16-Zeichen können verlustlos in UTF-8 kodiert werden. UTF-16-Dateien werden unter Unix übersprungen, wenn die lokale Zeichenkodierung nicht UTF-8 ist, um unbeabsichtigte Verluste von Textteilen zu verhindern. Wenn eine Umwandlung von UTF-16 nach UTF-8 Fehlermeldungen verursacht, zum Beispiel die UTF-16-Eingabedatei einen Fehler enthält, dann wird diese Datei übersprungen.</p> +<p>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.</p> + +<p>Wenn die Option <code>-u</code> verwendet wird, wird die Ausgabedatei in der gleichen UTF-16-Kodierung wie die Eingabedatei geschrieben. Die Option <code>-u</code> verhindert die Umwandlung in UTF-8.</p> + +<p>Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF-8-Dateien in UTF-16.</p> <p>Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht.</p> @@ -516,8 +536,6 @@ <p>SourceForge-Seite: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="SIEHE-AUCH">SIEHE AUCH</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/de/man1/dos2unix.po b/man/de/man1/dos2unix.po index 6ccb79b..d2525d7 100644 --- a/man/de/man1/dos2unix.po +++ b/man/de/man1/dos2unix.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" -"PO-Revision-Date: 2014-07-10 10:04+0100\n" +"Project-Id-Version: dos2unix-man-6.1-beta1\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-18 20:30+0100\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" @@ -24,7 +24,9 @@ msgstr "BEZEICHNUNG" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt" +msgstr "" +"dos2unix - Formatumwandlung für Textdateien von DOS/Mac nach Unix und " +"umgekehrt" #. type: =head1 #: dos2unix.pod:56 @@ -50,38 +52,86 @@ msgstr "BESCHREIBUNG" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "Das Paket Dos2unix enthält die Werkzeuge C<dos2unix> und C<unix2dos> zum Umwandeln einfacher Textdateien aus dem DOS- oder Mac-Format in das Unix-Format und umgekehrt." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"Das Paket Dos2unix enthält die Werkzeuge C<dos2unix> und C<unix2dos> zum " +"Umwandeln einfacher Textdateien aus dem DOS- oder Mac-Format in das Unix-" +"Format und umgekehrt." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "In Textdateien unter DOS/Windows sind Zeilenumbrüche, auch als neue Zeile (NL) bekannt, eine Kombination aus zwei Zeichen: einem Wagenrücklauf (Carriage Return, CR) gefolgt von einem Zeilenvorschub (Line Feed, LF). In Unix-Textdateien bestehen Zeilenumbrüche nur aus einem Zeichen, dem Zeilenvorschub (LF). In Mac-Textdateien aus der Zeit vor MacOSX bestand ein Zeilenumbruch aus einem einzelnen CR-Zeichen. Heute verwendet Mac OS Zeilenumbrüche im Unix-Stil (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"In Textdateien unter DOS/Windows sind Zeilenumbrüche, auch als neue Zeile " +"(NL) bekannt, eine Kombination aus zwei Zeichen: einem Wagenrücklauf " +"(Carriage Return, CR) gefolgt von einem Zeilenvorschub (Line Feed, LF). In " +"Unix-Textdateien bestehen Zeilenumbrüche nur aus einem Zeichen, dem " +"Zeilenvorschub (LF). In Mac-Textdateien aus der Zeit vor MacOSX bestand ein " +"Zeilenumbruch aus einem einzelnen CR-Zeichen. Heute verwendet Mac OS " +"Zeilenumbrüche im Unix-Stil (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Neben Zeilenumbrüchen kann Dos2unix auch die Zeichenkodierung von Dateien umwandeln. Einige DOS-Codepages können in Unix Latin-1 umgewandelt werden, und Windows-Unicode-Dateien (UTF-16) können in Unix-Unicode-Dateien (UTF-8) umgewandelt werden." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Neben Zeilenumbrüchen kann Dos2unix auch die Zeichenkodierung von Dateien " +"umwandeln. Einige DOS-Codepages können in Unix Latin-1 umgewandelt werden, " +"und Windows-Unicode-Dateien (UTF-16) können in Unix-Unicode-Dateien (UTF-8) " +"umgewandelt werden." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Binärdateien werden automatisch übersprungen, sofern die Umwandlung nicht erzwungen wird." +msgstr "" +"Binärdateien werden automatisch übersprungen, sofern die Umwandlung nicht " +"erzwungen wird." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Nicht-reguläre Dateien, wie Verzeichnisse und FIFOS (Weiterleitungen) werden automatisch übersprungen." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Nicht-reguläre Dateien, wie Verzeichnisse und FIFOS (Weiterleitungen) werden " +"automatisch übersprungen." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "Symbolische Links und deren Ziele werden per Vorgabe unverändert belassen. Symbolische Links können optional ersetzt werden, oder die Ausgabe wird in das Ziel des symbolischen Links geschrieben. Unter Windows wird das Schreiben in das Ziele eines symbolischen Links nicht unterstützt." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"Symbolische Links und deren Ziele werden per Vorgabe unverändert belassen. " +"Symbolische Links können optional ersetzt werden, oder die Ausgabe wird in " +"das Ziel des symbolischen Links geschrieben. Unter Windows wird das " +"Schreiben in das Ziele eines symbolischen Links nicht unterstützt." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +msgstr "" +"Dos2unix wurde nach dem Vorbild der dos2unix-Version unter SunOS/Solaris " +"entwickelt, doch es gitb einen wesentlichen Unterschied zu: Diese Version " +"ersetzt per Vorgabe Dateien bei der Umwandlung (Alte-Datei-Modus), während " +"unter SunOS/Solaris nur die paarweise Umwandlung (Neue-Datei-Modus) " +"unterstützt wird. Siehe dazu die Optionen C<-o> und C<-n>." #. type: =head1 #: dos2unix.pod:90 @@ -95,8 +145,15 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "nimmt alle folgenden Optionen als Dateinamen an. Verwenden Sie diese Option, wenn Sie Dateien umwandeln wollen, deren Namen mit einem Minuszeichen beginnen. Um beispielsweise eine Datei namens »-bla« umzuwandeln, können Sie folgenden Befehl verwenden:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"nimmt alle folgenden Optionen als Dateinamen an. Verwenden Sie diese Option, " +"wenn Sie Dateien umwandeln wollen, deren Namen mit einem Minuszeichen " +"beginnen. Um beispielsweise eine Datei namens »-bla« umzuwandeln, können Sie " +"folgenden Befehl verwenden:" #. type: verbatim #: dos2unix.pod:100 @@ -131,7 +188,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:108 msgid "Convert only line breaks. This is the default conversion mode." -msgstr "wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus." +msgstr "" +"wandelt nur Zeilenumbrüche um. Dies ist der vorgegebene Umwandlungsmodus." #. type: =item #: dos2unix.pod:110 @@ -140,8 +198,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -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." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"wandelt aus dem DOS- in den ISO-8859-1-Zeichensatz um. Weitere Informationen " +"hierzu finden Sie im Abschnitt UMWANDLUNGSMODI." #. type: =item #: dos2unix.pod:115 @@ -160,8 +222,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -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." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"verwendet die DOS-Codepage 437 (US). Dies ist die vorgegebene Codepage für " +"die ISO-Umwandlung." #. type: =item #: dos2unix.pod:123 @@ -220,8 +286,15 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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>." +msgid "" +"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " +"the output file. This is the default behavior when converting to DOS line " +"breaks. See also option C<-r>." +msgstr "" +"erhält die Markierung der Bytereihenfolge (BOM). Wenn die Eingabedatei eine " +"BOM enthält, wird ebenfalls eine BOM in die Ausgabedatei geschrieben. Dies " +"ist das Standardverhalten beim Umwandeln von DOS-Zeilenumbrüchen. Siehe auch " +"die Option C<-r>." #. type: =item #: dos2unix.pod:149 @@ -230,8 +303,12 @@ msgstr "B<-c, --convmode UMWANDLUNGSMODUS>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"legt den Umwandlungsmodus fest. UMWANDLUNGSMODUS kann I<ascii>, I<7bit>, " +"I<iso> oder I<mac> sein, wobei I<ascii> die Vorgabe ist." #. type: =item #: dos2unix.pod:155 @@ -285,13 +362,23 @@ msgstr "fügt eine zusätzliche neue Zeile hinzu." #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -300,231 +387,416 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "schreibt eine UTF-Markierung der Bytereihenfolge in die Ausgabedatei. Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei nicht UTF-8 ist. Weitere Informationen finden Sie im Abschnitt UNICODE." +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: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei " +"weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt " +"UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile EINGABEDATEI AUSGABEDATEI …>" #. type: textblock -#: dos2unix.pod:189 -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>." +#: dos2unix.pod:196 +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:193 -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." +#: dos2unix.pod:200 +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:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile DATEI …>" #. type: textblock -#: dos2unix.pod:200 -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." +#: dos2unix.pod:207 +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:203 -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." +#: dos2unix.pod:210 +msgid "" +"In old file (in-place) mode the converted file gets the same owner, group, " +"and read/write permissions as the original file. Also when the file is " +"converted by another user who has write permissions on the file (e.g. user " +"root). The conversion will be aborted when it is not possible to preserve " +"the original values. Change of owner could mean that the original owner is " +"not able to read the file any more. Change of group could be a security " +"risk, the file could be made readable for persons for whom it is not " +"intended. Preservation of owner, group, and read/write permissions is only " +"supported on Unix." +msgstr "" +"Im Alte-Datei-Modus (Ersetzungsmodus) erhalten die umgewandelten Dateien den " +"gleichen Eigentümer, die gleiche Gruppe und die gleichen Lese- und " +"Schreibberechtigungen wie die Originaldatei, auch wenn die Datei von einem " +"anderen Benutzer umgewandelt wird, der Schreibrechte für die Datei hat (zum " +"Beispiel der Systemadministrator). Die Umwandlung wird abgebrochen, wenn es " +"nicht möglich ist, die originalen Werte beizubehalten. Die Änderung des " +"Eigentümers könnte zum Beispiel bewirken, dass der ursprüngliche Eigentümer " +"die Datei nicht mehr lesen kann. Die Änderung der Gruppe könnte ein " +"Sicherheitsrisiko sein, da die Datei vielleicht für Benutzer lesbar wird, " +"für die sie nicht bestimmt ist. Die Beibehaltung von Eigentümer, Gruppe und " +"Schreib- und Leserechten wird nur unter Unix unterstützt." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -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." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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>." +#: dos2unix.pod:226 +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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "überspringt Binärdateien (Vorgabe)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 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:231 -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." +#: dos2unix.pod:245 +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:234 -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." +#: dos2unix.pod:248 +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:239 -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." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 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:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "Diese Option ist gleichbedeutend mit C<-ul>." #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +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:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "folgt symbolischen Links und wandelt die Zieldateien um." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -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)." +#: dos2unix.pod:273 +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:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." -msgstr "erhält symbolische Links als solche und lässt die Ziele unverändert (Vorgabe)." +msgstr "" +"erhält symbolische Links als solche und lässt die Ziele unverändert " +"(Vorgabe)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "zeigt Versionsinformationen an und beendet das Programm." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:269 -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." +#: dos2unix.pod:288 +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:272 -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." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "UMWANDLUNGSMODI" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -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." +#: dos2unix.pod:303 +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:287 -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." +#: dos2unix.pod:306 +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:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -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." +#: dos2unix.pod:312 +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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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." +#: dos2unix.pod:317 +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:303 -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." +#: dos2unix.pod:322 +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:312 -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." +#: dos2unix.pod:331 +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:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Einige Beispiele:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -534,12 +806,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "Umwandlung von DOS CP850 nach Unix Latin-1" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -549,12 +821,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "Umwandlung von Windows CP1252 nach Unix Latin-1" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -564,12 +836,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" msgstr "Umwandlung von Windows CP1252 nach Unix UTF-8 (Unicode)" #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -579,12 +851,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 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:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -594,12 +866,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "Umwandlung von Unix Latin-1 nach DOS CP850" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -609,12 +881,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "Umwandlung von Unix Latin-1 nach Windows CP1252" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -624,12 +896,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" msgstr "Umwandlung von Unix UTF-8 (Unicode) nach Windows CP1252" #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -639,112 +911,208 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Zeichenkodierungen" #. type: textblock -#: dos2unix.pod:357 -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." +#: dos2unix.pod:376 +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:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Umwandlung" #. type: textblock -#: dos2unix.pod:364 -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." +#: dos2unix.pod:383 +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:367 -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." +#: dos2unix.pod:386 +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:389 +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:370 -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." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" +"In UTF-16 kodierte Dateien werden standardmäßig in UTF-8 umgewandelt. Unter " +"Unix/Linux ist es notwendig, dass die Zeichenkodierung der Locale auf UTF-8 " +"gesetzt ist. Mit dem Befehl locale(1) können Sie herausfinden, wie die " +"Zeichenkodierung der Locale eingestellt ist. In UTF-8 formatierte " +"Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt." #. type: textblock -#: dos2unix.pod:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "Die Windows-Versionen von dos2unix und unix2dos wandeln UTF-16-kodierte Dateien stets in UTF-8-Dateien um. Die entsprechenden Unix-Versionen wandeln UTF-16-kodierte Dateien in die lokale Zeichenkodierung um, falls diese nicht auf UTF-8 gesetzt ist. Verwenden Sie den Befehl locale(1), um die lokale Zeichenkodierung zu ermitteln." +#: dos2unix.pod:398 +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:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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 "Da in UTF-8 formatierte Textdateien sowohl unter Windows als auch unter Unix gut unterstützt werden, haben dos2unix und unix2dos keine Option zum Schreiben von UTF-16-Dateien. Alle UTF-16-Zeichen können verlustlos in UTF-8 kodiert werden. UTF-16-Dateien werden unter Unix übersprungen, wenn die lokale Zeichenkodierung nicht UTF-8 ist, um unbeabsichtigte Verluste von Textteilen zu verhindern. Wenn eine Umwandlung von UTF-16 nach UTF-8 Fehlermeldungen verursacht, zum Beispiel die UTF-16-Eingabedatei einen Fehler enthält, dann wird diese Datei übersprungen." +#: dos2unix.pod:402 +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:405 +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:387 +#: dos2unix.pod:407 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." +msgstr "" +"Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht." #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Markierung der Bytereihenfolge" #. type: textblock -#: dos2unix.pod:391 -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>." +#: dos2unix.pod:411 +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:395 -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." +#: dos2unix.pod:415 +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:398 -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." +#: dos2unix.pod:418 +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:402 +#: dos2unix.pod:422 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." +msgstr "" +"Verwenden Sie die Optionen C<-ul> oder C<-ub>, um eine UTF-16-Datei ohne BOM " +"umzuwandeln." #. type: textblock -#: dos2unix.pod:404 -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." +#: dos2unix.pod:424 +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:407 -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." +#: dos2unix.pod:427 +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:410 +#: dos2unix.pod:430 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." +msgstr "" +"Dos2unix und unix2dos schreiben immer eine BOM, wenn die Option C<-m> " +"angegeben ist." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Unicode-Beispiele" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 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:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -754,12 +1122,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 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:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -769,12 +1137,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 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:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -784,12 +1152,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 msgid "Convert from Unix UTF-8 to Windows UTF-16" msgstr "Umwandlung von Unix UTF-8 nach Windows UTF-16" #. type: verbatim -#: dos2unix.pod:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -799,17 +1167,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "BEISPIELE" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 msgid "Read input from 'stdin' and write output to 'stdout'." msgstr "Aus der Standardeingabe lesen und in die Standardausgabe schreiben:" #. type: verbatim -#: dos2unix.pod:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -821,12 +1189,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -838,12 +1206,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 msgid "Convert and replace a.txt in ascii conversion mode." msgstr "a.txt im ascii-Modus umwandeln und ersetzen:" #. type: verbatim -#: dos2unix.pod:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -853,12 +1221,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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:" +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -872,12 +1244,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "a.txt aus dem Mac- in das Unix-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -889,12 +1261,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "a.txt aus dem Unix- in das Mac-Format umwandeln:" #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -906,12 +1278,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 msgid "Convert and replace a.txt while keeping original date stamp." msgstr "a.txt unter Beibehaltung des Zeitstempels umwandeln:" #. type: verbatim -#: dos2unix.pod:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -923,12 +1295,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "a.txt umwandeln und das Ergebnis nach e.txt schreiben:" #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -938,12 +1310,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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:" +#: dos2unix.pod:492 +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:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -953,12 +1328,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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:" +msgstr "" +"a.txt umwandeln und ersetzen, b.txt umwandeln und das Ergebnis nach e.txt " +"schreiben:" #. type: verbatim -#: dos2unix.pod:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -970,12 +1347,17 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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 "a.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:" +#: dos2unix.pod:501 +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 "" +"a.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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -985,17 +1367,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "REKURSIVE UMWANDLUNG" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Verwenden Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1), um Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen umzuwandeln, geben Sie Folgendes ein:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Verwenden Sie dos2unix zusammen mit den Befehlen find(1) und xargs(1), um " +"Textdateien in einem Verzeichnisbaum rekursiv umzuwandeln. Um beispielsweise " +"alle *.txt-Dateien im aktuellen Verzeichnis und dessen Unterverzeichnissen " +"umzuwandeln, geben Sie Folgendes ein:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1005,22 +1395,35 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "LOKALISIERUNG" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -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:" +#: dos2unix.pod:520 +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:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1042,47 +1445,83 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -msgstr "Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +msgstr "" +"Eine vollständige Liste der Sprachen und Ländercodes finden Sie im Gettext-" +"Handbuch: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-" +"Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to command locale(1) to get locale specific information." -msgstr "Auf Unix-Systemen erhalten Sie mit dem Befehl locale(1) spezifische Informationen zu den Spracheinstellungen." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to 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:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -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 nutzen können. Weitere Informationen finden Sie im Gettext-Handbuch: L<http://www.gnu.org/software/gettext/manual/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +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 nutzen können. " +"Weitere Informationen finden Sie im Gettext-Handbuch: L<http://www.gnu.org/" +"software/gettext/manual/gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -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." +#: dos2unix.pod:551 +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:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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." +#: dos2unix.pod:557 +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:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Beispiel (POSIX-Shell):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1092,85 +1531,141 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "RÃœCKGABEWERT" #. type: textblock -#: dos2unix.pod:551 -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." +#: dos2unix.pod:571 +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:554 -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." +#: dos2unix.pod:574 +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:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://de.wikipedia.org/wiki/Textdatei>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://de.wikipedia.org/wiki/Wagenr%C3%BCcklauf>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://de.wikipedia.org/wiki/Zeilenumbruch>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTOREN" #. type: textblock -#: dos2unix.pod:569 -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)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge-Seite: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "Dos2unix never writes a BOM in the output file, unless you use option C<-m>." -#~ msgstr "Dos2unix schreibt nur dann eine BOM in die Ausgabedatei, wenn Sie die Option C<-m> angeben." - -#~ msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar conversion modes." -#~ msgstr "Dos2unix wurde nach dem Beispiel des in SunOS/Solaris verfügbaren dos2unix entwickelt und bietet ähnliche Umwandlungsmodi." - -#~ msgid "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of dos2unix/unix2dos under SunOS/Solaris." -#~ msgstr "Die Umwandlungsmodi I<ascii>, I<7bit> und I<iso> ähneln denen von dos2unix/unix2dos unter SunOS/Solaris." +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "Die Windows-Versionen von dos2unix und unix2dos wandeln UTF-16-kodierte " +#~ "Dateien stets in UTF-8-Dateien um. Die entsprechenden Unix-Versionen " +#~ "wandeln UTF-16-kodierte Dateien in die lokale Zeichenkodierung um, falls " +#~ "diese nicht auf UTF-8 gesetzt ist. Verwenden Sie den Befehl locale(1), um " +#~ "die lokale Zeichenkodierung zu ermitteln." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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 "" +#~ "Da in UTF-8 formatierte Textdateien sowohl unter Windows als auch unter " +#~ "Unix gut unterstützt werden, haben dos2unix und unix2dos keine Option zum " +#~ "Schreiben von UTF-16-Dateien. Alle UTF-16-Zeichen können verlustlos in " +#~ "UTF-8 kodiert werden. UTF-16-Dateien werden unter Unix übersprungen, wenn " +#~ "die lokale Zeichenkodierung nicht UTF-8 ist, um unbeabsichtigte Verluste " +#~ "von Textteilen zu verhindern. Wenn eine Umwandlung von UTF-16 nach UTF-8 " +#~ "Fehlermeldungen verursacht, zum Beispiel die UTF-16-Eingabedatei einen " +#~ "Fehler enthält, dann wird diese Datei übersprungen." + +#~ msgid "" +#~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" +#~ "m>." +#~ msgstr "" +#~ "Dos2unix schreibt nur dann eine BOM in die Ausgabedatei, wenn Sie die " +#~ "Option C<-m> angeben." + +#~ msgid "" +#~ "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar " +#~ "conversion modes." +#~ msgstr "" +#~ "Dos2unix wurde nach dem Beispiel des in SunOS/Solaris verfügbaren " +#~ "dos2unix entwickelt und bietet ähnliche Umwandlungsmodi." + +#~ msgid "" +#~ "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of " +#~ "dos2unix/unix2dos under SunOS/Solaris." +#~ msgstr "" +#~ "Die Umwandlungsmodi I<ascii>, I<7bit> und I<iso> ähneln denen von " +#~ "dos2unix/unix2dos unter SunOS/Solaris." diff --git a/man/de/man1/dos2unix.pod b/man/de/man1/dos2unix.pod index 166ac17..0a44534 100644 --- a/man/de/man1/dos2unix.pod +++ b/man/de/man1/dos2unix.pod @@ -158,11 +158,18 @@ Mac-Zeilenumbrüche umgewandelt. =item B<-m, --add-bom> -schreibt eine UTF-Markierung der Bytereihenfolge in die -Ausgabedatei. Verwenden Sie diese Option niemals, wenn die Kodierung der -Ausgabedatei nicht UTF-8 ist. Weitere Informationen finden Sie im Abschnitt +schreibt eine Markierung der Bytereihenfolge (BOM) in die Ausgabedatei. In +der Voreinstellung wird eine UTF-8-BOM geschrieben. + +Wenn die Eingabedatei in UTF-16 kodiert ist und die Option C<-u> verwendet +wird, wird eine UTF-16-BOM geschrieben. + +Verwenden Sie diese Option niemals, wenn die Kodierung der Ausgabedatei +weder UTF-8 noch UTF-16 ist. Weitere Informationen finden Sie im Abschnitt UNICODE. + + =item B<-n, --newfile EINGABEDATEI AUSGABEDATEI …> Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die AUSGABEDATEI @@ -209,6 +216,14 @@ Unix-Zeilenumbrüchen. Siehe auch die Option C<-b>. überspringt Binärdateien (Vorgabe). +=item B<-u, --keep-utf16> + +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. + =item B<-ul, --assume-utf16le> nimmt an, dass die Eingabedatei das Format UTF-16LE hat. @@ -231,6 +246,12 @@ nimmt an, dass die Eingabedatei das Format UTF-16BE hat. Diese Option ist gleichbedeutend mit C<-ul>. +=item B<-v, --verbose> + +zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu den +Markierungen der Bytereihenfolge (BOM) und zur Anzahl der umgewandelten +Zeilenumbrüche angezeigt. + =item B<-F, --follow-symlink> folgt symbolischen Links und wandelt die Zieldateien um. @@ -362,20 +383,24 @@ 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. -Die Windows-Versionen von dos2unix und unix2dos wandeln UTF-16-kodierte -Dateien stets in UTF-8-Dateien um. Die entsprechenden Unix-Versionen wandeln -UTF-16-kodierte Dateien in die lokale Zeichenkodierung um, falls diese nicht -auf UTF-8 gesetzt ist. Verwenden Sie den Befehl locale(1), um die lokale -Zeichenkodierung zu ermitteln. - -Da in UTF-8 formatierte Textdateien sowohl unter Windows als auch unter Unix -gut unterstützt werden, haben dos2unix und unix2dos keine Option zum -Schreiben von UTF-16-Dateien. Alle UTF-16-Zeichen können verlustlos in UTF-8 -kodiert werden. UTF-16-Dateien werden unter Unix übersprungen, wenn die -lokale Zeichenkodierung nicht UTF-8 ist, um unbeabsichtigte Verluste von -Textteilen zu verhindern. Wenn eine Umwandlung von UTF-16 nach UTF-8 -Fehlermeldungen verursacht, zum Beispiel die UTF-16-Eingabedatei einen -Fehler enthält, dann wird diese Datei übersprungen. +In UTF-16 kodierte Dateien werden standardmäßig in UTF-8 umgewandelt. Unter +Unix/Linux ist es notwendig, dass die Zeichenkodierung der Locale auf UTF-8 +gesetzt ist. Mit dem Befehl locale(1) können Sie herausfinden, wie die +Zeichenkodierung der Locale eingestellt ist. In UTF-8 formatierte +Textdateien werden von Windows und Unix/Linux gleichermaßen unterstützt. + +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. + +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. + +Dos2unix und unix2dos bieten keine Option zur Umwandlung von UTF-8-Dateien +in UTF-16. Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht. @@ -583,8 +608,6 @@ Projektseite: L<http://waterlan.home.xs4all.nl/dos2unix.html> SourceForge-Seite: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 SIEHE AUCH file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/de/man1/dos2unix.txt b/man/de/man1/dos2unix.txt index c6ab63c..df57077 100644 --- a/man/de/man1/dos2unix.txt +++ b/man/de/man1/dos2unix.txt @@ -118,10 +118,15 @@ OPTIONEN Mac-Zeilenumbrüche umgewandelt. -m, --add-bom - schreibt eine UTF-Markierung der Bytereihenfolge in die - Ausgabedatei. Verwenden Sie diese Option niemals, wenn die Kodierung - der Ausgabedatei nicht UTF-8 ist. Weitere Informationen finden Sie - im Abschnitt UNICODE. + schreibt eine Markierung der Bytereihenfolge (BOM) in die + Ausgabedatei. In der Voreinstellung wird eine UTF-8-BOM geschrieben. + + Wenn die Eingabedatei in UTF-16 kodiert ist und die Option "-u" + verwendet wird, wird eine UTF-16-BOM geschrieben. + + Verwenden Sie diese Option niemals, wenn die Kodierung der + Ausgabedatei weder UTF-8 noch UTF-16 ist. Weitere Informationen + finden Sie im Abschnitt UNICODE. -n, --newfile EINGABEDATEI AUSGABEDATEI … Neue-Datei-Modus. Die EINGABEDATEI wird umgewandelt und in die @@ -166,6 +171,14 @@ OPTIONEN -s, --safe überspringt Binärdateien (Vorgabe). + -u, --keep-utf16 + 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 "-ascii" deaktiviert werden. + -ul, --assume-utf16le nimmt an, dass die Eingabedatei das Format UTF-16LE hat. @@ -188,6 +201,11 @@ OPTIONEN Diese Option ist gleichbedeutend mit "-ul". + -v, --verbose + zeigt ausführliche Meldungen an. Zusätzliche Informationen werden zu + den Markierungen der Bytereihenfolge (BOM) und zur Anzahl der + umgewandelten Zeilenumbrüche angezeigt. + -F, --follow-symlink folgt symbolischen Links und wandelt die Zieldateien um. @@ -303,21 +321,25 @@ UNICODE Um festzustellen, ob dos2unix mit UTF-16-Unterstützung kompiliert wurde, geben Sie "dos2unix -V" ein. - Die Windows-Versionen von dos2unix und unix2dos wandeln UTF-16-kodierte - Dateien stets in UTF-8-Dateien um. Die entsprechenden Unix-Versionen - wandeln UTF-16-kodierte Dateien in die lokale Zeichenkodierung um, falls - diese nicht auf UTF-8 gesetzt ist. Verwenden Sie den Befehl locale(1), - um die lokale Zeichenkodierung zu ermitteln. - - Da in UTF-8 formatierte Textdateien sowohl unter Windows als auch unter - Unix gut unterstützt werden, haben dos2unix und unix2dos keine Option - zum Schreiben von UTF-16-Dateien. Alle UTF-16-Zeichen können verlustlos - in UTF-8 kodiert werden. UTF-16-Dateien werden unter Unix übersprungen, - wenn die lokale Zeichenkodierung nicht UTF-8 ist, um unbeabsichtigte - Verluste von Textteilen zu verhindern. Wenn eine Umwandlung von UTF-16 - nach UTF-8 Fehlermeldungen verursacht, zum Beispiel die - UTF-16-Eingabedatei einen Fehler enthält, dann wird diese Datei - übersprungen. + In UTF-16 kodierte Dateien werden standardmäßig in UTF-8 umgewandelt. + Unter Unix/Linux ist es notwendig, dass die Zeichenkodierung der Locale + auf UTF-8 gesetzt ist. Mit dem Befehl locale(1) können Sie herausfinden, + wie die Zeichenkodierung der Locale eingestellt ist. In UTF-8 + formatierte Textdateien werden von Windows und Unix/Linux gleichermaßen + unterstützt. + + 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. + + Wenn die Option "-u" verwendet wird, wird die Ausgabedatei in der + gleichen UTF-16-Kodierung wie die Eingabedatei geschrieben. Die Option + "-u" verhindert die Umwandlung in UTF-8. + + Dos2unix und unix2dos bieten keine Option zur Umwandlung von + UTF-8-Dateien in UTF-16. Umwandlungen im ISO- und 7bit-Modus funktionieren mit UTF-16-Dateien nicht. @@ -513,8 +535,6 @@ AUTOREN SourceForge-Seite: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - SIEHE AUCH file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1 index 69179c7..6d3e256 100644 --- a/man/es/man1/dos2unix.1 +++ b/man/es/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -204,9 +204,14 @@ lÃnea \s-1DOS.\s0 En modo Mac los saltos de lÃnea Unix son cambiados por dos s de lÃnea Mac. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Escribe una marca de orden de bytes para \s-1UTF\-8\s0 en el fichero de -salida. Nunca use esta opción cuando la codificación de salida sea distinta -de \s-1UTF\-8.\s0 Véase también la sección \s-1UNICODE.\s0 +Write a Byte Order Mark (\s-1BOM\s0) in the output file. By default an \s-1UTF\-8 BOM\s0 is +written. +.Sp +When the input file is \s-1UTF\-16,\s0 and the option \f(CW\*(C`\-u\*(C'\fR is used, an \s-1UTF\-16 BOM\s0 +will be written. +.Sp +Never use this option when the output encoding is other than \s-1UTF\-8\s0 or +\&\s-1UTF\-16. \s0 See also section \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ...\s0\fR" 4 .IX Item "-n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ..." Modo de fichero nuevo. Convierte el fichero \s-1FICHERO_DE_ENTRADA\s0 y escribe la @@ -245,6 +250,12 @@ Unix. Vea también la opción \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" Ignora los ficheros binarios (por defecto). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Keep the original \s-1UTF\-16\s0 encoding of the input file. The output file will be +written in the same \s-1UTF\-16\s0 encoding, little or big endian, as the input +file. This prevents transformation to \s-1UTF\-8.\s0 An \s-1UTF\-16 BOM\s0 will be written +accordingly. This option can be disabled with the \f(CW\*(C`\-ascii\*(C'\fR option. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" Supone que el formato de fichero de entrada es \s-1UTF\-16LE.\s0 @@ -265,6 +276,10 @@ al modo por defecto \fIascii\fR el supuesto \s-1UTF\-16LE\s0 es deshabilitado. Supone que el formato del fichero de entrada es \s-1UTF\-16BE.\s0 .Sp Esta opción funciona igual que la opción \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +Display verbose messages. Extra information is displayed about Byte Order +Marks and the amount of converted line breaks. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Sigue los enlaces simbólicos y convierte los destinos. @@ -397,20 +412,21 @@ Dos2unix y unix2dos con soporte Unicode \s-1UTF\-16,\s0 pueden leer ficheros de texto codificados como \s-1UTF\-16\s0 little y big endian. Para ver si dos2unix fue compilado con soporte \s-1UTF\-16\s0 escriba \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros -Codificados como \s-1UTF\-16\s0 a \s-1UTF\-8.\s0 Las versiones Unix de dos2unix/unix2dos -convierten ficheros \s-1UTF\-16\s0 a la codificación de caracteres local cuando es -configurado a \s-1UTF\-8.\s0 Emplee el comando \fIlocale\fR\|(1) para determinar cual es la -codificación de caracteres local. -.PP -Dado que los ficheros de texto formateados \s-1UTF\-8\s0 son bien soportados tanto -en Windows como en Unix, dos2unix y unix2dos no tienen opción para escribir -ficheros \s-1UTF\-16.\s0 Todos los caracteres \s-1UTF\-16\s0 pueden ser codificados en -\&\s-1UTF\-8.\s0 La conversión de \s-1UTF\-16\s0 a \s-1UTF\-8\s0 ocurre sin pérdida. Los ficheros -\&\s-1UTF\-16\s0 serán ignorados en Unix cuando la codificación de caracteres local no -sea \s-1UTF\-8,\s0 para evitar la pérdida accidental de texto. Cuando ocurre un -error de conversión de \s-1UTF\-16\s0 a \s-1UTF\-8,\s0 por ejemplo cuando el fichero de -entrada \s-1UTF\-16\s0 contiene un error, el fichero será ignorado. +\&\s-1UTF\-16\s0 encoded files are by default converted to \s-1UTF\-8.\s0 On Unix/Linux it is +required that the locale character encoding is set to \s-1UTF\-8.\s0 Use the +\&\fIlocale\fR\|(1) command to find out what the locale character encoding is. \s-1UTF\-8\s0 +formatted text files are well supported on both Windows and Unix/Linux. +.PP +\&\s-1UTF\-16\s0 and \s-1UTF\-8\s0 encoding are fully compatible, there will no text be lost +in the conversion. When an \s-1UTF\-16\s0 to \s-1UTF\-8\s0 conversion error occurs, for +instance when the \s-1UTF\-16\s0 input file contains an error, the file will be +skipped. +.PP +When option \f(CW\*(C`\-u\*(C'\fR is used, the output file will be written in the same +\&\s-1UTF\-16\s0 encoding as the input file. Option \f(CW\*(C`\-u\*(C'\fR prevents conversion to +\&\s-1UTF\-8.\s0 +.PP +Dos2unix and unix2dos have no option to convert \s-1UTF\-8\s0 files to \s-1UTF\-16.\s0 .PP La conversión en modos \s-1ISO\s0 y 7\-bit no funciona en ficheros \s-1UTF\-16.\s0 .SS "Marca de orden de bytes" @@ -629,8 +645,6 @@ Benjamin Lin \- <blin@socs.uts.edu.au> Bernd Johannes Wuebben (mac2unix mode) Página del proyecto: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP Página de SourceForge: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "VÉASE TAMBIÉN" .IX Header "VÉASE TAMBIÉN" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm index e5a480b..99658d5 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 6.0.6 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Todos los parámetros siguientes son tratados como nombres de fichero. Use este parámetro si desea convertir ficheros cuyos nombres inician con un guión. Por ejemplo para convertir un fichero llamado "-foo", use este comando:</p> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Escribe una marca de orden de bytes para UTF-8 en el fichero de salida. Nunca use esta opción cuando la codificación de salida sea distinta de UTF-8. Véase también la sección UNICODE.</p> +<p>Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written.</p> + +<p>When the input file is UTF-16, and the option <code>-u</code> is used, an UTF-16 BOM will be written.</p> + +<p>Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE.</p> </dd> -<dt id="n---newfile-FICHERO_DE_ENTRADA-FICHERO_DE_SALIDA-..."><b>-n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ...</b></dt> +<dt id="n---newfile-FICHERO_DE_ENTRADA-FICHERO_DE_SALIDA"><b>-n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ...</b></dt> <dd> <p>Modo de fichero nuevo. Convierte el fichero FICHERO_DE_ENTRADA y escribe la salida al fichero FICHERO_DE_SALIDA. Los nombres de fichero deben ser dados en pares y los comodines <i>no</i> deben ser usados o <i>perderá</i> sus ficheros.</p> @@ -190,7 +194,7 @@ <p>La persona que inicia la conversión en el modo de fichero nuevo (pareado) será el propietario del fichero convertido. Los permisos de lectura/escritura del fichero nuevo serán los permisos del fichero original menos la umask(1) de la persona que ejecute la conversión.</p> </dd> -<dt id="o---oldfile-FICHERO-..."><b>-o, --oldfile FICHERO ...</b></dt> +<dt id="o---oldfile-FICHERO"><b>-o, --oldfile FICHERO ...</b></dt> <dd> <p>Modo de fichero viejo. Convierte el fichero FICHERO y lo sobrescribe con la salida. El programa por defecto se ejecuta en este modo. Sí se pueden emplear comodines.</p> @@ -216,6 +220,12 @@ <p>Ignora los ficheros binarios (por defecto).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code> option.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Esta opción funciona igual que la opción <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>Dos2unix y unix2dos con soporte Unicode UTF-16, pueden leer ficheros de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba <code>dos2unix -V</code>.</p> -<p>Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos convierten ficheros UTF-16 a la codificación de caracteres local cuando es configurado a UTF-8. Emplee el comando locale(1) para determinar cual es la codificación de caracteres local.</p> +<p>UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is required that the locale character encoding is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is. UTF-8 formatted text files are well supported on both Windows and Unix/Linux.</p> -<p>Dado que los ficheros de texto formateados UTF-8 son bien soportados tanto en Windows como en Unix, dos2unix y unix2dos no tienen opción para escribir ficheros UTF-16. Todos los caracteres UTF-16 pueden ser codificados en UTF-8. La conversión de UTF-16 a UTF-8 ocurre sin pérdida. Los ficheros UTF-16 serán ignorados en Unix cuando la codificación de caracteres local no sea UTF-8, para evitar la pérdida accidental de texto. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por ejemplo cuando el fichero de entrada UTF-16 contiene un error, el fichero será ignorado.</p> +<p>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.</p> + +<p>When option <code>-u</code> is used, the output file will be written in the same UTF-16 encoding as the input file. Option <code>-u</code> prevents conversion to UTF-8.</p> + +<p>Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16.</p> <p>La conversión en modos ISO y 7-bit no funciona en ficheros UTF-16.</p> @@ -516,8 +536,6 @@ <p>Página de SourceForge: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="VASE-TAMBIN">VÉASE TAMBIÉN</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/es/man1/dos2unix.po b/man/es/man1/dos2unix.po index ddbb8fb..4057b01 100644 --- a/man/es/man1/dos2unix.po +++ b/man/es/man1/dos2unix.po @@ -7,9 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-man-6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" "PO-Revision-Date: 2014-07-30 10:31+0100\n" -"Last-Translator: Enrique Lazcorreta Puigmartà <enrique.lazcorreta@gmail.com>\n" +"Last-Translator: Enrique Lazcorreta Puigmartà <enrique.lazcorreta@gmail." +"com>\n" "Language-Team: Spanish <es@tp.org.es>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -25,7 +26,9 @@ msgstr "NOMBRE" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - Convertidor de ficheros de texto de formato DOS/Mac a Unix y viceversa" +msgstr "" +"dos2unix - Convertidor de ficheros de texto de formato DOS/Mac a Unix y " +"viceversa" #. type: =head1 #: dos2unix.pod:56 @@ -51,38 +54,86 @@ msgstr "DESCRIPCIÓN" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "El paquete Dos2unix incluye las utilerÃas C<dos2unix> y C<unix2dos> para convertir ficheros de texto plano en formato DOS o Mac a formato Unix y viceversa." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"El paquete Dos2unix incluye las utilerÃas C<dos2unix> y C<unix2dos> para " +"convertir ficheros de texto plano en formato DOS o Mac a formato Unix y " +"viceversa." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "En ficheros de texto DOS/Windows, un salto de lÃnea, también conocido como nueva lÃnea, es una combinación de dos caracteres: un retorno de carro (CR) seguido por un salto de lÃnea (LF). En ficheros de texto Unix, un salto de lÃnea es solamente un carácter: el salto de lÃnea (LF). En ficheros de texto Mac, antes de Mac OS X, un salto de lÃnea era sólo un carácter retorno de carro (CR). Actualmente, Mac OS usa el estilo Unix de saltos de lÃnea (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"En ficheros de texto DOS/Windows, un salto de lÃnea, también conocido como " +"nueva lÃnea, es una combinación de dos caracteres: un retorno de carro (CR) " +"seguido por un salto de lÃnea (LF). En ficheros de texto Unix, un salto de " +"lÃnea es solamente un carácter: el salto de lÃnea (LF). En ficheros de texto " +"Mac, antes de Mac OS X, un salto de lÃnea era sólo un carácter retorno de " +"carro (CR). Actualmente, Mac OS usa el estilo Unix de saltos de lÃnea (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Además de saltos de lÃnea, Dos2unix puede también convertir la codificación de ficheros. Unas cuantas páginas de códigos DOS pueden ser convertidas a Unix Latin-1. Y ficheros Unicode de Windows (UTF-16) pueden ser convertidos a ficheros Unicode de Unix (UTF-8)." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Además de saltos de lÃnea, Dos2unix puede también convertir la codificación " +"de ficheros. Unas cuantas páginas de códigos DOS pueden ser convertidas a " +"Unix Latin-1. Y ficheros Unicode de Windows (UTF-16) pueden ser convertidos " +"a ficheros Unicode de Unix (UTF-8)." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Los ficheros binarios son ignorados automáticamente, a menos que se fuerce su conversión." +msgstr "" +"Los ficheros binarios son ignorados automáticamente, a menos que se fuerce " +"su conversión." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Los ficheros no regulares, tales como directorios y FIFO, son ignorados automáticamente." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Los ficheros no regulares, tales como directorios y FIFO, son ignorados " +"automáticamente." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "Los enlaces simbólicos y sus destinos no son modificados por defecto. Los enlaces simbólicos pueden opcionalmente ser reemplazados, o la salida puede ser escrita al destino simbólico del enlace. En Windows no está soportada la escritura a enlaces simbólicos." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"Los enlaces simbólicos y sus destinos no son modificados por defecto. Los " +"enlaces simbólicos pueden opcionalmente ser reemplazados, o la salida puede " +"ser escrita al destino simbólico del enlace. En Windows no está soportada la " +"escritura a enlaces simbólicos." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una importante diferencia respecto a la versión original SunOS/Solaris. Esta versión hace, por defecto, la conversión en el mismo fichero (modo de fichero antiguo), mientras que la versión original de SunOS/Solaris sólo es compatible con la conversión en fichero emparejado (modo de fichero nuevo). Véanse las opciones C<-o> y C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +msgstr "" +"Dos2unix fue modelado después de dos2unix bajo SunOS/Solaris. Hay una " +"importante diferencia respecto a la versión original SunOS/Solaris. Esta " +"versión hace, por defecto, la conversión en el mismo fichero (modo de " +"fichero antiguo), mientras que la versión original de SunOS/Solaris sólo es " +"compatible con la conversión en fichero emparejado (modo de fichero nuevo). " +"Véanse las opciones C<-o> y C<-n>." #. type: =head1 #: dos2unix.pod:90 @@ -96,8 +147,15 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "Todos los parámetros siguientes son tratados como nombres de fichero. Use este parámetro si desea convertir ficheros cuyos nombres inician con un guión. Por ejemplo para convertir un fichero llamado \"-foo\", use este comando:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"Todos los parámetros siguientes son tratados como nombres de fichero. Use " +"este parámetro si desea convertir ficheros cuyos nombres inician con un " +"guión. Por ejemplo para convertir un fichero llamado \"-foo\", use este " +"comando:" #. type: verbatim #: dos2unix.pod:100 @@ -132,7 +190,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:108 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." +msgstr "" +"Sólo convierte los salto de lÃnea. Éste es el modo de conversión por defecto." #. type: =item #: dos2unix.pod:110 @@ -141,8 +200,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -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." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"Conversión entre el conjunto de caracteres DOS e ISO-8859-1. Véase también " +"la sección MODOS DE CONVERSIÓN." #. type: =item #: dos2unix.pod:115 @@ -161,8 +224,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -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." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"Usa la página de códigos DOS 437 (EE. UU.). Está es la página de códigos " +"usada por defecto para conversión ISO." #. type: =item #: dos2unix.pod:123 @@ -221,8 +288,15 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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 fichero de entrada tiene BOM, escribe BOM en el fichero 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>." +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 fichero de entrada " +"tiene BOM, escribe BOM en el fichero de salida. Este es el comportamiento " +"por defecto en la conversión a saltos de lÃnea DOS. Vea también la opción C<-" +"r>." #. type: =item #: dos2unix.pod:149 @@ -231,8 +305,12 @@ msgstr "B<-c, --convmode CONVMODE>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"Establece el modo de conversión, Donde CONVMODE puede ser: I<ascii>, " +"I<7bit>, I<iso>, I<mac> siendo ascii el valor por defecto." #. type: =item #: dos2unix.pod:155 @@ -262,7 +340,8 @@ msgstr "B<-k, --keepdate>" #. type: textblock #: dos2unix.pod:165 msgid "Keep the date stamp of output file same as input file." -msgstr "Mantiene la fecha del fichero de salida igual a la del fichero de entrada." +msgstr "" +"Mantiene la fecha del fichero de salida igual a la del fichero de entrada." #. type: =item #: dos2unix.pod:167 @@ -286,13 +365,23 @@ msgstr "Añade salto de lÃnea adicional." #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -301,231 +390,416 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "Escribe una marca de orden de bytes para UTF-8 en el fichero de salida. Nunca use esta opción cuando la codificación de salida sea distinta de UTF-8. Véase también la sección UNICODE." +#, fuzzy +#| msgid "" +#| "When there is a Byte Order Mark in the input file the BOM has priority " +#| "over this option." +msgid "" +"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " +"written." +msgstr "" +"Cuando existe una marca de orden de bytes (BOM) en el fichero de entrada, la " +"BOM tiene prioridad sobre esta opción." -#. type: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +#, fuzzy +#| msgid "" +#| "Write an UTF-8 Byte Order Mark in the output file. Never use this option " +#| "when the output encoding is other than UTF-8. See also section UNICODE." +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Escribe una marca de orden de bytes para UTF-8 en el fichero de salida. " +"Nunca use esta opción cuando la codificación de salida sea distinta de " +"UTF-8. Véase también la sección UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ...>" #. type: textblock -#: dos2unix.pod:189 -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 fichero nuevo. Convierte el fichero FICHERO_DE_ENTRADA y escribe la salida al fichero FICHERO_DE_SALIDA. Los nombres de fichero deben ser dados en pares y los comodines I<no> deben ser usados o I<perderá> sus ficheros." +#: dos2unix.pod:196 +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 fichero nuevo. Convierte el fichero FICHERO_DE_ENTRADA y escribe la " +"salida al fichero FICHERO_DE_SALIDA. Los nombres de fichero deben ser dados " +"en pares y los comodines I<no> deben ser usados o I<perderá> sus ficheros." #. type: textblock -#: dos2unix.pod:193 -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 fichero nuevo (pareado) será el propietario del fichero convertido. Los permisos de lectura/escritura del fichero nuevo serán los permisos del fichero original menos la umask(1) de la persona que ejecute la conversión." +#: dos2unix.pod:200 +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 fichero nuevo (pareado) " +"será el propietario del fichero convertido. Los permisos de lectura/" +"escritura del fichero nuevo serán los permisos del fichero original menos la " +"umask(1) de la persona que ejecute la conversión." #. type: =item -#: dos2unix.pod:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FICHERO ...>" #. type: textblock -#: dos2unix.pod:200 -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 fichero viejo. Convierte el fichero FICHERO y lo sobrescribe con la salida. El programa por defecto se ejecuta en este modo. Sà se pueden emplear comodines." +#: dos2unix.pod:207 +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 fichero viejo. Convierte el fichero FICHERO y lo sobrescribe con la " +"salida. El programa por defecto se ejecuta en este modo. Sà se pueden " +"emplear comodines." #. type: textblock -#: dos2unix.pod:203 -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 fichero antiguo (in situ), el fichero convertido obtiene el mismo propietario, grupo, y permisos de lectura/escritura que el fichero original. Lo mismo aplica cuando el fichero es convertido por otro usuario quien tiene permiso de lectura en el fichero (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 fichero. Cambiar el grupo podrÃa ser un riesgo de seguridad, ya que el fichero podrÃa ser accesible a personas inadecuadas. La preservación del propietario, grupo, y permisos de lectura/escritura sólo está soportada bajo Unix." +#: dos2unix.pod:210 +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 fichero antiguo (in situ), el fichero convertido obtiene el mismo " +"propietario, grupo, y permisos de lectura/escritura que el fichero " +"original. Lo mismo aplica cuando el fichero es convertido por otro usuario " +"quien tiene permiso de lectura en el fichero (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 fichero. Cambiar el grupo podrÃa ser un riesgo de " +"seguridad, ya que el fichero podrÃa ser accesible a personas inadecuadas. " +"La preservación del propietario, grupo, y permisos de lectura/escritura sólo " +"está soportada bajo Unix." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -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." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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 fichero de salida. Este es el comportamiento por defecto al convertir a saltos de lÃnea Unix. Vea también la opción C<-b>." +#: dos2unix.pod:226 +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 fichero 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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "Ignora los ficheros binarios (por defecto)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +#, fuzzy +#| msgid "B<-ul, --assume-utf16le>" +msgid "B<-u, --keep-utf16>" +msgstr "B<-ul, --assume-utf16le>" + +#. type: textblock +#: dos2unix.pod:236 +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 "" + +#. type: =item +#: dos2unix.pod:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 msgid "Assume that the input file format is UTF-16LE." msgstr "Supone que el formato de fichero de entrada es UTF-16LE." #. type: textblock -#: dos2unix.pod:231 -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 fichero de entrada, la BOM tiene prioridad sobre esta opción." +#: dos2unix.pod:245 +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 fichero de entrada, la " +"BOM tiene prioridad sobre esta opción." #. type: textblock -#: dos2unix.pod:234 -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 un supuesto incorrecto (el fichero de entrada no estaba en formato UTF-16LE) y la conversión tiene éxito, obtendrá un fichero UTF-8 de salida con el texto erróneo. La conversión errónea puede ser deshecha con iconv(1) mediante convertir el fichero UTF-8 de salida de vuelta a UTF-16LE. Esto restaurará el fichero original." +#: dos2unix.pod:248 +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 un supuesto incorrecto (el fichero de entrada no estaba en " +"formato UTF-16LE) y la conversión tiene éxito, obtendrá un fichero UTF-8 de " +"salida con el texto erróneo. La conversión errónea puede ser deshecha con " +"iconv(1) mediante convertir el fichero UTF-8 de salida de vuelta a UTF-16LE. " +"Esto restaurará el fichero original." #. type: textblock -#: dos2unix.pod:239 -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." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 msgid "Assume that the input file format is UTF-16BE." msgstr "Supone que el formato del fichero de entrada es UTF-16BE." #. type: textblock -#: dos2unix.pod:246 +#: dos2unix.pod:260 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:248 +#: dos2unix.pod:262 +#, fuzzy +#| msgid "B<-V, --version>" +msgid "B<-v, --verbose>" +msgstr "B<-V, --version>" + +#. type: textblock +#: dos2unix.pod:264 +msgid "" +"Display verbose messages. Extra information is displayed about Byte Order " +"Marks and the amount of converted line breaks." +msgstr "" + +#. type: =item +#: dos2unix.pod:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "Sigue los enlaces simbólicos y convierte los destinos." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -msgid "Replace symbolic links with converted files (original target files remain unchanged)." -msgstr "Reemplaza los enlaces simbólicos con los ficheros convertidos (los ficheros destino originales no se alteran)." +#: dos2unix.pod:273 +msgid "" +"Replace symbolic links with converted files (original target files remain " +"unchanged)." +msgstr "" +"Reemplaza los enlaces simbólicos con los ficheros convertidos (los ficheros " +"destino originales no se alteran)." #. type: =item -#: dos2unix.pod:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." msgstr "No altera los enlaces simbólicos ni sus destinos (por defecto)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "Despiega la información de la versión y termina el programa." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:269 -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." +#: dos2unix.pod:288 +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:272 -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." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSIÓN" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -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." +#: dos2unix.pod:303 +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:287 -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, el cual es un estándar de 7 bits, éste emplea 8 bits. Siempre use este modo cuando convierta ficheros en Unicode UTF-8." +#: dos2unix.pod:306 +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, el cual es un estándar de 7 bits, " +"éste emplea 8 bits. Siempre use este modo cuando convierta ficheros en " +"Unicode UTF-8." #. type: =item -#: dos2unix.pod:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -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." +#: dos2unix.pod:312 +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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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:303 -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." +#: dos2unix.pod:317 +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:312 -msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." -msgstr "No use nunca la conversión ISO en ficheros de texto Unicode. Esto corromperÃa los ficheros codificados como UTF-8." +#: dos2unix.pod:322 +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:331 +msgid "" +"Never use ISO conversion on Unicode text files. It will corrupt UTF-8 " +"encoded files." +msgstr "" +"No use nunca la conversión ISO en ficheros de texto Unicode. Esto " +"corromperÃa los ficheros codificados como UTF-8." #. type: textblock -#: dos2unix.pod:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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." +msgstr "" +"Convierte de la página de códigos por defecto de DOS a LatÃn-1 de Unix." #. type: verbatim -#: dos2unix.pod:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -535,12 +809,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "Convierte de DOS 850 a Unix LatÃn-1." #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -550,12 +824,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "Convierte de Windows 1252 a Unix LatÃn-1." #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -565,12 +839,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" msgstr "Convierte de Windows 1252 a Unix UTF-8 (Unicode)." #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -580,12 +854,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 msgid "Convert from Unix Latin-1 to DOS default code page" -msgstr "Convierte de LatÃn-1 en Unix a la página de códigos por defecto de DOS." +msgstr "" +"Convierte de LatÃn-1 en Unix a la página de códigos por defecto de DOS." #. type: verbatim -#: dos2unix.pod:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -595,12 +870,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "Convierte de Unix LatÃn-1 a DOS 850." #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -610,12 +885,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "Convierte de Unix LatÃn-1 a Windows 1252." #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -625,12 +900,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" msgstr "Convierte de Unix UTF-8 (Unicode) a Windows 1252." #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -640,112 +915,186 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Codificaciones" #. type: textblock -#: dos2unix.pod:357 -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 ficheros Unicode son codificados comúnmente como UTF-8. En Windows los ficheros de texto Unicode pueden estar codificados en UTF-8, UTF-16, o UTF-16 big endian, pero con más frecuencia son codificados en formato UTF-16." +#: dos2unix.pod:376 +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 ficheros " +"Unicode son codificados comúnmente como UTF-8. En Windows los ficheros de " +"texto Unicode pueden estar codificados en UTF-8, UTF-16, o UTF-16 big " +"endian, pero con más frecuencia son codificados en formato UTF-16." #. type: =head2 -#: dos2unix.pod:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:364 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "Los ficheros de texto Unicode pueden tener saltos de lÃnea DOS, Unix o Mac, como cualquier fichero de texto." +#: dos2unix.pod:383 +msgid "" +"Unicode text files can have DOS, Unix or Mac line breaks, like regular text " +"files." +msgstr "" +"Los ficheros de texto Unicode pueden tener saltos de lÃnea DOS, Unix o Mac, " +"como cualquier fichero de texto." #. type: textblock -#: dos2unix.pod:367 -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 ficheros codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-compatibilidad con ASCII." +#: dos2unix.pod:386 +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 ficheros " +"codificados como UTF-8, debido a que UTF-8 fue diseñado para retro-" +"compatibilidad con ASCII." #. type: textblock -#: dos2unix.pod:370 -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 ficheros de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba C<dos2unix -V>." +#: dos2unix.pod:389 +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 ficheros 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:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos convierten ficheros UTF-16 a la codificación de caracteres local cuando es configurado a UTF-8. Emplee el comando locale(1) para determinar cual es la codificación de caracteres local." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" #. type: textblock -#: dos2unix.pod:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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 "Dado que los ficheros de texto formateados UTF-8 son bien soportados tanto en Windows como en Unix, dos2unix y unix2dos no tienen opción para escribir ficheros UTF-16. Todos los caracteres UTF-16 pueden ser codificados en UTF-8. La conversión de UTF-16 a UTF-8 ocurre sin pérdida. Los ficheros UTF-16 serán ignorados en Unix cuando la codificación de caracteres local no sea UTF-8, para evitar la pérdida accidental de texto. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por ejemplo cuando el fichero de entrada UTF-16 contiene un error, el fichero será ignorado." +#: dos2unix.pod:398 +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 "" + +#. type: textblock +#: dos2unix.pod:402 +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 "" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:405 +msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." +msgstr "" + +#. type: textblock +#: dos2unix.pod:407 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 ficheros UTF-16." #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Marca de orden de bytes" #. type: textblock -#: dos2unix.pod:391 -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 ficheros 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>." +#: dos2unix.pod:411 +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 ficheros 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:395 -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 ficheros Unicode tÃpicamente no tienen una BOM. Se supone que los ficheros de texto son codificados en la codificación de caracteres local." +#: dos2unix.pod:415 +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 ficheros Unicode tÃpicamente no tienen una BOM. Se supone que " +"los ficheros de texto son codificados en la codificación de caracteres local." #. type: textblock -#: dos2unix.pod:398 -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 fichero está en formato UTF-16 si el fichero tiene una BOM. Cuando un fichero UTF-16 no tiene una BOM, dos2unix tratará el fichero como un fichero binario." +#: dos2unix.pod:418 +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 fichero está en formato UTF-16 si el " +"fichero tiene una BOM. Cuando un fichero UTF-16 no tiene una BOM, dos2unix " +"tratará el fichero como un fichero binario." #. type: textblock -#: dos2unix.pod:402 +#: dos2unix.pod:422 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." -msgstr "Emplee la opción C<-ul> o C<-ub> para convertir un fichero UTF-16 sin BOM." +msgstr "" +"Emplee la opción C<-ul> o C<-ub> para convertir un fichero UTF-16 sin BOM." #. type: textblock -#: dos2unix.pod:404 -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 fichero de salida. Con la opción C<-b> Dos2unix escribe el BOM cuando el fichero de entrada tiene el BOM." +#: dos2unix.pod:424 +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 fichero de salida. Con la opción " +"C<-b> Dos2unix escribe el BOM cuando el fichero de entrada tiene el BOM." #. type: textblock -#: dos2unix.pod:407 -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 fichero de salida cuando el fichero de entrada tiene BOM. Use la opción C<-r> para eliminar el BOM." +#: dos2unix.pod:427 +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 fichero de salida cuando el fichero de entrada " +"tiene BOM. Use la opción C<-r> para eliminar el BOM." #. type: textblock -#: dos2unix.pod:410 +#: dos2unix.pod:430 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>." +msgstr "" +"Dos2unix y unix2dos escriben siempre BOM cuando se usa la opción C<-m>." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Ejemplos Unicode" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 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:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -755,12 +1104,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 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:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -770,12 +1119,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 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:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -785,12 +1134,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 msgid "Convert from Unix UTF-8 to Windows UTF-16" msgstr "Convertir de Unix UTF-8 a Windows UTF-16" #. type: verbatim -#: dos2unix.pod:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -800,17 +1149,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "EJEMPLOS" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 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:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -822,12 +1171,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -839,12 +1188,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 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:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -854,12 +1203,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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." +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -873,12 +1226,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "Convierte a.txt del formato de Mac a Unix." #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -890,12 +1243,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Convierte a.txt del formato de Unix a Mac." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -907,12 +1260,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 msgid "Convert and replace a.txt while keeping original date stamp." msgstr "Convierte y reemplaza a.txt manteniendo la fecha del fichero original." #. type: verbatim -#: dos2unix.pod:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -924,12 +1277,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Convierte a.txt y escribe la salida a e.txt." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -939,12 +1292,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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 a e.txt, manteniendo la fecha de e.txt igual a la de a.txt." +#: dos2unix.pod:492 +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 a e.txt, manteniendo la fecha de e.txt " +"igual a la de a.txt." #. type: verbatim -#: dos2unix.pod:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -954,12 +1310,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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 a e.txt." #. type: verbatim -#: dos2unix.pod:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -971,12 +1327,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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 a e.txt. Convierte y reemplaza a.txt. Convierte y reemplaza b.txt. Convierte d.txt y escribe a f.txt." +#: dos2unix.pod:501 +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 a e.txt. Convierte y reemplaza a.txt. Convierte y " +"reemplaza b.txt. Convierte d.txt y escribe a f.txt." #. type: verbatim -#: dos2unix.pod:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -986,17 +1346,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIÓN RECURSIVA" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Emplee dos2unix en combinación con los comandos find(1) y xargs(1) para convertir recursivamente ficheros de texto contenidos en un árbol de directorios. Por ejemplo para convertir todos los ficheros .txt en el árbol de directorios debajo del directorio actual escriba:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Emplee dos2unix en combinación con los comandos find(1) y xargs(1) para " +"convertir recursivamente ficheros de texto contenidos en un árbol de " +"directorios. Por ejemplo para convertir todos los ficheros .txt en el árbol " +"de directorios debajo del directorio actual escriba:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1006,22 +1374,34 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "INTERNACIONALIZACIÓN" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -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:" +#: dos2unix.pod:520 +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:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1043,47 +1423,83 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -msgstr "Para 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/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +msgstr "" +"Para 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/gettext.html#Language-" +"Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to command locale(1) to get locale specific information." -msgstr "En sistemas Unix puede emplear el comando locale(1) para obtener información especÃfica del locale." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to command locale(1) to get locale specific " +"information." +msgstr "" +"En sistemas Unix puede emplear el comando locale(1) para obtener información " +"especÃfica del locale." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -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 por encima de LANG. Por ejemplo, primero neerlandés y entonces alemán: C<LANGUAGE=nl:de>. Antes de que pueda usar una lista de prioridad de idiomas a través de la variable LANGUAGE, primero tiene que habilitar la internacionalización, mediante asignar 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/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +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 " +"por encima de LANG. Por ejemplo, primero neerlandés y entonces alemán: " +"C<LANGUAGE=nl:de>. Antes de que pueda usar una lista de prioridad de idiomas " +"a través de la variable LANGUAGE, primero tiene que habilitar la " +"internacionalización, mediante asignar 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/gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -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." +#: dos2unix.pod:551 +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:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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 ficheros de idioma. El valor por defecto de GNU es C</usr/local/share/locale>. El parámetro B<--version> desplegará el LOCALEDIR en uso." +#: dos2unix.pod:557 +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 " +"ficheros de idioma. El valor por defecto de GNU es C</usr/local/share/" +"locale>. El parámetro B<--version> desplegará el LOCALEDIR en uso." #. type: textblock -#: dos2unix.pod:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Ejemplo (intérprete de comandos POSIX):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1093,85 +1509,142 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "VALOR DE RETORNO" #. type: textblock -#: dos2unix.pod:551 -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." +#: dos2unix.pod:571 +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:554 -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." +#: dos2unix.pod:574 +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:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "ESTÃNDARES" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://es.wikipedia.org/wiki/Documento_de_texto>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://es.wikipedia.org/wiki/Retorno_de_carro>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://es.wikipedia.org/wiki/Nueva_l%C3%ADnea>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://es.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:569 -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)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Página de SourceForge: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "VÉASE TAMBIÉN" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar conversion modes." -#~ msgstr "Dos2unix fue moldeado a partir del dos2unix que existe en SunOS/Solaris y tiene modos de conversión similares." - -#~ msgid "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of dos2unix/unix2dos under SunOS/Solaris." -#~ msgstr "Los modos de conversión I<ascii>, I<7bit>, e I<iso> son similares a los de los comandos dos2unix/unix2dos de SunOS/Solaris." - -#~ msgid "Dos2unix never writes a BOM in the output file, unless you use option C<-m>." -#~ msgstr "Dos2unix nunca escribe una BOM en el fichero de salida, a menos que emplee la opción C<-m>." +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros " +#~ "Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos " +#~ "convierten ficheros UTF-16 a la codificación de caracteres local cuando " +#~ "es configurado a UTF-8. Emplee el comando locale(1) para determinar cual " +#~ "es la codificación de caracteres local." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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 "" +#~ "Dado que los ficheros de texto formateados UTF-8 son bien soportados " +#~ "tanto en Windows como en Unix, dos2unix y unix2dos no tienen opción para " +#~ "escribir ficheros UTF-16. Todos los caracteres UTF-16 pueden ser " +#~ "codificados en UTF-8. La conversión de UTF-16 a UTF-8 ocurre sin pérdida. " +#~ "Los ficheros UTF-16 serán ignorados en Unix cuando la codificación de " +#~ "caracteres local no sea UTF-8, para evitar la pérdida accidental de " +#~ "texto. Cuando ocurre un error de conversión de UTF-16 a UTF-8, por " +#~ "ejemplo cuando el fichero de entrada UTF-16 contiene un error, el fichero " +#~ "será ignorado." + +#~ msgid "" +#~ "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar " +#~ "conversion modes." +#~ msgstr "" +#~ "Dos2unix fue moldeado a partir del dos2unix que existe en SunOS/Solaris y " +#~ "tiene modos de conversión similares." + +#~ msgid "" +#~ "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of " +#~ "dos2unix/unix2dos under SunOS/Solaris." +#~ msgstr "" +#~ "Los modos de conversión I<ascii>, I<7bit>, e I<iso> son similares a los " +#~ "de los comandos dos2unix/unix2dos de SunOS/Solaris." + +#~ msgid "" +#~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" +#~ "m>." +#~ msgstr "" +#~ "Dos2unix nunca escribe una BOM en el fichero de salida, a menos que " +#~ "emplee la opción C<-m>." diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod index da20f3c..8506e20 100644 --- a/man/es/man1/dos2unix.pod +++ b/man/es/man1/dos2unix.pod @@ -159,9 +159,16 @@ de lÃnea Mac. =item B<-m, --add-bom> -Escribe una marca de orden de bytes para UTF-8 en el fichero de -salida. Nunca use esta opción cuando la codificación de salida sea distinta -de UTF-8. Véase también la sección UNICODE. +Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is +written. + +When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM +will be written. + +Never use this option when the output encoding is other than UTF-8 or +UTF-16. See also section UNICODE. + + =item B<-n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ...> @@ -206,6 +213,13 @@ Unix. Vea también la opción C<-b>. Ignora los ficheros binarios (por defecto). +=item B<-u, --keep-utf16> + +Keep the original UTF-16 encoding of the input file. The output file will be +written in the same UTF-16 encoding, little or big endian, 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. + =item B<-ul, --assume-utf16le> Supone que el formato de fichero de entrada es UTF-16LE. @@ -228,6 +242,11 @@ Supone que el formato del fichero de entrada es UTF-16BE. Esta opción funciona igual que la opción C<-ul>. +=item B<-v, --verbose> + +Display verbose messages. Extra information is displayed about Byte Order +Marks and the amount of converted line breaks. + =item B<-F, --follow-symlink> Sigue los enlaces simbólicos y convierte los destinos. @@ -359,20 +378,21 @@ Dos2unix y unix2dos con soporte Unicode UTF-16, pueden leer ficheros de texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba C<dos2unix -V>. -Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros -Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos -convierten ficheros UTF-16 a la codificación de caracteres local cuando es -configurado a UTF-8. Emplee el comando locale(1) para determinar cual es la -codificación de caracteres local. - -Dado que los ficheros de texto formateados UTF-8 son bien soportados tanto -en Windows como en Unix, dos2unix y unix2dos no tienen opción para escribir -ficheros UTF-16. Todos los caracteres UTF-16 pueden ser codificados en -UTF-8. La conversión de UTF-16 a UTF-8 ocurre sin pérdida. Los ficheros -UTF-16 serán ignorados en Unix cuando la codificación de caracteres local no -sea UTF-8, para evitar la pérdida accidental de texto. Cuando ocurre un -error de conversión de UTF-16 a UTF-8, por ejemplo cuando el fichero de -entrada UTF-16 contiene un error, el fichero será ignorado. +UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is +required that the locale character encoding is set to UTF-8. Use the +locale(1) command to find out what the locale character encoding is. UTF-8 +formatted text files are well supported on both Windows and Unix/Linux. + +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. + +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. + +Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16. La conversión en modos ISO y 7-bit no funciona en ficheros UTF-16. @@ -574,8 +594,6 @@ Página del proyecto: L<http://waterlan.home.xs4all.nl/dos2unix.html> Página de SourceForge: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 VÉASE TAMBIÉN file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/es/man1/dos2unix.txt b/man/es/man1/dos2unix.txt index 1ba8cf9..931c8a5 100644 --- a/man/es/man1/dos2unix.txt +++ b/man/es/man1/dos2unix.txt @@ -118,9 +118,14 @@ PARÃMETROS dos saltos de lÃnea Mac. -m, --add-bom - Escribe una marca de orden de bytes para UTF-8 en el fichero de - salida. Nunca use esta opción cuando la codificación de salida sea - distinta de UTF-8. Véase también la sección UNICODE. + Write a Byte Order Mark (BOM) in the output file. By default an + UTF-8 BOM is written. + + When the input file is UTF-16, and the option "-u" is used, an + UTF-16 BOM will be written. + + Never use this option when the output encoding is other than UTF-8 + or UTF-16. See also section UNICODE. -n, --newfile FICHERO_DE_ENTRADA FICHERO_DE_SALIDA ... Modo de fichero nuevo. Convierte el fichero FICHERO_DE_ENTRADA y @@ -163,6 +168,13 @@ PARÃMETROS -s, --safe Ignora los ficheros binarios (por defecto). + -u, --keep-utf16 + Keep the original UTF-16 encoding of the input file. The output file + will be written in the same UTF-16 encoding, little or big endian, + 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 "-ascii" option. + -ul, --assume-utf16le Supone que el formato de fichero de entrada es UTF-16LE. @@ -184,6 +196,10 @@ PARÃMETROS Esta opción funciona igual que la opción "-ul". + -v, --verbose + Display verbose messages. Extra information is displayed about Byte + Order Marks and the amount of converted line breaks. + -F, --follow-symlink Sigue los enlaces simbólicos y convierte los destinos. @@ -299,21 +315,22 @@ UNICODE texto codificados como UTF-16 little y big endian. Para ver si dos2unix fue compilado con soporte UTF-16 escriba "dos2unix -V". - Las versiones Windows de dos2unix y unix2dos siempre convierten ficheros - Codificados como UTF-16 a UTF-8. Las versiones Unix de dos2unix/unix2dos - convierten ficheros UTF-16 a la codificación de caracteres local cuando - es configurado a UTF-8. Emplee el comando locale(1) para determinar cual - es la codificación de caracteres local. - - Dado que los ficheros de texto formateados UTF-8 son bien soportados - tanto en Windows como en Unix, dos2unix y unix2dos no tienen opción para - escribir ficheros UTF-16. Todos los caracteres UTF-16 pueden ser - codificados en UTF-8. La conversión de UTF-16 a UTF-8 ocurre sin - pérdida. Los ficheros UTF-16 serán ignorados en Unix cuando la - codificación de caracteres local no sea UTF-8, para evitar la pérdida - accidental de texto. Cuando ocurre un error de conversión de UTF-16 a - UTF-8, por ejemplo cuando el fichero de entrada UTF-16 contiene un - error, el fichero será ignorado. + UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it + is required that the locale character encoding is set to UTF-8. Use the + locale(1) command to find out what the locale character encoding is. + UTF-8 formatted text files are well supported on both Windows and + Unix/Linux. + + 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. + + When option "-u" is used, the output file will be written in the same + UTF-16 encoding as the input file. Option "-u" prevents conversion to + UTF-8. + + Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16. La conversión en modos ISO y 7-bit no funciona en ficheros UTF-16. @@ -502,8 +519,6 @@ AUTORES Página de SourceForge: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - VÉASE TAMBIÉN file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1 index 22058b1..3e09322 100644 --- a/man/fr/man1/dos2unix.1 +++ b/man/fr/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -203,9 +203,14 @@ lignes du \s-1DOS.\s0 En mode Mac, les sauts de lignes Unix sont remplacés par sauts de lignes Mac. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Écrit un indicateur \s-1UTF\-8\s0 d'ordre des octets dans le fichier de -sortie. N'utilisez jamais cette option quand le codage de sortie n'est pas -\&\s-1UTF\-8.\s0 Consultez également la section \s-1UNICODE.\s0 +Écrit une marque d'ordre des octets (\s-1BOM\s0) dans le fichier de sortie. Par +défaut une \s-1BOM UTF\-8\s0 est écrite. +.Sp +Lorsque le fichier d'entrée est en \s-1UTF\-16\s0 et que l'option \f(CW\*(C`\-u\*(C'\fR est +utilisée, une \s-1BOM UTF\-16\s0 est écrite. +.Sp +N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est +ni \s-1UTF\-8\s0 ni \s-1UTF\-16.\s0 Consultez également la section \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newline FICHIER_ENTRÉE \s-1FICHIER_SORTIE\s0 …\fR" 4 .IX Item "-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …" Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la @@ -247,6 +252,13 @@ lignes sont convertis au format Unix. Consultez aussi l'option \f(CW\*(C`\-b\*(C .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" Ignore les fichiers binaires (par défaut). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Conserve l'encodage \s-1UTF\-16\s0 original du fichier d'entrée. Le fichier de +sortie sera écrit dans le même encodage \s-1UTF\-16 \s0(petit ou grand boutien) que +le fichier d'entrée. Ceci évite la transformation en \s-1UTF\-8.\s0 Une \s-1BOM UTF\-16\s0 +sera écrite en conséquent. Cette option peut être désactivée avec l'option +\&\f(CW\*(C`\-ascii\*(C'\fR. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" Suppose que le fichier d'entrée est au format \s-1UTF\-16LE.\s0 @@ -268,6 +280,11 @@ présupposé. Suppose que le fichier d'entrée est au format \s-1UTF\-16BE.\s0 .Sp Cette option fonctionne comme l'option \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +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. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Suit les liens symboliques et convertit les cibles. @@ -400,20 +417,23 @@ les fichiers textes codés sous forme petit boutien ou gros boutien. Pour savoir si dos2unix a été compilé avec le support \s-1UTF\-16\s0 tapez \f(CW\*(C`dos2unix \&\-V\*(C'\fR. .PP -Les versions Windows de dos2unix et unix2dos convertissent toujours les -fichiers \s-1UTF\-16\s0 en fichiers \s-1UTF\-8.\s0 Les versions Unix de dos2unix/unix2dos -convertissent les fichiers \s-1UTF\-16\s0 vers le codage de l'environnement -linguistique quand il est en \s-1UTF\-8.\s0 Utilisez la commande \fIlocale\fR\|(1) pour -connaître le codage de l'environnement linguistique en vigueur. -.PP -Puisque les fichiers textes au format \s-1UTF\-8\s0 sont bien supportés sous Windows -et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des fichiers -\&\s-1UTF\-16.\s0 Tous les caractères \s-1UTF\-16\s0 peuvent être codés en \s-1UTF\-8.\s0 La -conversion de \s-1UTF\-16\s0 vers \s-1UTF\-8\s0 est sans perte. Les fichiers \s-1UTF\-16\s0 seront -ignorés sous Unix quand l'encodage des caractères de l'environnement -linguistique n'est pas \s-1UTF\-8\s0 pour éviter la perte accidentelle du -texte. Quand une conversion de \s-1UTF\-16\s0 vers \s-1UTF\-8\s0 échoue, par exemple parce -que le fichier d'entrée \s-1UTF\-16\s0 contient des erreurs, le fichier est ignoré. +Les fichiers encodés en \s-1UTF\-16\s0 sont convertis par défaut en \s-1UTF\-8.\s0 Sous +Unix/Linux, le codage des caractères de l'environnement linguistique doit +être \s-1UTF\-8.\s0 Utilisez la commande \fIlocale\fR\|(1) pour déterminer le codage des +caractères utilisé. Les fichiers textes au format \s-1UTF\-8\s0 sont bien supportés +sous Windows et Unix/Linux. +.PP +Les codages \s-1UTF\-16\s0 et \s-1UTF\-8\s0 sont parfaitement compatibles. Il n'y a pas de +pertes lors de la conversion. Lorsqu'une erreur de conversion \s-1UTF\-16\s0 vers +\&\s-1UTF\-8\s0 survient, par exemple, quand le fichier d'entrée \s-1UTF\-16\s0 contient une +erreur, le fichier est ignoré. +.PP +Quand l'option \f(CW\*(C`\-u\*(C'\fR est utilisée, le fichier de sortie est écrit dans le +même encodage \s-1UTF\-16\s0 que le fichier d'entrée. L'option \f(CW\*(C`\-u\*(C'\fR empêche la +conversion en \s-1UTF\-8.\s0 +.PP +Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers \s-1UTF\-8\s0 en +\&\s-1UTF\-16.\s0 .PP Les modes de conversion \s-1ISO\s0 et 7 bits ne fonctionnent pas sur des fichiers \&\s-1UTF\-16.\s0 @@ -635,8 +655,6 @@ Benjamin Lin \- <blin@socs.uts.edu.au> Bernd Johannes Wuebben (mode mac2unix) Page du projet: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP Page SourceForge: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "VOIR AUSSI" .IX Header "VOIR AUSSI" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm index 97300fa..af4da92 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 6.0.6 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Traites toutes les options à sa suite comme étant des noms de fichiers. Utilisez cette option si vous voulez convertir des fichiers dont le nom commence par un tiret. Par exemple, pour convertir un fichier nommé <span style="white-space: nowrap;">« -foo »,</span> vous pouvez utiliser cette commande:</p> @@ -179,7 +179,11 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Écrit un indicateur UTF-8 d'ordre des octets dans le fichier de sortie. N'utilisez jamais cette option quand le codage de sortie n'est pas UTF-8. Consultez également la section UNICODE.</p> +<p>Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. Par défaut une BOM UTF-8 est écrite.</p> + +<p>Lorsque le fichier d'entrée est en UTF-16 et que l'option <code>-u</code> est utilisée, une BOM UTF-16 est écrite.</p> + +<p>N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est ni UTF-8 ni UTF-16. Consultez également la section UNICODE.</p> </dd> <dt id="n---newline-FICHIER_ENTRE-FICHIER_SORTIE"><b>-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …</b></dt> @@ -216,6 +220,12 @@ <p>Ignore les fichiers binaires (par défaut).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code>.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Cette option fonctionne comme l'option <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>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.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>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 <code>dos2unix -V</code>.</p> -<p>Les versions Windows de dos2unix et unix2dos convertissent toujours les fichiers UTF-16 en fichiers UTF-8. Les versions Unix de dos2unix/unix2dos convertissent les fichiers UTF-16 vers le codage de l'environnement linguistique quand il est en UTF-8. Utilisez la commande locale(1) pour connaître le codage de l'environnement linguistique en vigueur.</p> +<p>Les fichiers encodés en UTF-16 sont convertis par défaut en UTF-8. Sous Unix/Linux, le codage des caractères de l'environnement linguistique doit être UTF-8. Utilisez la commande locale(1) pour déterminer le codage des caractères utilisé. Les fichiers textes au format UTF-8 sont bien supportés sous Windows et Unix/Linux.</p> -<p>Puisque les fichiers textes au format UTF-8 sont bien supportés sous Windows et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des fichiers UTF-16. Tous les caractères UTF-16 peuvent être codés en UTF-8. La conversion de UTF-16 vers UTF-8 est sans perte. Les fichiers UTF-16 seront ignorés sous Unix quand l'encodage des caractères de l'environnement linguistique n'est pas UTF-8 pour éviter la perte accidentelle du texte. Quand une conversion de UTF-16 vers UTF-8 échoue, par exemple parce que le fichier d'entrée UTF-16 contient des erreurs, le fichier est ignoré.</p> +<p>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é.</p> + +<p>Quand l'option <code>-u</code> est utilisée, le fichier de sortie est écrit dans le même encodage UTF-16 que le fichier d'entrée. L'option <code>-u</code> empêche la conversion en UTF-8.</p> + +<p>Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers UTF-8 en UTF-16.</p> <p>Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16.</p> @@ -516,8 +536,6 @@ <p>Page SourceForge: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="VOIR-AUSSI">VOIR AUSSI</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/fr/man1/dos2unix.po b/man/fr/man1/dos2unix.po index 5a31e60..de08efe 100644 --- a/man/fr/man1/dos2unix.po +++ b/man/fr/man1/dos2unix.po @@ -4,9 +4,9 @@ # Frédéric Marchal <fmarchal@perso.be>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" -"PO-Revision-Date: 2014-07-10 08:36+0200\n" +"Project-Id-Version: dos2unix-man-6.1-beta1\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-18 13:49+0200\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -23,7 +23,9 @@ msgstr "NOM" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement" +msgstr "" +"dos2unix - Convertit les fichiers textes du format DOS/Mac vers Unix et " +"inversement" #. type: =head1 #: dos2unix.pod:56 @@ -49,38 +51,85 @@ msgstr "DESCRIPTION" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "Le package Dos2unix inclut les utilitaires C<dos2unix> et C<unix2dos> pour convertir des fichiers textes au format DOS ou Mac vers le format Unix et inversement." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"Le package Dos2unix inclut les utilitaires C<dos2unix> et C<unix2dos> pour " +"convertir des fichiers textes au format DOS ou Mac vers le format Unix et " +"inversement." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "Dans les fichiers textes DOS/Windows, un saut de ligne est une combinaison de deux caractères: un retour de chariot (CR) suivi d'un saut de ligne (LF). Dans les fichiers textes Unix, le saut de ligne est un seul caractère: le saut de ligne (LF). Les fichiers textes Mac, avant Mac OS X, utilisaient le retour chariot (CR) comme seul caractère. De nos jours, Mac OS utilise le même style de saut de ligne que Unix (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"Dans les fichiers textes DOS/Windows, un saut de ligne est une combinaison " +"de deux caractères: un retour de chariot (CR) suivi d'un saut de ligne (LF). " +"Dans les fichiers textes Unix, le saut de ligne est un seul caractère: le " +"saut de ligne (LF). Les fichiers textes Mac, avant Mac OS X, utilisaient le " +"retour chariot (CR) comme seul caractère. De nos jours, Mac OS utilise le " +"même style de saut de ligne que Unix (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Outre les sauts de lignes, Dos2unix convertit aussi le codage des fichiers. Quelques codes page DOS peuvent être convertis en Latin-1 sous Unix. L'Unicode des fichiers Windows (UTF-16) peut être converti en Unicode Unix (UTF-8)." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Outre les sauts de lignes, Dos2unix convertit aussi le codage des fichiers. " +"Quelques codes page DOS peuvent être convertis en Latin-1 sous Unix. " +"L'Unicode des fichiers Windows (UTF-16) peut être converti en Unicode Unix " +"(UTF-8)." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Les fichiers binaires sont automatiquement ignorés à moins que la conversion soit forcée." +msgstr "" +"Les fichiers binaires sont automatiquement ignorés à moins que la conversion " +"soit forcée." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Les fichiers non réguliers tels que les répertoires et les FIFOs sont automatiquement ignorés." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Les fichiers non réguliers tels que les répertoires et les FIFOs sont " +"automatiquement ignorés." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "Les liens symboliques et leur cible sont, par défaut, inchangés. En option, les liens symboliques peuvent être remplacés ou, au choix, la sortie peut être écrite dans la cible du lien symbolique. Écrire dans la cible d'un lien symbolique n'est pas supporté sous Windows." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"Les liens symboliques et leur cible sont, par défaut, inchangés. En option, " +"les liens symboliques peuvent être remplacés ou, au choix, la sortie peut " +"être écrite dans la cible du lien symbolique. Écrire dans la cible d'un lien " +"symbolique n'est pas supporté sous Windows." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une différence importante avec la version originale de SunOS/Solaris. Cette version effectue les conversions en place (ancien mode de fichiers) tandis que la version originale de SunOS/Solaris ne supporte que la conversion par paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +msgstr "" +"Dos2unix a été conçu comme dos2unix sous SunOS/Solaris. Il y a une " +"différence importante avec la version originale de SunOS/Solaris. Cette " +"version effectue les conversions en place (ancien mode de fichiers) tandis " +"que la version originale de SunOS/Solaris ne supporte que la conversion par " +"paire (nouveau mode de fichier). Voyez aussi les options C<-o> et C<-n>." #. type: =head1 #: dos2unix.pod:90 @@ -94,8 +143,15 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "Traites toutes les options à sa suite comme étant des noms de fichiers. Utilisez cette option si vous voulez convertir des fichiers dont le nom commence par un tiret. Par exemple, pour convertir un fichier nommé « -foo », vous pouvez utiliser cette commande:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"Traites toutes les options à sa suite comme étant des noms de fichiers. " +"Utilisez cette option si vous voulez convertir des fichiers dont le nom " +"commence par un tiret. Par exemple, pour convertir un fichier nommé « -" +"foo », vous pouvez utiliser cette commande:" #. type: verbatim #: dos2unix.pod:100 @@ -130,7 +186,9 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:108 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." +msgstr "" +"Convertit uniquement les sauts de lignes. C'est le mode de conversion par " +"défaut." #. type: =item #: dos2unix.pod:110 @@ -139,8 +197,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -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." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"Convertit le jeu de caractères du DOS vers ISO-8859-1. Voyez aussi la " +"section des MODES DE CONVERSION." #. type: =item #: dos2unix.pod:115 @@ -159,8 +221,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -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." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"Utilise le code page 437 du DOS (US). C'est le code page par défaut pour les " +"conversions ISO." #. type: =item #: dos2unix.pod:123 @@ -219,8 +285,15 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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>." +msgid "" +"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " +"the output file. This is the default behavior when converting to DOS line " +"breaks. See also option C<-r>." +msgstr "" +"Conserve la marque d'ordre des octets (BOM). Si le fichier d'entrée a une " +"BOM, elle est écrite dans le fichier de sortie. C'est le comportement par " +"défaut quand les sauts de lignes sont convertis au format DOS. Consultez " +"aussi l'option C<-r>." #. type: =item #: dos2unix.pod:149 @@ -229,8 +302,12 @@ msgstr "B<-c, --convmode MODE_CONV>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"Change le mode de conversion. MODE_CONV prend l'une des valeurs: I<ascii>, " +"I<7bit>, I<iso>, I<mac>. Ascii est la valeur par défaut." #. type: =item #: dos2unix.pod:155 @@ -260,7 +337,8 @@ msgstr "B<-k, --keepdate>" #. type: textblock #: dos2unix.pod:165 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." +msgstr "" +"La date du fichier de sortie est la même que celle du fichier d'entrée." #. type: =item #: dos2unix.pod:167 @@ -284,13 +362,23 @@ msgstr "Ajoute des sauts de lignes additionnels." #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -299,231 +387,415 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "Écrit un indicateur UTF-8 d'ordre des octets dans le fichier de sortie. N'utilisez jamais cette option quand le codage de sortie n'est pas UTF-8. Consultez également la section UNICODE." +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: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est " +"ni UTF-8 ni UTF-16. Consultez également la section UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …>" #. type: textblock -#: dos2unix.pod:189 -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." +#: dos2unix.pod:196 +msgid "" +"New file mode. Convert file INFILE and write output to file OUTFILE. File " +"names must be given in pairs and wildcard names should I<not> be used or you " +"I<will> lose your files." +msgstr "" +"Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et écrit la " +"sortie dans le fichier FICHIER_SORTIE. Les noms des fichiers doivent être " +"indiqués par paires. Les jokers I<ne> doivent I<pas> être utilisés ou vous " +"I<perdrez> vos fichiers." #. type: textblock -#: dos2unix.pod:193 -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." +#: dos2unix.pod:200 +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:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile FICHIER …>" #. type: textblock -#: dos2unix.pod:200 -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." +#: dos2unix.pod:207 +msgid "" +"Old file mode. Convert file FILE and overwrite output to it. The program " +"defaults to run in this mode. Wildcard names may be used." +msgstr "" +"Ancien mode de fichiers. Convertit le fichier FICHIER et écrit la sortie " +"dedans. Le programme fonctionne dans ce mode par défaut. Les jokers peuvent " +"être utilisés." #. type: textblock -#: dos2unix.pod:203 -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." +#: dos2unix.pod:210 +msgid "" +"In old file (in-place) mode the converted file gets the same owner, group, " +"and read/write permissions as the original file. Also when the file is " +"converted by another user who has write permissions on the file (e.g. user " +"root). The conversion will be aborted when it is not possible to preserve " +"the original values. Change of owner could mean that the original owner is " +"not able to read the file any more. Change of group could be a security " +"risk, the file could be made readable for persons for whom it is not " +"intended. Preservation of owner, group, and read/write permissions is only " +"supported on Unix." +msgstr "" +"Dans l'ancien mode (en place) des fichiers, les fichiers convertis ont le " +"même propriétaire, groupe et permissions lecture/écriture que le fichier " +"original. Idem quand le fichier est converti par un utilisateur qui a la " +"permission d'écrire dans le fichier (par exemple, root). La conversion est " +"interrompue si il n'est pas possible de conserver les valeurs d'origine. Le " +"changement de propriétaire pourrait signifier que le propriétaire original " +"n'est plus en mesure de lire le fichier. Le changement de groupe pourrait " +"être un risque pour la sécurité. Le fichier pourrait être rendu accessible " +"en lecture par des personnes à qui il n'est pas destiné. La conservation du " +"propriétaire, du groupe et des permissions de lecture/écriture n'est " +"supportée que sous Unix." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -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." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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>." +#: dos2unix.pod:226 +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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "Ignore les fichiers binaires (par défaut)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 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:231 -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." +#: dos2unix.pod:245 +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:234 -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." +#: dos2unix.pod:248 +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:239 -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é." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 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:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "Cette option fonctionne comme l'option C<-ul>." #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +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:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "Suit les liens symboliques et convertit les cibles." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -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)." +#: dos2unix.pod:273 +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:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 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:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "Affiche les informations de version puis arrête." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "MODE MAC" #. type: textblock -#: dos2unix.pod:269 -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." +#: dos2unix.pod:288 +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:272 -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." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "MODES DE CONVERSION" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -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." +#: dos2unix.pod:303 +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:287 -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." +#: dos2unix.pod:306 +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:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -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." +#: dos2unix.pod:312 +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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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:303 -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." +#: dos2unix.pod:317 +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:312 -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." +#: dos2unix.pod:322 +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:331 +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:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Quelques exemples:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -533,12 +805,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "Convertir du CP850 du DOS au Latin-1 Unix" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -548,12 +820,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "Convertir du CP1252 de Windows au Latin-1 de Unix" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -563,12 +835,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 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:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -578,12 +850,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 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:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -593,12 +865,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "Convertir le Latin-1 de Unix en CP850 du DOS" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -608,12 +880,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "Convertir le Latin-1 de Unix en CP1252 de Windows" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -623,12 +895,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 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:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -638,112 +910,203 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Codages" #. type: textblock -#: dos2unix.pod:357 -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." +#: dos2unix.pod:376 +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:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Conversion" #. type: textblock -#: dos2unix.pod:364 -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." +#: dos2unix.pod:383 +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:367 -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." +#: dos2unix.pod:386 +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:370 -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>." +#: dos2unix.pod:389 +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:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "Les versions Windows de dos2unix et unix2dos convertissent toujours les fichiers UTF-16 en fichiers UTF-8. Les versions Unix de dos2unix/unix2dos convertissent les fichiers UTF-16 vers le codage de l'environnement linguistique quand il est en UTF-8. Utilisez la commande locale(1) pour connaître le codage de l'environnement linguistique en vigueur." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" +"Les fichiers encodés en UTF-16 sont convertis par défaut en UTF-8. Sous Unix/" +"Linux, le codage des caractères de l'environnement linguistique doit être " +"UTF-8. Utilisez la commande locale(1) pour déterminer le codage des " +"caractères utilisé. Les fichiers textes au format UTF-8 sont bien supportés " +"sous Windows et Unix/Linux." + +#. type: textblock +#: dos2unix.pod:398 +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:402 +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:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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 "Puisque les fichiers textes au format UTF-8 sont bien supportés sous Windows et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des fichiers UTF-16. Tous les caractères UTF-16 peuvent être codés en UTF-8. La conversion de UTF-16 vers UTF-8 est sans perte. Les fichiers UTF-16 seront ignorés sous Unix quand l'encodage des caractères de l'environnement linguistique n'est pas UTF-8 pour éviter la perte accidentelle du texte. Quand une conversion de UTF-16 vers UTF-8 échoue, par exemple parce que le fichier d'entrée UTF-16 contient des erreurs, le fichier est ignoré." +#: dos2unix.pod:405 +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:387 +#: dos2unix.pod:407 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." +msgstr "" +"Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers " +"UTF-16." #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Marque d'ordre des octets" #. type: textblock -#: dos2unix.pod:391 -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>." +#: dos2unix.pod:411 +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:395 -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." +#: dos2unix.pod:415 +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:398 -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." +#: dos2unix.pod:418 +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:402 +#: dos2unix.pod:422 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." +msgstr "" +"Utilisez l'option C<-ul> ou C<-ub> pour convertir un fichier UTF-16 sans BOM." #. type: textblock -#: dos2unix.pod:404 -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." +#: dos2unix.pod:424 +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:407 -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." +#: dos2unix.pod:427 +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:410 +#: dos2unix.pod:430 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." +msgstr "" +"Dos2unix et unix2dos écrivent toujours une BOM quand l'option C<-m> est " +"utilisée." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Exemples Unicode" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 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:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -753,12 +1116,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 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:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -768,12 +1131,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 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:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -783,12 +1146,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 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:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -798,17 +1161,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "EXEMPLES" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 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:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -820,12 +1183,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -837,12 +1200,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 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:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -852,12 +1215,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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." +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -871,12 +1238,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 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:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -888,12 +1255,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Convertir a.txt du format Unix au format Mac." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -905,12 +1272,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 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:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -922,12 +1289,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Convertir a.txt et écrire dans e.txt." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -937,12 +1304,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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." +#: dos2unix.pod:492 +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:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -952,12 +1322,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -969,12 +1339,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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." +#: dos2unix.pod:501 +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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -984,17 +1358,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "CONVERSIONS RÉCURSIVES" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Utilisez dos2unix avec les commandes find(1) et xargs(1) pour convertir récursivement des fichiers textes dans une arborescence de répertoires. Par exemple, pour convertir tous les fichiers .txt dans les répertoires sous le répertoire courant, tapez:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Utilisez dos2unix avec les commandes find(1) et xargs(1) pour convertir " +"récursivement des fichiers textes dans une arborescence de répertoires. Par " +"exemple, pour convertir tous les fichiers .txt dans les répertoires sous le " +"répertoire courant, tapez:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1004,22 +1386,34 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "PARAMÈTRES LINGUISTIQUES" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -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:" +#: dos2unix.pod:520 +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:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1041,47 +1435,84 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -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/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +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/gettext.html#Language-" +"Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to 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." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to 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:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -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/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +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/" +"gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -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." +#: dos2unix.pod:551 +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:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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." +#: dos2unix.pod:557 +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:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Exemple (shell POSIX):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1091,85 +1522,142 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "VALEUR DE RETOUR" #. type: textblock -#: dos2unix.pod:551 -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é." +#: dos2unix.pod:571 +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:554 -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." +#: dos2unix.pod:574 +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:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "STANDARDS" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://fr.wikipedia.org/wiki/Fichier_texte>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://fr.wikipedia.org/wiki/Retour_chariot>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://fr.wikipedia.org/wiki/Fin_de_ligne>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://fr.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:569 -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)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Page SourceForge: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "VOIR AUSSI" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "Dos2unix never writes a BOM in the output file, unless you use option C<-m>." -#~ msgstr "Dos2unix n'écrit jamais de BOM dans le fichier de sortie à moins que vous utilisiez l'option C<-m>." - -#~ msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar conversion modes." -#~ msgstr "Dos2unix a été conçu comme dos2unix sous SunOS/Solaris et a des modes de conversions similaires." - -#~ msgid "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of dos2unix/unix2dos under SunOS/Solaris." -#~ msgstr "Les modes de conversion I<ascii>, I<7bit> et I<iso> sont similaires à ceux de dos2unix/unix2dos sous SunOS/Solaris." +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "Les versions Windows de dos2unix et unix2dos convertissent toujours les " +#~ "fichiers UTF-16 en fichiers UTF-8. Les versions Unix de dos2unix/unix2dos " +#~ "convertissent les fichiers UTF-16 vers le codage de l'environnement " +#~ "linguistique quand il est en UTF-8. Utilisez la commande locale(1) pour " +#~ "connaître le codage de l'environnement linguistique en vigueur." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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 "" +#~ "Puisque les fichiers textes au format UTF-8 sont bien supportés sous " +#~ "Windows et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des " +#~ "fichiers UTF-16. Tous les caractères UTF-16 peuvent être codés en UTF-8. " +#~ "La conversion de UTF-16 vers UTF-8 est sans perte. Les fichiers UTF-16 " +#~ "seront ignorés sous Unix quand l'encodage des caractères de " +#~ "l'environnement linguistique n'est pas UTF-8 pour éviter la perte " +#~ "accidentelle du texte. Quand une conversion de UTF-16 vers UTF-8 échoue, " +#~ "par exemple parce que le fichier d'entrée UTF-16 contient des erreurs, le " +#~ "fichier est ignoré." + +#~ msgid "" +#~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" +#~ "m>." +#~ msgstr "" +#~ "Dos2unix n'écrit jamais de BOM dans le fichier de sortie à moins que vous " +#~ "utilisiez l'option C<-m>." + +#~ msgid "" +#~ "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar " +#~ "conversion modes." +#~ msgstr "" +#~ "Dos2unix a été conçu comme dos2unix sous SunOS/Solaris et a des modes de " +#~ "conversions similaires." + +#~ msgid "" +#~ "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of " +#~ "dos2unix/unix2dos under SunOS/Solaris." +#~ msgstr "" +#~ "Les modes de conversion I<ascii>, I<7bit> et I<iso> sont similaires à " +#~ "ceux de dos2unix/unix2dos sous SunOS/Solaris." diff --git a/man/fr/man1/dos2unix.pod b/man/fr/man1/dos2unix.pod index 6cbe41e..54ded2d 100644 --- a/man/fr/man1/dos2unix.pod +++ b/man/fr/man1/dos2unix.pod @@ -158,9 +158,16 @@ sauts de lignes Mac. =item B<-m, --add-bom> -Écrit un indicateur UTF-8 d'ordre des octets dans le fichier de -sortie. N'utilisez jamais cette option quand le codage de sortie n'est pas -UTF-8. Consultez également la section UNICODE. +Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. Par +défaut une BOM UTF-8 est écrite. + +Lorsque le fichier d'entrée est en UTF-16 et que l'option C<-u> est +utilisée, une BOM UTF-16 est écrite. + +N'utilisez jamais cette option quand l'encodage du fichier de sortie n'est +ni UTF-8 ni UTF-16. Consultez également la section UNICODE. + + =item B<-n, --newline FICHIER_ENTRÉE FICHIER_SORTIE …> @@ -208,6 +215,14 @@ lignes sont convertis au format Unix. Consultez aussi l'option C<-b>. Ignore les fichiers binaires (par défaut). +=item B<-u, --keep-utf16> + +Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier de +sortie sera écrit dans le même encodage UTF-16 (petit ou grand 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>. + =item B<-ul, --assume-utf16le> Suppose que le fichier d'entrée est au format UTF-16LE. @@ -231,6 +246,12 @@ Suppose que le fichier d'entrée est au format UTF-16BE. Cette option fonctionne comme l'option C<-ul>. +=item B<-v, --verbose> + +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. + =item B<-F, --follow-symlink> Suit les liens symboliques et convertit les cibles. @@ -362,20 +383,23 @@ 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>. -Les versions Windows de dos2unix et unix2dos convertissent toujours les -fichiers UTF-16 en fichiers UTF-8. Les versions Unix de dos2unix/unix2dos -convertissent les fichiers UTF-16 vers le codage de l'environnement -linguistique quand il est en UTF-8. Utilisez la commande locale(1) pour -connaître le codage de l'environnement linguistique en vigueur. - -Puisque les fichiers textes au format UTF-8 sont bien supportés sous Windows -et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des fichiers -UTF-16. Tous les caractères UTF-16 peuvent être codés en UTF-8. La -conversion de UTF-16 vers UTF-8 est sans perte. Les fichiers UTF-16 seront -ignorés sous Unix quand l'encodage des caractères de l'environnement -linguistique n'est pas UTF-8 pour éviter la perte accidentelle du -texte. Quand une conversion de UTF-16 vers UTF-8 échoue, par exemple parce -que le fichier d'entrée UTF-16 contient des erreurs, le fichier est ignoré. +Les fichiers encodés en UTF-16 sont convertis par défaut en UTF-8. Sous +Unix/Linux, le codage des caractères de l'environnement linguistique doit +être UTF-8. Utilisez la commande locale(1) pour déterminer le codage des +caractères utilisé. Les fichiers textes au format UTF-8 sont bien supportés +sous Windows et Unix/Linux. + +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é. + +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. + +Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers UTF-8 en +UTF-16. Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16. @@ -580,8 +604,6 @@ Page du projet: L<http://waterlan.home.xs4all.nl/dos2unix.html> Page SourceForge: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 VOIR AUSSI file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/fr/man1/dos2unix.txt b/man/fr/man1/dos2unix.txt index 90043f5..0f90e73 100644 --- a/man/fr/man1/dos2unix.txt +++ b/man/fr/man1/dos2unix.txt @@ -118,9 +118,14 @@ OPTIONS remplacés par deux sauts de lignes Mac. -m, --add-bom - Écrit un indicateur UTF-8 d'ordre des octets dans le fichier de - sortie. N'utilisez jamais cette option quand le codage de sortie - n'est pas UTF-8. Consultez également la section UNICODE. + Écrit une marque d'ordre des octets (BOM) dans le fichier de sortie. + Par défaut une BOM UTF-8 est écrite. + + Lorsque le fichier d'entrée est en UTF-16 et que l'option "-u" est + utilisée, une BOM UTF-16 est écrite. + + N'utilisez jamais cette option quand l'encodage du fichier de sortie + n'est ni UTF-8 ni UTF-16. Consultez également la section UNICODE. -n, --newline FICHIER_ENTRÉE FICHIER_SORTIE … Nouveau mode de fichiers. Convertit le fichier FICHER_ENTRÉE et @@ -166,6 +171,13 @@ OPTIONS -s, --safe Ignore les fichiers binaires (par défaut). + -u, --keep-utf16 + Conserve l'encodage UTF-16 original du fichier d'entrée. Le fichier + de sortie sera écrit dans le même encodage UTF-16 (petit ou grand + 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 "-ascii". + -ul, --assume-utf16le Suppose que le fichier d'entrée est au format UTF-16LE. @@ -187,6 +199,11 @@ OPTIONS Cette option fonctionne comme l'option "-ul". + -v, --verbose + 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. + -F, --follow-symlink Suit les liens symboliques et convertit les cibles. @@ -300,22 +317,23 @@ UNICODE Pour savoir si dos2unix a été compilé avec le support UTF-16 tapez "dos2unix -V". - Les versions Windows de dos2unix et unix2dos convertissent toujours les - fichiers UTF-16 en fichiers UTF-8. Les versions Unix de - dos2unix/unix2dos convertissent les fichiers UTF-16 vers le codage de - l'environnement linguistique quand il est en UTF-8. Utilisez la commande - locale(1) pour connaître le codage de l'environnement linguistique en - vigueur. - - Puisque les fichiers textes au format UTF-8 sont bien supportés sous - Windows et Unix, dos2unix et unix2dos n'ont pas d'option pour écrire des - fichiers UTF-16. Tous les caractères UTF-16 peuvent être codés en UTF-8. - La conversion de UTF-16 vers UTF-8 est sans perte. Les fichiers UTF-16 - seront ignorés sous Unix quand l'encodage des caractères de - l'environnement linguistique n'est pas UTF-8 pour éviter la perte - accidentelle du texte. Quand une conversion de UTF-16 vers UTF-8 échoue, - par exemple parce que le fichier d'entrée UTF-16 contient des erreurs, - le fichier est ignoré. + Les fichiers encodés en UTF-16 sont convertis par défaut en UTF-8. Sous + Unix/Linux, le codage des caractères de l'environnement linguistique + doit être UTF-8. Utilisez la commande locale(1) pour déterminer le + codage des caractères utilisé. Les fichiers textes au format UTF-8 sont + bien supportés sous Windows et Unix/Linux. + + 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é. + + Quand l'option "-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 "-u" empêche la + conversion en UTF-8. + + Dos2unix et unix2dos n'ont pas d'option pour convertir des fichiers + UTF-8 en UTF-16. Les modes de conversion ISO et 7 bits ne fonctionnent pas sur des fichiers UTF-16. @@ -508,8 +526,6 @@ AUTEURS Page SourceForge: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - VOIR AUSSI file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/man1/Makefile b/man/man1/Makefile index 0d32049..e4c630b 100644 --- a/man/man1/Makefile +++ b/man/man1/Makefile @@ -109,7 +109,7 @@ dos2unix.pod : ; # make target - create manual page from a *.pod page podchecker $< $(POD2MAN) $(POD2MAN_FLAGS) \ - --utf8 \ + --utf8 \ --center="$(PODCENTER)" \ --name="$(PACKAGE)" \ --section="$(MANSECT)" \ diff --git a/man/man1/dos2unix-man.pot b/man/man1/dos2unix-man.pot index 8eb4c61..7fcb3ec 100644 --- a/man/man1/dos2unix-man.pot +++ b/man/man1/dos2unix-man.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-08-03 22:45+0300\n" +"POT-Creation-Date: 2014-09-09 20:15+0300\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" @@ -330,17 +330,31 @@ msgstr "" #. type: textblock #: dos2unix.pod:184 msgid "" -"Write an UTF-8 Byte Order Mark in the output file. Never use this option " -"when the output encoding is other than UTF-8. See also section UNICODE." +"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " +"written." msgstr "" -#. type: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:189 +#: dos2unix.pod:196 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 " @@ -348,7 +362,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:193 +#: dos2unix.pod:200 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 " @@ -357,19 +371,19 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:207 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:203 +#: dos2unix.pod:210 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 " @@ -383,24 +397,24 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "" #. type: textblock -#: dos2unix.pod:214 +#: dos2unix.pod:221 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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:226 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 " @@ -408,34 +422,48 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "" #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:236 +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 "" + +#. type: =item +#: dos2unix.pod:241 msgid "B<-ul, --assume-utf16le>" msgstr "" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 msgid "Assume that the input file format is UTF-16LE." msgstr "" #. type: textblock -#: dos2unix.pod:231 +#: dos2unix.pod:245 msgid "" "When there is a Byte Order Mark in the input file the BOM has priority over " "this option." msgstr "" #. type: textblock -#: dos2unix.pod:234 +#: dos2unix.pod:248 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 " @@ -444,114 +472,126 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:239 +#: dos2unix.pod:253 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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 msgid "Assume that the input file format is UTF-16BE." msgstr "" #. type: textblock -#: dos2unix.pod:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "" #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "" + +#. type: textblock +#: dos2unix.pod:264 +msgid "" +"Display verbose messages. Extra information is displayed about Byte Order " +"Marks and the amount of converted line breaks." +msgstr "" + +#. type: =item +#: dos2unix.pod:267 msgid "B<-F, --follow-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "" #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:254 +#: dos2unix.pod:273 msgid "" "Replace symbolic links with converted files (original target files remain " "unchanged)." msgstr "" #. type: =item -#: dos2unix.pod:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." msgstr "" #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "" #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "" #. type: textblock -#: dos2unix.pod:269 +#: dos2unix.pod:288 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:272 +#: dos2unix.pod:291 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:275 +#: dos2unix.pod:294 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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "" #. type: textblock -#: dos2unix.pod:284 +#: dos2unix.pod:303 msgid "" "In mode C<ascii> only line breaks are converted. This is the default " "conversion mode." msgstr "" #. type: textblock -#: dos2unix.pod:287 +#: dos2unix.pod:306 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 " @@ -559,24 +599,24 @@ msgid "" msgstr "" #. type: =item -#: dos2unix.pod:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "" #. type: textblock -#: dos2unix.pod:293 +#: dos2unix.pod:312 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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:317 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 " @@ -585,7 +625,7 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:303 +#: dos2unix.pod:322 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 " @@ -598,24 +638,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:312 +#: dos2unix.pod:331 msgid "" "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 " "encoded files." msgstr "" #. type: textblock -#: dos2unix.pod:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 msgid "Convert from DOS default code page to Unix Latin-1" msgstr "" #. type: verbatim -#: dos2unix.pod:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -623,12 +663,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -636,12 +676,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -649,12 +689,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" msgstr "" #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -662,12 +702,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 msgid "Convert from Unix Latin-1 to DOS default code page" msgstr "" #. type: verbatim -#: dos2unix.pod:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -675,12 +715,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -688,12 +728,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -701,12 +741,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" msgstr "" #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -714,24 +754,24 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:348 +#: dos2unix.pod:367 msgid "" "See also L<http://czyborra.com/charsets/codepages.html> and " "L<http://czyborra.com/charsets/iso8859.html>." msgstr "" #. type: =head1 -#: dos2unix.pod:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "" #. type: textblock -#: dos2unix.pod:357 +#: dos2unix.pod:376 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 " @@ -740,26 +780,26 @@ msgid "" msgstr "" #. type: =head2 -#: dos2unix.pod:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:383 msgid "" "Unicode text files can have DOS, Unix or Mac line breaks, like regular text " "files." msgstr "" #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:386 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:370 +#: dos2unix.pod:389 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 " @@ -767,39 +807,48 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:374 +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" + +#. type: textblock +#: dos2unix.pod:398 msgid "" -"The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files " -"always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert " -"UTF-16 encoded files to the locale character encoding when it is set to " -"UTF-8. Use the locale(1) command to find out what the locale character " -"encoding is." +"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 "" #. type: textblock -#: dos2unix.pod:379 +#: dos2unix.pod:402 msgid "" -"Because UTF-8 formatted text files are well supported on both Windows and " -"Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 " -"characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is " -"without loss. UTF-16 files will be skipped on Unix when the locale character " -"encoding is not UTF-8, to prevent accidental loss of text. 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." +"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 "" #. type: textblock -#: dos2unix.pod:387 +#: dos2unix.pod:405 +msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." +msgstr "" + +#. type: textblock +#: dos2unix.pod:407 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "" #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "" #. type: textblock -#: dos2unix.pod:391 +#: dos2unix.pod:411 msgid "" "On Windows Unicode text files typically have a Byte Order Mark (BOM), " "because many Windows programs (including Notepad) add BOMs by default. See " @@ -807,14 +856,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:395 +#: dos2unix.pod:415 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:398 +#: dos2unix.pod:418 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 " @@ -822,41 +871,41 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:402 +#: dos2unix.pod:422 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." msgstr "" #. type: textblock -#: dos2unix.pod:404 +#: dos2unix.pod:424 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:407 +#: dos2unix.pod:427 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:410 +#: dos2unix.pod:430 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "" #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8" msgstr "" #. type: verbatim -#: dos2unix.pod:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -864,12 +913,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8" msgstr "" #. type: verbatim -#: dos2unix.pod:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -877,12 +926,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM" msgstr "" #. type: verbatim -#: dos2unix.pod:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -890,12 +939,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 msgid "Convert from Unix UTF-8 to Windows UTF-16" msgstr "" #. type: verbatim -#: dos2unix.pod:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -903,17 +952,17 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 msgid "Read input from 'stdin' and write output to 'stdout'." msgstr "" #. type: verbatim -#: dos2unix.pod:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -922,12 +971,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 msgid "Convert and replace a.txt. Convert and replace b.txt." msgstr "" #. type: verbatim -#: dos2unix.pod:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -936,12 +985,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 msgid "Convert and replace a.txt in ascii conversion mode." msgstr "" #. type: verbatim -#: dos2unix.pod:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -949,14 +998,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:466 msgid "" "Convert and replace a.txt in ascii conversion mode. Convert and replace " "b.txt in 7bit conversion mode." msgstr "" #. type: verbatim -#: dos2unix.pod:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -966,12 +1015,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "" #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -980,12 +1029,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "" #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -994,12 +1043,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 msgid "Convert and replace a.txt while keeping original date stamp." msgstr "" #. type: verbatim -#: dos2unix.pod:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1008,12 +1057,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "" #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1021,12 +1070,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:472 +#: dos2unix.pod:492 msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt." msgstr "" #. type: verbatim -#: dos2unix.pod:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1034,12 +1083,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 msgid "Convert and replace a.txt. Convert b.txt and write to e.txt." msgstr "" #. type: verbatim -#: dos2unix.pod:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1048,14 +1097,14 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:481 +#: dos2unix.pod:501 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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1063,12 +1112,12 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "" #. type: textblock -#: dos2unix.pod:488 +#: dos2unix.pod:508 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 " @@ -1077,7 +1126,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1085,17 +1134,17 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "" #. type: textblock -#: dos2unix.pod:500 +#: dos2unix.pod:520 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 " @@ -1106,7 +1155,7 @@ msgid "" msgstr "" #. type: verbatim -#: dos2unix.pod:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1120,26 +1169,26 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:515 +#: dos2unix.pod:535 msgid "" "For a complete list of language and country codes see the gettext manual: " "L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" msgstr "" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:538 msgid "" "On Unix systems you can use to command locale(1) to get locale specific " "information." msgstr "" #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:543 msgid "" "With the LANGUAGE environment variable you can specify a priority list of " "languages, separated by colons. Dos2unix gives preference to LANGUAGE over " @@ -1151,19 +1200,19 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:531 +#: dos2unix.pod:551 msgid "" "If you select a language which is not available you will get the standard " "English messages." msgstr "" #. type: =item -#: dos2unix.pod:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:557 msgid "" "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during " "compilation can be overruled. LOCALEDIR is used to find the language " @@ -1172,12 +1221,12 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1185,56 +1234,56 @@ msgid "" msgstr "" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "" #. type: textblock -#: dos2unix.pod:551 +#: dos2unix.pod:571 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:554 +#: dos2unix.pod:574 msgid "" "The return value is always zero in quiet mode, except when wrong " "command-line options are used." msgstr "" #. type: =head1 -#: dos2unix.pod:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:589 msgid "" "Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben (mac2unix mode) " "- <wuebben@kde.org>, Christian Wurll (add extra newline) - " @@ -1242,26 +1291,21 @@ msgid "" msgstr "" #. type: textblock -#: dos2unix.pod:574 +#: dos2unix.pod:594 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "" #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "" diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1 index e0cc096..e0fcace 100644 --- a/man/man1/dos2unix.1 +++ b/man/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-07-09" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-08" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -191,8 +191,14 @@ line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Write an \s-1UTF\-8\s0 Byte Order Mark in the output file. Never use this option when -the output encoding is other than \s-1UTF\-8.\s0 See also section \s-1UNICODE.\s0 +Write a Byte Order Mark (\s-1BOM\s0) in the output file. By default an \s-1UTF\-8 BOM\s0 +is written. +.Sp +When the input file is \s-1UTF\-16,\s0 and the option \f(CW\*(C`\-u\*(C'\fR is used, an \s-1UTF\-16 +BOM\s0 will be written. +.Sp +Never use this option when the output encoding is other than \s-1UTF\-8\s0 or \s-1UTF\-16.\s0 +See also section \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1INFILE OUTFILE ...\s0\fR" 4 .IX Item "-n, --newfile INFILE OUTFILE ..." New file mode. Convert file \s-1INFILE\s0 and write output to file \s-1OUTFILE.\s0 @@ -228,6 +234,12 @@ See also option \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" Skip binary files (default). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Keep the original \s-1UTF\-16\s0 encoding of the input file. The output file will be +written in the same \s-1UTF\-16\s0 encoding, little or big endian, as the input file. +This prevents transformation to \s-1UTF\-8.\s0 An \s-1UTF\-16 BOM\s0 will be written +accordingly. This option can be disabled with the \f(CW\*(C`\-ascii\*(C'\fR option. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" Assume that the input file format is \s-1UTF\-16LE.\s0 @@ -247,6 +259,10 @@ The assumption of \s-1UTF\-16LE\s0 works as a \fIconversion mode\fR. By switchin Assume that the input file format is \s-1UTF\-16BE.\s0 .Sp This option works the same as option \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +Display verbose messages. Extra information is displayed about Byte Order Marks +and the amount of converted line breaks. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Follow symbolic links and convert the targets. @@ -374,18 +390,19 @@ Dos2unix and unix2dos with Unicode \s-1UTF\-16\s0 support, can read little and b endian \s-1UTF\-16\s0 encoded text files. To see if dos2unix was built with \s-1UTF\-16\s0 support type \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -The Windows versions of dos2unix and unix2dos convert \s-1UTF\-16\s0 encoded files -always to \s-1UTF\-8\s0 encoded files. Unix versions of dos2unix/unix2dos convert -\&\s-1UTF\-16\s0 encoded files to the locale character encoding when it is set to \s-1UTF\-8.\s0 -Use the \fIlocale\fR\|(1) command to find out what the locale character encoding is. +\&\s-1UTF\-16\s0 encoded files are by default converted to \s-1UTF\-8.\s0 On Unix/Linux it is +required that the locale character encoding is set to \s-1UTF\-8.\s0 Use the \fIlocale\fR\|(1) +command to find out what the locale character encoding is. \s-1UTF\-8\s0 formatted +text files are well supported on both Windows and Unix/Linux. +.PP +\&\s-1UTF\-16\s0 and \s-1UTF\-8\s0 encoding are fully compatible, there will no text be lost in +the conversion. When an \s-1UTF\-16\s0 to \s-1UTF\-8\s0 conversion error occurs, for instance +when the \s-1UTF\-16\s0 input file contains an error, the file will be skipped. .PP -Because \s-1UTF\-8\s0 formatted text files are well supported on both Windows and Unix, -dos2unix and unix2dos have no option to write \s-1UTF\-16\s0 files. All \s-1UTF\-16\s0 -characters can be encoded in \s-1UTF\-8.\s0 Conversion from \s-1UTF\-16\s0 to \s-1UTF\-8\s0 is without -loss. \s-1UTF\-16\s0 files will be skipped on Unix when the locale character encoding -is not \s-1UTF\-8,\s0 to prevent accidental loss of text. When an \s-1UTF\-16\s0 to \s-1UTF\-8\s0 -conversion error occurs, for instance when the \s-1UTF\-16\s0 input file contains -an error, the file will be skipped. +When option \f(CW\*(C`\-u\*(C'\fR is used, the output file will be written in the same \s-1UTF\-16\s0 +encoding as the input file. Option \f(CW\*(C`\-u\*(C'\fR prevents conversion to \s-1UTF\-8.\s0 +.PP +Dos2unix and unix2dos have no option to convert \s-1UTF\-8\s0 files to \s-1UTF\-16.\s0 .PP \&\s-1ISO\s0 and 7\-bit mode conversion do not work on \s-1UTF\-16\s0 files. .SS "Byte Order Mark" @@ -597,8 +614,6 @@ Erwin Waterlander \- <waterlan@xs4all.nl> (Maintainer) Project page: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP SourceForge page: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "SEE ALSO" .IX Header "SEE ALSO" \&\fIfile\fR\|(1) diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm index 7c40bf8..b3e5924 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 6.0.6 - DOS/MAC to UNIX and vice versa text file format converter</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named "-foo", you can use this command:</p> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE.</p> +<p>Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written.</p> + +<p>When the input file is UTF-16, and the option <code>-u</code> is used, an UTF-16 BOM will be written.</p> + +<p>Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE.</p> </dd> -<dt id="n---newfile-INFILE-OUTFILE-..."><b>-n, --newfile INFILE OUTFILE ...</b></dt> +<dt id="n---newfile-INFILE-OUTFILE"><b>-n, --newfile INFILE OUTFILE ...</b></dt> <dd> <p>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</i> be used or you <i>will</i> lose your files.</p> @@ -190,7 +194,7 @@ <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="o---oldfile-FILE-..."><b>-o, --oldfile FILE ...</b></dt> +<dt id="o---oldfile-FILE"><b>-o, --oldfile FILE ...</b></dt> <dd> <p>Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used.</p> @@ -216,6 +220,12 @@ <p>Skip binary files (default).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code> option.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>This option works the same as option <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>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 <code>dos2unix -V</code>.</p> -<p>The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is.</p> +<p>UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is required that the locale character encoding is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is. UTF-8 formatted text files are well supported on both Windows and Unix/Linux.</p> -<p>Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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.</p> +<p>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.</p> + +<p>When option <code>-u</code> is used, the output file will be written in the same UTF-16 encoding as the input file. Option <code>-u</code> prevents conversion to UTF-8.</p> + +<p>Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16.</p> <p>ISO and 7-bit mode conversion do not work on UTF-16 files.</p> @@ -516,8 +536,6 @@ <p>SourceForge page: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="SEE-ALSO">SEE ALSO</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod index 9ff0953..2b95ea7 100644 --- a/man/man1/dos2unix.pod +++ b/man/man1/dos2unix.pod @@ -181,8 +181,15 @@ In Mac mode Unix line breaks are changed to two Mac line breaks. =item B<-m, --add-bom> -Write an UTF-8 Byte Order Mark in the output file. Never use this option when -the output encoding is other than UTF-8. See also section UNICODE. +Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM +is written. + +When the input file is UTF-16, and the option C<-u> is used, an UTF-16 +BOM will be written. + +Never use this option when the output encoding is other than UTF-8 or UTF-16. +See also section UNICODE. + =item B<-n, --newfile INFILE OUTFILE ...> @@ -224,6 +231,13 @@ See also option C<-b>. Skip binary files (default). +=item B<-u, --keep-utf16> + +Keep the original UTF-16 encoding of the input file. The output file will be +written in the same UTF-16 encoding, little or big endian, 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. + =item B<-ul, --assume-utf16le> Assume that the input file format is UTF-16LE. @@ -245,6 +259,11 @@ Assume that the input file format is UTF-16BE. This option works the same as option C<-ul>. +=item B<-v, --verbose> + +Display verbose messages. Extra information is displayed about Byte Order Marks +and the amount of converted line breaks. + =item B<-F, --follow-symlink> Follow symbolic links and convert the targets. @@ -371,18 +390,19 @@ 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>. -The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files -always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert -UTF-16 encoded files to the locale character encoding when it is set to UTF-8. -Use the locale(1) command to find out what the locale character encoding is. +UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is +required that the locale character encoding is set to UTF-8. Use the locale(1) +command to find out what the locale character encoding is. UTF-8 formatted +text files are well supported on both Windows and Unix/Linux. + +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. -Because UTF-8 formatted text files are well supported on both Windows and Unix, -dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 -characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without -loss. UTF-16 files will be skipped on Unix when the locale character encoding -is not UTF-8, to prevent accidental loss of text. 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. +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. + +Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16. ISO and 7-bit mode conversion do not work on UTF-16 files. @@ -575,8 +595,6 @@ Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html> SourceForge page: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 SEE ALSO file(1) diff --git a/man/man1/dos2unix.txt b/man/man1/dos2unix.txt index ed1332b..4f32ec9 100644 --- a/man/man1/dos2unix.txt +++ b/man/man1/dos2unix.txt @@ -108,9 +108,14 @@ OPTIONS In Mac mode Unix line breaks are changed to two Mac line breaks. -m, --add-bom - Write an UTF-8 Byte Order Mark in the output file. Never use this - option when the output encoding is other than UTF-8. See also - section UNICODE. + Write a Byte Order Mark (BOM) in the output file. By default an + UTF-8 BOM is written. + + When the input file is UTF-16, and the option "-u" is used, an + UTF-16 BOM will be written. + + Never use this option when the output encoding is other than UTF-8 + or UTF-16. See also section UNICODE. -n, --newfile INFILE OUTFILE ... New file mode. Convert file INFILE and write output to file OUTFILE. @@ -148,6 +153,13 @@ OPTIONS -s, --safe Skip binary files (default). + -u, --keep-utf16 + Keep the original UTF-16 encoding of the input file. The output file + will be written in the same UTF-16 encoding, little or big endian, + 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 "-ascii" option. + -ul, --assume-utf16le Assume that the input file format is UTF-16LE. @@ -169,6 +181,10 @@ OPTIONS This option works the same as option "-ul". + -v, --verbose + Display verbose messages. Extra information is displayed about Byte + Order Marks and the amount of converted line breaks. + -F, --follow-symlink Follow symbolic links and convert the targets. @@ -279,19 +295,22 @@ UNICODE big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type "dos2unix -V". - The Windows versions of dos2unix and unix2dos convert UTF-16 encoded - files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos - convert UTF-16 encoded files to the locale character encoding when it is - set to UTF-8. Use the locale(1) command to find out what the locale - character encoding is. + UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it + is required that the locale character encoding is set to UTF-8. Use the + locale(1) command to find out what the locale character encoding is. + UTF-8 formatted text files are well supported on both Windows and + Unix/Linux. - Because UTF-8 formatted text files are well supported on both Windows - and Unix, dos2unix and unix2dos have no option to write UTF-16 files. - All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to - UTF-8 is without loss. UTF-16 files will be skipped on Unix when the - locale character encoding is not UTF-8, to prevent accidental loss of - text. 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. + 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. + + When option "-u" is used, the output file will be written in the same + UTF-16 encoding as the input file. Option "-u" prevents conversion to + UTF-8. + + Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16. ISO and 7-bit mode conversion do not work on UTF-16 files. @@ -473,8 +492,6 @@ AUTHORS SourceForge page: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - SEE ALSO file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1 index ace5960..b3ebf91 100644 --- a/man/nl/man1/dos2unix.1 +++ b/man/nl/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -171,9 +171,9 @@ DOS-codetabel 865 (Scandinavisch) gebruiken. Lettertekens met het achtste bit gezet converteren naar spaties. .IP "\fB\-b, \-\-keep\-bom\fR" 4 .IX Item "-b, --keep-bom" -Keep Byte Order Mark (\s-1BOM\s0). When the input file has a \s-1BOM,\s0 write a \s-1BOM\s0 in -the output file. This is the default behavior when converting to \s-1DOS\s0 line -breaks. See also option \f(CW\*(C`\-r\*(C'\fR. +Een Byte Order Mark (\s-1BOM\s0) behouden. Als het invoerbestand een \s-1BOM\s0 bevat, +dan wordt ook een \s-1BOM\s0 naar het uitvoerbestand geschreven. Dit is het +standaardgedrag bij conversie naar \s-1DOS. \s0 Zie ook optie \f(CW\*(C`\-r\*(C'\fR. .IP "\fB\-c, \-\-convmode \s-1CONVERSIEMODUS\s0\fR" 4 .IX Item "-c, --convmode CONVERSIEMODUS" De te gebruiken conversiemodus. \s-1CONVERSIEMODUS\s0 kan zijn: \fIascii\fR, \fI7bit\fR, @@ -203,9 +203,14 @@ DOS-regeleindes. In Mac-modus worden Unix-regeleindes omgezet naar twee Mac-regeleindes. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Een \s-1UTF\-8 \s0'Byte Order Mark' in het uitvoerbestand schrijven. Gebruik deze -optie nooit als de codering van het uitvoerbestand géén \s-1UTF\-8\s0 is. Zie ook -de sectie \s-1UNICODE.\s0 +Een Byte Order Mark (\s-1BOM\s0) naar het uitvoerbestand schrijven. Standaard +wordt een \s-1UTF\-8\-BOM\s0 geschreven. +.Sp +Als het invoerbestand in \s-1UTF\-16\s0 is, en de optie \f(CW\*(C`\-u\*(C'\fR is gegeven, dan wordt +een \s-1UTF\-16\-BOM\s0 geschreven. +.Sp +Gebruik deze optie nooit als de codering van het uitvoerbestand niet \s-1UTF\-8\s0 +of \s-1UTF\-16\s0 is. Zie ook de sectie \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1INVOERBESTAND UITVOERBESTAND ...\s0\fR" 4 .IX Item "-n, --newfile INVOERBESTAND UITVOERBESTAND ..." Nieuw-bestand-modus. Het bestand \s-1INVOERBESTAND\s0 converteren en naar bestand @@ -238,12 +243,19 @@ Stille werking. Alle waarschuwingen onderdrukken. De aflsuitwaarde is nul, behalve wanneer verkeerde opties worden gegeven. .IP "\fB\-r, \-\-remove\-bom\fR" 4 .IX Item "-r, --remove-bom" -Remove Byte Order Mark (\s-1BOM\s0). Do not write a \s-1BOM\s0 in the output file. This -is the default behavior when converting to Unix line breaks. See also -option \f(CW\*(C`\-b\*(C'\fR. +Een Byte Order Mark (\s-1BOM\s0) verwijderen. Er wordt geen \s-1BOM\s0 naar het +uitvoerbestand geschreven. Dit is het standaardgedrag bij conversie naar +Unix. Zie ook optie \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" Binaire bestanden overslaan (standaard). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +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 +\&\s-1UTF\-8. \s0 Er wordt ook een corresponderende \s-1UTF\-16\-BOM\s0 geschreven. Deze optie +kan uitgeschakeld worden met de optie \f(CW\*(C`\-ascii\*(C'\fR. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" Veronderstellen dat de indeling van het invoerbestand \s-1UTF\-16LE\s0 is. @@ -265,6 +277,10 @@ uitgeschakeld. Veronderstellen dat de indeling van het invoerbestand \s-1UTF\-16BE\s0 is. .Sp Deze optie werkt hetzelfde als optie \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +Extra meldingen weergeven. Er wordt extra informatie getoond over 'Byte +Order Marks' en het aantal geconverteerde regeleindes. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Symbolische koppelingen volgen en de doelen converteren. @@ -304,15 +320,15 @@ Alle 8\-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7\-bits spatie. .IP "\fBiso\fR" 4 .IX Item "iso" -Tekens worden omgezet tussen een DOS-tekenset (codetabel) en ISO-tekenset +Tekens worden omgezet tussen een DOS-tekenset (codetabel) en de ISO-tekenset \&\s-1ISO\-8859\-1 \s0(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 \s-1DOS\s0 tegenhanger. +Hetzelfde geldt voor ISO\-8859\-1\-tekens zonder DOS-tegenhanger. .Sp Wanneer alleen optie \f(CW\*(C`\-iso\*(C'\fR gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt codetabel -\&\s-1CP437\s0 gebruikt, die met name in de \s-1VS\s0 gebruikt word. Om een bepaalde -codetabel te forceren, u de opties \f(CW\*(C`\-850\*(C'\fR (West-Europees), \f(CW\*(C`\-860\*(C'\fR +\&\s-1CP437\s0 gebruikt, die vooral in de \s-1VS\s0 gebruikt wordt. Om een bepaalde +codetabel te forceren, kunt u de opties \f(CW\*(C`\-850\*(C'\fR (West-Europees), \f(CW\*(C`\-860\*(C'\fR (Portugees), \f(CW\*(C`\-863\*(C'\fR (Canadees Frans) of \f(CW\*(C`\-865\*(C'\fR (Scandinavisch) gebruiken. Windows-codetabel \s-1CP1252 \s0(West-Europees) wordt ook ondersteund met optie \&\f(CW\*(C`\-1252\*(C'\fR. Gebruik voor andere codetabellen dos2unix in combinatie met @@ -393,20 +409,23 @@ Dos2unix en unix2dos met Unicode UTF\-16\-ondersteuning, kunnen little en big endian \s-1UTF\-16\s0 gecodeerde tekstbestanden lezen. Om er achter te komen of dos2unix gebouwd is met \s-1UTF\-16\-\s0 ondersteuning, typt u \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -De Windows-versies van dos2unix en unix2dos converteren \s-1UTF\-16\s0 \-gecodeerde -bestanden altijd naar UTF\-8\-gecodeerde bestanden. Unix-versies van -dos2unix/unix2dos zetten UTF\-16\-gecodeerde bestanden om naar de lokale -tekencodering als die gelijk is aan \s-1UTF\-8. \s0 Gebruik de opdracht \fIlocale\fR\|(1) om -uit te vinden wat de lokale tekencodering is. -.PP -Omdat UTF\-8\-gecodeerde tekstbestanden zowel op Windows en Unix goed -ondersteund worden, hebben dos2unix en unix2dos geen optie om -UTF\-16\-bestanden te schrijven. Alle UTF\-16\-tekens kunnen worden omgezet -naar \s-1UTF\-8. \s0 De omzetting van \s-1UTF\-16\s0 naar \s-1UTF\-8\s0 is verliesvrij. Op Unix -worden UTF\-16\-bestanden overgeslagen als de lokale tekencodering ongelijk is -aan \s-1UTF\-8,\s0 om te voorkomen dat er per ongeluk tekst verloren gaat. Wanneer -een conversiefout van \s-1UTF\-16\s0 naar \s-1UTF\-8\s0 optreedt, bijvoorbeeld wanneer het -UTF\-16\-invoerbestand een fout bevat, wordt het bestand overgeslagen. +In \s-1UTF\-16\s0 gecodeerde bestanden worden standaard geconverteerd naar \s-1UTF\-8.\s0 +Op Unix/Linux dient de codering van de taalregio op \s-1UTF\-8\s0 ingesteld te +zijn. Gebruik de opdracht \fIlocale\fR\|(1) om uit te vinden wat de codering van uw +taalregio is. In \s-1UTF\-8\s0 gecodeerde bestanden worden wijdverbreid +ondersteund, zowel in Windows als op Unix/Linux. +.PP +De \s-1UTF\-16\-\s0 en UTF\-8\-coderingen zijn volledig compatibel, er gaat bij het +converteren niets verloren. Als er tijdens de conversie van \s-1UTF\-16\s0 naar +\&\s-1UTF\-8\s0 een fout optreedt, bijvoorbeeld omdat het UTF\-16\-invoerbestand een +fout bevat, dan wordt het bestand overgeslagen. +.PP +Wanneer \f(CW\*(C`\-u\*(C'\fR gebruikt wordt, wordt het uitvoerbestand in dezelfde +UTF\-16\-codering geschreven als het invoerbestand. Optie \f(CW\*(C`\-u\*(C'\fR voorkomt +conversie naar \s-1UTF\-8.\s0 +.PP +Dos2unix en unix2dos hebben geen optie om van \s-1UTF\-8\s0 naar \s-1UTF\-16\s0 te +converteren. .PP \&\s-1ISO\-\s0 en 7\-bits\-conversie werken niet op UTF\-16\-bestanden. .SS "Byte Order Mark" @@ -425,13 +444,14 @@ dos2unix het bestand als een binair bestand. Gebruik optie \f(CW\*(C`\-ul\*(C'\fR of \f(CW\*(C`\-ub\*(C'\fR om een UTF\-16\-bestand zonder \s-1BOM\s0 om te zetten. .PP -Dos2unix writes by default no \s-1BOM\s0 in the output file. With option \f(CW\*(C`\-b\*(C'\fR -Dos2unix writes a \s-1BOM\s0 when the input file has a \s-1BOM.\s0 +Dos2unix schrijft standaard geen \s-1BOM\s0 in het uitvoerbestand. Met optie \f(CW\*(C`\-b\*(C'\fR +schrijft dos2unix een \s-1BOM\s0 wanneer het invoerbestand een \s-1BOM\s0 bevat. .PP -Unix2dos writes by default a \s-1BOM\s0 in the output file when the input file has -a \s-1BOM.\s0 Use option \f(CW\*(C`\-r\*(C'\fR to remove the \s-1BOM.\s0 +Unix2dos schrijft standaard een \s-1BOM\s0 in het uitvoerbestand wanneer het +invoerbestand een \s-1BOM\s0 bevat. Gebruik optie \f(CW\*(C`\-r\*(C'\fR om de \s-1BOM\s0 te verwijderen. .PP -Dos2unix and unix2dos write always a \s-1BOM\s0 when option \f(CW\*(C`\-m\*(C'\fR is used. +Dos2unix en unix2dos schrijven altijd een \s-1BOM\s0 wanneer optie \f(CW\*(C`\-m\*(C'\fR gebruikt +wordt. .SS "Unicode-voorbeelden" .IX Subsection "Unicode-voorbeelden" Omzetten van Windows \s-1UTF\-16 \s0(met \s-1BOM\s0) naar Unix \s-1UTF\-8\s0 @@ -626,8 +646,6 @@ regeleindes) \- <wurll@ira.uka.de>, Erwin Waterlander \- <waterlan@xs4all.nl> Projectpagina: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP SourceForge-pagina: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "ZIE OOK" .IX Header "ZIE OOK" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm index d827986..98b681f 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 6.0.6 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Alle volgende opties als bestandsnamen behandelen. Gebruik deze optie als u een bestand wilt converteren waarvan de naam met een streepje begint. Bijvoorbeeld, om een bestand genaamd "-foo" om te zetten, gebruikt u de volgende opdracht:</p> @@ -133,7 +133,7 @@ <dt id="b---keep-bom"><b>-b, --keep-bom</b></dt> <dd> -<p>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 <code>-r</code>.</p> +<p>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 <code>-r</code>.</p> </dd> <dt id="c---convmode-CONVERSIEMODUS"><b>-c, --convmode CONVERSIEMODUS</b></dt> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Een UTF-8 'Byte Order Mark' in het uitvoerbestand schrijven. Gebruik deze optie nooit als de codering van het uitvoerbestand géén UTF-8 is. Zie ook de sectie UNICODE.</p> +<p>Een Byte Order Mark (BOM) naar het uitvoerbestand schrijven. Standaard wordt een UTF-8-BOM geschreven.</p> + +<p>Als het invoerbestand in UTF-16 is, en de optie <code>-u</code> is gegeven, dan wordt een UTF-16-BOM geschreven.</p> + +<p>Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8 of UTF-16 is. Zie ook de sectie UNICODE.</p> </dd> -<dt id="n---newfile-INVOERBESTAND-UITVOERBESTAND-..."><b>-n, --newfile INVOERBESTAND UITVOERBESTAND ...</b></dt> +<dt id="n---newfile-INVOERBESTAND-UITVOERBESTAND"><b>-n, --newfile INVOERBESTAND UITVOERBESTAND ...</b></dt> <dd> <p>Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar bestand UITVOERBESTAND schrijven. Bestandsnamen moeten opgegeven worden in paren. Jokertekens moeten <i>niet</i>gebruikt worden, anders <i>verlies</i> je de bestanden.</p> @@ -190,7 +194,7 @@ <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="o---oldfile-BESTAND-..."><b>-o, --oldfile BESTAND ...</b></dt> +<dt id="o---oldfile-BESTAND"><b>-o, --oldfile BESTAND ...</b></dt> <dd> <p>Oud-bestand-modus. Het bestand BESTAND converteren en overschrijven. Dit is de standaard modus. Jokertekens kunnen gebruikt worden.</p> @@ -207,7 +211,7 @@ <dt id="r---remove-bom"><b>-r, --remove-bom</b></dt> <dd> -<p>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 <code>-b</code>.</p> +<p>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 <code>-b</code>.</p> </dd> <dt id="s---safe"><b>-s, --safe</b></dt> @@ -216,6 +220,12 @@ <p>Binaire bestanden overslaan (standaard).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code>.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Deze optie werkt hetzelfde als optie <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Extra meldingen weergeven. Er wordt extra informatie getoond over 'Byte Order Marks' en het aantal geconverteerde regeleindes.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -291,9 +307,9 @@ <dt id="iso1"><b>iso</b></dt> <dd> -<p>Tekens worden omgezet tussen een DOS-tekenset (codetabel) en 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.</p> +<p>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.</p> -<p>Wanneer alleen optie <code>-iso</code> gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt codetabel CP437 gebruikt, die met name in de VS gebruikt word. Om een bepaalde codetabel te forceren, u de opties <code>-850</code> (West-Europees), <code>-860</code> (Portugees), <code>-863</code> (Canadees Frans) of <code>-865</code> (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie <code>-1252</code>. Gebruik voor andere codetabellen dos2unix in combinatie met iconv(1). Iconv kan omzetten tussen een lange lijst tekensetcoderingen.</p> +<p>Wanneer alleen optie <code>-iso</code> 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 <code>-850</code> (West-Europees), <code>-860</code> (Portugees), <code>-863</code> (Canadees Frans) of <code>-865</code> (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie <code>-1252</code>. Gebruik voor andere codetabellen dos2unix in combinatie met iconv(1). Iconv kan omzetten tussen een lange lijst tekensetcoderingen.</p> <p>Gebruik ISO-conversie nooit op Unicode-tekstbestanden. Het zal UTF-8-gecodeerde bestanden beschadigen.</p> @@ -350,9 +366,13 @@ <p>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 <code>dos2unix -V</code>.</p> -<p>De Windows-versies van dos2unix en unix2dos converteren UTF-16 -gecodeerde bestanden altijd naar UTF-8-gecodeerde bestanden. Unix-versies van dos2unix/unix2dos zetten UTF-16-gecodeerde bestanden om naar de lokale tekencodering als die gelijk is aan UTF-8. Gebruik de opdracht locale(1) om uit te vinden wat de lokale tekencodering is.</p> +<p>In UTF-16 gecodeerde bestanden worden standaard geconverteerd naar UTF-8. Op Unix/Linux dient de codering van de taalregio op UTF-8 ingesteld te zijn. Gebruik de opdracht locale(1) om uit te vinden wat de codering van uw taalregio is. In UTF-8 gecodeerde bestanden worden wijdverbreid ondersteund, zowel in Windows als op Unix/Linux.</p> -<p>Omdat UTF-8-gecodeerde tekstbestanden zowel op Windows en Unix goed ondersteund worden, hebben dos2unix en unix2dos geen optie om UTF-16-bestanden te schrijven. Alle UTF-16-tekens kunnen worden omgezet naar UTF-8. De omzetting van UTF-16 naar UTF-8 is verliesvrij. Op Unix worden UTF-16-bestanden overgeslagen als de lokale tekencodering ongelijk is aan UTF-8, om te voorkomen dat er per ongeluk tekst verloren gaat. Wanneer een conversiefout van UTF-16 naar UTF-8 optreedt, bijvoorbeeld wanneer het UTF-16-invoerbestand een fout bevat, wordt het bestand overgeslagen.</p> +<p>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.</p> + +<p>Wanneer <code>-u</code> gebruikt wordt, wordt het uitvoerbestand in dezelfde UTF-16-codering geschreven als het invoerbestand. Optie <code>-u</code> voorkomt conversie naar UTF-8.</p> + +<p>Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te converteren.</p> <p>ISO- en 7-bits-conversie werken niet op UTF-16-bestanden.</p> @@ -366,11 +386,11 @@ <p>Gebruik optie <code>-ul</code> of <code>-ub</code> om een UTF-16-bestand zonder BOM om te zetten.</p> -<p>Dos2unix writes by default no BOM in the output file. With option <code>-b</code> Dos2unix writes a BOM when the input file has a BOM.</p> +<p>Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie <code>-b</code> schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat.</p> -<p>Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option <code>-r</code> to remove the BOM.</p> +<p>Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het invoerbestand een BOM bevat. Gebruik optie <code>-r</code> om de BOM te verwijderen.</p> -<p>Dos2unix and unix2dos write always a BOM when option <code>-m</code> is used.</p> +<p>Dos2unix en unix2dos schrijven altijd een BOM wanneer optie <code>-m</code> gebruikt wordt.</p> <h2 id="Unicode-voorbeelden">Unicode-voorbeelden</h2> @@ -516,8 +536,6 @@ <p>SourceForge-pagina: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="ZIE-OOK">ZIE OOK</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/nl/man1/dos2unix.po b/man/nl/man1/dos2unix.po index 1bb5d33..0c5a20a 100644 --- a/man/nl/man1/dos2unix.po +++ b/man/nl/man1/dos2unix.po @@ -2,13 +2,15 @@ # Copyright (C) 2014 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. # +# “Hm! I can see those old men shake their heads.†+# # Erwin Waterlander <waterlan@xs4all.nl>, 2014. # Benno Schulenberg <benno@vertaalt.nl>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man-6.0.5-beta11\n" -"POT-Creation-Date: 2014-07-09 19:08+0300\n" -"PO-Revision-Date: 2014-03-23 11:11+0100\n" +"Project-Id-Version: dos2unix-man-6.1-beta1\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-30 17:12+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" @@ -282,10 +284,8 @@ msgstr "Lettertekens met het achtste bit gezet converteren naar spaties." #. type: =item #: dos2unix.pod:143 -#, fuzzy -#| msgid "B<-m, --add-bom>" msgid "B<-b, --keep-bom>" -msgstr "B<-m, --add-bom>" +msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 @@ -294,6 +294,9 @@ msgid "" "the output file. This is the default behavior when converting to DOS line " "breaks. See also option C<-r>." msgstr "" +"Een Byte Order Mark (BOM) behouden. Als het invoerbestand een BOM bevat, " +"dan wordt ook een BOM naar het uitvoerbestand geschreven. Dit is het " +"standaardgedrag bij conversie naar DOS. Zie ook optie C<-r>." #. type: =item #: dos2unix.pod:149 @@ -388,20 +391,37 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 msgid "" -"Write an UTF-8 Byte Order Mark in the output file. Never use this option " -"when the output encoding is other than UTF-8. See also section UNICODE." +"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " +"written." msgstr "" -"Een UTF-8 'Byte Order Mark' in het uitvoerbestand schrijven. Gebruik deze " -"optie nooit als de codering van het uitvoerbestand géén UTF-8 is. Zie ook " -"de sectie UNICODE." +"Een Byte Order Mark (BOM) naar het uitvoerbestand schrijven. Standaard " +"wordt een UTF-8-BOM geschreven." -#. type: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8 " +"of UTF-16 is. Zie ook de sectie UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile INVOERBESTAND UITVOERBESTAND ...>" #. type: textblock -#: dos2unix.pod:189 +#: dos2unix.pod:196 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 " @@ -412,7 +432,7 @@ msgstr "" "Jokertekens moeten I<niet>gebruikt worden, anders I<verlies> je de bestanden." #. type: textblock -#: dos2unix.pod:193 +#: dos2unix.pod:200 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 " @@ -425,12 +445,12 @@ msgstr "" "minus de umask(1) van de gebruiker die de conversie draait." #. type: =item -#: dos2unix.pod:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile BESTAND ...>" #. type: textblock -#: dos2unix.pod:200 +#: dos2unix.pod:207 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." @@ -439,7 +459,7 @@ msgstr "" "is de standaard modus. Jokertekens kunnen gebruikt worden." #. type: textblock -#: dos2unix.pod:203 +#: dos2unix.pod:210 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 " @@ -463,12 +483,12 @@ msgstr "" "schrijf-rechten wordt alleen ondersteund op Unix." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 +#: dos2unix.pod:221 msgid "" "Quiet mode. Suppress all warnings and messages. The return value is zero. " "Except when wrong command-line options are used." @@ -477,42 +497,62 @@ msgstr "" "behalve wanneer verkeerde opties worden gegeven." #. type: =item -#: dos2unix.pod:217 -#, fuzzy -#| msgid "B<-m, --add-bom>" +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" -msgstr "B<-m, --add-bom>" +msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 +#: dos2unix.pod:226 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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "Binaire bestanden overslaan (standaard)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 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:231 +#: dos2unix.pod:245 msgid "" "When there is a Byte Order Mark in the input file the BOM has priority over " "this option." @@ -521,7 +561,7 @@ msgstr "" "vóór deze optie." #. type: textblock -#: dos2unix.pod:234 +#: dos2unix.pod:248 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 " @@ -535,7 +575,7 @@ msgstr "" "UTF-16LE. Dit zal het originele bestand terug brengen." #. type: textblock -#: dos2unix.pod:239 +#: dos2unix.pod:253 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." @@ -545,37 +585,51 @@ msgstr "" "uitgeschakeld." #. type: =item -#: dos2unix.pod:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 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:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "Deze optie werkt hetzelfde als optie C<-ul>." #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +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:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "Symbolische koppelingen volgen en de doelen converteren." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 +#: dos2unix.pod:273 msgid "" "Replace symbolic links with converted files (original target files remain " "unchanged)." @@ -584,32 +638,32 @@ msgstr "" "originele doelbestanden blijven ongewijzigd)." #. type: =item -#: dos2unix.pod:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Symbolische koppelingen en doelen ongewijzigd laten (standaard)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "Versie-informatie tonen." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "MAC-MODUS" #. type: textblock -#: dos2unix.pod:269 +#: dos2unix.pod:288 msgid "" "In normal mode line breaks are converted from DOS to Unix and vice versa. " "Mac line breaks are not converted." @@ -618,7 +672,7 @@ msgstr "" "Mac-regeleindes worden niet omgezet." #. type: textblock -#: dos2unix.pod:272 +#: dos2unix.pod:291 msgid "" "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS " "line breaks are not changed." @@ -627,7 +681,7 @@ msgstr "" "regeleindes blijven ongewijzigd." #. type: textblock -#: dos2unix.pod:275 +#: dos2unix.pod:294 msgid "" "To run in Mac mode use the command-line option C<-c mac> or use the commands " "C<mac2unix> or C<unix2mac>." @@ -636,17 +690,17 @@ msgstr "" "of de opdrachten C<mac2unix> of C<unix2mac>." #. type: =head1 -#: dos2unix.pod:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "CONVERSIEMODI" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 +#: dos2unix.pod:303 msgid "" "In mode C<ascii> only line breaks are converted. This is the default " "conversion mode." @@ -655,7 +709,7 @@ msgstr "" "standaardmodus." #. type: textblock -#: dos2unix.pod:287 +#: dos2unix.pod:306 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 " @@ -666,12 +720,12 @@ msgstr "" "bestanden omzet." #. type: =item -#: dos2unix.pod:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 +#: dos2unix.pod:312 msgid "" "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) " "are converted to a 7 bit space." @@ -680,25 +734,25 @@ msgstr "" "omgezet naar een 7-bits spatie." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 +#: dos2unix.pod:317 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 ISO-tekenset " +"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." +"Hetzelfde geldt voor ISO-8859-1-tekens zonder DOS-tegenhanger." #. type: textblock -#: dos2unix.pod:303 +#: dos2unix.pod:322 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 " @@ -711,15 +765,15 @@ msgid "" 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 met name in de VS gebruikt word. Om een bepaalde " -"codetabel te forceren, u de opties C<-850> (West-Europees), C<-860> " +"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:312 +#: dos2unix.pod:331 msgid "" "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 " "encoded files." @@ -728,17 +782,17 @@ msgstr "" "gecodeerde bestanden beschadigen." #. type: textblock -#: dos2unix.pod:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Enkele voorbeelden:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -748,12 +802,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "Omzetten van DOS CP850 naar Unix Latin-1" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -763,12 +817,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "Omzetten van Windows CP1252 naar Unix Latin-1" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -778,12 +832,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" msgstr "Omzetten van Windows CP1252 naar Unix UTF-8 (Unicode)" #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -793,12 +847,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 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:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -808,12 +862,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "Omzetten van Unix Latin-1 naar DOS CP850" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -823,12 +877,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "Omzetten van Unix Latin-1 naar Windows CP1252" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -838,12 +892,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" msgstr "Omzetten van Unix UTF-8 (Unicode) naar Windows CP1252" #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -853,7 +907,7 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 +#: dos2unix.pod:367 msgid "" "See also L<http://czyborra.com/charsets/codepages.html> and L<http://" "czyborra.com/charsets/iso8859.html>." @@ -862,17 +916,17 @@ msgstr "" "com/charsets/iso8859.html>." #. type: =head1 -#: dos2unix.pod:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Coderingen" #. type: textblock -#: dos2unix.pod:357 +#: dos2unix.pod:376 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 " @@ -885,12 +939,12 @@ msgstr "" "zijn meestal gecodeerd in UTF-16." #. type: =head2 -#: dos2unix.pod:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Conversie" #. type: textblock -#: dos2unix.pod:364 +#: dos2unix.pod:383 msgid "" "Unicode text files can have DOS, Unix or Mac line breaks, like regular text " "files." @@ -899,7 +953,7 @@ msgstr "" "reguliere tekstbestanden." #. type: textblock -#: dos2unix.pod:367 +#: dos2unix.pod:386 msgid "" "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, " "because UTF-8 was designed for backward compatibility with ASCII." @@ -908,7 +962,7 @@ msgstr "" "omzetten, want UTF-8 is ontworpen op compatibiliteit met ASCII." #. type: textblock -#: dos2unix.pod:370 +#: dos2unix.pod:389 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 " @@ -919,52 +973,61 @@ msgstr "" "dos2unix gebouwd is met UTF-16- ondersteuning, typt u C<dos2unix -V>." #. type: textblock -#: dos2unix.pod:374 +#: dos2unix.pod:393 msgid "" -"The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files " -"always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert " -"UTF-16 encoded files to the locale character encoding when it is set to " -"UTF-8. Use the locale(1) command to find out what the locale character " -"encoding is." +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." msgstr "" -"De Windows-versies van dos2unix en unix2dos converteren UTF-16 -gecodeerde " -"bestanden altijd naar UTF-8-gecodeerde bestanden. Unix-versies van dos2unix/" -"unix2dos zetten UTF-16-gecodeerde bestanden om naar de lokale tekencodering " -"als die gelijk is aan UTF-8. Gebruik de opdracht locale(1) om uit te vinden " -"wat de lokale tekencodering is." +"In UTF-16 gecodeerde bestanden worden standaard geconverteerd naar UTF-8. " +"Op Unix/Linux dient de codering van de taalregio op UTF-8 ingesteld te " +"zijn. Gebruik de opdracht locale(1) om uit te vinden wat de codering van uw " +"taalregio is. In UTF-8 gecodeerde bestanden worden wijdverbreid " +"ondersteund, zowel in Windows als op Unix/Linux." #. type: textblock -#: dos2unix.pod:379 +#: dos2unix.pod:398 msgid "" -"Because UTF-8 formatted text files are well supported on both Windows and " -"Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 " -"characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is " -"without loss. UTF-16 files will be skipped on Unix when the locale character " -"encoding is not UTF-8, to prevent accidental loss of text. 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." +"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 "" -"Omdat UTF-8-gecodeerde tekstbestanden zowel op Windows en Unix goed " -"ondersteund worden, hebben dos2unix en unix2dos geen optie om UTF-16-" -"bestanden te schrijven. Alle UTF-16-tekens kunnen worden omgezet naar " -"UTF-8. De omzetting van UTF-16 naar UTF-8 is verliesvrij. Op Unix worden " -"UTF-16-bestanden overgeslagen als de lokale tekencodering ongelijk is aan " -"UTF-8, om te voorkomen dat er per ongeluk tekst verloren gaat. Wanneer een " -"conversiefout van UTF-16 naar UTF-8 optreedt, bijvoorbeeld wanneer het " -"UTF-16-invoerbestand een fout bevat, wordt het bestand overgeslagen." +"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:387 +#: dos2unix.pod:402 +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:405 +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:407 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:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Byte Order Mark" #. type: textblock -#: dos2unix.pod:391 +#: dos2unix.pod:411 msgid "" "On Windows Unicode text files typically have a Byte Order Mark (BOM), " "because many Windows programs (including Notepad) add BOMs by default. See " @@ -975,7 +1038,7 @@ msgstr "" "een BOM toevoegen. Zie ook L<http://en.wikipedia.org/wiki/Byte_order_mark>." #. type: textblock -#: dos2unix.pod:395 +#: dos2unix.pod:415 msgid "" "On Unix Unicode files typically don't have a BOM. It is assumed that text " "files are encoded in the locale character encoding." @@ -984,7 +1047,7 @@ msgstr "" "dat de codering van tekstbestanden gelijk is aan de lokale tekencodering." #. type: textblock -#: dos2unix.pod:398 +#: dos2unix.pod:418 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 " @@ -995,54 +1058,48 @@ msgstr "" "dos2unix het bestand als een binair bestand." #. type: textblock -#: dos2unix.pod:402 +#: dos2unix.pod:422 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:404 +#: dos2unix.pod:424 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:407 -#, fuzzy -#| msgid "" -#| "Unix2dos writes a BOM in the output file when the input file has a BOM, " -#| "or when option C<-m> is used." +#: dos2unix.pod:427 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 een BOM in het uitvoerbestand wanneer het invoerbestand " -"een BOM heeft, of wanneer optie C<-m> gebruikt wordt." +"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:410 -#, fuzzy -#| msgid "" -#| "Unix2dos writes a BOM in the output file when the input file has a BOM, " -#| "or when option C<-m> is used." +#: dos2unix.pod:430 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." msgstr "" -"Unix2dos schrijft een BOM in het uitvoerbestand wanneer het invoerbestand " -"een BOM heeft, of wanneer optie C<-m> gebruikt wordt." +"Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt " +"wordt." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Unicode-voorbeelden" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 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:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -1052,12 +1109,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 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:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -1067,12 +1124,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 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:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -1082,12 +1139,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 msgid "Convert from Unix UTF-8 to Windows UTF-16" msgstr "Omzetten van Unix UTF-8 naar Windows UTF-16" #. type: verbatim -#: dos2unix.pod:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -1097,18 +1154,18 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "VOORBEELDEN" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 msgid "Read input from 'stdin' and write output to 'stdout'." msgstr "" "Invoer lezen van standaardinvoer en uitvoer schrijven naar standaarduitvoer." #. type: verbatim -#: dos2unix.pod:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -1120,12 +1177,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -1137,12 +1194,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 msgid "Convert and replace a.txt in ascii conversion mode." msgstr "Omzetten en vervangen van a.txt in ascii-conversiemodus." #. type: verbatim -#: dos2unix.pod:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -1152,7 +1209,7 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 +#: dos2unix.pod:466 msgid "" "Convert and replace a.txt in ascii conversion mode. Convert and replace b." "txt in 7bit conversion mode." @@ -1161,7 +1218,7 @@ msgstr "" "vervangen b.txt in 7-bits conversiemodus." #. type: verbatim -#: dos2unix.pod:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -1175,12 +1232,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "Omzetten van a.txt van Mac- naar Unix-indeling." #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -1192,12 +1249,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Omzetten van a.txt van Unix- naar Mac-indeling." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -1209,12 +1266,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 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:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -1226,12 +1283,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Omzetten van a.txt en naar e.txt schrijven." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -1241,7 +1298,7 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 +#: dos2unix.pod:492 msgid "" "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt." msgstr "" @@ -1249,7 +1306,7 @@ msgstr "" "gelijk aan die van a.txt." #. type: verbatim -#: dos2unix.pod:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -1259,13 +1316,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -1277,7 +1334,7 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 +#: dos2unix.pod:501 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." @@ -1287,7 +1344,7 @@ msgstr "" "schrijven." #. type: verbatim -#: dos2unix.pod:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -1297,12 +1354,12 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "RECURSIEVE CONVERSIE" #. type: textblock -#: dos2unix.pod:488 +#: dos2unix.pod:508 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 " @@ -1315,7 +1372,7 @@ msgstr "" "typt u:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1325,17 +1382,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "LOKALISATIE" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 +#: dos2unix.pod:520 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 " @@ -1352,7 +1409,7 @@ msgstr "" "voorbeelden voor een POSIX-shell:" #. type: verbatim -#: dos2unix.pod:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1374,7 +1431,7 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 +#: dos2unix.pod:535 msgid "" "For a complete list of language and country codes see the gettext manual: " "L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" @@ -1383,7 +1440,7 @@ msgstr "" "L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" #. type: textblock -#: dos2unix.pod:518 +#: dos2unix.pod:538 msgid "" "On Unix systems you can use to command locale(1) to get locale specific " "information." @@ -1392,12 +1449,12 @@ msgstr "" "taalregio-informatie te verkrijgen." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 +#: dos2unix.pod:543 msgid "" "With the LANGUAGE environment variable you can specify a priority list of " "languages, separated by colons. Dos2unix gives preference to LANGUAGE over " @@ -1417,7 +1474,7 @@ msgstr "" "gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 +#: dos2unix.pod:551 msgid "" "If you select a language which is not available you will get the standard " "English messages." @@ -1426,12 +1483,12 @@ msgstr "" "berichten gebruikt." #. type: =item -#: dos2unix.pod:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 +#: dos2unix.pod:557 msgid "" "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during " "compilation can be overruled. LOCALEDIR is used to find the language files. " @@ -1444,12 +1501,12 @@ msgstr "" "locale>. De optie B<--version> laat de gebruikte LOCALEDIR zien." #. type: textblock -#: dos2unix.pod:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Voorbeeld (POSIX-shell):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1459,12 +1516,12 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "AFSLUITWAARDE" #. type: textblock -#: dos2unix.pod:551 +#: dos2unix.pod:571 msgid "" "On success, zero is returned. When a system error occurs the last system " "error will be returned. For other errors 1 is returned." @@ -1474,7 +1531,7 @@ msgstr "" "teruggegeven." #. type: textblock -#: dos2unix.pod:554 +#: dos2unix.pod:574 msgid "" "The return value is always zero in quiet mode, except when wrong command-" "line options are used." @@ -1483,37 +1540,37 @@ msgstr "" "verkeerde opties worden gegeven." #. type: =head1 -#: dos2unix.pod:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "STANDAARDEN" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://nl.wikipedia.org/wiki/Tekstbestand>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://nl.wikipedia.org/wiki/Carriage_Return>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://nl.wikipedia.org/wiki/Linefeed>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "<http://nl.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTEURS" #. type: textblock -#: dos2unix.pod:569 +#: dos2unix.pod:589 msgid "" "Benjamin Lin - <blin@socs.uts.edu.au> Bernd Johannes Wuebben (mac2unix mode) " "- <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka." @@ -1525,30 +1582,60 @@ msgstr "" "(beheerder)" #. type: textblock -#: dos2unix.pod:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "SourceForge-pagina: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "ZIE OOK" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "De Windows-versies van dos2unix en unix2dos converteren UTF-16 -" +#~ "gecodeerde bestanden altijd naar UTF-8-gecodeerde bestanden. Unix-" +#~ "versies van dos2unix/unix2dos zetten UTF-16-gecodeerde bestanden om naar " +#~ "de lokale tekencodering als die gelijk is aan UTF-8. Gebruik de opdracht " +#~ "locale(1) om uit te vinden wat de lokale tekencodering is." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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 "" +#~ "Omdat UTF-8-gecodeerde tekstbestanden zowel op Windows en Unix goed " +#~ "ondersteund worden, hebben dos2unix en unix2dos geen optie om UTF-16-" +#~ "bestanden te schrijven. Alle UTF-16-tekens kunnen worden omgezet naar " +#~ "UTF-8. De omzetting van UTF-16 naar UTF-8 is verliesvrij. Op Unix " +#~ "worden UTF-16-bestanden overgeslagen als de lokale tekencodering ongelijk " +#~ "is aan UTF-8, om te voorkomen dat er per ongeluk tekst verloren gaat. " +#~ "Wanneer een conversiefout van UTF-16 naar UTF-8 optreedt, bijvoorbeeld " +#~ "wanneer het UTF-16-invoerbestand een fout bevat, wordt het bestand " +#~ "overgeslagen." + #~ msgid "" #~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" #~ "m>." diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod index b6ab92c..aed01a2 100644 --- a/man/nl/man1/dos2unix.pod +++ b/man/nl/man1/dos2unix.pod @@ -119,9 +119,9 @@ Lettertekens met het achtste bit gezet converteren naar spaties. =item B<-b, --keep-bom> -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>. +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>. =item B<-c, --convmode CONVERSIEMODUS> @@ -158,9 +158,16 @@ Mac-regeleindes. =item B<-m, --add-bom> -Een UTF-8 'Byte Order Mark' in het uitvoerbestand schrijven. Gebruik deze -optie nooit als de codering van het uitvoerbestand géén UTF-8 is. Zie ook -de sectie UNICODE. +Een Byte Order Mark (BOM) naar het uitvoerbestand schrijven. Standaard +wordt een UTF-8-BOM geschreven. + +Als het invoerbestand in UTF-16 is, en de optie C<-u> is gegeven, dan wordt +een UTF-16-BOM geschreven. + +Gebruik deze optie nooit als de codering van het uitvoerbestand niet UTF-8 +of UTF-16 is. Zie ook de sectie UNICODE. + + =item B<-n, --newfile INVOERBESTAND UITVOERBESTAND ...> @@ -197,14 +204,22 @@ behalve wanneer verkeerde opties worden gegeven. =item B<-r, --remove-bom> -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>. +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>. =item B<-s, --safe> Binaire bestanden overslaan (standaard). +=item B<-u, --keep-utf16> + +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>. + =item B<-ul, --assume-utf16le> Veronderstellen dat de indeling van het invoerbestand UTF-16LE is. @@ -228,6 +243,11 @@ Veronderstellen dat de indeling van het invoerbestand UTF-16BE is. Deze optie werkt hetzelfde als optie C<-ul>. +=item B<-v, --verbose> + +Extra meldingen weergeven. Er wordt extra informatie getoond over 'Byte +Order Marks' en het aantal geconverteerde regeleindes. + =item B<-F, --follow-symlink> Symbolische koppelingen volgen en de doelen converteren. @@ -278,15 +298,15 @@ omgezet naar een 7-bits spatie. =item B<iso> -Tekens worden omgezet tussen een DOS-tekenset (codetabel) en ISO-tekenset +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. +Hetzelfde geldt voor ISO-8859-1-tekens zonder DOS-tegenhanger. 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 met name in de VS gebruikt word. Om een bepaalde -codetabel te forceren, u de opties C<-850> (West-Europees), C<-860> +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 @@ -355,20 +375,23 @@ 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>. -De Windows-versies van dos2unix en unix2dos converteren UTF-16 -gecodeerde -bestanden altijd naar UTF-8-gecodeerde bestanden. Unix-versies van -dos2unix/unix2dos zetten UTF-16-gecodeerde bestanden om naar de lokale -tekencodering als die gelijk is aan UTF-8. Gebruik de opdracht locale(1) om -uit te vinden wat de lokale tekencodering is. - -Omdat UTF-8-gecodeerde tekstbestanden zowel op Windows en Unix goed -ondersteund worden, hebben dos2unix en unix2dos geen optie om -UTF-16-bestanden te schrijven. Alle UTF-16-tekens kunnen worden omgezet -naar UTF-8. De omzetting van UTF-16 naar UTF-8 is verliesvrij. Op Unix -worden UTF-16-bestanden overgeslagen als de lokale tekencodering ongelijk is -aan UTF-8, om te voorkomen dat er per ongeluk tekst verloren gaat. Wanneer -een conversiefout van UTF-16 naar UTF-8 optreedt, bijvoorbeeld wanneer het -UTF-16-invoerbestand een fout bevat, wordt het bestand overgeslagen. +In UTF-16 gecodeerde bestanden worden standaard geconverteerd naar UTF-8. +Op Unix/Linux dient de codering van de taalregio op UTF-8 ingesteld te +zijn. Gebruik de opdracht locale(1) om uit te vinden wat de codering van uw +taalregio is. In UTF-8 gecodeerde bestanden worden wijdverbreid +ondersteund, zowel in Windows als op Unix/Linux. + +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. + +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. + +Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te +converteren. ISO- en 7-bits-conversie werken niet op UTF-16-bestanden. @@ -388,13 +411,14 @@ dos2unix het bestand als een binair bestand. Gebruik optie C<-ul> of C<-ub> om een UTF-16-bestand zonder BOM om te zetten. -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. +Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie C<-b> +schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat. -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. +Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het +invoerbestand een BOM bevat. Gebruik optie C<-r> om de BOM te verwijderen. -Dos2unix and unix2dos write always a BOM when option C<-m> is used. +Dos2unix en unix2dos schrijven altijd een BOM wanneer optie C<-m> gebruikt +wordt. =head2 Unicode-voorbeelden @@ -571,8 +595,6 @@ Projectpagina: L<http://waterlan.home.xs4all.nl/dos2unix.html> SourceForge-pagina: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 ZIE OOK file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/nl/man1/dos2unix.txt b/man/nl/man1/dos2unix.txt index 9de134c..0c2469f 100644 --- a/man/nl/man1/dos2unix.txt +++ b/man/nl/man1/dos2unix.txt @@ -83,9 +83,9 @@ OPTIES -7 Lettertekens met het achtste bit gezet converteren naar spaties. -b, --keep-bom - 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 "-r". + 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 "-r". -c, --convmode CONVERSIEMODUS De te gebruiken conversiemodus. CONVERSIEMODUS kan zijn: *ascii*, @@ -116,9 +116,14 @@ OPTIES twee Mac-regeleindes. -m, --add-bom - Een UTF-8 'Byte Order Mark' in het uitvoerbestand schrijven. Gebruik - deze optie nooit als de codering van het uitvoerbestand géén UTF-8 - is. Zie ook de sectie UNICODE. + Een Byte Order Mark (BOM) naar het uitvoerbestand schrijven. + Standaard wordt een UTF-8-BOM geschreven. + + Als het invoerbestand in UTF-16 is, en de optie "-u" is gegeven, dan + wordt een UTF-16-BOM geschreven. + + Gebruik deze optie nooit als de codering van het uitvoerbestand niet + UTF-8 of UTF-16 is. Zie ook de sectie UNICODE. -n, --newfile INVOERBESTAND UITVOERBESTAND ... Nieuw-bestand-modus. Het bestand INVOERBESTAND converteren en naar @@ -153,13 +158,20 @@ OPTIES is nul, behalve wanneer verkeerde opties worden gegeven. -r, --remove-bom - 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 "-b". + 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 "-b". -s, --safe Binaire bestanden overslaan (standaard). + -u, --keep-utf16 + 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 "-ascii". + -ul, --assume-utf16le Veronderstellen dat de indeling van het invoerbestand UTF-16LE is. @@ -182,6 +194,10 @@ OPTIES Deze optie werkt hetzelfde als optie "-ul". + -v, --verbose + Extra meldingen weergeven. Er wordt extra informatie getoond over + 'Byte Order Marks' en het aantal geconverteerde regeleindes. + -F, --follow-symlink Symbolische koppelingen volgen en de doelen converteren. @@ -218,16 +234,16 @@ CONVERSIEMODI Alle 8-bits niet-ASCII lettertekens (met waardes van 128 t/m 255) worden omgezet naar een 7-bits spatie. - iso Tekens worden omgezet tussen een DOS-tekenset (codetabel) en + iso 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. + zonder DOS-tegenhanger. Wanneer alleen optie "-iso" gebruikt wordt, zal dos2unix proberen de actieve codetabel te gebruiken. Als dat niet mogelijk is wordt - codetabel CP437 gebruikt, die met name in de VS gebruikt word. Om - een bepaalde codetabel te forceren, u de opties -850 + codetabel CP437 gebruikt, die vooral in de VS gebruikt wordt. Om een + bepaalde codetabel te forceren, kunt u de opties -850 (West-Europees), -860 (Portugees), -863 (Canadees Frans) of -865 (Scandinavisch) gebruiken. Windows-codetabel CP1252 (West-Europees) wordt ook ondersteund met optie -1252. Gebruik voor andere @@ -292,21 +308,23 @@ UNICODE big endian UTF-16 gecodeerde tekstbestanden lezen. Om er achter te komen of dos2unix gebouwd is met UTF-16- ondersteuning, typt u "dos2unix -V". - De Windows-versies van dos2unix en unix2dos converteren UTF-16 - -gecodeerde bestanden altijd naar UTF-8-gecodeerde bestanden. - Unix-versies van dos2unix/unix2dos zetten UTF-16-gecodeerde bestanden om - naar de lokale tekencodering als die gelijk is aan UTF-8. Gebruik de - opdracht locale(1) om uit te vinden wat de lokale tekencodering is. - - Omdat UTF-8-gecodeerde tekstbestanden zowel op Windows en Unix goed - ondersteund worden, hebben dos2unix en unix2dos geen optie om - UTF-16-bestanden te schrijven. Alle UTF-16-tekens kunnen worden omgezet - naar UTF-8. De omzetting van UTF-16 naar UTF-8 is verliesvrij. Op Unix - worden UTF-16-bestanden overgeslagen als de lokale tekencodering - ongelijk is aan UTF-8, om te voorkomen dat er per ongeluk tekst verloren - gaat. Wanneer een conversiefout van UTF-16 naar UTF-8 optreedt, - bijvoorbeeld wanneer het UTF-16-invoerbestand een fout bevat, wordt het - bestand overgeslagen. + In UTF-16 gecodeerde bestanden worden standaard geconverteerd naar + UTF-8. Op Unix/Linux dient de codering van de taalregio op UTF-8 + ingesteld te zijn. Gebruik de opdracht locale(1) om uit te vinden wat de + codering van uw taalregio is. In UTF-8 gecodeerde bestanden worden + wijdverbreid ondersteund, zowel in Windows als op Unix/Linux. + + 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. + + Wanneer "-u" gebruikt wordt, wordt het uitvoerbestand in dezelfde + UTF-16-codering geschreven als het invoerbestand. Optie "-u" voorkomt + conversie naar UTF-8. + + Dos2unix en unix2dos hebben geen optie om van UTF-8 naar UTF-16 te + converteren. ISO- en 7-bits-conversie werken niet op UTF-16-bestanden. @@ -326,13 +344,15 @@ UNICODE Gebruik optie "-ul" of "-ub" om een UTF-16-bestand zonder BOM om te zetten. - Dos2unix writes by default no BOM in the output file. With option "-b" - Dos2unix writes a BOM when the input file has a BOM. + Dos2unix schrijft standaard geen BOM in het uitvoerbestand. Met optie + "-b" schrijft dos2unix een BOM wanneer het invoerbestand een BOM bevat. - Unix2dos writes by default a BOM in the output file when the input file - has a BOM. Use option "-r" to remove the BOM. + Unix2dos schrijft standaard een BOM in het uitvoerbestand wanneer het + invoerbestand een BOM bevat. Gebruik optie "-r" om de BOM te + verwijderen. - Dos2unix and unix2dos write always a BOM when option "-m" is used. + Dos2unix en unix2dos schrijven altijd een BOM wanneer optie "-m" + gebruikt wordt. Unicode-voorbeelden Omzetten van Windows UTF-16 (met BOM) naar Unix UTF-8 @@ -495,8 +515,6 @@ AUTEURS SourceForge-pagina: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - ZIE OOK file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1 index 0d353d3..1c4e97d 100644 --- a/man/pl/man1/dos2unix.1 +++ b/man/pl/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -200,9 +200,14 @@ DOS-owe. W trybie Mac uniksowe znaki koÅ„ca linii sÄ… zamieniane na dwa macowe. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Zapis znacznika \s-1BOM \s0(Byte Order Mark) \s-1UTF\-8\s0 w pliku wyjÅ›ciowym. Nie należy -używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż \s-1UTF\-8.\s0 WiÄ™cej w -sekcji \s-1UNICODE.\s0 +Zapisanie znacznika \s-1BOM \s0(Byte Order Mark) w pliku wyjÅ›ciowym. DomyÅ›lnie +zapisywany jest \s-1BOM UTF\-8.\s0 +.Sp +JeÅ›li plik wejÅ›ciowy jest w kodowaniu \s-1UTF\-16\s0 i użyto opcji \f(CW\*(C`\-u\*(C'\fR, zostanie +zapisany \s-1BOM UTF\-16.\s0 +.Sp +Nigdy nie należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż +\&\s-1UTF\-8\s0 lub \s-1UTF\-16.\s0 WiÄ™cej w sekcji \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1PLIK_WEJ PLIK_WYJ ...\s0\fR" 4 .IX Item "-n, --newfile PLIK_WEJ PLIK_WYJ ..." Tryb nowego pliku. Konwersja \s-1PLIKU_WEJ\s0 z zapisem wyjÅ›cia do \s-1PLIKU_WYJ.\s0 Nazwy @@ -239,6 +244,13 @@ linii. P. także opcja \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" PominiÄ™cie plików binarnych (domyÅ›lne). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Zachowanie oryginalnego kodowania pliku wejÅ›ciowego \s-1UTF\-16.\s0 Plik wyjÅ›ciowy +zostanie zapisany w tym samym kodowaniu \s-1UTF\-16 \s0(little lub big endian), co +plik wejÅ›ciowy. Zapobiega to przeksztaÅ‚ceniu do \s-1UTF\-8.\s0 Do pliku zostanie +zapisany odpowiedni znacznik \s-1BOM UTF\-16.\s0 TÄ™ opcjÄ™ można wyÅ‚Ä…czyć opcjÄ… +\&\f(CW\*(C`\-ascii\*(C'\fR. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" PrzyjÄ™cie, że format pliku wejÅ›ciowego to \s-1UTF\-16LE.\s0 @@ -259,6 +271,11 @@ domyÅ›lny tryb \fIascii\fR przyjÄ™cie \s-1UTF\-16LE\s0 jest wyÅ‚Ä…czane. PrzyjÄ™cie, że format pliku wejÅ›ciowego to \s-1UTF\-16BE.\s0 .Sp Ta opcja dziaÅ‚a analogicznie do \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +WyÅ›wietlanie szczegółowych komunikatów. WyÅ›wietlane Å›a dodatkowe informacje +o znacznikach \s-1BOM \s0(Byte Order Mark) oraz liczbie przekonwertowanych koÅ„ców +linii. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Podążanie za dowiÄ…zaniami symbolicznymi i konwertowanie ich celów @@ -389,19 +406,22 @@ Dos2unix i unix2dos z obsÅ‚ugÄ… Unicode \s-1UTF\-16\s0 potrafiÄ… odczytywać pli tekstowe kodowane \s-1UTF\-16\s0 little\- oraz big-endian. Aby sprawdzić, czy dos2unix zostaÅ‚ zbudowany z obsÅ‚ugÄ… \s-1UTF\-16,\s0 należy napisać \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -Wersje programów dos2unix i unix2dos dla systemu Windows konwertujÄ… pliki -kodowane \s-1UTF\-16\s0 zawsze do \s-1UTF\-8.\s0 Uniksowe wersje dos2unix/unix2dos -konwertujÄ… pliki kodowane \s-1UTF\-16\s0 do zestawu znaków ustawionej lokalizacji, -kiedy jest ustawiony na \s-1UTF\-8.\s0 Zestaw znaków lokalizacji można sprawdzić -poleceniem \fIlocale\fR\|(1). +Pliki w kodowaniu \s-1UTF\-16\s0 sÄ… domyÅ›lnie konwertowane do \s-1UTF\-8.\s0 Pod +Uniksem/Linuksem wymagane jest, żeby kodowanie znaków używanej lokalizacji +byÅ‚o ustawione na \s-1UTF\-8.\s0 Kodowanie znaków dla lokalizacji można sprawdzić +poleceniem \fIlocale\fR\|(1). Pliki tekstkowe w kodowaniu \s-1UTF\-8\s0 sÄ… dobrze +obsÅ‚ugiwane zarówno pod Windows, jak i Uniksem/Linuksem. +.PP +Kodowania \s-1UTF\-16\s0 i \s-1UTF\-8\s0 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 \s-1UTF\-16,\s0 plik zostanie pominiÄ™ty. .PP -Ponieważ pliki tekstowe kodowane \s-1UTF\-8\s0 sÄ… dobrze obsÅ‚ugiwane zarówno pod -Windows, jak i Uniksem, dos2unix i unix2dos nie majÄ… opcji zapisu plików -\&\s-1UTF\-16.\s0 Wszystkie znaki \s-1UTF\-16\s0 mogÄ… być zakodowane w \s-1UTF\-8,\s0 konwersja z -\&\s-1UTF\-16\s0 do \s-1UTF\-8\s0 jest bezstratna. Pliki \s-1UTF\-16\s0 bÄ™dÄ… pominiÄ™te na Uniksie, -jeÅ›li zestaw znaków lokalizacji to nie \s-1UTF\-8,\s0 aby zapobiec przypadkowej -utracie tekstu. W przypadku bÅ‚Ä™du konwersji \s-1UTF\-16\s0 do \s-1UTF\-8,\s0 na przykÅ‚ad -kiedy plik wejÅ›ciowy \s-1UTF\-16\s0 zawiera bÅ‚Ä…d, plik bÄ™dzie pominiÄ™ty. +W przypadku użycia opcji \f(CW\*(C`\-u\*(C'\fR, plik wejÅ›ciowy zostanie zapisany w tym samym +kodowaniu \s-1UTF\-16,\s0 co plik wejÅ›ciowy. Opcja \f(CW\*(C`\-u\*(C'\fR zapobiega konwersji do +\&\s-1UTF\-8.\s0 +.PP +Dos2unix oraz unix2dos nie majÄ… opcji pozwalajÄ…cej na konwersjÄ™ plików \s-1UTF\-8\s0 +do \s-1UTF\-16.\s0 .PP Tryby konwersji \s-1ISO\s0 i 7\-bit nie dziaÅ‚ajÄ… na plikach \s-1UTF\-16.\s0 .SS "Znacznik \s-1BOM\s0" @@ -620,8 +640,6 @@ Benjamin Lin <blin@socs.uts.edu.au>; Bernd Johannes Wuebben (tryb mac2unix) Strona projektu: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP Strona SourceForge: <http://sourceforge.net/projects/dos2unix/> -.PP -Strona Freecode: <http://freecode.com/projects/dos2unix> .SH "ZOBACZ TAKÅ»E" .IX Header "ZOBACZ TAKÅ»E" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm index ca99a15..ac29964 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 6.0.6 - konwerter formatu plików tekstowych miÄ™dzy systemami DOS/Mac a Uniksem</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Potraktowanie wszystkich kolejnych opcji jako nazw plików. Tej opcji należy użyć, aby przekonwertować pliki, których nazwy zaczynają się od minusa. Przykładowo, aby przekonwertować plik o nazwie "-foo", można użyć polecenia:</p> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Zapis znacznika BOM (Byte Order Mark) UTF-8 w pliku wyjściowym. Nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8. Więcej w sekcji UNICODE.</p> +<p>Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjściowym. Domyślnie zapisywany jest BOM UTF-8.</p> + +<p>Jeśli plik wejściowy jest w kodowaniu UTF-16 i użyto opcji <code>-u</code>, zostanie zapisany BOM UTF-16.</p> + +<p>Nigdy nie należy używać tej opcji, jeśli kodowanie wyjściowe jest inne niż UTF-8 lub UTF-16. Więcej w sekcji UNICODE.</p> </dd> -<dt id="n---newfile-PLIK_WEJ-PLIK_WYJ-..."><b>-n, --newfile PLIK_WEJ PLIK_WYJ ...</b></dt> +<dt id="n---newfile-PLIK_WEJ-PLIK_WYJ"><b>-n, --newfile PLIK_WEJ PLIK_WYJ ...</b></dt> <dd> <p>Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjścia do PLIKU_WYJ. Nazwy plików muszą być podane parami, a masek <i>nie</i> należy używać, gdyż <i>spowoduje</i> to utratę plików.</p> @@ -190,7 +194,7 @@ <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="o---oldfile-PLIK-..."><b>-o, --oldfile PLIK ...</b></dt> +<dt id="o---oldfile-PLIK"><b>-o, --oldfile PLIK ...</b></dt> <dd> <p>Tryb starego pliku. Konwersja PLIKU i nadpisanie go wyjściem. Program działa domyślnie w tym trybie. Można używać masek.</p> @@ -216,6 +220,12 @@ <p>Pominięcie plików binarnych (domyślne).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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ą <code>-ascii</code>.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Ta opcja działa analogicznie do <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Wyświetlanie szczegółowych komunikatów. Wyświetlane śa dodatkowe informacje o znacznikach BOM (Byte Order Mark) oraz liczbie przekonwertowanych końców linii.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>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ć <code>dos2unix -V</code>.</p> -<p>Wersje programów dos2unix i unix2dos dla systemu Windows konwertują pliki kodowane UTF-16 zawsze do UTF-8. Uniksowe wersje dos2unix/unix2dos konwertują pliki kodowane UTF-16 do zestawu znaków ustawionej lokalizacji, kiedy jest ustawiony na UTF-8. Zestaw znaków lokalizacji można sprawdzić poleceniem locale(1).</p> +<p>Pliki w kodowaniu UTF-16 są domyślnie konwertowane do UTF-8. Pod Uniksem/Linuksem wymagane jest, żeby kodowanie znaków używanej lokalizacji było ustawione na UTF-8. Kodowanie znaków dla lokalizacji można sprawdzić poleceniem locale(1). Pliki tekstkowe w kodowaniu UTF-8 są dobrze obsługiwane zarówno pod Windows, jak i Uniksem/Linuksem.</p> -<p>Ponieważ pliki tekstowe kodowane UTF-8 są dobrze obsługiwane zarówno pod Windows, jak i Uniksem, dos2unix i unix2dos nie mają opcji zapisu plików UTF-16. Wszystkie znaki UTF-16 mogą być zakodowane w UTF-8, konwersja z UTF-16 do UTF-8 jest bezstratna. Pliki UTF-16 będą pominięte na Uniksie, jeśli zestaw znaków lokalizacji to nie UTF-8, aby zapobiec przypadkowej utracie tekstu. W przypadku błędu konwersji UTF-16 do UTF-8, na przykład kiedy plik wejściowy UTF-16 zawiera błąd, plik będzie pominięty.</p> +<p>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.</p> + +<p>W przypadku użycia opcji <code>-u</code>, plik wejściowy zostanie zapisany w tym samym kodowaniu UTF-16, co plik wejściowy. Opcja <code>-u</code> zapobiega konwersji do UTF-8.</p> + +<p>Dos2unix oraz unix2dos nie mają opcji pozwalającej na konwersję plików UTF-8 do UTF-16.</p> <p>Tryby konwersji ISO i 7-bit nie działają na plikach UTF-16.</p> @@ -516,8 +536,6 @@ <p>Strona SourceForge: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Strona Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="ZOBACZ-TAKE">ZOBACZ TAKŻE</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/pl/man1/dos2unix.po b/man/pl/man1/dos2unix.po index f959ef8..bca1cdd 100644 --- a/man/pl/man1/dos2unix.po +++ b/man/pl/man1/dos2unix.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" -"PO-Revision-Date: 2014-07-10 18:47+0200\n" +"Project-Id-Version: dos2unix-man 6.1-beta1\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-21 19: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" @@ -22,7 +22,9 @@ msgstr "NAZWA" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - konwerter formatu plików tekstowych miÄ™dzy systemami DOS/Mac a Uniksem" +msgstr "" +"dos2unix - konwerter formatu plików tekstowych miÄ™dzy systemami DOS/Mac a " +"Uniksem" #. type: =head1 #: dos2unix.pod:56 @@ -48,38 +50,83 @@ msgstr "OPIS" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "Pakiet Dos2unix zawiera narzÄ™dzia C<dos2unix> oraz C<unix2dos> do konwersji zwykÅ‚ych plików tekstowych miÄ™dzy formatami używanymi w systemach DOS lub Mac a formatem uniksowym." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"Pakiet Dos2unix zawiera narzÄ™dzia C<dos2unix> oraz C<unix2dos> do konwersji " +"zwykÅ‚ych plików tekstowych miÄ™dzy formatami używanymi w systemach DOS lub " +"Mac a formatem uniksowym." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "W plikach tekstowych systemu DOS/Windows oznaczenie koÅ„ca linii to poÅ‚Ä…czenie dwóch znaków: powrotu karetki (CR) i przesuniÄ™cia linii (LF). W uniksowych plikach tekstowych koniec linii to pojedynczy znak LF. W plikach tekstowych systemu Mac sprzed Mac OS X koniec linii byÅ‚ pojedynczym znakiem CR. Obecnie Mac OS wykorzystuje uniksowe koÅ„ce linii (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"W plikach tekstowych systemu DOS/Windows oznaczenie koÅ„ca linii to " +"poÅ‚Ä…czenie dwóch znaków: powrotu karetki (CR) i przesuniÄ™cia linii (LF). W " +"uniksowych plikach tekstowych koniec linii to pojedynczy znak LF. W plikach " +"tekstowych systemu Mac sprzed Mac OS X koniec linii byÅ‚ pojedynczym znakiem " +"CR. Obecnie Mac OS wykorzystuje uniksowe koÅ„ce linii (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Oprócz oznaczeÅ„ koÅ„ców linii Dos2unix potrafi konwertować także kodowanie plików. Kilko stron kodowych DOS-a może być przekonwertowanych do uniksowego Latin-1, a windowsowy Unicode (UTF-16) do powszechniejszego pod Uniksem kodowania Unicode UTF-8." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Oprócz oznaczeÅ„ koÅ„ców linii Dos2unix potrafi konwertować także kodowanie " +"plików. Kilko stron kodowych DOS-a może być przekonwertowanych do uniksowego " +"Latin-1, a windowsowy Unicode (UTF-16) do powszechniejszego pod Uniksem " +"kodowania Unicode UTF-8." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Pliki binarne sÄ… pomijane automatycznie, chyba że konwersja zostanie wymuszona." +msgstr "" +"Pliki binarne sÄ… pomijane automatycznie, chyba że konwersja zostanie " +"wymuszona." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Pliki inne niż zwykÅ‚e, np. katalogi lub FIFO, sÄ… pomijane automatycznie." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Pliki inne niż zwykÅ‚e, np. katalogi lub FIFO, sÄ… pomijane automatycznie." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "DowiÄ…zania symboliczne i ich cele sÄ… domyÅ›lnie pozostawiane bez zmian. DowiÄ…zania symboliczne mogÄ… być opcjonalnie zastÄ™powane, albo wyjÅ›cie może być zapisywane do celu dowiÄ…zania. Zapis do celu dowiÄ…zania symbolicznego nie jest obsÅ‚ugiwane pod Windows." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"DowiÄ…zania symboliczne i ich cele sÄ… domyÅ›lnie pozostawiane bez zmian. " +"DowiÄ…zania symboliczne mogÄ… być opcjonalnie zastÄ™powane, albo wyjÅ›cie może " +"być zapisywane do celu dowiÄ…zania. Zapis do celu dowiÄ…zania symbolicznego " +"nie jest obsÅ‚ugiwane pod Windows." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Dos2unix powstaÅ‚ na podstawie narzÄ™dzia dos2unix z systemu SunOS/Solaris. Jest jedna istotna różnica w stosunku do oryginalnej wersji z SunOS-a/Solarisa: ta wersja domyÅ›lnie wykonuje konwersjÄ™ w miejscu (tryb starego pliku), podczas gdy oryginalna obsÅ‚ugiwaÅ‚a tylko konwersjÄ™ parami (tryb nowego pliku) - p. także opcje C<-o> i C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +msgstr "" +"Dos2unix powstaÅ‚ na podstawie narzÄ™dzia dos2unix z systemu SunOS/Solaris. " +"Jest jedna istotna różnica w stosunku do oryginalnej wersji z SunOS-a/" +"Solarisa: ta wersja domyÅ›lnie wykonuje konwersjÄ™ w miejscu (tryb starego " +"pliku), podczas gdy oryginalna obsÅ‚ugiwaÅ‚a tylko konwersjÄ™ parami (tryb " +"nowego pliku) - p. także opcje C<-o> i C<-n>." #. type: =head1 #: dos2unix.pod:90 @@ -93,8 +140,15 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "Potraktowanie wszystkich kolejnych opcji jako nazw plików. Tej opcji należy użyć, aby przekonwertować pliki, których nazwy zaczynajÄ… siÄ™ od minusa. PrzykÅ‚adowo, aby przekonwertować plik o nazwie \"-foo\", można użyć polecenia:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"Potraktowanie wszystkich kolejnych opcji jako nazw plików. Tej opcji należy " +"użyć, aby przekonwertować pliki, których nazwy zaczynajÄ… siÄ™ od minusa. " +"PrzykÅ‚adowo, aby przekonwertować plik o nazwie \"-foo\", można użyć " +"polecenia:" #. type: verbatim #: dos2unix.pod:100 @@ -138,8 +192,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -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." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"Konwersja miÄ™dzy zestawami znaków DOS i ISO-8859-1. WiÄ™cej w sekcji TRYBY " +"KONWERSJI." #. type: =item #: dos2unix.pod:115 @@ -158,8 +216,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -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." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"Użycie strony kodowej DOS 437 (US). Jest to domyÅ›lna strona kodowa używana " +"przy konwersji ISO." #. type: =item #: dos2unix.pod:123 @@ -218,8 +280,14 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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>." +msgid "" +"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " +"the output file. This is the default behavior when converting to DOS line " +"breaks. See also option C<-r>." +msgstr "" +"Zachowanie znaku BOM (Byte Order Makr). Jeżeli plik wejÅ›ciowy zawiera BOM, " +"powoduje zapisanie go w pliku wyjÅ›ciowym. Jest to domyÅ›lne zachowanie przy " +"konwersji na DOS-owe koÅ„ce linii. P. także opcja C<-r>." #. type: =item #: dos2unix.pod:149 @@ -228,8 +296,12 @@ msgstr "B<-c, --convmode TRYB_KONW>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"Ustawienie trybu konwersji. TRYB_KONW to jeden z: I<ascii>, I<7bit>, I<iso>, " +"I<mac>, przy czym domyÅ›lny jest ascii." #. type: =item #: dos2unix.pod:155 @@ -259,7 +331,9 @@ msgstr "B<-k, --keepdate>" #. type: textblock #: dos2unix.pod:165 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." +msgstr "" +"Zachowanie znacznika czasu pliku wyjÅ›ciowego takiego samego, jak pliku " +"wejÅ›ciowego." #. type: =item #: dos2unix.pod:167 @@ -283,13 +357,21 @@ msgstr "Dodanie dodatkowego znaku koÅ„ca linii." #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -298,231 +380,409 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "Zapis znacznika BOM (Byte Order Mark) UTF-8 w pliku wyjÅ›ciowym. Nie należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż UTF-8. WiÄ™cej w sekcji UNICODE." +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: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Nigdy nie należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż " +"UTF-8 lub UTF-16. WiÄ™cej w sekcji UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile PLIK_WEJ PLIK_WYJ ...>" #. type: textblock -#: dos2unix.pod:189 -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." +#: dos2unix.pod:196 +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:193 -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Ä™." +#: dos2unix.pod:200 +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:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile PLIK ...>" #. type: textblock -#: dos2unix.pod:200 -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." +#: dos2unix.pod:207 +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:203 -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." +#: dos2unix.pod:210 +msgid "" +"In old file (in-place) mode the converted file gets the same owner, group, " +"and read/write permissions as the original file. Also when the file is " +"converted by another user who has write permissions on the file (e.g. user " +"root). The conversion will be aborted when it is not possible to preserve " +"the original values. Change of owner could mean that the original owner is " +"not able to read the file any more. Change of group could be a security " +"risk, the file could be made readable for persons for whom it is not " +"intended. Preservation of owner, group, and read/write permissions is only " +"supported on Unix." +msgstr "" +"W trybie starego pliku (w miejscu) przekonwertowany plik otrzymuje tego " +"samego wÅ‚aÅ›ciciela, grupÄ™ oraz prawa odczytu/zapisu, jak plik oryginalny - " +"także wtedy, gdy plik jest konwertowany przez innego użytkownika, majÄ…cego " +"prawo zapisu do pliku (np. przez użytkownika root). Konwersja zostanie " +"przerwana, jeÅ›li nie bÄ™dzie możliwe zachowanie oryginalnych wartoÅ›ci. Zmiana " +"wÅ‚aÅ›ciciela mogÅ‚aby oznaczać, że pierwotny wÅ‚aÅ›ciciel nie może już odczytać " +"pliku. Zmiana grupy mogÅ‚aby być zagrożeniem bezpieczeÅ„stwa, plik mógÅ‚by być " +"czytelny dla nie zamierzonych osób. Zachowanie wÅ‚aÅ›ciciela, grupy i praw " +"odczytu/zapisu jest obsÅ‚ugiwane tylko na Uniksie." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -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Å„." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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>." +#: dos2unix.pod:226 +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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "PominiÄ™cie plików binarnych (domyÅ›lne)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 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:231 -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Ä…." +#: dos2unix.pod:245 +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:234 -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." +#: dos2unix.pod:248 +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:239 -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." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 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:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "Ta opcja dziaÅ‚a analogicznie do C<-ul>." #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +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:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "Podążanie za dowiÄ…zaniami symbolicznymi i konwertowanie ich celów" #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -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)." +#: dos2unix.pod:273 +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:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Pozostawienie dowiÄ…zaÅ„ symbolicznych i celów bez zmian (domyÅ›lne)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "WyÅ›wietlenie informacji o wersji i zakoÅ„czenie." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "TRYB MAC" #. type: textblock -#: dos2unix.pod:269 -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." +#: dos2unix.pod:288 +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:272 -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." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "TRYBY KONWERSJI" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -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." +#: dos2unix.pod:303 +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:287 -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." +#: dos2unix.pod:306 +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:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -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." +#: dos2unix.pod:312 +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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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:303 -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." +#: dos2unix.pod:317 +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:312 -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." +#: dos2unix.pod:322 +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:331 +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:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Kilka przykÅ‚adów:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -532,12 +792,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" msgstr "Konwersja ze strony DOS CP850 do uniksowego Latin-1" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -547,12 +807,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" msgstr "Konwersja ze strony Windows CP1252 do uniksowego Latin-1" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -562,12 +822,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" msgstr "Konwersja ze strony Windows CP1252 do uniksowego UTF-8 (Unicode)" #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -577,12 +837,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 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:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -592,12 +852,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" msgstr "Konwersja z uniksowego Latin-1 do strony DOS CP850" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -607,12 +867,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" msgstr "Konwersja z uniksowego Latin-1 do strony Windows CP1252" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -622,12 +882,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" msgstr "Konwersja z uniksowego UTF-8 (Unicode) do strony Windows CP1252" #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -637,112 +897,200 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Kodowania" #. type: textblock -#: dos2unix.pod:357 -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." +#: dos2unix.pod:376 +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:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Konwersje" #. type: textblock -#: dos2unix.pod:364 -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." +#: dos2unix.pod:383 +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:367 -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." +#: dos2unix.pod:386 +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:370 -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>." +#: dos2unix.pod:389 +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:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "Wersje programów dos2unix i unix2dos dla systemu Windows konwertujÄ… pliki kodowane UTF-16 zawsze do UTF-8. Uniksowe wersje dos2unix/unix2dos konwertujÄ… pliki kodowane UTF-16 do zestawu znaków ustawionej lokalizacji, kiedy jest ustawiony na UTF-8. Zestaw znaków lokalizacji można sprawdzić poleceniem locale(1)." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" +"Pliki w kodowaniu UTF-16 sÄ… domyÅ›lnie konwertowane do UTF-8. Pod Uniksem/" +"Linuksem wymagane jest, żeby kodowanie znaków używanej lokalizacji byÅ‚o " +"ustawione na UTF-8. Kodowanie znaków dla lokalizacji można sprawdzić " +"poleceniem locale(1). Pliki tekstkowe w kodowaniu UTF-8 sÄ… dobrze " +"obsÅ‚ugiwane zarówno pod Windows, jak i Uniksem/Linuksem." + +#. type: textblock +#: dos2unix.pod:398 +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:402 +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:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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 "Ponieważ pliki tekstowe kodowane UTF-8 sÄ… dobrze obsÅ‚ugiwane zarówno pod Windows, jak i Uniksem, dos2unix i unix2dos nie majÄ… opcji zapisu plików UTF-16. Wszystkie znaki UTF-16 mogÄ… być zakodowane w UTF-8, konwersja z UTF-16 do UTF-8 jest bezstratna. Pliki UTF-16 bÄ™dÄ… pominiÄ™te na Uniksie, jeÅ›li zestaw znaków lokalizacji to nie UTF-8, aby zapobiec przypadkowej utracie tekstu. W przypadku bÅ‚Ä™du konwersji UTF-16 do UTF-8, na przykÅ‚ad kiedy plik wejÅ›ciowy UTF-16 zawiera bÅ‚Ä…d, plik bÄ™dzie pominiÄ™ty." +#: dos2unix.pod:405 +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:387 +#: dos2unix.pod:407 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:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Znacznik BOM" #. type: textblock -#: dos2unix.pod:391 -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)>." +#: dos2unix.pod:411 +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:395 -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." +#: dos2unix.pod:415 +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:398 -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." +#: dos2unix.pod:418 +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:402 +#: dos2unix.pod:422 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>." +msgstr "" +"Do konwersji pliku UTF-16 bez znacznika BOM można użyć opcji C<-ul> lub C<-" +"ub>." #. type: textblock -#: dos2unix.pod:404 -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." +#: dos2unix.pod:424 +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:407 -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>." +#: dos2unix.pod:427 +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:410 +#: dos2unix.pod:430 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>." +msgstr "" +"Dos2unix oraz unix2dos zawsze zapisujÄ… znaczniki BOM, jeÅ›li użyta zostanie " +"opcja C<-m>." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "PrzykÅ‚ady Unicode" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8" msgstr "Konwersja pliku UTF-16 z Windows (z BOM) do uniksowego UTF-8" #. type: verbatim -#: dos2unix.pod:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -752,12 +1100,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8" msgstr "Konwersja pliku UTF-16LE z Windows (bez BOM) do uniksowego UTF-8" #. type: verbatim -#: dos2unix.pod:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -767,12 +1115,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM" msgstr "Konwersja z uniksowego UTF-8 do UTF-8 dla Windows z BOM" #. type: verbatim -#: dos2unix.pod:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -782,12 +1130,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 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:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -797,17 +1145,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "PRZYKÅADY" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 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:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -819,12 +1167,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -836,12 +1184,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 msgid "Convert and replace a.txt in ascii conversion mode." msgstr "Konwersja i zastÄ…pienie a.txt w trybie ascii." #. type: verbatim -#: dos2unix.pod:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -851,12 +1199,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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." +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -870,12 +1222,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "Konwersja a.txt z formatu Mac do formatu uniksowego." #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -887,12 +1239,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Konwersja a.txt z formatu uniksowego do formatu Mac." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -904,12 +1256,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 msgid "Convert and replace a.txt while keeping original date stamp." -msgstr "Konwersja i zastÄ…pienie a.txt z zachowaniem oryginalnego znacznika czasu." +msgstr "" +"Konwersja i zastÄ…pienie a.txt z zachowaniem oryginalnego znacznika czasu." #. type: verbatim -#: dos2unix.pod:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -921,12 +1274,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Konwersja a.txt i zapis do e.txt." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -936,12 +1289,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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." +#: dos2unix.pod:492 +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:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -951,12 +1307,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -968,12 +1324,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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." +#: dos2unix.pod:501 +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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -983,17 +1343,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "KONWERSJA REKURENCYJNA" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Można użyć dos2unix w poÅ‚Ä…czeniu z poleceniami find(1) i xargs(1) do rekurencyjnej konwersji plików tekstowych w strukturze drzewa katalogów. Na przykÅ‚ad, aby przekonwertować wszystkie pliki .txt w drzewie katalogów poniżej katalogu bieżącego, należy napisać:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Można użyć dos2unix w poÅ‚Ä…czeniu z poleceniami find(1) i xargs(1) do " +"rekurencyjnej konwersji plików tekstowych w strukturze drzewa katalogów. Na " +"przykÅ‚ad, aby przekonwertować wszystkie pliki .txt w drzewie katalogów " +"poniżej katalogu bieżącego, należy napisać:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1003,22 +1371,34 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "LOKALIZACJA" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -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:" +#: dos2unix.pod:520 +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:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1040,47 +1420,82 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -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/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +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/gettext.html#Language-Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to 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)." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to 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:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -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/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +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/gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -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." +#: dos2unix.pod:551 +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:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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." +#: dos2unix.pod:557 +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:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "PrzykÅ‚ad (dla powÅ‚oki POSIX):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1090,76 +1505,89 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "WARTOŚĆ ZWRACANA" #. type: textblock -#: dos2unix.pod:551 -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." +#: dos2unix.pod:571 +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:554 -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Å„." +#: dos2unix.pod:574 +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:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "STANDARDY" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://pl.wikipedia.org/wiki/Plik_tekstowy>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://pl.wikipedia.org/wiki/End-of-line>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://pl.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTORZY" #. type: textblock -#: dos2unix.pod:569 -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)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Strona SourceForge: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Strona Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "ZOBACZ TAKÅ»E" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" + +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Strona Freecode: L<http://freecode.com/projects/dos2unix>" diff --git a/man/pl/man1/dos2unix.pod b/man/pl/man1/dos2unix.pod index 42e2257..96c15de 100644 --- a/man/pl/man1/dos2unix.pod +++ b/man/pl/man1/dos2unix.pod @@ -155,9 +155,16 @@ macowe. =item B<-m, --add-bom> -Zapis znacznika BOM (Byte Order Mark) UTF-8 w pliku wyjÅ›ciowym. Nie należy -używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż UTF-8. WiÄ™cej w -sekcji UNICODE. +Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjÅ›ciowym. DomyÅ›lnie +zapisywany jest BOM UTF-8. + +JeÅ›li plik wejÅ›ciowy jest w kodowaniu UTF-16 i użyto opcji C<-u>, zostanie +zapisany BOM UTF-16. + +Nigdy nie należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż +UTF-8 lub UTF-16. WiÄ™cej w sekcji UNICODE. + + =item B<-n, --newfile PLIK_WEJ PLIK_WYJ ...> @@ -200,6 +207,14 @@ linii. P. także opcja C<-b>. PominiÄ™cie plików binarnych (domyÅ›lne). +=item B<-u, --keep-utf16> + +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>. + =item B<-ul, --assume-utf16le> PrzyjÄ™cie, że format pliku wejÅ›ciowego to UTF-16LE. @@ -222,6 +237,12 @@ PrzyjÄ™cie, że format pliku wejÅ›ciowego to UTF-16BE. Ta opcja dziaÅ‚a analogicznie do C<-ul>. +=item B<-v, --verbose> + +WyÅ›wietlanie szczegółowych komunikatów. WyÅ›wietlane Å›a dodatkowe informacje +o znacznikach BOM (Byte Order Mark) oraz liczbie przekonwertowanych koÅ„ców +linii. + =item B<-F, --follow-symlink> Podążanie za dowiÄ…zaniami symbolicznymi i konwertowanie ich celów @@ -351,19 +372,22 @@ 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>. -Wersje programów dos2unix i unix2dos dla systemu Windows konwertujÄ… pliki -kodowane UTF-16 zawsze do UTF-8. Uniksowe wersje dos2unix/unix2dos -konwertujÄ… pliki kodowane UTF-16 do zestawu znaków ustawionej lokalizacji, -kiedy jest ustawiony na UTF-8. Zestaw znaków lokalizacji można sprawdzić -poleceniem locale(1). +Pliki w kodowaniu UTF-16 sÄ… domyÅ›lnie konwertowane do UTF-8. Pod +Uniksem/Linuksem wymagane jest, żeby kodowanie znaków używanej lokalizacji +byÅ‚o ustawione na UTF-8. Kodowanie znaków dla lokalizacji można sprawdzić +poleceniem locale(1). Pliki tekstkowe w kodowaniu UTF-8 sÄ… dobrze +obsÅ‚ugiwane zarówno pod Windows, jak i Uniksem/Linuksem. + +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. -Ponieważ pliki tekstowe kodowane UTF-8 sÄ… dobrze obsÅ‚ugiwane zarówno pod -Windows, jak i Uniksem, dos2unix i unix2dos nie majÄ… opcji zapisu plików -UTF-16. Wszystkie znaki UTF-16 mogÄ… być zakodowane w UTF-8, konwersja z -UTF-16 do UTF-8 jest bezstratna. Pliki UTF-16 bÄ™dÄ… pominiÄ™te na Uniksie, -jeÅ›li zestaw znaków lokalizacji to nie UTF-8, aby zapobiec przypadkowej -utracie tekstu. W przypadku bÅ‚Ä™du konwersji UTF-16 do UTF-8, na przykÅ‚ad -kiedy plik wejÅ›ciowy UTF-16 zawiera bÅ‚Ä…d, plik bÄ™dzie pominiÄ™ty. +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. + +Dos2unix oraz unix2dos nie majÄ… opcji pozwalajÄ…cej na konwersjÄ™ plików UTF-8 +do UTF-16. Tryby konwersji ISO i 7-bit nie dziaÅ‚ajÄ… na plikach UTF-16. @@ -565,8 +589,6 @@ Strona projektu: L<http://waterlan.home.xs4all.nl/dos2unix.html> Strona SourceForge: L<http://sourceforge.net/projects/dos2unix/> -Strona Freecode: L<http://freecode.com/projects/dos2unix> - =head1 ZOBACZ TAKÅ»E file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/pl/man1/dos2unix.txt b/man/pl/man1/dos2unix.txt index c8f9ed6..8dade6d 100644 --- a/man/pl/man1/dos2unix.txt +++ b/man/pl/man1/dos2unix.txt @@ -114,9 +114,14 @@ OPCJE dwa macowe. -m, --add-bom - Zapis znacznika BOM (Byte Order Mark) UTF-8 w pliku wyjÅ›ciowym. Nie - należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest inne niż - UTF-8. WiÄ™cej w sekcji UNICODE. + Zapisanie znacznika BOM (Byte Order Mark) w pliku wyjÅ›ciowym. + DomyÅ›lnie zapisywany jest BOM UTF-8. + + JeÅ›li plik wejÅ›ciowy jest w kodowaniu UTF-16 i użyto opcji "-u", + zostanie zapisany BOM UTF-16. + + Nigdy nie należy używać tej opcji, jeÅ›li kodowanie wyjÅ›ciowe jest + inne niż UTF-8 lub UTF-16. WiÄ™cej w sekcji UNICODE. -n, --newfile PLIK_WEJ PLIK_WYJ ... Tryb nowego pliku. Konwersja PLIKU_WEJ z zapisem wyjÅ›cia do @@ -155,6 +160,13 @@ OPCJE -s, --safe PominiÄ™cie plików binarnych (domyÅ›lne). + -u, --keep-utf16 + 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Ä… "-ascii". + -ul, --assume-utf16le PrzyjÄ™cie, że format pliku wejÅ›ciowego to UTF-16LE. @@ -175,6 +187,11 @@ OPCJE Ta opcja dziaÅ‚a analogicznie do "-ul". + -v, --verbose + WyÅ›wietlanie szczegółowych komunikatów. WyÅ›wietlane Å›a dodatkowe + informacje o znacznikach BOM (Byte Order Mark) oraz liczbie + przekonwertowanych koÅ„ców linii. + -F, --follow-symlink Podążanie za dowiÄ…zaniami symbolicznymi i konwertowanie ich celów @@ -287,19 +304,23 @@ UNICODE dos2unix zostaÅ‚ zbudowany z obsÅ‚ugÄ… UTF-16, należy napisać "dos2unix -V". - Wersje programów dos2unix i unix2dos dla systemu Windows konwertujÄ… - pliki kodowane UTF-16 zawsze do UTF-8. Uniksowe wersje dos2unix/unix2dos - konwertujÄ… pliki kodowane UTF-16 do zestawu znaków ustawionej - lokalizacji, kiedy jest ustawiony na UTF-8. Zestaw znaków lokalizacji - można sprawdzić poleceniem locale(1). + Pliki w kodowaniu UTF-16 sÄ… domyÅ›lnie konwertowane do UTF-8. Pod + Uniksem/Linuksem wymagane jest, żeby kodowanie znaków używanej + lokalizacji byÅ‚o ustawione na UTF-8. Kodowanie znaków dla lokalizacji + można sprawdzić poleceniem locale(1). Pliki tekstkowe w kodowaniu UTF-8 + sÄ… dobrze obsÅ‚ugiwane zarówno pod Windows, jak i Uniksem/Linuksem. - Ponieważ pliki tekstowe kodowane UTF-8 sÄ… dobrze obsÅ‚ugiwane zarówno pod - Windows, jak i Uniksem, dos2unix i unix2dos nie majÄ… opcji zapisu plików - UTF-16. Wszystkie znaki UTF-16 mogÄ… być zakodowane w UTF-8, konwersja z - UTF-16 do UTF-8 jest bezstratna. Pliki UTF-16 bÄ™dÄ… pominiÄ™te na Uniksie, - jeÅ›li zestaw znaków lokalizacji to nie UTF-8, aby zapobiec przypadkowej - utracie tekstu. W przypadku bÅ‚Ä™du konwersji UTF-16 do UTF-8, na przykÅ‚ad - kiedy plik wejÅ›ciowy UTF-16 zawiera bÅ‚Ä…d, plik bÄ™dzie pominiÄ™ty. + 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. + + W przypadku użycia opcji "-u", plik wejÅ›ciowy zostanie zapisany w tym + samym kodowaniu UTF-16, co plik wejÅ›ciowy. Opcja "-u" zapobiega + konwersji do UTF-8. + + Dos2unix oraz unix2dos nie majÄ… opcji pozwalajÄ…cej na konwersjÄ™ plików + UTF-8 do UTF-16. Tryby konwersji ISO i 7-bit nie dziaÅ‚ajÄ… na plikach UTF-16. @@ -489,8 +510,6 @@ AUTORZY Strona SourceForge: <http://sourceforge.net/projects/dos2unix/> - Strona Freecode: <http://freecode.com/projects/dos2unix> - ZOBACZ TAKÅ»E file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1 index 21afe00..1ecf20b 100644 --- a/man/pt_BR/man1/dos2unix.1 +++ b/man/pt_BR/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -200,9 +200,14 @@ de linha do \s-1DOS.\s0 No modo Mac, quebras de linha do Unix são alteradas par duas quebras de linha do Mac. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -Escreve com marca de ordem de byte de \s-1UTF\-8\s0 no arquivo de saÃda. Nunca use -essa opção quando a codificação de saÃda for outra que não \s-1UTF\-8.\s0 Veja -também a seção \s-1UNICODE.\s0 +Escreve uma marca de ordem de byte (\s-1BOM\s0) no arquivo de saÃda. Por padrão, um +\&\s-1BOM UTF\-8\s0 é escrito. +.Sp +Quando o arquivo de entrada é \s-1UTF\-16,\s0 e a opção \f(CW\*(C`\-u\*(C'\fR é usada, um \s-1BOM UTF\-16\s0 +será escrito. +.Sp +Nunca use essa opção quando a codificação de saÃda é outra além de \s-1UTF\-8\s0 ou +\&\s-1UTF\-16.\s0 Veja também a seção \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile \s-1ARQENT\s0 ARQSAÃDA ...\fR" 4 .IX Item "-n, --newfile ARQENT ARQSAÃDA ..." Modo de novo arquivo. Converte o arquivo \s-1ARQENT\s0 e escreve a saÃda para o @@ -240,6 +245,13 @@ Unix. Veja também a opção \f(CW\*(C`\-b\*(C'\fR. .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" Ignora arquivo binários (padrão). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Mantém a codificação \s-1UTF\-16\s0 original do arquivo de entrada. O arquivo de +saÃda será escrito na mesma codificação \s-1UTF\-16,\s0 em little ou big endian, +como o arquivo de entrada. Isso evita transformação para \s-1UTF\-8.\s0 Como +consequência, um \s-1BOM UTF\-16\s0 será escrito. Essa opção pode ser desabilitada +com a opção \f(CW\*(C`\-ascii\*(C'\fR. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" Presume que o formato de arquivo de entrada é \s-1UTF\-16LE.\s0 @@ -260,6 +272,10 @@ o modo \fIascii\fR padrão, a presunção de \s-1UTF\-16LE\s0 é desativada. Presume que o formato de arquivo de entrada é \s-1UTF\-16BE.\s0 .Sp Essa opção funciona o mesmo que a opção \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem +de byte e a quantidade de quebras de linha convertidas. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Segue ligações simbólicas e converte os alvos. @@ -391,20 +407,23 @@ Dos2unix e unix2dos com suporte a Unicode \s-1UTF\-16\s0 podem ler arquivos text codificados em little e big endian \s-1UTF\-16.\s0 Para ver se dos2unix foi compilado com suporte a \s-1UTF\-16,\s0 digite \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -As versões do Windows do dos2unix e unix2dos convertem arquivos codificados -em \s-1UTF\-16\s0 sempre para arquivos \s-1UTF\-8.\s0 Versões Unix do dos2unix/unix2dos -convertem arquivos codificados em \s-1UTF\-16\s0 para a codificação de caracteres da -localização quando esta estiver definida para \s-1UTF\-8.\s0 Usa o comando \fIlocale\fR\|(1) -para descobrir qual é a codificação de caracteres da localização. -.PP -Por causa dos arquivos texto formatados em \s-1UTF\-8\s0 terem bom suporte em tanto -Windows e Unix, dos2unix e unix2dos têm a opção de escrever arquivos -\&\s-1UTF\-16.\s0 Todos os caracteres \s-1UTF\-16\s0 podem ser codificados em \s-1UTF\-8.\s0 Conversão -de \s-1UTF\-16\s0 para \s-1UTF\-8\s0 não tem perda. Arquivos \s-1UTF\-16\s0 serão ignorados no Unix -quando a codificação de caracteres da localização não for \s-1UTF\-8,\s0 para evitar -perda acidental de texto. Quando um erro de conversão entre \s-1UTF\-16\s0 e \s-1UTF\-8\s0 -ocorre (por exemplo, quando o arquivo de entrada em \s-1UTF\-16\s0 contém um erro), -o arquivo será ignorado. +Arquivos codificados em \s-1UTF\-16\s0 são, por padrão, convertidos para \s-1UTF\-8.\s0 No +Unix/Linux, é necessário que a codificação de caracteres da localização +esteja definida para \s-1UTF\-8.\s0 Use o comando \fIlocale\fR\|(1) para descobrir qual é a +codificação de caracteres da localização. Arquivos textos formatados em +\&\s-1UTF\-8\s0 possuem suporte em tanto Windows quanto Unix/Linux. +.PP +Codificações \s-1UTF\-16\s0 e \s-1UTF\-8\s0 são completamente compatÃveis, não havendo +qualquer perda de texto na conversão. Quando um erro de conversão \s-1UTF\-16\s0 +para \s-1UTF\-8\s0 ocorre, por exemplo quando o arquivo de entrada \s-1UTF\-16 \s0 contém um +erro, o arquivo será ignorado. +.PP +Quando a opção \f(CW\*(C`\-u\*(C'\fR é usada, o arquivo de saÃda será escrito na mesma +codificação \s-1UTF\-16\s0 que o arquivo de saÃda. A opção \f(CW\*(C`\-u\*(C'\fR evita conversão +para \s-1UTF\-8.\s0 +.PP +Dos2unix e unix2dos não possuem opção para converter arquivos \s-1UTF\-8\s0 ára +\&\s-1UTF\-16.\s0 .PP Modo de conversão \s-1ISO\s0 e 7\-bit não funciona em arquivos \s-1UTF\-16.\s0 .SS "Marca de ordem de byte" @@ -617,8 +636,6 @@ Benjamin Lin \- <blin@socs.uts.edu.au> Bernd Johannes Wuebben (modo mac2unix) Página do projeto: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP Página do SourceForge: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "Veja também" .IX Header "Veja também" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm index 4104ae3..fee6557 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 6.0.6 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title> +<title>dos2unix 7.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:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Trata as opções seguintes como nomes de arquivos. Use essa opção se você quiser converter arquivos cujos nomes iniciam com um traço. Por exemplo, para converter um arquivo chamado "foo", você pode usar este comando:</p> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Escreve com marca de ordem de byte de UTF-8 no arquivo de saída. Nunca use essa opção quando a codificação de saída for outra que não UTF-8. Veja também a seção UNICODE.</p> +<p>Escreve uma marca de ordem de byte (BOM) no arquivo de saída. Por padrão, um BOM UTF-8 é escrito.</p> + +<p>Quando o arquivo de entrada é UTF-16, e a opção <code>-u</code> é usada, um BOM UTF-16 será escrito.</p> + +<p>Nunca use essa opção quando a codificação de saída é outra além de UTF-8 ou UTF-16. Veja também a seção UNICODE.</p> </dd> -<dt id="n---newfile-ARQENT-ARQSADA-..."><b>-n, --newfile ARQENT ARQSAÍDA ...</b></dt> +<dt id="n---newfile-ARQENT-ARQSADA"><b>-n, --newfile ARQENT ARQSAÍDA ...</b></dt> <dd> <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> @@ -190,7 +194,7 @@ <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> </dd> -<dt id="o---oldfile-ARQUIVO-..."><b>-o, --oldfile ARQUIVO ...</b></dt> +<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> @@ -216,6 +220,12 @@ <p>Ignora arquivo binários (padrão).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>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 <code>-ascii</code>.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Essa opção funciona o mesmo que a opção <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem de byte e a quantidade de quebras de linha convertidas.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>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 <code>dos2unix -V</code>.</p> -<p>As versões do Windows do dos2unix e unix2dos convertem arquivos codificados em UTF-16 sempre para arquivos UTF-8. Versões Unix do dos2unix/unix2dos convertem arquivos codificados em UTF-16 para a codificação de caracteres da localização quando esta estiver definida para UTF-8. Usa o comando locale(1) para descobrir qual é a codificação de caracteres da localização.</p> +<p>Arquivos codificados em UTF-16 são, por padrão, convertidos para UTF-8. No Unix/Linux, é necessário que a codificação de caracteres da localização esteja definida para UTF-8. Use o comando locale(1) para descobrir qual é a codificação de caracteres da localização. Arquivos textos formatados em UTF-8 possuem suporte em tanto Windows quanto Unix/Linux.</p> -<p>Por causa dos arquivos texto formatados em UTF-8 terem bom suporte em tanto Windows e Unix, dos2unix e unix2dos têm a opção de escrever arquivos UTF-16. Todos os caracteres UTF-16 podem ser codificados em UTF-8. Conversão de UTF-16 para UTF-8 não tem perda. Arquivos UTF-16 serão ignorados no Unix quando a codificação de caracteres da localização não for UTF-8, para evitar perda acidental de texto. Quando um erro de conversão entre UTF-16 e UTF-8 ocorre (por exemplo, quando o arquivo de entrada em UTF-16 contém um erro), o arquivo será ignorado.</p> +<p>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.</p> + +<p>Quando a opção <code>-u</code> é usada, o arquivo de saída será escrito na mesma codificação UTF-16 que o arquivo de saída. A opção <code>-u</code> evita conversão para UTF-8.</p> + +<p>Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára UTF-16.</p> <p>Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16.</p> @@ -516,8 +536,6 @@ <p>Página do SourceForge: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="Veja-tambm">Veja também</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/pt_BR/man1/dos2unix.po b/man/pt_BR/man1/dos2unix.po index 22592ff..5572d47 100644 --- a/man/pt_BR/man1/dos2unix.po +++ b/man/pt_BR/man1/dos2unix.po @@ -6,16 +6,18 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" -"PO-Revision-Date: 2014-07-09 22:56-0300\n" +"Project-Id-Version: dos2unix-man 6.1-beta1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-28 00:05-0300\n" "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" -"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n" +"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." +"net>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.5\n" +"X-Generator: Poedit 1.6.7\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. type: =head1 @@ -26,7 +28,9 @@ msgstr "NOME" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa" +msgstr "" +"dos2unix - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-" +"versa" #. type: =head1 #: dos2unix.pod:56 @@ -52,38 +56,85 @@ msgstr "DESCRIÇÃO" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "O pacote Dos2unix inclui utilitários de C<dos2unix> e C<unix2dos> para converter arquivos texto nos formatos DOS ou Mac para formato Unix e vice-versa." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"O pacote Dos2unix inclui utilitários de C<dos2unix> e C<unix2dos> para " +"converter arquivos texto nos formatos DOS ou Mac para formato Unix e vice-" +"versa." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "Em arquivos texto DOS/Windows uma quebra de linha, também conhecida como nova linha, é uma combinação de dois caracteres: um Carriage Return (CR) seguido por um Line Feed (LF). Em arquivos texto do Unix uma quebra de linha é um único caractere: o Line Feed (LF). Em arquivos texto do Mac, anteriores ao Mac OS X, uma quebra de linha era um único caractere Carriage Return (CR). Hoje em dia, Mac OS usa quebras de linha no estilo do Unix (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"Em arquivos texto DOS/Windows uma quebra de linha, também conhecida como " +"nova linha, é uma combinação de dois caracteres: um Carriage Return (CR) " +"seguido por um Line Feed (LF). Em arquivos texto do Unix uma quebra de linha " +"é um único caractere: o Line Feed (LF). Em arquivos texto do Mac, anteriores " +"ao Mac OS X, uma quebra de linha era um único caractere Carriage Return " +"(CR). Hoje em dia, Mac OS usa quebras de linha no estilo do Unix (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Além das quebras de linhas, Dos2unix também pode converter as codificações de arquivos. Algumas poucas páginas podem ser convertidos para Latin-1 para Unix. E arquivos Unicode do Windows (UTF-16) podem ser convertidos para arquivos Unicode do Unix (UTF-8)." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Além das quebras de linhas, Dos2unix também pode converter as codificações " +"de arquivos. Algumas poucas páginas podem ser convertidos para Latin-1 para " +"Unix. E arquivos Unicode do Windows (UTF-16) podem ser convertidos para " +"arquivos Unicode do Unix (UTF-8)." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Arquivos binários são ignorados automaticamente, a menos que a conversão seja forçada." +msgstr "" +"Arquivos binários são ignorados automaticamente, a menos que a conversão " +"seja forçada." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Arquivos não regulares, tais como diretórios e FIFOs, são ignorados automaticamente." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Arquivos não regulares, tais como diretórios e FIFOs, são ignorados " +"automaticamente." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "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." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"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." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Dos2unix foi modelado seguindo dos2unix do SunOS/Solaris. Há uma diferença importante em relação à versão original do SunOS/Solaris. Essa versão faz conversão no-lugar (modo arquivo antigo) por padrão, enquanto a versão original do SunOS/Solaris fornecia suporte apenas a conversão pareada (modo de novo arquivo). Veja também as opções C<-o> e C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +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>." #. type: =head1 #: dos2unix.pod:90 @@ -97,8 +148,14 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "Trata as opções seguintes como nomes de arquivos. Use essa opção se você quiser converter arquivos cujos nomes iniciam com um traço. Por exemplo, para converter um arquivo chamado \"foo\", você pode usar este comando:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"Trata as opções seguintes como nomes de arquivos. Use essa opção se você " +"quiser converter arquivos cujos nomes iniciam com um traço. Por exemplo, " +"para converter um arquivo chamado \"foo\", você pode usar este comando:" #. type: verbatim #: dos2unix.pod:100 @@ -133,7 +190,8 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:108 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." +msgstr "" +"Converte apenas as quebras de linhas. Esse é o modo de conversão padrão." #. type: =item #: dos2unix.pod:110 @@ -142,8 +200,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -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." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"Conversão entre conjunto de caractere do DOS e ISO-8859-1. Veja também a " +"seção MODOS DE CONVERSÃO." #. type: =item #: dos2unix.pod:115 @@ -162,8 +224,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -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." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"Usa a página de código 437 do DOS (EUA). Essa é a página de código padrão " +"usada para conversão ISO." #. type: =item #: dos2unix.pod:123 @@ -222,8 +288,14 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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>." +msgid "" +"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " +"the output file. This is the default behavior when converting to DOS line " +"breaks. See also option C<-r>." +msgstr "" +"Mantém marca de ordem de bytes (BOM). Quando o arquivo de entrada possuir um " +"BOM, escreve um BOM no arquivo de saÃda. Esse é o comportamento padrão ao " +"converter para quebras de linha do DOS. Veja também a opção C<-r>." #. type: =item #: dos2unix.pod:149 @@ -232,8 +304,12 @@ msgstr "B<-c, --convmode MODOCONV>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>, " +"I<iso>, I<mac> com ascii sendo o padrão." #. type: =item #: dos2unix.pod:155 @@ -263,7 +339,8 @@ msgstr "B<-k, --keepdate>" #. type: textblock #: dos2unix.pod:165 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." +msgstr "" +"Mantém a marca da data do arquivo de saÃda igual ao do arquivo de entrada." #. type: =item #: dos2unix.pod:167 @@ -287,13 +364,23 @@ msgstr "Adiciona nova linha adicional." #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -302,231 +389,409 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "Escreve com marca de ordem de byte de UTF-8 no arquivo de saÃda. Nunca use essa opção quando a codificação de saÃda for outra que não UTF-8. Veja também a seção UNICODE." +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: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Nunca use essa opção quando a codificação de saÃda é outra além de UTF-8 ou " +"UTF-16. Veja também a seção UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ARQENT ARQSAÃDA ...>" #. type: textblock -#: dos2unix.pod:189 -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." +#: dos2unix.pod:196 +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:193 -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." +#: dos2unix.pod:200 +msgid "" +"The person who starts the conversion in new file (paired) mode will be the " +"owner of the converted file. The read/write permissions of the new file will " +"be the permissions of the original file minus the umask(1) of the person who " +"runs the conversion." +msgstr "" +"A pessoa que começa a conversão em modo novo arquivo (pareado) será o dono " +"do arquivo convertido. As permissões de leitura/escrita do novo arquivo " +"serão as permissões do arquivo original menos a umask(1) da pessoa que " +"executa a conversão." #. type: =item -#: dos2unix.pod:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ARQUIVO ...>" #. type: textblock -#: dos2unix.pod:200 -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." +#: dos2unix.pod:207 +msgid "" +"Old file mode. Convert file FILE and overwrite output to it. The program " +"defaults to run in this mode. Wildcard names may be used." +msgstr "" +"Modo arquivo antigo. Converte o arquivo ARQUIVO e o sobrescreve com a saÃda. " +"O programa, por padrão, executa neste modo. Nomes coringas podem ser usados." #. type: textblock -#: dos2unix.pod:203 -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." +#: dos2unix.pod:210 +msgid "" +"In old file (in-place) mode the converted file gets the same owner, group, " +"and read/write permissions as the original file. Also when the file is " +"converted by another user who has write permissions on the file (e.g. user " +"root). The conversion will be aborted when it is not possible to preserve " +"the original values. Change of owner could mean that the original owner is " +"not able to read the file any more. Change of group could be a security " +"risk, the file could be made readable for persons for whom it is not " +"intended. Preservation of owner, group, and read/write permissions is only " +"supported on Unix." +msgstr "" +"No modo de arquivo antigo (no-lugar) o arquivo convertido recebe no mesmo " +"dono, grupo e permissões de leitura/escrita que o arquivo original. Também, " +"quando o arquivo é convertido por outro usuário que tenha permissões de " +"escrita no arquivo (ex.: usuário root). A conversão será abortada quando não " +"for possÃvel preservar os valores originais. Alteração do dono pode " +"significar que o dono original não é mais capaz de ler o arquivo. Alteração " +"do grupo pode ser um risco para a segurança, pois o arquivo pode ficar " +"legÃvel para pessoas cujo acesso não é desejado. Preservação do dono, grupo " +"e permissões de leitura/escrita tem suporte apenas no Unix." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -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." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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>." +#: dos2unix.pod:226 +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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "Ignora arquivo binários (padrão)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 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:231 -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." +#: dos2unix.pod:245 +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:234 -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." +#: dos2unix.pod:248 +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:239 -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." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 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:246 +#: dos2unix.pod:260 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:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +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:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." msgstr "Segue ligações simbólicas e converte os alvos." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -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)." +#: dos2unix.pod:273 +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:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." msgstr "Mentém ligações simbólicas e alvos inalterados (padrão)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "Exibe informação da versão e sai." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "MODO MAC" #. type: textblock -#: dos2unix.pod:269 -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." +#: dos2unix.pod:288 +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:272 -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." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "MODOS DE CONVERSÃO" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -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." +#: dos2unix.pod:303 +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:287 -msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files." -msgstr "Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bit, o modo é em verdade 8 bit. Sempre use este modo quando quiser converter arquivos Unicode UTF-8." +#: dos2unix.pod:306 +msgid "" +"Although the name of this mode is ASCII, which is a 7 bit standard, the " +"actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 " +"files." +msgstr "" +"Apesar do nome deste modo ser ASCII, o qual é um padrão de 7 bit, o modo é " +"em verdade 8 bit. Sempre use este modo quando quiser converter arquivos " +"Unicode UTF-8." #. type: =item -#: dos2unix.pod:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space." -msgstr "Neste modo todos os caracteres não-ASCII de 8 bit (com valores entre 128 e 255) são convertidos para um espaço de 7 bit." +#: dos2unix.pod:312 +msgid "" +"In this mode all 8 bit non-ASCII characters (with values from 128 to 255) " +"are converted to a 7 bit space." +msgstr "" +"Neste modo todos os caracteres não-ASCII de 8 bit (com valores entre 128 e " +"255) são convertidos para um espaço de 7 bit." #. type: =item -#: dos2unix.pod:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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:303 -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." +#: dos2unix.pod:317 +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:312 -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." +#: dos2unix.pod:322 +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:331 +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:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 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:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -536,12 +801,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 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:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -551,12 +816,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 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:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -566,12 +831,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 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:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -581,12 +846,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 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:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -596,12 +861,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 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:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -611,12 +876,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 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:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -626,12 +891,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 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:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -641,112 +906,197 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "Codificações" #. type: textblock -#: dos2unix.pod:357 -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." +#: dos2unix.pod:376 +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:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "Conversão" #. type: textblock -#: dos2unix.pod:364 -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." +#: dos2unix.pod:383 +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:367 -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." +#: dos2unix.pod:386 +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:370 -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>." +#: dos2unix.pod:389 +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:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "As versões do Windows do dos2unix e unix2dos convertem arquivos codificados em UTF-16 sempre para arquivos UTF-8. Versões Unix do dos2unix/unix2dos convertem arquivos codificados em UTF-16 para a codificação de caracteres da localização quando esta estiver definida para UTF-8. Usa o comando locale(1) para descobrir qual é a codificação de caracteres da localização." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" +"Arquivos codificados em UTF-16 são, por padrão, convertidos para UTF-8. No " +"Unix/Linux, é necessário que a codificação de caracteres da localização " +"esteja definida para UTF-8. Use o comando locale(1) para descobrir qual é a " +"codificação de caracteres da localização. Arquivos textos formatados em " +"UTF-8 possuem suporte em tanto Windows quanto Unix/Linux." #. type: textblock -#: dos2unix.pod:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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 "Por causa dos arquivos texto formatados em UTF-8 terem bom suporte em tanto Windows e Unix, dos2unix e unix2dos têm a opção de escrever arquivos UTF-16. Todos os caracteres UTF-16 podem ser codificados em UTF-8. Conversão de UTF-16 para UTF-8 não tem perda. Arquivos UTF-16 serão ignorados no Unix quando a codificação de caracteres da localização não for UTF-8, para evitar perda acidental de texto. Quando um erro de conversão entre UTF-16 e UTF-8 ocorre (por exemplo, quando o arquivo de entrada em UTF-16 contém um erro), o arquivo será ignorado." +#: dos2unix.pod:398 +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:402 +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:387 +#: dos2unix.pod:405 +msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16." +msgstr "" +"Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára " +"UTF-16." + +#. type: textblock +#: dos2unix.pod:407 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." msgstr "Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16." #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Marca de ordem de byte" #. type: textblock -#: dos2unix.pod:391 -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>." +#: dos2unix.pod:411 +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:395 -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." +#: dos2unix.pod:415 +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:398 -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." +#: dos2unix.pod:418 +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:402 +#: dos2unix.pod:422 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:404 -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." +#: dos2unix.pod:424 +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:407 -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." +#: dos2unix.pod:427 +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:410 +#: dos2unix.pod:430 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:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Exemplos de Unicode" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 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:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -756,12 +1106,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 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:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -771,12 +1121,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 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:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -786,12 +1136,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 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:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -801,17 +1151,17 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "EXEMPLOS" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 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:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -823,12 +1173,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 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:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -840,12 +1190,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 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:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -855,12 +1205,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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." +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -874,12 +1228,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "Converte a.txt do formato do Mac para Unix." #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -891,12 +1245,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Converte a.txt do formato do Unix para Mac." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -908,12 +1262,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 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:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -925,12 +1279,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Converte a.txt e escreve para e.txt." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -940,12 +1294,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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." +#: dos2unix.pod:492 +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:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -955,12 +1312,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 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:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -972,12 +1329,16 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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." +#: dos2unix.pod:501 +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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -987,17 +1348,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "Conversão recursiva" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Use dos2unix em combinação com os comandos find(1) e xargs(1) para converter recursivamente arquivos texto em uma estrutura de árvore de diretórios. Por exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o diretório atual, digite:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Use dos2unix em combinação com os comandos find(1) e xargs(1) para converter " +"recursivamente arquivos texto em uma estrutura de árvore de diretórios. Por " +"exemplo, para converter todos os arquivos .txt na árvore de diretórios sob o " +"diretório atual, digite:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1007,22 +1376,33 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "LOCALIZAÇÃO" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:" -msgstr "O idioma primário é selecionado com a variável de ambiente LANG. A variável LANG consiste em várias partes. A primeira parte está em letras pequenas no código do idioma. A segunda parte é opcional e é o código do paÃs em letras maiúsculo, precedido de um ponto. Alguns exemplos para shells do tipo padrão POSIX:" +#: dos2unix.pod:520 +msgid "" +"The primary language is selected with the environment variable LANG. The " +"LANG variable consists out of several parts. The first part is in small " +"letters the language code. The second is optional and is the country code in " +"capital letters, preceded with an underscore. There is also an optional " +"third part: character encoding, preceded with a dot. A few examples for " +"POSIX standard type shells:" +msgstr "" +"O idioma primário é selecionado com a variável de ambiente LANG. A variável " +"LANG consiste em várias partes. A primeira parte está em letras pequenas no " +"código do idioma. A segunda parte é opcional e é o código do paÃs em letras " +"maiúsculo, precedido de um ponto. Alguns exemplos para shells do tipo padrão " +"POSIX:" #. type: verbatim -#: dos2unix.pod:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1044,47 +1424,82 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -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/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +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/gettext.html#Language-Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to 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." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to 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:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -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 a 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/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +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 " +"a 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/gettext." +"html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -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)." +#: dos2unix.pod:551 +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:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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." +#: dos2unix.pod:557 +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:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Exemplo (shell POSIX):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1094,85 +1509,141 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "VALOR RETORNADO" #. type: textblock -#: dos2unix.pod:551 -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." +#: dos2unix.pod:571 +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:554 -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." +#: dos2unix.pod:574 +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:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "PADRÕES" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://en.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://en.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "AUTORES" #. type: textblock -#: dos2unix.pod:569 -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)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 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:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Página do SourceForge: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "Veja também" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "Dos2unix never writes a BOM in the output file, unless you use option C<-m>." -#~ msgstr "Dos2unix nuncas escreve BOM no arquivo de saÃda, a menos que você use a opção C<-m>." - -#~ msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar conversion modes." -#~ msgstr "Dos2unix foi modelado após dos2unix sob SunOS/Solaris e tem modos de conversão similares." - -#~ msgid "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of dos2unix/unix2dos under SunOS/Solaris." -#~ msgstr "Modos de conversão I<ascii>, I<7bit> e I<iso> são similares à quelas do dos2unix/unix2dos no SunOS/Solaris." +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "As versões do Windows do dos2unix e unix2dos convertem arquivos " +#~ "codificados em UTF-16 sempre para arquivos UTF-8. Versões Unix do " +#~ "dos2unix/unix2dos convertem arquivos codificados em UTF-16 para a " +#~ "codificação de caracteres da localização quando esta estiver definida " +#~ "para UTF-8. Usa o comando locale(1) para descobrir qual é a codificação " +#~ "de caracteres da localização." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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 "" +#~ "Por causa dos arquivos texto formatados em UTF-8 terem bom suporte em " +#~ "tanto Windows e Unix, dos2unix e unix2dos têm a opção de escrever " +#~ "arquivos UTF-16. Todos os caracteres UTF-16 podem ser codificados em " +#~ "UTF-8. Conversão de UTF-16 para UTF-8 não tem perda. Arquivos UTF-16 " +#~ "serão ignorados no Unix quando a codificação de caracteres da localização " +#~ "não for UTF-8, para evitar perda acidental de texto. Quando um erro de " +#~ "conversão entre UTF-16 e UTF-8 ocorre (por exemplo, quando o arquivo de " +#~ "entrada em UTF-16 contém um erro), o arquivo será ignorado." + +#~ msgid "" +#~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" +#~ "m>." +#~ msgstr "" +#~ "Dos2unix nuncas escreve BOM no arquivo de saÃda, a menos que você use a " +#~ "opção C<-m>." + +#~ msgid "" +#~ "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar " +#~ "conversion modes." +#~ msgstr "" +#~ "Dos2unix foi modelado após dos2unix sob SunOS/Solaris e tem modos de " +#~ "conversão similares." + +#~ msgid "" +#~ "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of " +#~ "dos2unix/unix2dos under SunOS/Solaris." +#~ msgstr "" +#~ "Modos de conversão I<ascii>, I<7bit> e I<iso> são similares à quelas do " +#~ "dos2unix/unix2dos no SunOS/Solaris." diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod index f5e0e82..28e9002 100644 --- a/man/pt_BR/man1/dos2unix.pod +++ b/man/pt_BR/man1/dos2unix.pod @@ -155,9 +155,16 @@ duas quebras de linha do Mac. =item B<-m, --add-bom> -Escreve com marca de ordem de byte de UTF-8 no arquivo de saÃda. Nunca use -essa opção quando a codificação de saÃda for outra que não UTF-8. Veja -também a seção UNICODE. +Escreve uma marca de ordem de byte (BOM) no arquivo de saÃda. Por padrão, um +BOM UTF-8 é escrito. + +Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16 +será escrito. + +Nunca use essa opção quando a codificação de saÃda é outra além de UTF-8 ou +UTF-16. Veja também a seção UNICODE. + + =item B<-n, --newfile ARQENT ARQSAÃDA ...> @@ -201,6 +208,14 @@ Unix. Veja também a opção C<-b>. Ignora arquivo binários (padrão). +=item B<-u, --keep-utf16> + +Mantém a codificação UTF-16 original do arquivo de entrada. O arquivo de +saÃda será escrito na mesma codificação UTF-16, em little 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>. + =item B<-ul, --assume-utf16le> Presume que o formato de arquivo de entrada é UTF-16LE. @@ -223,6 +238,11 @@ Presume que o formato de arquivo de entrada é UTF-16BE. Essa opção funciona o mesmo que a opção C<-ul>. +=item B<-v, --verbose> + +Exibe mensagens detalhadas. Informação extra é exibida sobre marcas de ordem +de byte e a quantidade de quebras de linha convertidas. + =item B<-F, --follow-symlink> Segue ligações simbólicas e converte os alvos. @@ -353,20 +373,23 @@ 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>. -As versões do Windows do dos2unix e unix2dos convertem arquivos codificados -em UTF-16 sempre para arquivos UTF-8. Versões Unix do dos2unix/unix2dos -convertem arquivos codificados em UTF-16 para a codificação de caracteres da -localização quando esta estiver definida para UTF-8. Usa o comando locale(1) -para descobrir qual é a codificação de caracteres da localização. - -Por causa dos arquivos texto formatados em UTF-8 terem bom suporte em tanto -Windows e Unix, dos2unix e unix2dos têm a opção de escrever arquivos -UTF-16. Todos os caracteres UTF-16 podem ser codificados em UTF-8. Conversão -de UTF-16 para UTF-8 não tem perda. Arquivos UTF-16 serão ignorados no Unix -quando a codificação de caracteres da localização não for UTF-8, para evitar -perda acidental de texto. Quando um erro de conversão entre UTF-16 e UTF-8 -ocorre (por exemplo, quando o arquivo de entrada em UTF-16 contém um erro), -o arquivo será ignorado. +Arquivos codificados em UTF-16 são, por padrão, convertidos para UTF-8. No +Unix/Linux, é necessário que a codificação de caracteres da localização +esteja definida para UTF-8. Use o comando locale(1) para descobrir qual é a +codificação de caracteres da localização. Arquivos textos formatados em +UTF-8 possuem suporte em tanto Windows quanto Unix/Linux. + +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. + +Quando a opção C<-u> é usada, o arquivo de saÃda será escrito na mesma +codificação UTF-16 que o arquivo de saÃda. A opção C<-u> evita conversão +para UTF-8. + +Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára +UTF-16. Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16. @@ -562,8 +585,6 @@ Página do projeto: L<http://waterlan.home.xs4all.nl/dos2unix.html> Página do SourceForge: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 Veja também file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt index c8d6642..6ea2bdc 100644 --- a/man/pt_BR/man1/dos2unix.txt +++ b/man/pt_BR/man1/dos2unix.txt @@ -117,9 +117,14 @@ OPÇÕES alteradas para duas quebras de linha do Mac. -m, --add-bom - Escreve com marca de ordem de byte de UTF-8 no arquivo de saÃda. - Nunca use essa opção quando a codificação de saÃda for outra que não - UTF-8. Veja também a seção UNICODE. + Escreve uma marca de ordem de byte (BOM) no arquivo de saÃda. Por + padrão, um BOM UTF-8 é escrito. + + Quando o arquivo de entrada é UTF-16, e a opção "-u" é usada, um BOM + UTF-16 será escrito. + + Nunca use essa opção quando a codificação de saÃda é outra além de + UTF-8 ou UTF-16. Veja também a seção UNICODE. -n, --newfile ARQENT ARQSAÃDA ... Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saÃda @@ -160,6 +165,13 @@ OPÇÕES -s, --safe Ignora arquivo binários (padrão). + -u, --keep-utf16 + Mantém a codificação UTF-16 original do arquivo de entrada. O + arquivo de saÃda será escrito na mesma codificação UTF-16, em little + 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 "-ascii". + -ul, --assume-utf16le Presume que o formato de arquivo de entrada é UTF-16LE. @@ -182,6 +194,10 @@ OPÇÕES Essa opção funciona o mesmo que a opção "-ul". + -v, --verbose + Exibe mensagens detalhadas. Informação extra é exibida sobre marcas + de ordem de byte e a quantidade de quebras de linha convertidas. + -F, --follow-symlink Segue ligações simbólicas e converte os alvos. @@ -294,21 +310,24 @@ UNICODE texto codificados em little e big endian UTF-16. Para ver se dos2unix foi compilado com suporte a UTF-16, digite "dos2unix -V". - As versões do Windows do dos2unix e unix2dos convertem arquivos - codificados em UTF-16 sempre para arquivos UTF-8. Versões Unix do - dos2unix/unix2dos convertem arquivos codificados em UTF-16 para a - codificação de caracteres da localização quando esta estiver definida - para UTF-8. Usa o comando locale(1) para descobrir qual é a codificação - de caracteres da localização. - - Por causa dos arquivos texto formatados em UTF-8 terem bom suporte em - tanto Windows e Unix, dos2unix e unix2dos têm a opção de escrever - arquivos UTF-16. Todos os caracteres UTF-16 podem ser codificados em - UTF-8. Conversão de UTF-16 para UTF-8 não tem perda. Arquivos UTF-16 - serão ignorados no Unix quando a codificação de caracteres da - localização não for UTF-8, para evitar perda acidental de texto. Quando - um erro de conversão entre UTF-16 e UTF-8 ocorre (por exemplo, quando o - arquivo de entrada em UTF-16 contém um erro), o arquivo será ignorado. + Arquivos codificados em UTF-16 são, por padrão, convertidos para UTF-8. + No Unix/Linux, é necessário que a codificação de caracteres da + localização esteja definida para UTF-8. Use o comando locale(1) para + descobrir qual é a codificação de caracteres da localização. Arquivos + textos formatados em UTF-8 possuem suporte em tanto Windows quanto + Unix/Linux. + + 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. + + Quando a opção "-u" é usada, o arquivo de saÃda será escrito na mesma + codificação UTF-16 que o arquivo de saÃda. A opção "-u" evita conversão + para UTF-8. + + Dos2unix e unix2dos não possuem opção para converter arquivos UTF-8 ára + UTF-16. Modo de conversão ISO e 7-bit não funciona em arquivos UTF-16. @@ -492,8 +511,6 @@ AUTORES Página do SourceForge: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - Veja também file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1 index 6e887a4..bb951fa 100644 --- a/man/uk/man1/dos2unix.1 +++ b/man/uk/man1/dos2unix.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.20) +.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2014-08-03" "dos2unix" "2014-08-03" +.TH dos2unix 1 "2014-09-09" "dos2unix" "2014-09-09" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -205,9 +205,14 @@ SunOS/Solaris передбачено підтримку лише парного розриву Ñ€Ñдків Unix. .IP "\fB\-m, \-\-add\-bom\fR" 4 .IX Item "-m, --add-bom" -ДопиÑати до файла результатів Ñимвол позначки порÑдку байтів \s-1UTF\-8 \s0(\s-1BOM\s0). Ðе -викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від -\&\s-1UTF\-8.\s0 Див. також розділ щодо \s-1UNICODE.\s0 +ЗапиÑати до файла результатів позначку порÑдку байтів (\s-1BOM\s0). Типово буде +запиÑано позначку порÑдку байтів \s-1UTF\-8.\s0 +.Sp +Якщо дані початкового файла закодовано у \s-1UTF\-16\s0 Ñ– викориÑтано параметр +\&\f(CW\*(C`\-u\*(C'\fR, буде допиÑано позначку порÑдку байтів \s-1UTF\-16.\s0 +.Sp +Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від \s-1UTF\-8\s0 +або \s-1UTF\-16.\s0 Див. також розділ щодо \s-1UNICODE.\s0 .IP "\fB\-n, \-\-newfile ВХІДÐИЙ_ФÐЙЛ ВИХІДÐИЙ_ФÐЙЛ ...\fR" 4 .IX Item "-n, --newfile ВХІДÐИЙ_ФÐЙЛ ВИХІДÐИЙ_ФÐЙЛ ..." Ðовий режим обробки файлів. Перетворити дані з файла ВХІДÐИЙ_ФÐЙЛ Ñ– запиÑати @@ -248,6 +253,13 @@ SunOS/Solaris передбачено підтримку лише парного .IP "\fB\-s, \-\-safe\fR" 4 .IX Item "-s, --safe" ПропуÑкати двійкові файли (типово). +.IP "\fB\-u, \-\-keep\-utf16\fR" 4 +.IX Item "-u, --keep-utf16" +Зберегти початкове ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-16.\s0 Файл результатів буде запиÑано у тому +Ñамому кодуванні \s-1UTF\-16,\s0 із прÑмим або зворотним порÑдком байтів, що Ñ– +початковий файл. Таким чином можна запобігти перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ +\&\s-1UTF\-8.\s0 До файла буде запиÑано відповідну позначку порÑдку байтів +\&\s-1UTF\-16.\s0 Вимкнути цей параметр можна за допомогою параметра \f(CW\*(C`\-ascii\*(C'\fR. .IP "\fB\-ul, \-\-assume\-utf16le\fR" 4 .IX Item "-ul, --assume-utf16le" ПрипуÑкати, що кодуваннÑм вхідних файлів Ñ” \s-1UTF\-16LE.\s0 @@ -270,6 +282,10 @@ SunOS/Solaris передбачено підтримку лише парного ПрипуÑкати, що вхідним форматом Ñ” \s-1UTF\-16BE.\s0 .Sp Цей параметр працює у ÑпоÑіб, тотожний до параметра \f(CW\*(C`\-ul\*(C'\fR. +.IP "\fB\-v, \-\-verbose\fR" 4 +.IX Item "-v, --verbose" +Виводити докладні повідомленнÑ. Буде показано додаткові дані щодо позначок +порÑдку байтів та кількоÑÑ‚Ñ– перетворених Ñимволів розриву Ñ€Ñдків. .IP "\fB\-F, \-\-follow\-symlink\fR" 4 .IX Item "-F, --follow-symlink" Переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони @@ -409,22 +425,23 @@ Unicode може бути викориÑтано ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-8, байтів. Щоб дізнатиÑÑ Ð¿Ñ€Ð¾ те, чи було dos2unix зібрано з підтримкою \s-1UTF\-16,\s0 віддайте команду \f(CW\*(C`dos2unix \-V\*(C'\fR. .PP -ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Windows завжди виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² -у кодуванні \s-1UTF\-16\s0 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-8.\s0 ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Unix -виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні \s-1UTF\-16\s0 до файлів у кодуванні -локалі. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ -\&\fIlocale\fR\|(1). +Типово, файли у кодуванні \s-1UTF\-16\s0 буде перетворено на файли у кодуванні +\&\s-1UTF\-8.\s0 У Unix/Linux це потребує вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів локалі +\&\s-1UTF\-8.\s0 Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– можна ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ +\&\fIlocale\fR\|(1). Обидва типи ÑиÑтем, Windows та Unix/Linux, мають непогані +можливоÑÑ‚Ñ– з підтримки форматованих текÑтових файлів у кодуванні \s-1UTF\-8.\s0 .PP -ОÑкільки підтримку текÑтових файлів у кодуванні \s-1UTF\-8\s0 доволі добре -реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено -можливоÑÑ‚Ñ– запиÑу файлів у кодуванні \s-1UTF\-16.\s0 УÑÑ– Ñимволи \s-1UTF\-16\s0 можна знайти -Ñ– у кодуванні \s-1UTF\-8.\s0 ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-16\s0 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ -\&\s-1UTF\-8,\s0 Ñ– навпаки, відбуваєтьÑÑ Ð±ÐµÐ· втрат. Файли у кодуванні \s-1UTF\-16\s0 буде -пропущено у Unix, Ñкщо кодуваннÑм локалі не Ñ” \s-1UTF\-8,\s0 щоб запобігти -випадковій втраті даних. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у кодуванні \s-1UTF\-16\s0 -на дані у кодуванні \s-1UTF\-8\s0 ÑтанетьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, помилка -міÑтитиметьÑÑ Ñƒ файлі вхідних даних \s-1UTF\-16,\s0 файл буде пропущено під Ñ‡Ð°Ñ -обробки. +ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-16\s0 та \s-1UTF\-8\s0 Ñ” повніÑÑ‚ÑŽ ÑуміÑними. Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ðµ буде +втрачено жодної інформації. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у кодуванні +\&\s-1UTF\-16\s0 на дані у кодуванні \s-1UTF\-8\s0 трапитьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, Ñкщо у +вхідному файлі \s-1UTF\-16\s0 міÑтитиметьÑÑ ÑкаÑÑŒ помилка, файл буде пропущено. +.PP +Якщо викориÑтано параметр \f(CW\*(C`\-u\*(C'\fR, файл результатів буде запиÑано у тому +Ñамому кодуванні \s-1UTF\-16,\s0 що Ñ– початковий файл. ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Option +\&\f(CW\*(C`\-u\*(C'\fR запобігає перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ \s-1UTF\-8.\s0 +.PP +У dos2unix та unix2dos не передбачено параметра Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у +кодуванні \s-1UTF\-8\s0 на дані у кодуванні \s-1UTF\-16.\s0 .PP Режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ \s-1ISO\s0 та 7\-бітовий режим не працюють Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² \s-1UTF\-16.\s0 .SS "Позначка порÑдку байтів" @@ -658,8 +675,6 @@ mac2unix) \- <wuebben@kde.org>, Christian Wurll (додатковий новий Сторінка проекту: <http://waterlan.home.xs4all.nl/dos2unix.html> .PP Сторінка на SourceForge: <http://sourceforge.net/projects/dos2unix/> -.PP -Freecode: <http://freecode.com/projects/dos2unix> .SH "ТÐКОЖ ПЕРЕГЛЯÐЬТЕ" .IX Header "ТÐКОЖ ПЕРЕГЛЯÐЬТЕ" \&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1) diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm index b1eccf1..cd87edc 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 6.0.6 - програма Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у текÑтовому форматі DOS/Mac у формат Unix, Ñ– навпаки</title> +<title>dos2unix 7.0 - ÿрþóрðüð ôûѠÿõрõтòþрõýýѠôðýøх у тõúÑÂтþòþüу фþрüðті DOS/Mac у фþрüðт Unix, і ýðòÿðúø</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <link rev="made" href="mailto:root@localhost" /> </head> @@ -64,7 +64,7 @@ <dl> -<dt id="pod--"><b>--</b></dt> +<dt id="pod"><b>--</b></dt> <dd> <p>Вважати усі наступні параметри назвами файлів. Цим параметром слід користуватися, якщо вам потрібно виконати перетворення файлів, чиї назви містять дефіси. Наприклад, щоб виконати перетворення файла «-foo», скористайтеся такою командою:</p> @@ -179,10 +179,14 @@ <dt id="m---add-bom"><b>-m, --add-bom</b></dt> <dd> -<p>Дописати до файла результатів символ позначки порядку байтів UTF-8 (BOM). Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8. Див. також розділ щодо UNICODE.</p> +<p>Записати до файла результатів позначку порядку байтів (BOM). Типово буде записано позначку порядку байтів UTF-8.</p> + +<p>Якщо дані початкового файла закодовано у UTF-16 і використано параметр <code>-u</code>, буде дописано позначку порядку байтів UTF-16.</p> + +<p>Не використовуйте цей параметр для кодувань результатів, відмінних від UTF-8 або UTF-16. Див. також розділ щодо UNICODE.</p> </dd> -<dt id="n---newfile-_-_-..."><b>-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...</b></dt> +<dt id="n---newfile-_-_"><b>-n, --newfile ВХІДНИЙ_ФАЙЛ ВИХІДНИЙ_ФАЙЛ ...</b></dt> <dd> <p>Новий режим обробки файлів. Перетворити дані з файла ВХІДНИЙ_ФАЙЛ і записати результати до файла ВИХІДНИЙ_ФАЙЛ. Назви файлів слід вказувати парами, <i>не слід</i> використовувати шаблони заміни, інакше вміст файлів <i>буде втрачено</i>.</p> @@ -190,7 +194,7 @@ <p>Власником перетвореного файла буде призначено користувача, яким було розпочато перетворення у режимі нового файла (парному режимі). Права доступу на читання або запис нового файла буде визначено на основі прав доступу до початкового файла мінус umask(1) для користувача, яким було розпочато перетворення.</p> </dd> -<dt id="o---oldfile-..."><b>-o, --oldfile ФАЙЛ ...</b></dt> +<dt id="o---oldfile"><b>-o, --oldfile ФАЙЛ ...</b></dt> <dd> <p>Застарілий режим обробки. Виконати перетворення файла ФАЙЛ і перезаписати його вміст. Типово, програма працює у цьому режимі. Можна використовувати шаблони заміни.</p> @@ -216,6 +220,12 @@ <p>Пропускати двійкові файли (типово).</p> </dd> +<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt> +<dd> + +<p>Зберегти початкове кодування UTF-16. Файл результатів буде записано у тому самому кодуванні UTF-16, із прямим або зворотним порядком байтів, що і початковий файл. Таким чином можна запобігти перетворенню даних у кодування UTF-8. До файла буде записано відповідну позначку порядку байтів UTF-16. Вимкнути цей параметр можна за допомогою параметра <code>-ascii</code>.</p> + +</dd> <dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt> <dd> @@ -236,6 +246,12 @@ <p>Цей параметр працює у спосіб, тотожний до параметра <code>-ul</code>.</p> </dd> +<dt id="v---verbose"><b>-v, --verbose</b></dt> +<dd> + +<p>Виводити докладні повідомлення. Буде показано додаткові дані щодо позначок порядку байтів та кількості перетворених символів розриву рядків.</p> + +</dd> <dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt> <dd> @@ -350,9 +366,13 @@ <p>Програми dos2unix та unix2dos, зібрані з підтримкою Unicode UTF-16, можуть читати текстові файли у кодуванні UTF-16 з прямим та зворотним порядком байтів. Щоб дізнатися про те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду <code>dos2unix -V</code>.</p> -<p>Версії dos2unix та unix2dos для Windows завжди виконують перетворення файлів у кодуванні UTF-16 до кодування UTF-8. Версії dos2unix та unix2dos для Unix виконують перетворення файлів у кодуванні UTF-16 до файлів у кодуванні локалі. Для визначення поточного кодування локалі скористайтеся командою locale(1).</p> +<p>Типово, файли у кодуванні UTF-16 буде перетворено на файли у кодуванні UTF-8. У Unix/Linux це потребує встановлення кодування символів локалі UTF-8. Для визначення поточного кодування локалі можна скористатися командою locale(1). Обидва типи систем, Windows та Unix/Linux, мають непогані можливості з підтримки форматованих текстових файлів у кодуванні UTF-8.</p> -<p>Оскільки підтримку текстових файлів у кодуванні UTF-8 доволі добре реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено можливості запису файлів у кодуванні UTF-16. Усі символи UTF-16 можна знайти і у кодуванні UTF-8. Перетворення даних з кодування UTF-16 до кодування UTF-8, і навпаки, відбувається без втрат. Файли у кодуванні UTF-16 буде пропущено у Unix, якщо кодуванням локалі не є UTF-8, щоб запобігти випадковій втраті даних. Якщо під час перетворення даних у кодуванні UTF-16 на дані у кодуванні UTF-8 станеться помилка, наприклад, помилка міститиметься у файлі вхідних даних UTF-16, файл буде пропущено під час обробки.</p> +<p>Кодування UTF-16 та UTF-8 є повністю сумісними. Під час перетворення не буде втрачено жодної інформації. Якщо під час перетворення даних у кодуванні UTF-16 на дані у кодуванні UTF-8 трапиться помилка, наприклад, якщо у вхідному файлі UTF-16 міститиметься якась помилка, файл буде пропущено.</p> + +<p>Якщо використано параметр <code>-u</code>, файл результатів буде записано у тому самому кодуванні UTF-16, що і початковий файл. Використання параметра Option <code>-u</code> запобігає перетворенню даних у кодування UTF-8.</p> + +<p>У dos2unix та unix2dos не передбачено параметра для перетворення даних у кодуванні UTF-8 на дані у кодуванні UTF-16.</p> <p>Режим перетворення ISO та 7-бітовий режим не працюють для файлів UTF-16.</p> @@ -516,8 +536,6 @@ <p>Сторінка на SourceForge: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p> -<p>Freecode: <a href="http://freecode.com/projects/dos2unix">http://freecode.com/projects/dos2unix</a></p> - <h1 id="14">ТАКОЖ ПЕРЕГЛЯНЬТЕ</h1> <p>file(1) find(1) iconv(1) locale(1) xargs(1)</p> diff --git a/man/uk/man1/dos2unix.po b/man/uk/man1/dos2unix.po index 83317a6..b751c08 100644 --- a/man/uk/man1/dos2unix.po +++ b/man/uk/man1/dos2unix.po @@ -6,16 +6,17 @@ # Yuri Chornoivan <yurchor@ukr.net>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 6.0.6-beta4\n" -"POT-Creation-Date: 2014-07-09 19:11+0300\n" -"PO-Revision-Date: 2014-07-10 00:02+0300\n" +"Project-Id-Version: dos2unix-man 6.1-beta1\n" +"POT-Creation-Date: 2014-09-08 22:06+0300\n" +"PO-Revision-Date: 2014-08-18 20:26+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"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" #. type: =head1 @@ -26,7 +27,9 @@ msgstr "ÐÐЗВÐ" #. type: textblock #: dos2unix.pod:54 msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter" -msgstr "dos2unix - програма Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у текÑтовому форматі DOS/Mac у формат Unix, Ñ– навпаки" +msgstr "" +"dos2unix - програма Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у текÑтовому форматі DOS/Mac у " +"формат Unix, Ñ– навпаки" #. type: =head1 #: dos2unix.pod:56 @@ -52,38 +55,86 @@ msgstr "ОПИС" #. type: textblock #: dos2unix.pod:63 -msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa." -msgstr "До Ñкладу пакунка Dos2unix включено програми C<dos2unix> та C<unix2dos>, призначені Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¸Ñ… текÑтових даних у форматі DOS або Mac на дані у форматі Unix, Ñ– навпаки." +msgid "" +"The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to " +"convert plain text files in DOS or Mac format to Unix format and vice versa." +msgstr "" +"До Ñкладу пакунка Dos2unix включено програми C<dos2unix> та C<unix2dos>, " +"призначені Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¸Ñ… текÑтових даних у форматі DOS або Mac " +"на дані у форматі Unix, Ñ– навпаки." #. type: textblock #: dos2unix.pod:66 -msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks." -msgstr "У текÑтових файлах DOS/Windows розрив Ñ€Ñдка або перехід на новий Ñ€Ñдок здійÑнюєтьÑÑ Ð·Ð° допомогою комбінації двох Ñимволів: Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ ÐºÐ°Ñ€ÐµÑ‚ÐºÐ¸ (CR) Ñ– Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñдка (LF). У текÑтових файлах Unix за перехід на новий Ñ€Ñдок відповідає один Ñимвол: Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñдка (LF). У текÑтових файлах Mac, до Mac OS X, за розрив Ñ€Ñдка відповідав один Ñимвол: Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ ÐºÐ°Ñ€ÐµÑ‚ÐºÐ¸ (CR). У ÑучаÑних верÑÑ–ÑÑ… Mac OS викориÑтовуєтьÑÑ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸Ð¹ Ð´Ð»Ñ Unix розрив Ñ€Ñдка (LF)." +msgid "" +"In DOS/Windows text files a line break, also known as newline, is a " +"combination of two characters: a Carriage Return (CR) followed by a Line " +"Feed (LF). In Unix text files a line break is a single character: the Line " +"Feed (LF). In Mac text files, prior to Mac OS X, a line break was single " +"Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line " +"breaks." +msgstr "" +"У текÑтових файлах DOS/Windows розрив Ñ€Ñдка або перехід на новий Ñ€Ñдок " +"здійÑнюєтьÑÑ Ð·Ð° допомогою комбінації двох Ñимволів: Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ ÐºÐ°Ñ€ÐµÑ‚ÐºÐ¸ (CR) " +"Ñ– Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñдка (LF). У текÑтових файлах Unix за перехід на новий Ñ€Ñдок " +"відповідає один Ñимвол: Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñдка (LF). У текÑтових файлах Mac, до " +"Mac OS X, за розрив Ñ€Ñдка відповідав один Ñимвол: Ð¿Ð¾Ð²ÐµÑ€Ð½ÐµÐ½Ð½Ñ ÐºÐ°Ñ€ÐµÑ‚ÐºÐ¸ (CR). У " +"ÑучаÑних верÑÑ–ÑÑ… Mac OS викориÑтовуєтьÑÑ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸Ð¹ Ð´Ð»Ñ Unix розрив Ñ€Ñдка (LF)." #. type: textblock #: dos2unix.pod:72 -msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files." -msgstr "Окрім Ñимволів розриву Ñ€Ñдка, програма Dos2unix здатна виконувати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð². Можна перетворити дані у декількох кодуваннÑÑ… DOS на файли у кодуванні Latin-1 Unix. Також можна перетворити дані у файлах Windows Unicode (UTF-16) на дані у кодуванні Unix Unicode (UTF-8)." +msgid "" +"Besides line breaks Dos2unix can also convert the encoding of files. A few " +"DOS code pages can be converted to Unix Latin-1. And Windows Unicode " +"(UTF-16) files can be converted to Unix Unicode (UTF-8) files." +msgstr "" +"Окрім Ñимволів розриву Ñ€Ñдка, програма Dos2unix здатна виконувати " +"Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð². Можна перетворити дані у декількох кодуваннÑÑ… " +"DOS на файли у кодуванні Latin-1 Unix. Також можна перетворити дані у файлах " +"Windows Unicode (UTF-16) на дані у кодуванні Unix Unicode (UTF-8)." #. type: textblock #: dos2unix.pod:76 msgid "Binary files are automatically skipped, unless conversion is forced." -msgstr "Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° пропуÑкатиме двійкові файли, Ñкщо ви не накажете їй виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð°ÐºÐ¸Ñ… файлів безпоÑередньо." +msgstr "" +"Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° пропуÑкатиме двійкові файли, Ñкщо ви не " +"накажете їй виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð°ÐºÐ¸Ñ… файлів безпоÑередньо." #. type: textblock #: dos2unix.pod:78 -msgid "Non-regular files, such as directories and FIFOs, are automatically skipped." -msgstr "Програма автоматично пропуÑкатиме файли, Ñкі не Ñ” звичайними файлами, зокрема каталоги та канали FIFO." +msgid "" +"Non-regular files, such as directories and FIFOs, are automatically skipped." +msgstr "" +"Програма автоматично пропуÑкатиме файли, Ñкі не Ñ” звичайними файлами, " +"зокрема каталоги та канали FIFO." #. type: textblock #: dos2unix.pod:80 -msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows." -msgstr "Типово, програма не вноÑитиме змін до Ñимволічних поÑилань та об’єктів поÑилань. Якщо потрібно, програма може замінити Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ запиÑати перетворені дані до файла-Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñимволічного поÑиланнÑ. У Windows запиÑу до об’єкта Ñимволічного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ передбачено." +msgid "" +"Symbolic links and their targets are by default kept untouched. Symbolic " +"links can optionally be replaced, or the output can be written to the " +"symbolic link target. Writing to a symbolic link target is not supported on " +"Windows." +msgstr "" +"Типово, програма не вноÑитиме змін до Ñимволічних поÑилань та об’єктів " +"поÑилань. Якщо потрібно, програма може замінити Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ " +"запиÑати перетворені дані до файла-Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñимволічного поÑиланнÑ. У " +"Windows запиÑу до об’єкта Ñимволічного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ передбачено." #. type: textblock #: dos2unix.pod:84 -msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>." -msgstr "Програму dos2unix було Ñтворено за зразком програми dos2unix Ð´Ð»Ñ SunOS/Solaris. Втім, Ñ–Ñнує одна важлива відмінніÑÑ‚ÑŒ від оригінальної верÑÑ–Ñ— Ð´Ð»Ñ SunOS/Solaris. Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¾ виконує заміну файлів під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ (Ñтарий режим обробки файлів), а у оригінальній верÑÑ–Ñ— Ð´Ð»Ñ SunOS/Solaris передбачено підтримку лише парного Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ (новий режим обробки файлів). Див. також параметри C<-o> та C<-n>." +msgid "" +"Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one " +"important difference with the original SunOS/Solaris version. This version " +"does by default in-place conversion (old file mode), while the original " +"SunOS/Solaris version only supports paired conversion (new file mode). See " +"also options C<-o> and C<-n>." +msgstr "" +"Програму dos2unix було Ñтворено за зразком програми dos2unix Ð´Ð»Ñ SunOS/" +"Solaris. Втім, Ñ–Ñнує одна важлива відмінніÑÑ‚ÑŒ від оригінальної верÑÑ–Ñ— Ð´Ð»Ñ " +"SunOS/Solaris. Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¾ виконує заміну файлів під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ " +"(Ñтарий режим обробки файлів), а у оригінальній верÑÑ–Ñ— Ð´Ð»Ñ SunOS/Solaris " +"передбачено підтримку лише парного Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ (новий режим обробки " +"файлів). Див. також параметри C<-o> та C<-n>." #. type: =head1 #: dos2unix.pod:90 @@ -97,8 +148,15 @@ msgstr "B<-->" #. type: textblock #: dos2unix.pod:96 -msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:" -msgstr "Вважати уÑÑ– наÑтупні параметри назвами файлів. Цим параметром Ñлід кориÑтуватиÑÑ, Ñкщо вам потрібно виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð², чиї назви міÑÑ‚ÑÑ‚ÑŒ дефіÑи. Ðаприклад, щоб виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° «-foo», ÑкориÑтайтеÑÑ Ñ‚Ð°ÐºÐ¾ÑŽ командою:" +msgid "" +"Treat all following options as file names. Use this option if you want to " +"convert files whose names start with a dash. For instance to convert a file " +"named \"-foo\", you can use this command:" +msgstr "" +"Вважати уÑÑ– наÑтупні параметри назвами файлів. Цим параметром Ñлід " +"кориÑтуватиÑÑ, Ñкщо вам потрібно виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð², чиї назви " +"міÑÑ‚ÑÑ‚ÑŒ дефіÑи. Ðаприклад, щоб виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° «-foo», " +"ÑкориÑтайтеÑÑ Ñ‚Ð°ÐºÐ¾ÑŽ командою:" #. type: verbatim #: dos2unix.pod:100 @@ -133,7 +191,9 @@ msgstr "B<-ascii>" #. type: textblock #: dos2unix.pod:108 msgid "Convert only line breaks. This is the default conversion mode." -msgstr "Виконати лише Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñимволів розриву Ñ€Ñдків. Типовий режим перетвореннÑ." +msgstr "" +"Виконати лише Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñимволів розриву Ñ€Ñдків. Типовий режим " +"перетвореннÑ." #. type: =item #: dos2unix.pod:110 @@ -142,8 +202,12 @@ msgstr "B<-iso>" #. type: textblock #: dos2unix.pod:112 -msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES." -msgstr "Виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð· ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ DOS на ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ISO-8859-1. Див. розділ щодо режимів перетвореннÑ." +msgid "" +"Conversion between DOS and ISO-8859-1 character set. See also section " +"CONVERSION MODES." +msgstr "" +"Виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð· ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ DOS на ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ISO-8859-1. Див. розділ " +"щодо режимів перетвореннÑ." #. type: =item #: dos2unix.pod:115 @@ -162,8 +226,12 @@ msgstr "B<-437>" #. type: textblock #: dos2unix.pod:121 -msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion." -msgstr "ВикориÑтовувати кодову Ñторінку DOS 437 (СШÐ). Це типова кодова Ñторінка Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO." +msgid "" +"Use DOS code page 437 (US). This is the default code page used for ISO " +"conversion." +msgstr "" +"ВикориÑтовувати кодову Ñторінку DOS 437 (СШÐ). Це типова кодова Ñторінка Ð´Ð»Ñ " +"Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO." #. type: =item #: dos2unix.pod:123 @@ -222,8 +290,14 @@ msgstr "B<-b, --keep-bom>" #. type: textblock #: dos2unix.pod:145 -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>." +msgid "" +"Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in " +"the output file. This is the default behavior when converting to DOS line " +"breaks. See also option C<-r>." +msgstr "" +"Зберегти позначку порÑдку байтів (BOM). Якщо у файлі вхідних даних Ñ” BOM, " +"запиÑати BOM до файла результатів. Це типова поведінка під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ " +"у формат із Ñимволами розриву Ñ€Ñдків DOS. Див. також параметр C<-r>." #. type: =item #: dos2unix.pod:149 @@ -232,8 +306,12 @@ msgstr "B<-c, --convmode РЕЖИМ>" #. type: textblock #: dos2unix.pod:151 -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." +msgid "" +"Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, " +"I<mac> with ascii being the default." +msgstr "" +"Ð’Ñтановити режим перетвореннÑ. ЗначеннÑм аргументу РЕЖИМ може бути один з " +"таких Ñ€Ñдків: I<ascii>, I<7bit>, I<iso>, I<mac>. Типовим Ñ” режим ascii." #. type: =item #: dos2unix.pod:155 @@ -263,7 +341,9 @@ msgstr "B<-k, --keepdate>" #. type: textblock #: dos2unix.pod:165 msgid "Keep the date stamp of output file same as input file." -msgstr "Зберегти чаÑову позначку файла вхідних даних у файлі результатів перетвореннÑ." +msgstr "" +"Зберегти чаÑову позначку файла вхідних даних у файлі результатів " +"перетвореннÑ." #. type: =item #: dos2unix.pod:167 @@ -287,13 +367,24 @@ msgstr "Ð’Ñтавити додатковий Ñимвол розриву Ñ€Ñд #. type: textblock #: dos2unix.pod:175 -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." +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:179 -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." +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:182 @@ -302,231 +393,421 @@ msgstr "B<-m, --add-bom>" #. type: textblock #: dos2unix.pod:184 -msgid "Write an UTF-8 Byte Order Mark in the output file. Never use this option when the output encoding is other than UTF-8. See also section UNICODE." -msgstr "ДопиÑати до файла результатів Ñимвол позначки порÑдку байтів UTF-8 (BOM). Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від UTF-8. Див. також розділ щодо UNICODE." +msgid "" +"Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is " +"written." +msgstr "" +"ЗапиÑати до файла результатів позначку порÑдку байтів (BOM). Типово буде " +"запиÑано позначку порÑдку байтів UTF-8." -#. type: =item +#. type: textblock #: dos2unix.pod:187 +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:190 +msgid "" +"Never use this option when the output encoding is other than UTF-8 or " +"UTF-16. See also section UNICODE." +msgstr "" +"Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від UTF-8 " +"або UTF-16. Див. також розділ щодо UNICODE." + +#. type: =item +#: dos2unix.pod:194 msgid "B<-n, --newfile INFILE OUTFILE ...>" msgstr "B<-n, --newfile ВХІДÐИЙ_ФÐЙЛ ВИХІДÐИЙ_ФÐЙЛ ...>" #. type: textblock -#: dos2unix.pod:189 -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<буде втрачено>." +#: dos2unix.pod:196 +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:193 -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) Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, Ñким було розпочато перетвореннÑ." +#: dos2unix.pod:200 +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:198 +#: dos2unix.pod:205 msgid "B<-o, --oldfile FILE ...>" msgstr "B<-o, --oldfile ФÐЙЛ ...>" #. type: textblock -#: dos2unix.pod:200 -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 "ЗаÑтарілий режим обробки. Виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° ФÐЙЛ Ñ– перезапиÑати його вміÑÑ‚. Типово, програма працює у цьому режимі. Можна викориÑтовувати шаблони заміни." +#: dos2unix.pod:207 +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:203 -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." +#: dos2unix.pod:210 +msgid "" +"In old file (in-place) mode the converted file gets the same owner, group, " +"and read/write permissions as the original file. Also when the file is " +"converted by another user who has write permissions on the file (e.g. user " +"root). The conversion will be aborted when it is not possible to preserve " +"the original values. Change of owner could mean that the original owner is " +"not able to read the file any more. Change of group could be a security " +"risk, the file could be made readable for persons for whom it is not " +"intended. Preservation of owner, group, and read/write permissions is only " +"supported on Unix." +msgstr "" +"У заÑтарілому режимі (режимі заміщеннÑ) перетворений файл належатиме тому " +"Ñамому влаÑнику Ñ– групі Ñ– матиме Ñ‚Ñ– Ñамі права доÑтупу на Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ запиÑ, " +"що Ñ– початковий файл. Крім того, Ñкщо Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° виконуєтьÑÑ Ñ–Ð½ÑˆÐ¸Ð¼ " +"кориÑтувачем, Ñкий має права доÑтупу на Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ файла (наприклад " +"кориÑтувачем root), Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ перервано, Ñкщо зберегти початкові " +"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ вдаÑÑ‚ÑŒÑÑ. Зміна влаÑника може означати неможливіÑÑ‚ÑŒ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ " +"файла Ð´Ð»Ñ Ð¹Ð¾Ð³Ð¾ початкового влаÑника. Зміна групи може призвеÑти до проблем " +"із безпекою, оÑкільки файл може Ñтати доÑтупним Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачам, " +"Ñкі не повинні мати такі права доÑтупу. МожливіÑÑ‚ÑŒ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð°Ð² влаÑноÑÑ‚Ñ– " +"та прав доÑтупу до файла передбачено лише у Unix." #. type: =item -#: dos2unix.pod:212 +#: dos2unix.pod:219 msgid "B<-q, --quiet>" msgstr "B<-q, --quiet>" #. type: textblock -#: dos2unix.pod:214 -msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used." -msgstr "Режим без Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ. Програма не виводитиме жодних попереджень або повідомлень про помилки. Повернутим значеннÑм завжди буде нуль, Ñкщо вказано правильні параметри командного Ñ€Ñдка." +#: dos2unix.pod:221 +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:217 +#: dos2unix.pod:224 msgid "B<-r, --remove-bom>" msgstr "B<-r, --remove-bom>" #. type: textblock -#: dos2unix.pod:219 -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>." +#: dos2unix.pod:226 +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:223 +#: dos2unix.pod:230 msgid "B<-s, --safe>" msgstr "B<-s, --safe>" #. type: textblock -#: dos2unix.pod:225 +#: dos2unix.pod:232 msgid "Skip binary files (default)." msgstr "ПропуÑкати двійкові файли (типово)." #. type: =item -#: dos2unix.pod:227 +#: dos2unix.pod:234 +msgid "B<-u, --keep-utf16>" +msgstr "B<-u, --keep-utf16>" + +#. type: textblock +#: dos2unix.pod:236 +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:241 msgid "B<-ul, --assume-utf16le>" msgstr "B<-ul, --assume-utf16le>" #. type: textblock -#: dos2unix.pod:229 +#: dos2unix.pod:243 msgid "Assume that the input file format is UTF-16LE." msgstr "ПрипуÑкати, що кодуваннÑм вхідних файлів Ñ” UTF-16LE." #. type: textblock -#: dos2unix.pod:231 -msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option." -msgstr "Якщо у початковому файлі Ñ” позначка порÑдку байтів (BOM), Ñ—Ñ— буде викориÑтано у файлі-результаті, незалежно від викориÑÑ‚Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ параметра." +#: dos2unix.pod:245 +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:234 -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. Таким чином ви повернетеÑÑ Ð´Ð¾ початкового ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у файлі." +#: dos2unix.pod:248 +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:239 -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." +#: dos2unix.pod:253 +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:242 +#: dos2unix.pod:256 msgid "B<-ub, --assume-utf16be>" msgstr "B<-ub, --assume-utf16be>" #. type: textblock -#: dos2unix.pod:244 +#: dos2unix.pod:258 msgid "Assume that the input file format is UTF-16BE." msgstr "ПрипуÑкати, що вхідним форматом Ñ” UTF-16BE." #. type: textblock -#: dos2unix.pod:246 +#: dos2unix.pod:260 msgid "This option works the same as option C<-ul>." msgstr "Цей параметр працює у ÑпоÑіб, тотожний до параметра C<-ul>." #. type: =item -#: dos2unix.pod:248 +#: dos2unix.pod:262 +msgid "B<-v, --verbose>" +msgstr "B<-v, --verbose>" + +#. type: textblock +#: dos2unix.pod:264 +msgid "" +"Display verbose messages. Extra information is displayed about Byte Order " +"Marks and the amount of converted line breaks." +msgstr "" +"Виводити докладні повідомленнÑ. Буде показано додаткові дані щодо позначок " +"порÑдку байтів та кількоÑÑ‚Ñ– перетворених Ñимволів розриву Ñ€Ñдків." + +#. type: =item +#: dos2unix.pod:267 msgid "B<-F, --follow-symlink>" msgstr "B<-F, --follow-symlink>" #. type: textblock -#: dos2unix.pod:250 +#: dos2unix.pod:269 msgid "Follow symbolic links and convert the targets." -msgstr "Переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони вказують." +msgstr "" +"Переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони " +"вказують." #. type: =item -#: dos2unix.pod:252 +#: dos2unix.pod:271 msgid "B<-R, --replace-symlink>" msgstr "B<-R, --replace-symlink>" #. type: textblock -#: dos2unix.pod:254 -msgid "Replace symbolic links with converted files (original target files remain unchanged)." -msgstr "Замінити Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¼Ð¸ файлами (початкові файли, на Ñкі вони вказують, змінено не буде)." +#: dos2unix.pod:273 +msgid "" +"Replace symbolic links with converted files (original target files remain " +"unchanged)." +msgstr "" +"Замінити Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¼Ð¸ файлами (початкові файли, на Ñкі " +"вони вказують, змінено не буде)." #. type: =item -#: dos2unix.pod:257 +#: dos2unix.pod:276 msgid "B<-S, --skip-symlink>" msgstr "B<-S, --skip-symlink>" #. type: textblock -#: dos2unix.pod:259 +#: dos2unix.pod:278 msgid "Keep symbolic links and targets unchanged (default)." -msgstr "Ðе змінювати Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‚Ð° файли, на Ñкі вони поÑилаютьÑÑ (типово)." +msgstr "" +"Ðе змінювати Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‚Ð° файли, на Ñкі вони поÑилаютьÑÑ (типово)." #. type: =item -#: dos2unix.pod:261 +#: dos2unix.pod:280 msgid "B<-V, --version>" msgstr "B<-V, --version>" #. type: textblock -#: dos2unix.pod:263 +#: dos2unix.pod:282 msgid "Display version information and exit." msgstr "ВивеÑти дані щодо верÑÑ–Ñ— Ñ– завершити роботу." #. type: =head1 -#: dos2unix.pod:267 +#: dos2unix.pod:286 msgid "MAC MODE" msgstr "РЕЖИМ MAC" #. type: textblock -#: dos2unix.pod:269 -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 перетворенню не підлÑгають." +#: dos2unix.pod:288 +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:272 -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 перетворенню не підлÑгають." +#: dos2unix.pod:291 +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:275 -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>." +#: dos2unix.pod:294 +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:278 +#: dos2unix.pod:297 msgid "CONVERSION MODES" msgstr "РЕЖИМИ ПЕРЕТВОРЕÐÐЯ" #. type: =item -#: dos2unix.pod:282 +#: dos2unix.pod:301 msgid "B<ascii>" msgstr "B<ascii>" #. type: textblock -#: dos2unix.pod:284 -msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode." -msgstr "У режимі C<ascii> виконуватиметьÑÑ Ð»Ð¸ÑˆÐµ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñимволів розриву Ñ€Ñдків. Цей режим Ñ” типовим режимом перетвореннÑ." +#: dos2unix.pod:303 +msgid "" +"In mode C<ascii> only line breaks are converted. This is the default " +"conversion mode." +msgstr "" +"У режимі C<ascii> виконуватиметьÑÑ Ð»Ð¸ÑˆÐµ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñимволів розриву " +"Ñ€Ñдків. Цей режим Ñ” типовим режимом перетвореннÑ." #. type: textblock -#: dos2unix.pod:287 -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)." +#: dos2unix.pod:306 +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:291 +#: dos2unix.pod:310 msgid "B<7bit>" msgstr "B<7bit>" #. type: textblock -#: dos2unix.pod:293 -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-бітові Ñимволи." +#: dos2unix.pod:312 +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:296 +#: dos2unix.pod:315 msgid "B<iso>" msgstr "B<iso>" #. type: textblock -#: dos2unix.pod:298 -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:303 -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 здатна виконувати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у доволі широкому Ñпектрі кодувань Ñимволів." +#: dos2unix.pod:317 +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:312 -msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files." -msgstr "Ðіколи не кориÑтуйтеÑÑ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñм ISO Ð´Ð»Ñ Ñ‚ÐµÐºÑтових файлів у форматі Unicode. ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ð´Ñ–Ð±Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ до ÑƒÑˆÐºÐ¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¼Ñ–Ñту файлів у кодуванні UTF-8." +#: dos2unix.pod:322 +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:331 +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:314 +#: dos2unix.pod:333 msgid "Some examples:" msgstr "Декілька прикладів:" #. type: textblock -#: dos2unix.pod:316 +#: dos2unix.pod:335 msgid "Convert from DOS default code page to Unix Latin-1" -msgstr "Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix" +msgstr "" +"Перетворити дані у типовому кодуванні DOS на дані у кодуванні Latin-1 Unix" #. type: verbatim -#: dos2unix.pod:318 +#: dos2unix.pod:337 #, no-wrap msgid "" " dos2unix -iso -n in.txt out.txt\n" @@ -536,12 +817,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:320 +#: dos2unix.pod:339 msgid "Convert from DOS CP850 to Unix Latin-1" -msgstr "Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix" +msgstr "" +"Перетворити дані у кодуванні DOS CP850 на дані у кодуванні Latin-1 Unix" #. type: verbatim -#: dos2unix.pod:322 +#: dos2unix.pod:341 #, no-wrap msgid "" " dos2unix -850 -n in.txt out.txt\n" @@ -551,12 +833,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:324 +#: dos2unix.pod:343 msgid "Convert from Windows CP1252 to Unix Latin-1" -msgstr "Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix" +msgstr "" +"Перетворити дані у кодуванні CP1252 Windows на дані у кодуванні Latin-1 Unix" #. type: verbatim -#: dos2unix.pod:326 +#: dos2unix.pod:345 #, no-wrap msgid "" " dos2unix -1252 -n in.txt out.txt\n" @@ -566,12 +849,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:328 +#: dos2unix.pod:347 msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode)" -msgstr "Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix (Unicode)" +msgstr "" +"Перетворити дані у кодуванні CP252 Windows на дані у кодуванні UTF-8 Unix " +"(Unicode)" #. type: verbatim -#: dos2unix.pod:330 +#: dos2unix.pod:349 #, no-wrap msgid "" " iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n" @@ -581,12 +866,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:332 +#: dos2unix.pod:351 msgid "Convert from Unix Latin-1 to DOS default code page" -msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS" +msgstr "" +"Перетворити дані у кодуванні Latin-1 Unix на дані у типовому кодуванні DOS" #. type: verbatim -#: dos2unix.pod:334 +#: dos2unix.pod:353 #, no-wrap msgid "" " unix2dos -iso -n in.txt out.txt\n" @@ -596,12 +882,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:336 +#: dos2unix.pod:355 msgid "Convert from Unix Latin-1 to DOS CP850" -msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850" +msgstr "" +"Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні DOS CP850" #. type: verbatim -#: dos2unix.pod:338 +#: dos2unix.pod:357 #, no-wrap msgid "" " unix2dos -850 -n in.txt out.txt\n" @@ -611,12 +898,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:340 +#: dos2unix.pod:359 msgid "Convert from Unix Latin-1 to Windows CP1252" -msgstr "Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252" +msgstr "" +"Перетворити дані у кодуванні Latin-1 Unix на дані у кодуванні Windows CP1252" #. type: verbatim -#: dos2unix.pod:342 +#: dos2unix.pod:361 #, no-wrap msgid "" " unix2dos -1252 -n in.txt out.txt\n" @@ -626,12 +914,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:344 +#: dos2unix.pod:363 msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252" -msgstr "Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні Windows CP1252" +msgstr "" +"Перетворити дані у кодуванні UTF-8 Unix (Unicode) на дані у кодуванні " +"Windows CP1252" #. type: verbatim -#: dos2unix.pod:346 +#: dos2unix.pod:365 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n" @@ -641,112 +931,210 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:348 -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>." +#: dos2unix.pod:367 +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:353 +#: dos2unix.pod:372 msgid "UNICODE" msgstr "UNICODE" #. type: =head2 -#: dos2unix.pod:355 +#: dos2unix.pod:374 msgid "Encodings" msgstr "КодуваннÑ" #. type: textblock -#: dos2unix.pod:357 -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." +#: dos2unix.pod:376 +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:362 +#: dos2unix.pod:381 msgid "Conversion" msgstr "ПеретвореннÑ" #. type: textblock -#: dos2unix.pod:364 -msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files." -msgstr "У текÑтових файлах Unicode, Ñк Ñ– у звичайних текÑтових файлах, може бути викориÑтано розриви Ñ€Ñдків DOS, Unix або Mac." +#: dos2unix.pod:383 +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:367 -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 збережено." +#: dos2unix.pod:386 +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:370 -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>." +#: dos2unix.pod:389 +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:374 -msgid "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos convert UTF-16 encoded files to the locale character encoding when it is set to UTF-8. Use the locale(1) command to find out what the locale character encoding is." -msgstr "ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Windows завжди виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Unix виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні UTF-16 до файлів у кодуванні локалі. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ locale(1)." +#: dos2unix.pod:393 +msgid "" +"UTF-16 encoded files are by default converted to UTF-8. On Unix/Linux it is " +"required that the locale character encoding is set to UTF-8. Use the " +"locale(1) command to find out what the locale character encoding is. UTF-8 " +"formatted text files are well supported on both Windows and Unix/Linux." +msgstr "" +"Типово, файли у кодуванні UTF-16 буде перетворено на файли у кодуванні " +"UTF-8. У Unix/Linux це потребує вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів локалі " +"UTF-8. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– можна ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ " +"locale(1). Обидва типи ÑиÑтем, Windows та Unix/Linux, мають непогані " +"можливоÑÑ‚Ñ– з підтримки форматованих текÑтових файлів у кодуванні UTF-8." + +#. type: textblock +#: dos2unix.pod:398 +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:402 +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:379 -msgid "Because UTF-8 formatted text files are well supported on both Windows and Unix, dos2unix and unix2dos have no option to write UTF-16 files. All UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to UTF-8 is without loss. UTF-16 files will be skipped on Unix when the locale character encoding is not UTF-8, to prevent accidental loss of text. 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-8 доволі добре реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено можливоÑÑ‚Ñ– запиÑу файлів у кодуванні UTF-16. УÑÑ– Ñимволи UTF-16 можна знайти Ñ– у кодуванні UTF-8. ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8, Ñ– навпаки, відбуваєтьÑÑ Ð±ÐµÐ· втрат. Файли у кодуванні UTF-16 буде пропущено у Unix, Ñкщо кодуваннÑм локалі не Ñ” UTF-8, щоб запобігти випадковій втраті даних. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у кодуванні UTF-16 на дані у кодуванні UTF-8 ÑтанетьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, помилка міÑтитиметьÑÑ Ñƒ файлі вхідних даних UTF-16, файл буде пропущено під Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸." +#: dos2unix.pod:405 +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:387 +#: dos2unix.pod:407 msgid "ISO and 7-bit mode conversion do not work on UTF-16 files." -msgstr "Режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO та 7-бітовий режим не працюють Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16." +msgstr "" +"Режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO та 7-бітовий режим не працюють Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16." #. type: =head2 -#: dos2unix.pod:389 +#: dos2unix.pod:409 msgid "Byte Order Mark" msgstr "Позначка порÑдку байтів" #. type: textblock -#: dos2unix.pod:391 -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>." +#: dos2unix.pod:411 +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:395 -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 типово не міÑÑ‚ÑÑ‚ÑŒ позначки порÑдку байтів. ВважаєтьÑÑ, що кодуваннÑм текÑтових файлів Ñ” те кодуваннÑ, Ñке визначаєтьÑÑ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾ÑŽ локаллю." +#: dos2unix.pod:415 +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:398 -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 вважатиме такий файл двійковим (бінарним)." +#: dos2unix.pod:418 +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:402 +#: dos2unix.pod:422 msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM." -msgstr "Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16 без позначки порÑдку байтів ÑкориÑтайтеÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ C<-ul> або C<-ub>." +msgstr "" +"Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16 без позначки порÑдку байтів ÑкориÑтайтеÑÑ " +"параметром C<-ul> або C<-ub>." #. type: textblock -#: dos2unix.pod:404 -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 була у файлі початкових даних." +#: dos2unix.pod:424 +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:407 -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." +#: dos2unix.pod:427 +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:410 +#: dos2unix.pod:430 msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used." -msgstr "Dos2unix та unix2dos завжди запиÑують до файла результатів позначку порÑдку байтів (BOM), Ñкщо викориÑтано параметр C<-m>." +msgstr "" +"Dos2unix та unix2dos завжди запиÑують до файла результатів позначку порÑдку " +"байтів (BOM), Ñкщо викориÑтано параметр C<-m>." #. type: =head2 -#: dos2unix.pod:412 +#: dos2unix.pod:432 msgid "Unicode examples" msgstr "Приклади Ð´Ð»Ñ Unicode" #. type: textblock -#: dos2unix.pod:414 +#: dos2unix.pod:434 msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8" -msgstr "Перетворити дані з Windows UTF-16 (з позначкою порÑдку байтів (BOM)) у формат Unix UTF-8" +msgstr "" +"Перетворити дані з Windows UTF-16 (з позначкою порÑдку байтів (BOM)) у " +"формат Unix UTF-8" #. type: verbatim -#: dos2unix.pod:416 +#: dos2unix.pod:436 #, no-wrap msgid "" " dos2unix -n in.txt out.txt\n" @@ -756,12 +1144,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:418 +#: dos2unix.pod:438 msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8" -msgstr "Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі UTF-8 Unix" +msgstr "" +"Перетворити дані у форматі Windows UTF-16LE (без BOM) на дані у форматі " +"UTF-8 Unix" #. type: verbatim -#: dos2unix.pod:420 +#: dos2unix.pod:440 #, no-wrap msgid "" " dos2unix -ul -n in.txt out.txt\n" @@ -771,12 +1161,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:422 +#: dos2unix.pod:442 msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM" -msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 без BOM" +msgstr "" +"Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-8 " +"без BOM" #. type: verbatim -#: dos2unix.pod:424 +#: dos2unix.pod:444 #, no-wrap msgid "" " unix2dos -m -n in.txt out.txt\n" @@ -786,12 +1178,13 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:426 +#: dos2unix.pod:446 msgid "Convert from Unix UTF-8 to Windows UTF-16" -msgstr "Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16" +msgstr "" +"Перетворити дані у кодуванні UTF-8 Unix на дані у кодуванні Windows UTF-16" #. type: verbatim -#: dos2unix.pod:428 +#: dos2unix.pod:448 #, no-wrap msgid "" " unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n" @@ -801,17 +1194,19 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:430 +#: dos2unix.pod:450 msgid "EXAMPLES" msgstr "ПРИКЛÐДИ" #. type: textblock -#: dos2unix.pod:432 +#: dos2unix.pod:452 msgid "Read input from 'stdin' and write output to 'stdout'." -msgstr "Прочитати вхідні дані зі Ñтандартного джерела (stdin) Ñ– запиÑати результат до Ñтандартного Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ (stdout)." +msgstr "" +"Прочитати вхідні дані зі Ñтандартного джерела (stdin) Ñ– запиÑати результат " +"до Ñтандартного Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ (stdout)." #. type: verbatim -#: dos2unix.pod:434 +#: dos2unix.pod:454 #, no-wrap msgid "" " dos2unix\n" @@ -823,12 +1218,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:437 +#: dos2unix.pod:457 msgid "Convert and replace a.txt. Convert and replace b.txt." -msgstr "Перетворити дані у a.txt Ñ– заміÑтити цей файл. Перетворити дані у b.txt Ñ– заміÑтити цей файл." +msgstr "" +"Перетворити дані у a.txt Ñ– заміÑтити цей файл. Перетворити дані у b.txt Ñ– " +"заміÑтити цей файл." #. type: verbatim -#: dos2unix.pod:439 +#: dos2unix.pod:459 #, no-wrap msgid "" " dos2unix a.txt b.txt\n" @@ -840,12 +1237,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:442 +#: dos2unix.pod:462 msgid "Convert and replace a.txt in ascii conversion mode." msgstr "Перетворити дані у a.txt Ñ– заміÑтити файл у режимі Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ascii." #. type: verbatim -#: dos2unix.pod:444 +#: dos2unix.pod:464 #, no-wrap msgid "" " dos2unix a.txt\n" @@ -855,12 +1252,17 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:446 -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-бітового перетвореннÑ." +#: dos2unix.pod:466 +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:449 +#: dos2unix.pod:469 #, no-wrap msgid "" " dos2unix a.txt -c 7bit b.txt\n" @@ -874,12 +1276,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:453 +#: dos2unix.pod:473 msgid "Convert a.txt from Mac to Unix format." msgstr "Перетворити файл a.txt з формату Mac на формат Unix." #. type: verbatim -#: dos2unix.pod:455 +#: dos2unix.pod:475 #, no-wrap msgid "" " dos2unix -c mac a.txt\n" @@ -891,12 +1293,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:458 +#: dos2unix.pod:478 msgid "Convert a.txt from Unix to Mac format." msgstr "Перетворити файл a.txt з формату Unix на формат Mac." #. type: verbatim -#: dos2unix.pod:460 +#: dos2unix.pod:480 #, no-wrap msgid "" " unix2dos -c mac a.txt\n" @@ -908,12 +1310,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:463 +#: dos2unix.pod:483 msgid "Convert and replace a.txt while keeping original date stamp." -msgstr "Перетворити дані у a.txt, заміÑтити цей файл Ñ– зберегти чаÑову позначку початкового файла." +msgstr "" +"Перетворити дані у a.txt, заміÑтити цей файл Ñ– зберегти чаÑову позначку " +"початкового файла." #. type: verbatim -#: dos2unix.pod:465 +#: dos2unix.pod:485 #, no-wrap msgid "" " dos2unix -k a.txt\n" @@ -925,12 +1329,12 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:468 +#: dos2unix.pod:488 msgid "Convert a.txt and write to e.txt." msgstr "Перетворити дані у файлі a.txt Ñ– запиÑати результати до файла e.txt." #. type: verbatim -#: dos2unix.pod:470 +#: dos2unix.pod:490 #, no-wrap msgid "" " dos2unix -n a.txt e.txt\n" @@ -940,12 +1344,15 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:472 -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." +#: dos2unix.pod:492 +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:474 +#: dos2unix.pod:494 #, no-wrap msgid "" " dos2unix -k -n a.txt e.txt\n" @@ -955,12 +1362,14 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:476 +#: dos2unix.pod:496 msgid "Convert and replace a.txt. Convert b.txt and write to e.txt." -msgstr "Перетворити дані у a.txt Ñ– заміÑтити цей файл. Перетворити дані у b.txt Ñ– запиÑати результат до e.txt." +msgstr "" +"Перетворити дані у a.txt Ñ– заміÑтити цей файл. Перетворити дані у b.txt Ñ– " +"запиÑати результат до e.txt." #. type: verbatim -#: dos2unix.pod:478 +#: dos2unix.pod:498 #, no-wrap msgid "" " dos2unix a.txt -n b.txt e.txt\n" @@ -972,12 +1381,17 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:481 -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." +#: dos2unix.pod:501 +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:484 +#: dos2unix.pod:504 #, no-wrap msgid "" " dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n" @@ -987,17 +1401,25 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:486 +#: dos2unix.pod:506 msgid "RECURSIVE CONVERSION" msgstr "РЕКУРСИВÐЕ ПЕРЕТВОРЕÐÐЯ" #. type: textblock -#: dos2unix.pod:488 -msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:" -msgstr "Ð”Ð»Ñ Ñ€ÐµÐºÑƒÑ€Ñивного Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑтових файлів у ієрархії каталогів Ñлід викориÑтовувати dos2unix у поєднанні з програмами find(1) та xargs(1). Ðаприклад, щоб виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑƒÑÑ–Ñ… файлів .txt у Ñтруктурі підкаталогів поточного каталогу, віддайте таку команду:" +#: dos2unix.pod:508 +msgid "" +"Use dos2unix in combination with the find(1) and xargs(1) commands to " +"recursively convert text files in a directory tree structure. For instance " +"to convert all .txt files in the directory tree under the current directory " +"type:" +msgstr "" +"Ð”Ð»Ñ Ñ€ÐµÐºÑƒÑ€Ñивного Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑтових файлів у ієрархії каталогів Ñлід " +"викориÑтовувати dos2unix у поєднанні з програмами find(1) та xargs(1). " +"Ðаприклад, щоб виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑƒÑÑ–Ñ… файлів .txt у Ñтруктурі " +"підкаталогів поточного каталогу, віддайте таку команду:" #. type: verbatim -#: dos2unix.pod:492 +#: dos2unix.pod:512 #, no-wrap msgid "" " find . -name *.txt |xargs dos2unix\n" @@ -1007,22 +1429,36 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:494 +#: dos2unix.pod:514 msgid "LOCALIZATION" msgstr "ЛОКÐЛІЗÐЦІЯ" #. type: =item -#: dos2unix.pod:498 +#: dos2unix.pod:518 msgid "B<LANG>" msgstr "B<LANG>" #. type: textblock -#: dos2unix.pod:500 -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:" +#: dos2unix.pod:520 +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:507 +#: dos2unix.pod:527 #, no-wrap msgid "" " export LANG=nl Dutch\n" @@ -1044,47 +1480,83 @@ msgstr "" "\n" #. type: textblock -#: dos2unix.pod:515 -msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" -msgstr "Повний ÑпиÑок мов та кодів країн наведено у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +#: dos2unix.pod:535 +msgid "" +"For a complete list of language and country codes see the gettext manual: " +"L<http://www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" +msgstr "" +"Повний ÑпиÑок мов та кодів країн наведено у підручнику з gettext: L<http://" +"www.gnu.org/software/gettext/manual/gettext.html#Language-Codes>" #. type: textblock -#: dos2unix.pod:518 -msgid "On Unix systems you can use to command locale(1) to get locale specific information." -msgstr "У ÑиÑтемах Unix Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… щодо локалі можна ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ locale(1)." +#: dos2unix.pod:538 +msgid "" +"On Unix systems you can use to command locale(1) to get locale specific " +"information." +msgstr "" +"У ÑиÑтемах Unix Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… щодо локалі можна ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ " +"locale(1)." #. type: =item -#: dos2unix.pod:521 +#: dos2unix.pod:541 msgid "B<LANGUAGE>" msgstr "B<LANGUAGE>" #. type: textblock -#: dos2unix.pod:523 -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/gettext.html#The-LANGUAGE-variable>" -msgstr "За допомогою змінної Ñередовища LANGUAGE ви можете вказати ÑпиÑок пріоритеноÑÑ‚Ñ– мов. ЗапиÑи у ÑпиÑку Ñлід відокремлювати двокрапками. Програма dos2unix надає перевагу LANGUAGE над LANG. Ðаприклад, перша голландÑька, далі німецька: C<LANGUAGE=nl:de>. Спочатку вам Ñлід увімкнути локалізацію, вÑтановивши Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— LANG (або LC_ALL) значеннÑ, відмінне від «C». Далі ви зможете викориÑтовувати ÑпиÑок пріоритетноÑÑ‚Ñ– мов за допомогою змінної LANGUAGE. Додаткові відомоÑÑ‚Ñ– можна знайти у підручнику з gettext: L<http://www.gnu.org/software/gettext/manual/gettext.html#The-LANGUAGE-variable>" +#: dos2unix.pod:543 +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/gettext.html#The-LANGUAGE-variable>" +msgstr "" +"За допомогою змінної Ñередовища LANGUAGE ви можете вказати ÑпиÑок " +"пріоритеноÑÑ‚Ñ– мов. ЗапиÑи у ÑпиÑку Ñлід відокремлювати двокрапками. Програма " +"dos2unix надає перевагу LANGUAGE над LANG. Ðаприклад, перша голландÑька, " +"далі німецька: C<LANGUAGE=nl:de>. Спочатку вам Ñлід увімкнути локалізацію, " +"вÑтановивши Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— LANG (або LC_ALL) значеннÑ, відмінне від «C». Далі " +"ви зможете викориÑтовувати ÑпиÑок пріоритетноÑÑ‚Ñ– мов за допомогою змінної " +"LANGUAGE. Додаткові відомоÑÑ‚Ñ– можна знайти у підручнику з gettext: L<http://" +"www.gnu.org/software/gettext/manual/gettext.html#The-LANGUAGE-variable>" #. type: textblock -#: dos2unix.pod:531 -msgid "If you select a language which is not available you will get the standard English messages." -msgstr "Якщо вами буде вибрано мову, перекладу Ñкою немає, буде показано Ñтандартні Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð°Ð½Ð³Ð»Ñ–Ð¹Ñькою мовою." +#: dos2unix.pod:551 +msgid "" +"If you select a language which is not available you will get the standard " +"English messages." +msgstr "" +"Якщо вами буде вибрано мову, перекладу Ñкою немає, буде показано Ñтандартні " +"Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð°Ð½Ð³Ð»Ñ–Ð¹Ñькою мовою." #. type: =item -#: dos2unix.pod:535 +#: dos2unix.pod:555 msgid "B<DOS2UNIX_LOCALEDIR>" msgstr "B<DOS2UNIX_LOCALEDIR>" #. type: textblock -#: dos2unix.pod:537 -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>." +#: dos2unix.pod:557 +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:542 +#: dos2unix.pod:562 msgid "Example (POSIX shell):" msgstr "Приклад (командна оболонка POSIX):" #. type: verbatim -#: dos2unix.pod:544 +#: dos2unix.pod:564 #, no-wrap msgid "" " export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n" @@ -1094,85 +1566,144 @@ msgstr "" "\n" #. type: =head1 -#: dos2unix.pod:549 +#: dos2unix.pod:569 msgid "RETURN VALUE" msgstr "ПОВЕРÐУТЕ ЗÐÐЧЕÐÐЯ" #. type: textblock -#: dos2unix.pod:551 -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." +#: dos2unix.pod:571 +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:554 -msgid "The return value is always zero in quiet mode, except when wrong command-line options are used." -msgstr "У режимі без повідомлень повернутим значеннÑм завжди буде нуль, Ñкщо вказано правильні параметри командного Ñ€Ñдка." +#: dos2unix.pod:574 +msgid "" +"The return value is always zero in quiet mode, except when wrong command-" +"line options are used." +msgstr "" +"У режимі без повідомлень повернутим значеннÑм завжди буде нуль, Ñкщо вказано " +"правильні параметри командного Ñ€Ñдка." #. type: =head1 -#: dos2unix.pod:557 +#: dos2unix.pod:577 msgid "STANDARDS" msgstr "СТÐÐДÐРТИ" #. type: textblock -#: dos2unix.pod:559 +#: dos2unix.pod:579 msgid "L<http://en.wikipedia.org/wiki/Text_file>" msgstr "L<http://en.wikipedia.org/wiki/Text_file>" #. type: textblock -#: dos2unix.pod:561 +#: dos2unix.pod:581 msgid "L<http://en.wikipedia.org/wiki/Carriage_return>" msgstr "L<http://uk.wikipedia.org/wiki/Carriage_return>" #. type: textblock -#: dos2unix.pod:563 +#: dos2unix.pod:583 msgid "L<http://en.wikipedia.org/wiki/Newline>" msgstr "L<http://uk.wikipedia.org/wiki/Newline>" #. type: textblock -#: dos2unix.pod:565 +#: dos2unix.pod:585 msgid "L<http://en.wikipedia.org/wiki/Unicode>" msgstr "L<http://uk.wikipedia.org/wiki/Unicode>" #. type: =head1 -#: dos2unix.pod:567 +#: dos2unix.pod:587 msgid "AUTHORS" msgstr "ÐВТОРИ" #. type: textblock -#: dos2unix.pod:569 -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> (Ñупровідник)" +#: dos2unix.pod:589 +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:574 +#: dos2unix.pod:594 msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>" msgstr "Сторінка проекту: L<http://waterlan.home.xs4all.nl/dos2unix.html>" #. type: textblock -#: dos2unix.pod:576 +#: dos2unix.pod:596 msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>" msgstr "Сторінка на SourceForge: L<http://sourceforge.net/projects/dos2unix/>" -#. type: textblock -#: dos2unix.pod:578 -msgid "Freecode: L<http://freecode.com/projects/dos2unix>" -msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" - #. type: =head1 -#: dos2unix.pod:580 +#: dos2unix.pod:598 msgid "SEE ALSO" msgstr "ТÐКОЖ ПЕРЕГЛЯÐЬТЕ" #. type: textblock -#: dos2unix.pod:582 +#: dos2unix.pod:600 msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "Dos2unix never writes a BOM in the output file, unless you use option C<-m>." -#~ msgstr "Dos2unix ніколи не запиÑує позначку порÑдку байтів (BOM) до файла результатів, Ñкщо не вказано параметра C<-m>." - -#~ msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar conversion modes." -#~ msgstr "Зразком Ð´Ð»Ñ dos2unix Ñлугувала програма dos2unix Ð´Ð»Ñ SunOS/Solaris, отже, у програмі передбачено подібні режими Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…." - -#~ msgid "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of dos2unix/unix2dos under SunOS/Solaris." -#~ msgstr "Режими Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ I<ascii>, I<7bit> та I<iso> Ñ” подібними до таких Ñамих режимів Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ програмах dos2unix/unix2dos Ð´Ð»Ñ SunOS/Solaris." +#~ msgid "Freecode: L<http://freecode.com/projects/dos2unix>" +#~ msgstr "Freecode: L<http://freecode.com/projects/dos2unix>" + +#~ msgid "" +#~ "The Windows versions of dos2unix and unix2dos convert UTF-16 encoded " +#~ "files always to UTF-8 encoded files. Unix versions of dos2unix/unix2dos " +#~ "convert UTF-16 encoded files to the locale character encoding when it is " +#~ "set to UTF-8. Use the locale(1) command to find out what the locale " +#~ "character encoding is." +#~ msgstr "" +#~ "ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Windows завжди виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ " +#~ "файлів у кодуванні UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. ВерÑÑ–Ñ— dos2unix та unix2dos " +#~ "Ð´Ð»Ñ Unix виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні UTF-16 до файлів у " +#~ "кодуванні локалі. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– ÑкориÑтайтеÑÑ " +#~ "командою locale(1)." + +#~ msgid "" +#~ "Because UTF-8 formatted text files are well supported on both Windows and " +#~ "Unix, dos2unix and unix2dos have no option to write UTF-16 files. All " +#~ "UTF-16 characters can be encoded in UTF-8. Conversion from UTF-16 to " +#~ "UTF-8 is without loss. UTF-16 files will be skipped on Unix when the " +#~ "locale character encoding is not UTF-8, to prevent accidental loss of " +#~ "text. 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-8 доволі добре " +#~ "реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено " +#~ "можливоÑÑ‚Ñ– запиÑу файлів у кодуванні UTF-16. УÑÑ– Ñимволи UTF-16 можна " +#~ "знайти Ñ– у кодуванні UTF-8. ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 до " +#~ "ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8, Ñ– навпаки, відбуваєтьÑÑ Ð±ÐµÐ· втрат. Файли у кодуванні " +#~ "UTF-16 буде пропущено у Unix, Ñкщо кодуваннÑм локалі не Ñ” UTF-8, щоб " +#~ "запобігти випадковій втраті даних. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у " +#~ "кодуванні UTF-16 на дані у кодуванні UTF-8 ÑтанетьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, " +#~ "помилка міÑтитиметьÑÑ Ñƒ файлі вхідних даних UTF-16, файл буде пропущено " +#~ "під Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸." + +#~ msgid "" +#~ "Dos2unix never writes a BOM in the output file, unless you use option C<-" +#~ "m>." +#~ msgstr "" +#~ "Dos2unix ніколи не запиÑує позначку порÑдку байтів (BOM) до файла " +#~ "результатів, Ñкщо не вказано параметра C<-m>." + +#~ msgid "" +#~ "Dos2unix was modelled after dos2unix under SunOS/Solaris and has similar " +#~ "conversion modes." +#~ msgstr "" +#~ "Зразком Ð´Ð»Ñ dos2unix Ñлугувала програма dos2unix Ð´Ð»Ñ SunOS/Solaris, отже, " +#~ "у програмі передбачено подібні режими Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…." + +#~ msgid "" +#~ "Conversion modes I<ascii>, I<7bit>, and I<iso> are similar to those of " +#~ "dos2unix/unix2dos under SunOS/Solaris." +#~ msgstr "" +#~ "Режими Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ I<ascii>, I<7bit> та I<iso> Ñ” подібними до таких " +#~ "Ñамих режимів Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ програмах dos2unix/unix2dos Ð´Ð»Ñ SunOS/" +#~ "Solaris." diff --git a/man/uk/man1/dos2unix.pod b/man/uk/man1/dos2unix.pod index a01c7c7..259e07e 100644 --- a/man/uk/man1/dos2unix.pod +++ b/man/uk/man1/dos2unix.pod @@ -160,9 +160,16 @@ B<unix2dos>: Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð° дві комбінації розрР=item B<-m, --add-bom> -ДопиÑати до файла результатів Ñимвол позначки порÑдку байтів UTF-8 (BOM). Ðе -викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від -UTF-8. Див. також розділ щодо UNICODE. +ЗапиÑати до файла результатів позначку порÑдку байтів (BOM). Типово буде +запиÑано позначку порÑдку байтів UTF-8. + +Якщо дані початкового файла закодовано у UTF-16 Ñ– викориÑтано параметр +C<-u>, буде допиÑано позначку порÑдку байтів UTF-16. + +Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних від UTF-8 +або UTF-16. Див. також розділ щодо UNICODE. + + =item B<-n, --newfile ВХІДÐИЙ_ФÐЙЛ ВИХІДÐИЙ_ФÐЙЛ ...> @@ -209,6 +216,14 @@ UTF-8. Див. також розділ щодо UNICODE. ПропуÑкати двійкові файли (типово). +=item B<-u, --keep-utf16> + +Зберегти початкове ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16. Файл результатів буде запиÑано у тому +Ñамому кодуванні UTF-16, із прÑмим або зворотним порÑдком байтів, що Ñ– +початковий файл. Таким чином можна запобігти перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ +UTF-8. До файла буде запиÑано відповідну позначку порÑдку байтів +UTF-16. Вимкнути цей параметр можна за допомогою параметра C<-ascii>. + =item B<-ul, --assume-utf16le> ПрипуÑкати, що кодуваннÑм вхідних файлів Ñ” UTF-16LE. @@ -233,6 +248,11 @@ UTF-16LE. Таким чином ви повернетеÑÑ Ð´Ð¾ початкоРЦей параметр працює у ÑпоÑіб, тотожний до параметра C<-ul>. +=item B<-v, --verbose> + +Виводити докладні повідомленнÑ. Буде показано додаткові дані щодо позначок +порÑдку байтів та кількоÑÑ‚Ñ– перетворених Ñимволів розриву Ñ€Ñдків. + =item B<-F, --follow-symlink> Переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони @@ -371,22 +391,23 @@ UTF-8, оÑкільки UTF-8 було розроблено так, що Ð·Ð²Ð¾Ñ Ð±Ð°Ð¹Ñ‚Ñ–Ð². Щоб дізнатиÑÑ Ð¿Ñ€Ð¾ те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду C<dos2unix -V>. -ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Windows завжди виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² -у кодуванні UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Unix -виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні UTF-16 до файлів у кодуванні -локалі. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ -locale(1). +Типово, файли у кодуванні UTF-16 буде перетворено на файли у кодуванні +UTF-8. У Unix/Linux це потребує вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів локалі +UTF-8. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– можна ÑкориÑтатиÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ +locale(1). Обидва типи ÑиÑтем, Windows та Unix/Linux, мають непогані +можливоÑÑ‚Ñ– з підтримки форматованих текÑтових файлів у кодуванні UTF-8. -ОÑкільки підтримку текÑтових файлів у кодуванні UTF-8 доволі добре -реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено -можливоÑÑ‚Ñ– запиÑу файлів у кодуванні UTF-16. УÑÑ– Ñимволи UTF-16 можна знайти -Ñ– у кодуванні UTF-8. ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ -UTF-8, Ñ– навпаки, відбуваєтьÑÑ Ð±ÐµÐ· втрат. Файли у кодуванні UTF-16 буде -пропущено у Unix, Ñкщо кодуваннÑм локалі не Ñ” UTF-8, щоб запобігти -випадковій втраті даних. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у кодуванні UTF-16 -на дані у кодуванні UTF-8 ÑтанетьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, помилка -міÑтитиметьÑÑ Ñƒ файлі вхідних даних UTF-16, файл буде пропущено під Ñ‡Ð°Ñ -обробки. +ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 та UTF-8 Ñ” повніÑÑ‚ÑŽ ÑуміÑними. Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ðµ буде +втрачено жодної інформації. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у кодуванні +UTF-16 на дані у кодуванні UTF-8 трапитьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, Ñкщо у +вхідному файлі UTF-16 міÑтитиметьÑÑ ÑкаÑÑŒ помилка, файл буде пропущено. + +Якщо викориÑтано параметр C<-u>, файл результатів буде запиÑано у тому +Ñамому кодуванні UTF-16, що Ñ– початковий файл. ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Option +C<-u> запобігає перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. + +У dos2unix та unix2dos не передбачено параметра Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у +кодуванні UTF-8 на дані у кодуванні UTF-16. Режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO та 7-бітовий режим не працюють Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16. @@ -603,8 +624,6 @@ mac2unix) - <wuebben@kde.org>, Christian Wurll (додатковий новий Сторінка на SourceForge: L<http://sourceforge.net/projects/dos2unix/> -Freecode: L<http://freecode.com/projects/dos2unix> - =head1 ТÐКОЖ ПЕРЕГЛЯÐЬТЕ file(1) find(1) iconv(1) locale(1) xargs(1) diff --git a/man/uk/man1/dos2unix.txt b/man/uk/man1/dos2unix.txt index 32bba7a..8b3b965 100644 --- a/man/uk/man1/dos2unix.txt +++ b/man/uk/man1/dos2unix.txt @@ -122,9 +122,14 @@ Ñимволів розриву Ñ€Ñдків Unix. -m, --add-bom - ДопиÑати до файла результатів Ñимвол позначки порÑдку байтів UTF-8 - (BOM). Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, - відмінних від UTF-8. Див. також розділ щодо UNICODE. + ЗапиÑати до файла результатів позначку порÑдку байтів (BOM). Типово + буде запиÑано позначку порÑдку байтів UTF-8. + + Якщо дані початкового файла закодовано у UTF-16 Ñ– викориÑтано + параметр "-u", буде допиÑано позначку порÑдку байтів UTF-16. + + Ðе викориÑтовуйте цей параметр Ð´Ð»Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½ÑŒ результатів, відмінних + від UTF-8 або UTF-16. Див. також розділ щодо UNICODE. -n, --newfile ВХІДÐИЙ_ФÐЙЛ ВИХІДÐИЙ_ФÐЙЛ ... Ðовий режим обробки файлів. Перетворити дані з файла ВХІДÐИЙ_ФÐЙЛ Ñ– @@ -169,6 +174,14 @@ -s, --safe ПропуÑкати двійкові файли (типово). + -u, --keep-utf16 + Зберегти початкове ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16. Файл результатів буде запиÑано + у тому Ñамому кодуванні UTF-16, із прÑмим або зворотним порÑдком + байтів, що Ñ– початковий файл. Таким чином можна запобігти + перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. До файла буде запиÑано + відповідну позначку порÑдку байтів UTF-16. Вимкнути цей параметр + можна за допомогою параметра "-ascii". + -ul, --assume-utf16le ПрипуÑкати, що кодуваннÑм вхідних файлів Ñ” UTF-16LE. @@ -193,6 +206,11 @@ Цей параметр працює у ÑпоÑіб, тотожний до параметра "-ul". + -v, --verbose + Виводити докладні повідомленнÑ. Буде показано додаткові дані щодо + позначок порÑдку байтів та кількоÑÑ‚Ñ– перетворених Ñимволів розриву + Ñ€Ñдків. + -F, --follow-symlink Переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони вказують. @@ -322,22 +340,25 @@ UNICODE порÑдком байтів. Щоб дізнатиÑÑ Ð¿Ñ€Ð¾ те, чи було dos2unix зібрано з підтримкою UTF-16, віддайте команду "dos2unix -V". - ВерÑÑ–Ñ— dos2unix та unix2dos Ð´Ð»Ñ Windows завжди виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ - файлів у кодуванні UTF-16 до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. ВерÑÑ–Ñ— dos2unix та - unix2dos Ð´Ð»Ñ Unix виконують Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² у кодуванні UTF-16 до - файлів у кодуванні локалі. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– - ÑкориÑтайтеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾ÑŽ locale(1). - - ОÑкільки підтримку текÑтових файлів у кодуванні UTF-8 доволі добре - реалізовано у Windows та Unix, у dos2unix та unix2dos не передбачено - можливоÑÑ‚Ñ– запиÑу файлів у кодуванні UTF-16. УÑÑ– Ñимволи UTF-16 можна - знайти Ñ– у кодуванні UTF-8. ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… з ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 до - ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8, Ñ– навпаки, відбуваєтьÑÑ Ð±ÐµÐ· втрат. Файли у кодуванні - UTF-16 буде пропущено у Unix, Ñкщо кодуваннÑм локалі не Ñ” UTF-8, щоб - запобігти випадковій втраті даних. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у - кодуванні UTF-16 на дані у кодуванні UTF-8 ÑтанетьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, - помилка міÑтитиметьÑÑ Ñƒ файлі вхідних даних UTF-16, файл буде пропущено - під Ñ‡Ð°Ñ Ð¾Ð±Ñ€Ð¾Ð±ÐºÐ¸. + Типово, файли у кодуванні UTF-16 буде перетворено на файли у кодуванні + UTF-8. У Unix/Linux це потребує вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ñимволів локалі + UTF-8. Ð”Ð»Ñ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ð¾Ñ‡Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ Ð»Ð¾ÐºÐ°Ð»Ñ– можна ÑкориÑтатиÑÑ + командою locale(1). Обидва типи ÑиÑтем, Windows та Unix/Linux, мають + непогані можливоÑÑ‚Ñ– з підтримки форматованих текÑтових файлів у + кодуванні UTF-8. + + ÐšÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16 та UTF-8 Ñ” повніÑÑ‚ÑŽ ÑуміÑними. Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ðµ + буде втрачено жодної інформації. Якщо під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у + кодуванні UTF-16 на дані у кодуванні UTF-8 трапитьÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°, наприклад, + Ñкщо у вхідному файлі UTF-16 міÑтитиметьÑÑ ÑкаÑÑŒ помилка, файл буде + пропущено. + + Якщо викориÑтано параметр "-u", файл результатів буде запиÑано у тому + Ñамому кодуванні UTF-16, що Ñ– початковий файл. ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° + Option "-u" запобігає перетворенню даних у ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-8. + + У dos2unix та unix2dos не передбачено параметра Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… у + кодуванні UTF-8 на дані у кодуванні UTF-16. Режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ISO та 7-бітовий режим не працюють Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² UTF-16. @@ -543,8 +564,6 @@ UNICODE Сторінка на SourceForge: <http://sourceforge.net/projects/dos2unix/> - Freecode: <http://freecode.com/projects/dos2unix> - ТÐКОЖ ПЕРЕГЛЯÐЬТЕ file(1) find(1) iconv(1) locale(1) xargs(1) @@ -5,6 +5,7 @@ # This makefile is for use with MSYS and MinGW (mingw.org) target 32 bit (i686)
# http://www.mingw.org/
+.PHONY: test check
prefix=c:/usr/local
ENABLE_NLS=
@@ -17,6 +18,11 @@ endif all:
$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f"
+test: all
+ cd test; $(MAKE) test
+
+check: test
+
install:
$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f"
diff --git a/mingw32.mak b/mingw32.mak index 076b00d..fc53bce 100644 --- a/mingw32.mak +++ b/mingw32.mak @@ -4,6 +4,7 @@ # This makefile is for use with MSYS2 and MinGW-w64 target 32 bit (i686)
# http://sourceforge.net/projects/msys2/
+.PHONY: test check
CC = gcc
@@ -25,6 +26,11 @@ LIBS_EXTRA += $(CRT_GLOB_OBJ) all:
$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw32/include
+test: all
+ cd test; $(MAKE) test
+
+check: test
+
install:
$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw32/include
diff --git a/mingw64.mak b/mingw64.mak index ba4315b..ccca337 100644 --- a/mingw64.mak +++ b/mingw64.mak @@ -4,6 +4,7 @@ # This makefile is for use with MSYS2 and MinGW-w64 target 64 bit (x86_64)
# http://sourceforge.net/projects/msys2/
+.PHONY: test check
# Ruben van Boxem x86_64-w64-mingw32
#CC = x86_64-w64-mingw32-gcc
@@ -27,6 +28,11 @@ LIBS_EXTRA += $(CRT_GLOB_OBJ) all:
$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw64/include
+test: all
+ cd test; $(MAKE) test
+
+check: test
+
install:
$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="cp -f" CC=$(CC) CFLAGS_OS=-I/mingw64/include
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 6.0.5-b3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" "PO-Revision-Date: 2014-03-09 12:07+0100\n" "Last-Translator: Thomas Pryds <thomas@pryds.eu>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -33,181 +33,42 @@ msgstr "" "Alle rettigheder forbeholdes.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Binært symbol 0x00%02X fundet pÃ¥ linje %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "kan ikke skrive til outputfil: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "programfejl, ugyldig omdannelsestilstand %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "bruger tegnkodningstabel %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Binært symbol 0x%02X fundet pÃ¥ linje %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Ã…bning af midlertidig outputfil mislykkedes: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "bruger %s som midlertidig fil\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Skrivning til midlertidig outputfil %s mislykkedes: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "" -"Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problemer med at følge symbolsk henvisning \"%s\"\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " outputfil forbliver i \"%s\"\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problemer under omdøbning af \"%s\" til \"%s\": %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " som er mÃ¥let for symbolsk henvisning \"%s\"\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "fejl: Værdien af miljøvariabel DOS2UNIX_LOCALEDIR er for lang.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "aktuel tegnkodningstabel: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "ugyldig %s omdannelsestilstand specificeret\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "tilvalg \"%s\" kræver et argument\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "Springer %s over, ikke en almindelig fil.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "Springer %s over. Outputfil %s er en symbolsk henvisning.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Springer binær fil %s over\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "tegnkodningstabel %d understøttes ikke.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "" -"Skipping UTF-16 file %s, the current locale character encoding is not " -"UTF-8.\n" -msgstr "" -"Springer UTF-16-fil %s over. Tegnkodningen for den aktuelle lokalitet er " -"ikke UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "Springer UTF-16-fil %s over. Størrelsen pÃ¥ wchar_t er %d byte.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Springer UTF-16-fil %s over. Der opstod en fejl under omdannelse.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "omdanner fil %s til fil %s i Unix-format …\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemer under omdannelse af fil %s til fil %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Springer symbolsk henvisning %s over.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "omdanner fil %s til Unix-format …\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problemer under omdannelse af fil %s\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -220,27 +81,7 @@ msgstr "" "Alle rettigheder forbeholdes.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "omdanner fil %s til fil %s i Mac-format …\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "omdanner fil %s til fil %s i DOS-format …\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "omdanner fil %s til Mac-format …\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "omdanner fil %s til DOS-format …\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -263,7 +104,7 @@ msgstr "" " stilles til rÃ¥dighed med distribueringen.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -289,71 +130,71 @@ 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:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Brug: %s [tilvalg] [fil …] [-n indfil udfil …]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii omdan kun linjeskift (standard)\n" -#: common.c:215 +#: common.c:222 #, c-format 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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr "" " -1252 brug Windows-tegnkodningstabel 1252 (Vesteuropa)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr "" " -437 brug DOS-tegnkodningstabel 437 (US) (standard)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 brug DOS-tegnkodningstabel 850 (Vesteuropa)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 brug DOS-tegnkodningstabel 860 (portugisisk)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr "" " -863 brug DOS-tegnkodningstabel 863 (fransk-canadisk)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 brug DOS-tegnkodningstabel 865 (nordisk)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 omdan 8-bit-tegn til 7-bit-plads\n" -#: common.c:224 +#: common.c:231 #, fuzzy, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" -#: common.c:226 +#: common.c:233 #, fuzzy, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -362,37 +203,37 @@ msgstr "" " -c, --convmode omdannelsestilstand\n" " convmode ascii, 7bit, iso, mac, standard er ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force gennemtving omdannelse af binære filer\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjælpetekst\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold outputfils dato\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license vis softwarelicens\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline tilføj ekstra linjeskift\n" -#: common.c:234 -#, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#: common.c:241 +#, fuzzy, c-format +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -403,7 +244,7 @@ msgstr "" " infile originalfil i ny-fil-tilstand\n" " outfile outputfil i ny-fil-tilstand\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -412,47 +253,53 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filter til omdannelse i gammel-fil-tilstand\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet stilletilstand, tilbagehold alle advarsler\n" -" (altid slÃ¥et til i stdio-tilstand)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet stilletilstand, tilbagehold alle advarsler\n" -#: common.c:243 +#: common.c:249 #, fuzzy, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" -#: common.c:245 +#: common.c:251 #, fuzzy, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe spring binære filer over (standard)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr "" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr "" + +#: common.c:260 #, c-format 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:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -461,7 +308,7 @@ msgstr "" " -R, --replace-symlink erstat symbolske henvisninger med omdannede filer\n" " (oprindelige mÃ¥lfiler forbliver uændrede)\n" -#: common.c:257 +#: common.c:265 #, c-format msgid "" " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" @@ -469,77 +316,264 @@ msgstr "" "-S, --skip-symlink behold symbolske henvisninger og deres mÃ¥l uændrede " "(standard)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version vis versionsnummer\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-version (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-version (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-version (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-version (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS-version.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin-version.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-version (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-version (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-version (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-version (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-version (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-version (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-version (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2-version (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Med Unicode UTF-16-understøttelse.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Uden Unicode UTF-16-understøttelse.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Med understøttelse for lokale sprog.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Ã…bning af midlertidig outputfil mislykkedes: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "bruger %s som midlertidig fil\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Skrivning til midlertidig outputfil %s mislykkedes: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problemer med at følge symbolsk henvisning \"%s\"\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " outputfil forbliver i \"%s\"\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problemer under omdøbning af \"%s\" til \"%s\": %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " som er mÃ¥let for symbolsk henvisning \"%s\"\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Springer binær fil %s over\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "tegnkodningstabel %d understøttes ikke.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"Springer UTF-16-fil %s over. Tegnkodningen for den aktuelle lokalitet er " +"ikke UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, c-format +msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" +msgstr "Springer UTF-16-fil %s over. Størrelsen pÃ¥ wchar_t er %d byte.\n" + +#: common.c:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "Springer UTF-16-fil %s over. Der opstod en fejl under omdannelse.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "Springer %s over, ikke en almindelig fil.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemer under omdannelse af fil %s til fil %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Springer symbolsk henvisning %s over.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "omdanner fil %s til Unix-format …\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "omdanner fil %s til Mac-format …\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "omdanner fil %s til DOS-format …\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problemer under omdannelse af fil %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "aktuel tegnkodningstabel: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "ugyldig %s omdannelsestilstand specificeret\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "tilvalg \"%s\" kræver et argument\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr "" +#~ " -m, --add-bom tilføj UTF-8 byte-rækkefølge-markering (BOM)\n" @@ -1,17 +1,18 @@ # German messages for dos2unix. # This file is distributed under the same license as the dos2unix package. # -# Philipp Thomas <psmt@opensuse.org>, 2009, 2010, 2011. +# Philipp Thomas <pth@suse.de>, 2009, 2010, 2011, 2012. # Lars Wendler <polynomial-c@gentoo.org>, 2013. # Mario Blättermann <mario.blaettermann@gmail.com>, 2014. +# Philipp Thomas <pth@suse.de>, 2014. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-10 09:45+0100\n" -"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-18 15:24+0200\n" +"Last-Translator: Philipp Thomas <pth@suse.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -36,172 +37,42 @@ msgstr "" "Alle Rechte vorbehalten.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" -msgstr "Ein binäres Symbol 0x00%02X wurde in Zeile %d gefunden\n" +msgstr "Das binäre Symbol 0x00%02X wurde in Zeile %d gefunden\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "Programmfehler, der Umwandlungsmodus %d ist unzulässig\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Es wurden %d von %d Zeilenumbrüchen umgewandelt.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "Codepage %d wird verwendet.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Ein binäres Symbol 0x%02X wurde in Zeile %d gefunden\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "%s wird als temporäre Datei verwendet\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " Die Ausgabedatei verbleibt in »%s«\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "Aktive Codepage: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "Die Option »%s« benötigt ein Argument\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "Symbolische Verknüpfung %s wird übersprungen, da das Ziel keine reguläre Datei ist.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine reguläre Datei.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "binäre Datei %s wird übersprungen\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "Codepage %d wird nicht unterstützt.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "UTF-16 Datei %s wird übersprungen, da die derzeitige Zeichenkodierung nicht UTF-8 ist.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "UTF-16 Datei %s wird übersprungen, da beim Umwandeln ein Fehler auftrat.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt …\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n" +msgstr "" +"Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n" #: unix2dos.c:66 msgid "" @@ -215,27 +86,7 @@ msgstr "" "Alle Rechte vorbehalten.\n" "\n" -#: unix2dos.c:1177 -#, 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" - -#: unix2dos.c:1179 -#, 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" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -258,7 +109,7 @@ msgstr "" " Material wiedergeben.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -287,67 +138,73 @@ 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:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Aufruf: %s [Optionen] [Datei …] [-n Eingabedatei Ausgabedatei …]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n" -#: common.c:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso wandelt zwischen DOS- und ISO-8859-1-Zeichensatz um\n" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n" +msgstr "" +" -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 verwendet DOS Codepage 437 (US) (Vorgabe)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 verwendet DOS Codepage 850 (Westeuropäisch)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 verwendet DOS Codepage 860 (Portugiesisch)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n" +msgstr "" +" -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 verwendet DOS Codepage 865 (Nordisch)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" -msgstr " -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n" +msgstr "" +" -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n" +msgstr "" +" -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -356,37 +213,39 @@ msgstr "" " -c, --convmode gibt den Umwandlungsmodus an\n" " convmode ascii, 7bit, iso, mac, Standard ist nach ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force erzwingt die Umwandlung binärer Dateien\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help gibt diese Hilfe aus\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate erhält das Datum der Ausgabedatei\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license gibt die Software-Lizenz aus\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline fügt einen Zeilenumbruch hinzu\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom fügt eine UTF-8-Bytereihenfolge-Markierung hinzu\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -397,7 +256,7 @@ msgstr "" " Eingabedatei Originaldatei im Neue-Datei-Modus\n" " Ausgabedatei Ausgabedatei im Neue-Datei-Modus\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -406,132 +265,330 @@ msgstr "" " -o, --oldfile überschreibt die alte Datei (Vorgabe)\n" " Datei ... die im Alte-Datei-Modus umzuwandelnden Dateien\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet stiller Modus, unterdrückt alle Warnungen\n" -" (ist im stdio-Modus immer aktiv)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet stiller Modus, unterdrückt alle Warnungen\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n" +msgstr "" +" -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe überspringt binäre Dateien (Vorgabe)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 UTF-16-Kodierung beibehalten\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose ausführliche Ausgabe\n" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink folgt symbolischen Verknüpfungen und wandelt die " +"Ziele um\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die umgewandelten\n" +" -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die " +"umgewandelten\n" " Dateien (die originale Ziele bleiben unangetastet)\n" -#: common.c:257 +#: common.c:265 #, c-format -msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version gibt die Versionsnummer aus\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-Version (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-Version (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-Version (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-Version (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS-Version.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin-Version.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-Version (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-Version (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-Version (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-Version (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-Version (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-Version (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-Version (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2-Version (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Mit Unterstützung für Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Ohne Unterstützung für Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Mit Unterstützung von Landessprachen.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Das %s BOM wird geschrieben.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Die EIngabedatei %s hat ein %s BOM.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" + +#: common.c:746 +#, 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:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "%s wird als temporäre Datei verwendet\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s " +"scheiterte: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " Die Ausgabedatei verbleibt in »%s«\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten: %s\n" + +#: common.c:934 +#, 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:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "binäre Datei %s wird übersprungen\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "Codepage %d wird nicht unterstützt.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"UTF-16 Datei %s wird übersprungen, da die derzeitige Zeichenkodierung nicht " +"UTF-8 ist.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"UTF-16 Datei %s wird übersprungen, da beim Umwandeln ein Fehler auftrat.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, 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:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "Aktive Codepage: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "Die Option »%s« benötigt ein Argument\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" diff --git a/po/dos2unix.pot b/po/dos2unix.pot index 4822a12..3458e29 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: 2014-07-09 19:08+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+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" @@ -27,175 +27,42 @@ msgid "" "\n" msgstr "" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 #, c-format -msgid "using code page %d.\n" -msgstr "" - -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 -#, c-format -msgid "Binary symbol 0x%02X found at line %d\n" -msgstr "" - -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgid "Converted %d out of %d line breaks.\n" msgstr "" -#: dos2unix.c:690 unix2dos.c:705 +#: dos2unix.c:325 unix2dos.c:314 #, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr "" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" +msgid "using code page %d.\n" msgstr "" -#: dos2unix.c:776 unix2dos.c:791 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format -msgid " which is the target of symbolic link '%s'\n" +msgid "Binary symbol 0x%02X found at line %d\n" msgstr "" -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "" -"Skipping UTF-16 file %s, the current locale character encoding is not " -"UTF-8.\n" -msgstr "" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -204,27 +71,7 @@ msgid "" "\n" msgstr "" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -237,7 +84,7 @@ msgid "" "\n" msgstr "" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -252,105 +99,105 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr "" -#: common.c:215 +#: common.c:222 #, c-format msgid "" " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr "" -#: common.c:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr "" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr "" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr "" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr "" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr "" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr "" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr "" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr "" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr "" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" msgstr "" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr "" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr "" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr "" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr "" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr "" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr "" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -358,134 +205,319 @@ msgid "" " outfile output file in new-file mode\n" msgstr "" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" msgstr "" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr "" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr "" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr "" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr "" + +#: common.c:255 #, c-format msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr "" -#: common.c:249 +#: common.c:256 #, c-format msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr "" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr "" + +#: common.c:260 #, c-format msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr "" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -#: common.c:257 +#: common.c:265 #, c-format msgid "" " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr "" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr "" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr "" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr "" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" + +#: common.c:1006 common.c:1038 common.c:1081 +#, c-format +msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" +msgstr "" + +#: common.c:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "" + +#: common.c:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "" @@ -5,10 +5,10 @@ # Benno Schulenberg <benno@vertaalt.nl>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.5-b3\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-02-01 19:14+0100\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-31 17:44+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "Language: eo\n" @@ -34,179 +34,42 @@ msgstr "" "Ĉiuj rajtoj estas rezervitaj.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Duuma signo 0x00%02X troviÄis en linio %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "ne eblas skribi al eliga dosiero: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "**programeraro**: malvalida konvertmoduso %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "KonvertiÄis %d el %d linifinoj.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "uziÄas kodpaÄo %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Duuma signo 0x%02X troviÄis en linio %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "uziÄas %s kiel provizora dosiero\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Malsukcesis skribi al provizora eliga dosiero %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Malsukcesis ÅanÄi la permesojn de provizora eliga dosiero %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "" -"Malsukcesis ÅanÄi posedanton kaj grupon de provizora eliga dosiero %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problemoj dum redukto de simbola ligo '%s'\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " eliga dosiero restas en '%s'\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problemoj dum alinomigo de '%s' al '%s': %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " kiu estas la celo de simbola ligo '%s'\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "eraro: Valoro de ĉirkaÅaĵa variablo DOS2UNIX_LOCALEDIR tro longas.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "aktiva kodpaÄo: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "malvalida konvertmoduso %s indikatas\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "opcio '%s' bezonas argumenton\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "PreterpasiÄas %s, Äi ne estas normala dosiero.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "PreterpasiÄas %s, eliga dosiero %s estas simbola ligo.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "PreterpasiÄas duuma dosiero %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "kodpaÄo %d ne subtenatas.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "" -"Skipping UTF-16 file %s, the current locale character encoding is not " -"UTF-8.\n" -msgstr "" -"PreterpasiÄas UTF-16-a dosiero %s, la nuntempa lokaĵa kodo ne estas UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "PreterpasiÄas UTF-16-a dosiero %s, okazis konverteraro de UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "konvertiÄas dosiero %s al dosiero %s Unix-en...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "PreterpasiÄas simbola ligo %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konvertiÄas dosiero %s Unix-en...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problemoj dum konverto de dosiero %s\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -219,27 +82,7 @@ msgstr "" "Ĉiuj rajtoj estas rezervitaj.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "konvertiÄas dosiero %s al dosiero %s Mac-en...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "konvertiÄas dosiero %s al dosiero %s DOS-en...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konvertiÄas dosiero %s Mac-en...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konvertiÄas dosiero %s DOS-en...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -261,7 +104,7 @@ msgstr "" " la manlibro kaj/aÅ en la aliaj materialoj kiuj akompanis la distribuon.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -276,70 +119,70 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "" "Uzmaniero: %s [opcioj] [dosiero ...] [-n enigdosiero eligdosiero ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konverti nur linifinojn (defaÅlto)\n" -#: common.c:215 +#: common.c:222 #, c-format 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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 uzi Vindozan kodpaÄon 1252 (Okcident-EÅropa)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 uzi DOS-kodpaÄon 437 (Usona) (defaÅlto)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 uzi DOS-kodpaÄon 850 (Okcident-EÅropa)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 uzi DOS0-kodpaÄon 860 (Portugala)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 uzi DOS-kodpaÄon 863 (Kebekia)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 uzi DOS-kodpaÄon 865 (Nordlandaj)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr "" " -7 konverti signojn kun jesa oka bito al spacetojn\n" -#: common.c:224 -#, fuzzy, c-format +#: common.c:231 +#, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" -msgstr " -m, --add-bom aldoni UTF-8-an bajtordo-markon\n" +msgstr " -b, --keep-bom reteni bajtordo-markon\n" -#: common.c:226 -#, fuzzy, c-format +#: common.c:233 +#, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -m, --add-bom aldoni UTF-8-an bajtordo-markon\n" +msgstr " -b, --keep-bom reteni bajtordo-markon (defaÅlto)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -349,37 +192,37 @@ msgstr "" " konvertmoduso 'ascii', '7bit', 'iso', aÅ 'mac' (defaÅltas al " "'ascii')\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force perforte konverti ankaÅ duumajn dosierojn\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help montri ĉi tiun helptekston\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate konservi dattempon de eliga dosiero\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license montri la permesilon de la programo\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline aldoni aldonan linifinon\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom aldoni UTF-8-an bajtordo-markon\n" +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr " -m, --add-bom aldoni bajtordo-markon\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -390,7 +233,7 @@ msgstr "" " enigdosiero eniga dosiero en novdosiera moduso\n" " eligdosiero eliga dosiero en novdosiera moduso\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -399,46 +242,53 @@ msgstr "" " -o, --oldfile skribi al ekzistanta dosiero (defaÅlto)\n" " dosiero ... konvertenda(j) dosiero(j) en olddosiera moduso\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet subpremi avertojn (ĉiam dum uzo de ĉefeligujo)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet subpremi ĉiujn avertojn\n" -#: common.c:243 -#, fuzzy, c-format +#: common.c:249 +#, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -m, --add-bom aldoni UTF-8-an bajtordo-markon\n" +msgstr " -r, --remove-bom forigi bajtordo-markon (defaÅlto)\n" -#: common.c:245 -#, fuzzy, c-format +#: common.c:251 +#, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" -msgstr " -m, --add-bom aldoni UTF-8-an bajtordo-markon\n" +msgstr " -r, --remove-bom forigi bajtordo-markon\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe preterpasi duumajn dosierojn (defaÅlto)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 reteni UTF-16-kodoprezenton\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose parolema funkciado\n" + +#: common.c:260 #, c-format 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:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -448,7 +298,7 @@ msgstr "" "dosieroj\n" " (la celaj dosieroj ne ÅanÄiÄas)\n" -#: common.c:257 +#: common.c:265 #, c-format msgid "" " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" @@ -456,77 +306,258 @@ msgstr "" " -S, --skip-symlink ne ÅanÄi simbolajn ligojn nek ties celojn " "(defaÅlto)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version montri programversion\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bita versio (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bita versio (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bita versio (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bita versio (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS-versio.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin-versio.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bita versio (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bita versio (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bita versio (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bita versio (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bita versio (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bita versio (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versio (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versio (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Kun subteno por Unikoda UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Sen subteno por Unikoda UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Kun subteno por lokaĵoj.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "SkribiÄas %s-BOM.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Eniga dosiero %s havas %s-BOM.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "SupoziÄas UTF-16LE-kodoprezento.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "SupoziÄas UTF-16BE-kodoprezento.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "uziÄas %s kiel provizora dosiero\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Malsukcesis skribi al provizora eliga dosiero %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "Malsukcesis ÅanÄi la permesojn de provizora eliga dosiero %s: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Malsukcesis ÅanÄi posedanton kaj grupon de provizora eliga dosiero %s: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problemoj dum redukto de simbola ligo '%s'\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " eliga dosiero restas en '%s'\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problemoj dum alinomigo de '%s' al '%s': %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " kiu estas la celo de simbola ligo '%s'\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "PreterpasiÄas duuma dosiero %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "kodpaÄo %d ne subtenatas.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"PreterpasiÄas UTF-16-a dosiero %s, la nuntempa lokaĵa kodo ne estas UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "PreterpasiÄas UTF-16-a dosiero %s, okazis konverteraro de UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "PreterpasiÄas %s, Äi ne estas normala dosiero.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "PreterpasiÄas simbola ligo %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konvertiÄas dosiero %s Unix-en...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konvertiÄas dosiero %s Mac-en...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konvertiÄas dosiero %s DOS-en...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problemoj dum konverto de dosiero %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "aktiva kodpaÄo: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "malvalida konvertmoduso %s indikatas\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "opcio '%s' bezonas argumenton\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" @@ -9,9 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 6.0.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" "PO-Revision-Date: 2014-07-25 18:03+0100\n" -"Last-Translator: Enrique Lazcorreta Puigmartà <enrique.lazcorreta@gmail.com>\n" +"Last-Translator: Enrique Lazcorreta Puigmartà <enrique.lazcorreta@gmail." +"com>\n" "Language-Team: Spanish <es@tp.org.es>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -36,172 +37,43 @@ msgstr "" "Todos los derechos reservados.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "SÃmbolo binario 0x00%02X encontrado en la lÃnea %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "error, modo de conversión %d inválido\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "usando página de códigos %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "SÃmbolo binario 0x%02X encontrado en la lÃnea %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Falló al abrir el archivo de salida temporal: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "usando %s como archivo temporal\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Falló al escribir el archivo de salida temporal %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Error al cambiar los permisos del archivo temporal de salida %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problemas al resolver el enlace simbólico '%s'\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " el archivo de salida permanece en '%s'\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problemas al renombrar '%s' como '%s': %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " cual es el destino del enlace simbólico '%s'\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "error: El valor de la variable de entorno DOS2UNIX_LOCALEDIR es demasiado largo.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "Página de códigos activa: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "modo de conversión %s especificado es inválido\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "el parámetro '%s' requiere un argumento\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "Ignorando %s, no es un archivo regular.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, 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" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Ignorando archivo binario %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "La página de códigos %d no está soportada.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "Ignorando archivo UTF-16 %s, la codificación actual no es UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "convirtiendo archivo %s a %s in formato Unix...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemas al convertir el archivo %s a %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignorando enlace simbólico %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "convirtiendo archivo %s a formato Unix...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problemas convirtiendo el archivo %s\n" +msgstr "" +"error: El valor de la variable de entorno DOS2UNIX_LOCALEDIR es demasiado " +"largo.\n" #: unix2dos.c:66 msgid "" @@ -215,28 +87,8 @@ msgstr "" "Todos los derechos reservados.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "convirtiendo archivo %s a %s in formato Mac...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "convirtiendo archivo %s a %s en formato DOS...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "convirtiendo archivo %s a formato Mac...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "convirtiendo archivo %s a formato DOS...\n" - # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -248,18 +100,23 @@ msgid "" " the distribution.\n" "\n" msgstr "" -"La redistribución y el uso en las formas de código fuente y binario, con o sin\n" +"La redistribución y el uso en las formas de código fuente y binario, con o " +"sin\n" "modificaciones, están permitidos siempre que se cumplan las siguientes\n" "condiciones:\n" -"1. Las redistribuciones del código fuente deben conservar el aviso de copyright\n" -" anterior, esta lista de condiciones y el siguiente descargo de responsabilidad.\n" -"2. Las redistribuciones en formato binario deben reproducir el aviso de copyright\n" -" anterior, esta lista de condiciones y la siguiente renuncia en la documentación\n" +"1. Las redistribuciones del código fuente deben conservar el aviso de " +"copyright\n" +" anterior, esta lista de condiciones y el siguiente descargo de " +"responsabilidad.\n" +"2. Las redistribuciones en formato binario deben reproducir el aviso de " +"copyright\n" +" anterior, esta lista de condiciones y la siguiente renuncia en la " +"documentación\n" " y/u otros materiales suministrados con la distribución.\n" "\n" # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -279,73 +136,90 @@ msgstr "" "DETERMINADO SON RECHAZADAS. EN NINGÚN CASO EL AUTOR SERà RESPONSABLE\n" "POR NINGÚN DAÑO DIRECTO, INDIRECTO, INCIDENTAL, ESPECIAL, EJEMPLAR O\n" "CONSECUENTE (INCLUYENDO, PERO NO LIMITADO A, LA ADQUISICIÓN DE BIENES O\n" -"SERVICIOS; LA PÉRDIDA DE USO, DE DATOS O DE BENEFICIOS; O INTERRUPCIÓN DE LA\n" +"SERVICIOS; LA PÉRDIDA DE USO, DE DATOS O DE BENEFICIOS; O INTERRUPCIÓN DE " +"LA\n" "ACTIVIDAD EMPRESARIAL) O POR CUALQUIER TEORÃA DE RESPONSABILIDAD, YA SEA\n" "POR CONTRATO, RESPONSABILIDAD ESTRICTA O AGRAVIO (INCLUYENDO NEGLIGENCIA\n" "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:213 +#: common.c:220 #, 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" +msgstr "" +"Uso: %s [parámetros] [archivo ...] [-n archivo_de_entrada " +"archivo_de_salida ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii solamente convierte los saltos de lÃnea (por defecto)\n" +msgstr "" +" -ascii solamente convierte los saltos de lÃnea (por " +"defecto)\n" -#: common.c:215 +#: common.c:222 #, c-format -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" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 usa la página de códigos Windows 1252 (Europa Occidental)\n" +msgstr "" +" -1252 usa la página de códigos Windows 1252 (Europa " +"Occidental)\n" -#: common.c:217 +#: common.c:224 #, c-format 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" +msgstr "" +" -437 usa la página de códigos DOS 437 (EE. UU.) (por " +"defecto)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 usa la página de códigos DOS 850 (Europa Occidental)\n" +msgstr "" +" -850 usa la página de códigos DOS 850 (Europa Occidental)\n" -#: common.c:219 +#: common.c:226 #, c-format 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:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 usa la página de códigos DOS 863 (Francocanadiense)\n" +msgstr "" +" -863 usa la página de códigos DOS 863 (Francocanadiense)\n" -#: common.c:221 +#: common.c:228 #, c-format 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:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" -msgstr " -7 convierte caracteres de 8 bits al espacio de 7 bits\n" +msgstr "" +" -7 convierte caracteres de 8 bits al espacio de 7 bits\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM\n" -#: common.c:226 +#: common.c:233 #, c-format 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" +msgstr "" +" -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por " +"defecto)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -354,37 +228,39 @@ msgstr "" " -c, --convmode modo de conversión\n" " modo_de_conversion ascii, 7bit, iso, mac, por defecto es ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force fuerza la conversión de archivos binarios\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help arroja esta ayuda\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserva la fecha en el archivo de salida\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license muestra la licencia del programa\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline añade salto de lÃnea adicional\n" -#: common.c:234 -#, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom añade marca de orden de bytes para UTF-8\n" +#: common.c:241 +#, fuzzy, c-format +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr "" +" -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por " +"defecto)\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -395,7 +271,7 @@ msgstr "" " archivo_de_entrada archivo original en el modo de archivo nuevo\n" " archivo_de_salida archivo de salida en el modo de archivo nuevo\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -404,130 +280,330 @@ msgstr "" " -o, --oldfile escribe al archivo antiguo (por defecto)\n" " archivo ... archivos a convertir en el modo de archivo antiguo\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" " -q, --quiet modo silencioso, suprime todas las advertencias\n" -" (siempre en modo stdio)\n" -#: common.c:243 +#: common.c:249 #, c-format 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" +msgstr "" +" -r, --remove-bom elimina la Marca de Orden del Byte, BOM (por " +"defecto)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora archivos binarios (por defecto)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr "" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr "" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink sigue los enlaces simbólicos y convierte los " +"destinos\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos convertidos\n" +" -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos " +"convertidos\n" " (los archivos destino originales no son alterados)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version despliega el número de versión\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Versión DOS de 16 bit (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Versión DOS de 16 bit (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Versión DOS de 32 bit (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Versión DOS de 32 bit (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "Versión para MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Versión para Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Versión Windows de 64 bit (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Versión Windows de 32 bit (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Versión Windows de 32 bit (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Versión Windows de 32 bit (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Versión Windows de 64 bit (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Versión Windows de 32 bit (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "Versión para OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "Versión para OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Con soporte Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Sin soporte Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Con soporte de idioma materno.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Falló al abrir el archivo de salida temporal: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "usando %s como archivo temporal\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Falló al escribir el archivo de salida temporal %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "Error al cambiar los permisos del archivo temporal de salida %s: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Error al cambiar el propietario y grupo del archivo temporal de salida %s: " +"%s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problemas al resolver el enlace simbólico '%s'\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " el archivo de salida permanece en '%s'\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problemas al renombrar '%s' como '%s': %s\n" + +#: common.c:934 +#, 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:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Ignorando archivo binario %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "La página de códigos %d no está soportada.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "Ignorando archivo UTF-16 %s, la codificación actual no es UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "Ignorando %s, no es un archivo regular.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemas al convertir el archivo %s a %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignorando enlace simbólico %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "convirtiendo archivo %s a formato Unix...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "convirtiendo archivo %s a formato Mac...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "convirtiendo archivo %s a formato DOS...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problemas convirtiendo el archivo %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "Página de códigos activa: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "modo de conversión %s especificado es inválido\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "el parámetro '%s' requiere un argumento\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom añade marca de orden de bytes para UTF-8\n" @@ -4,10 +4,10 @@ # Frédéric Marchal <fmarchal@perso.be>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix-6.0.6-beta4\n" +"Project-Id-Version: dos2unix-6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-10 07:24+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-30 12:27+0200\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -32,172 +32,43 @@ msgstr "" "Tous droits réservés.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Symbole binaire 0x00%02X rencontré à la ligne %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "impossible d'écrire dans le fichier de sortie : %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "erreur du programme, mode de conversion %d invalide\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "A converti %d sauts de lignes sur %d.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "utilise le code page %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Symbole binaire 0x%02X rencontré à la ligne %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "utilise %s comme fichier temporaire\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Échec d'écriture dans le fichier temporaire de sortie %s : %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s : %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s : %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problème lors de la résolution du lien symbolique « %s »\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " le fichier de sortie reste dans « %s »\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problèmes en renommant « %s » en « %s » : %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " quelle est la cible du lien symbolique « %s »\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "erreur: La valeur de la variable d'environnement DOS2UNIX_LOCALEDIR est trop longue.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "code page actif : %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "mode de conversion %s spécifié invalide\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "l'option « %s » requiert un argument\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "Ignore %s, pas un fichier régulier.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, 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" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Ignore le fichier binaire %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "le code page %d n'est pas supporté.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "Ignore le fichier UTF-16 %s, l'encodage des caractères de l'environnement linguistique actuel n'est pas UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu.\n" - -#: dos2unix.c:1161 -#, 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" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, 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" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignore le lien symbolique %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "conversion du fichier %s au format Unix…\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problèmes lors de la conversion du fichier %s\n" +msgstr "" +"erreur: La valeur de la variable d'environnement DOS2UNIX_LOCALEDIR est trop " +"longue.\n" #: unix2dos.c:66 msgid "" @@ -211,27 +82,7 @@ msgstr "" "Tous droits réservés.\n" "\n" -#: unix2dos.c:1177 -#, 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" - -#: unix2dos.c:1179 -#, 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" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "conversion du fichier %s au format Mac…\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "conversion du fichier %s au format DOS…\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -248,10 +99,12 @@ msgstr "" "suivantes soient respectées :\n" "1. La distribution du code source doit conserver le copyright ci-dessus\n" " cette liste de conditions et l'avis de non-responsabilité ci-dessous.\n" -"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" +"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:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -271,73 +124,85 @@ msgstr "" "DANS AUCUN CAS, L'AUTEUR NE SERA TENU RESPONSABLE DES DÉGÂTS DIRECTS,\n" "INDIRECTS, INCIDENTAUX, SPÉCIAUX, EXEMPLAIRES, OU RÉSULTANTS (Y COMPRIS,\n" "MAIS NON LIMITÉ À, LA FOURNITURE OU LE REMPLACEMENT DE BIENS OU SERVICES,\n" -"PERTE D'UTILISATION, DONNÉES, OU PROFITS ; OU INTERRUPTION DE TRAVAIL) CAUSÉS\n" +"PERTE D'UTILISATION, DONNÉES, OU PROFITS ; OU INTERRUPTION DE TRAVAIL) " +"CAUSÉS\n" "DE QUELQUE MANIÈRE ET SELON TOUTE THÉORIE DE RESPONSABILITÉ, PAR CONTRAT,\n" "RESPONSABILITÉ STRICT, OU TORT (Y COMPRIS LA NÉGLIGENCE OU AUTRE) SURVENANT\n" "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:213 +#: common.c:220 #, 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:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n" +msgstr "" +" -ascii converti uniquement les sauts de ligne (par défaut)\n" -#: common.c:215 +#: common.c:222 #, c-format -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" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 utilise le code page 1252 de Windows (Europe de l'ouest)\n" +msgstr "" +" -1252 utilise le code page 1252 de Windows (Europe de " +"l'ouest)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 utilise le code page 437 du DOS (US) (par défaut)\n" +msgstr "" +" -437 utilise le code page 437 du DOS (US) (par défaut)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 utilise le code page 850 du DOS (Europe de l'ouest)\n" +msgstr "" +" -850 utilise le code page 850 du DOS (Europe de l'ouest)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 utilise le code page 860 du DOS (Portugais)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 utilise le code page 863 du DOS (Français Canadien)\n" +msgstr "" +" -863 utilise le code page 863 du DOS (Français Canadien)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 utilise le code page 865 du DOS (Nordique)\n" -#: common.c:222 +#: common.c:229 #, c-format 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" +msgstr "" +" -7 converti les caractères 8 bits vers l'espace 7 bits\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom garde la marque d'ordre des octets\n" -#: common.c:226 +#: common.c:233 #, c-format 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" +msgstr "" +" -b, --keep-bom garde la marque d'ordre des octets (par défaut)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -346,37 +211,39 @@ msgstr "" " -c, --convmode mode de conversion\n" " modeconv ascii, 7bit, iso, mac, ascii par défaut\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force force la conversion de fichiers binaires\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help affiche ce texte d'aide\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserve la date du fichier de sortie\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license affiche la licence du logiciel\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline ajoute des sauts de ligne supplémentaires\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom ajoute la marque d'ordre des octets de l'UTF-8\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -387,7 +254,7 @@ msgstr "" " fichier_entrée fichier original dans le mode « nouveau fichier »\n" " fichier_sortie fichier de sortie dans le mode « nouveau fichier »\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -396,130 +263,334 @@ msgstr "" " -o, --oldfile écrit dans l'ancien fichier (par défaut)\n" " fichier … fichiers à convertir dans le mode « ancien fichier »\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" " -q, --quiet mode silencieux, supprime tous les avertissements\n" -" (toujours le cas en mode stdio)\n" -#: common.c:243 +#: common.c:249 #, c-format 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" +msgstr "" +" -r, --remove-bom supprime la marque d'ordre des octets (par défaut)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom supprime la marque d'ordre des octets\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignore les fichiers binaires (par défaut)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 conserve l'encodage UTF-16\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose opération verbeuse\n" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink suit les liens symboliques et converti les cibles\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink remplace les liens symboliques par les fichiers convertis\n" +" -R, --replace-symlink remplace les liens symboliques par les fichiers " +"convertis\n" " (les fichiers cibles originaux restent inchangés)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version affiche le numéro de version\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Version DOS 16 bits (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Version DOS 16 bits (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Version DOS 32 bits (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Version DOS 32 bits (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "Version MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Version Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Version Windows 64 bit (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Version Windows 32 bits (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Version Windows 32 bits (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Version Windows 32 bits (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Version Windows 64 bits (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Version Windows 32 bits (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "Version OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "Version OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Avec support pour l'Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Sans support pour l'Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Avec support pour la langue native.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Écriture de la BOM %s.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Le fichier d'entrée %s a une BOM %s.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "Suppose un encodage UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "Suppose un encodage UTF-16BE.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "utilise %s comme fichier temporaire\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Échec d'écriture dans le fichier temporaire de sortie %s : %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Échec lors du changement des permissions du fichier temporaire de sortie " +"%s : %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Échec lors du changement du propriétaire et du groupe du fichier temporaire " +"de sortie %s : %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problème lors de la résolution du lien symbolique « %s »\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " le fichier de sortie reste dans « %s »\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problèmes en renommant « %s » en « %s » : %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " quelle est la cible du lien symbolique « %s »\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Ignore le fichier binaire %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "le code page %d n'est pas supporté.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"Ignore le fichier UTF-16 %s, l'encodage des caractères de l'environnement " +"linguistique actuel n'est pas UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "Ignore %s, pas un fichier régulier.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, 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:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignore le lien symbolique %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "conversion du fichier %s au format Unix…\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "conversion du fichier %s au format Mac…\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "conversion du fichier %s au format DOS…\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problèmes lors de la conversion du fichier %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "code page actif : %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "mode de conversion %s spécifié invalide\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "l'option « %s » requiert un argument\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr "" +#~ " -m, --add-bom ajoute la marque d'ordre des octets de l'UTF-8\n" @@ -5,10 +5,10 @@ # Balázs Úr <urbalazs@gmail.com>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-09 23:29+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-31 10:20+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" "Language: hu\n" @@ -34,173 +34,42 @@ msgstr "" "Minden jog fenntartva.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Bináris szimbólum (0x00%02X) található a(z) %d. sorban\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "nem sikerült Ãrni a kimeneti fájlba: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "programhiba, érvénytelen átalakÃtási mód: %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "%d / %d sortörés átalakÃtva.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "%d kódlap használata.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Bináris szimbólum (0x%02X) található a(z) %d. sorban\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "%s használata átmeneti fájlként\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Nem sikerült Ãrni a(z) %s átmeneti kimeneti fájlba: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "hiba a(z) „%s†szimbolikus link feloldásakor\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " kimeneti fájl maradt ebben: „%sâ€\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "hiba a(z) „%s†átnevezésekor erre: „%sâ€: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " mi a(z) „%s†szimbolikus link célja\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "hiba: a DOS2UNIX_LOCALEDIR környezeti változó értéke túl hosszú.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "aktÃv kódlap: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "érvénytelen %s átalakÃtási mód lett megadva\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "a(z) „%s†kapcsolóhoz argumentum szükséges\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "A(z) %s kihagyása, nem egy szabályos fájl.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, 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" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "A(z) %s bináris fájl kihagyása\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "a(z) %d kódlap nem támogatott.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "A(z) %s UTF-16 fájl kihagyása, a jelenlegi területi beállÃtás karakterkódolása nem UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakÃtási hiba történt.\n" - -#: dos2unix.c:1161 -#, 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" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, 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" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "A(z) %s szimbolikus link kihagyása.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "a(z) %s fájl átalakÃtása Unix formátumra…\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "hiba a(z) %s fájl átalakÃtásakor\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -213,27 +82,7 @@ msgstr "" "Minden jog fenntartva.\n" "\n" -#: unix2dos.c:1177 -#, 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" - -#: unix2dos.c:1179 -#, 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" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "a(z) %s fájl átalakÃtása Mac formátumra…\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "a(z) %s fájl átalakÃtása DOS formátumra…\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -255,7 +104,7 @@ msgstr "" " dokumentációban, illetve a csomaggal részét képezÅ‘ egyéb anyagokban.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -283,67 +132,72 @@ 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:213 +#: common.c:220 #, 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:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii csak sortörések átalakÃtása (alapértelmezett)\n" -#: common.c:215 +#: common.c:222 #, c-format -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" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n" +msgstr "" +" -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n" +msgstr "" +" -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n" -#: common.c:218 +#: common.c:225 #, c-format 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:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS 860-as kódlap használata (portugál)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 DOS 863-as kódlap használata (francia-kanadai)\n" +msgstr "" +" -863 DOS 863-as kódlap használata (francia-kanadai)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS 865-ös kódlap használata (északi)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 8-bites karakterek átalakÃtása 7-bitesre\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása (alapértelmezett)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -352,37 +206,38 @@ msgstr "" " -c, --convmode átalakÃtási mód\n" " convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n" -#: common.c:229 +#: common.c:236 #, c-format 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:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help ezen súgószöveg megjelenÃtése\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate kimeneti fájl dátumának megtartása\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license szoftverlicenc megjelenÃtése\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline további új sor hozzáadása\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom UTF-8 bájtsorrendjel hozzáadása\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -393,7 +248,7 @@ msgstr "" " infile eredeti fájl új-fájl módban\n" " outfile kimeneti fájl új-fájl módban\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -402,46 +257,55 @@ 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:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n" -" (mindig be van kapcsolva stdio módban)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n" -#: common.c:243 +#: common.c:249 #, c-format 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:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom bájtsorrendjel eltávolÃtása\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe bináris fájlok kihagyása (alapértelmezett)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 UTF-16 kódolás megtartása\n" + +#: common.c:255 #, c-format 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" +msgstr "" +" -ul, --assume-utf16le feltételezze, hogy a bemeneti formátum UTF-16LE\n" -#: common.c:249 +#: common.c:256 #, c-format 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" +msgstr "" +" -ub, --assume-utf16be feltételezze, hogy a bemeneti formátum UTF-16BE\n" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose részletes működés\n" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink szimbolikus linkek követése és a célok átalakÃtása\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -450,84 +314,272 @@ 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:257 +#: common.c:265 #, c-format -msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version verziószám megjelenÃtése\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "16-bites DOS verzió (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "16-bites DOS verzió (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "32-bites DOS verzió (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "32-bites DOS verzió (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS verzió.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin verzió.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "64-bites Windows verzió (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "32-bites Windows verzió (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "32-bites Windows verzió (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "32-bites Windows verzió (MinGW)\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "64-bites Windows verzió (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "32-bites Windows verzió (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 verzió (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2 verzió (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatással.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatás nélkül.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "NatÃv nyelvi támogatással.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "%s BOM Ãrása.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "A(z) %s bemeneti fájl %s BOM-mal rendelkezik.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "UTF-16LE kódolás feltételezése.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "UTF-16BE kódolás feltételezése.\n" + +#: common.c:746 +#, 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:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "%s használata átmeneti fájlként\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Nem sikerült Ãrni a(z) %s átmeneti kimeneti fájlba: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait: " +"%s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és " +"csoportját: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "hiba a(z) „%s†szimbolikus link feloldásakor\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " kimeneti fájl maradt ebben: „%sâ€\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "hiba a(z) „%s†átnevezésekor erre: „%sâ€: %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " mi a(z) „%s†szimbolikus link célja\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "A(z) %s bináris fájl kihagyása\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "a(z) %d kódlap nem támogatott.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"A(z) %s UTF-16 fájl kihagyása, a jelenlegi területi beállÃtás " +"karakterkódolása nem UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakÃtási hiba történt.\n" + +#: common.c:1017 common.c:1063 +#, 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:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, 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:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "A(z) %s szimbolikus link kihagyása.\n" + +#: common.c:1088 +#, 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:1091 +#, 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:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "a(z) %s fájl átalakÃtása DOS formátumra…\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "hiba a(z) %s fájl átalakÃtásakor\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "aktÃv kódlap: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "érvénytelen %s átalakÃtási mód lett megadva\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "a(z) „%s†kapcsolóhoz argumentum szükséges\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom UTF-8 bájtsorrendjel hozzáadása\n" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-6.0.6-beta4\n" +"Project-Id-Version: dos2unix-6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-10 09:44+0100\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-30 01:49+0100\n" "Last-Translator: Ã…ka Sikrom <a4@hush.com>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "Language: Norwegian BokmÃ¥l\n" @@ -34,173 +34,42 @@ msgstr "" "Alle rettigheter tilhører opphavsrettseieren.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Fant binærsymbol 0x00%02X pÃ¥ linje %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "klarte ikke Ã¥ skrive til utdata-fil: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "programfeil: konverteringsmodus «%d» er ugyldig\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Konvertert %d av %d linjeskift.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "bruker kodeside %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Fant binærsymbol 0x%02X pÃ¥ linje %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Klarte ikke Ã¥ Ã¥pne midlertidig utdata-fil: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "bruker «%s» som midlertidig fil\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Klarte ikke Ã¥ skrive til den midlertidige utdata-fila «%s». %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Klarte ikke Ã¥ endre rettighetene til den midlertidige utdata-fila «%s». %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Klarte ikke Ã¥ endre eier og gruppetilhørighet for den midlertidige utdata-fila «%s». %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "det oppstod problemer med Ã¥ følge den symbolske lenka «%s»\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " utdata-fil blir liggende i «%s»\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "det oppstod problemer med Ã¥ gi «%s» det nye navnet «%s». %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " som den symbolske lenka «%s» peker til\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "feil: Verdien av miljøvariabelen DOS2UNIX_LOCALEDIR er for lang.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "aktiv kodeside: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "du har valgt en ugyldig %s-konverteringsmodus\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "valget «%s» krever at du bruker et argument\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "mÃ¥let for fila «%s» er ikke valgt i ny fil-modus\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "Hopper over «%s», som ikke er en vanlig fil.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "Hopper over «%s». Utdata-fila «%s» er en symbolsk lenke.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "Hopper over den symbolske lenka «%s». MÃ¥let er ikke en vanlig fil.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "Hopper over «%s». MÃ¥let for den symbolske lenka «%s» er ikke en vanlig fil.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Hopper over binærfila «%s»\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "kodesiden %d støttes ikke.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "Hopper over UTF-16-fila «%s». Gjeldende lokaltilpasset tegnkoding er ikke UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "Hopper over UTF-16-fila «%s». Størrelsen pÃ¥ wchar_t er %d byte.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Hopper over UTF-16-fila «%s». Det oppstod en UTF-16-konverteringsfeil.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "konverterer fila «%s» til «%s» i Unix-format …\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "det oppstod problemer under konvertering av fila «%s» til «%s»\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Hopper over den symbolske lenka «%s».\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konverterer fila «%s» til Unix-format …\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "det oppstod problemer under konvertering av fila «%s»\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -213,27 +82,7 @@ msgstr "" "Alle rettigheter tilhører rettighetshaveren.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "konverterer fila «%s» til «%s» i Mac-format …\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "konverterer fila «%s» til «%s» i DOS-format …\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konverterer fila «%s» til Mac-format …\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konverterer fila «%s» til DOS-format …\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -248,13 +97,14 @@ msgstr "" "Du kan dele og/eller endre bÃ¥de kildekode og binærfiler, gitt at følgende\n" "vilkÃ¥r oppfylles:\n" "1. Redistribuert kildekode mÃ¥ beholde opphavsrettsteksten som\n" -" ligger ovenfor, samt denne lista over vilkÃ¥r og følgende ansvarsfraskrivelse.\n" +" ligger ovenfor, samt denne lista over vilkÃ¥r og følgende " +"ansvarsfraskrivelse.\n" "2. Redistribuerte binærfiler mÃ¥ kunne produsere opphavsrettsteksten\n" " i dokumentasjonen og/eller i annet materiell som inngÃ¥r i\n" " distribusjonen.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -270,7 +120,8 @@ msgid "" msgstr "" "DENNE PROGRAMVAREN TILBYS AV FORFATTEREN «SLIK DET ER», OG\n" "DET STILLES INGEN EKSPLISITT ELLER IMPLISITT GARANTI FOR AT DET EGNER\n" -"SEG TIL NOE SOM HELST. UTVIKLEREN SKAL UNDER INGEN OMSTENDIGHETERREGNES SOM \n" +"SEG TIL NOE SOM HELST. UTVIKLEREN SKAL UNDER INGEN OMSTENDIGHETERREGNES " +"SOM \n" "ANSVARLIG FOR DIREKTE, INDIREKTE, TILFELDIGE, SPESIELLE, EKSEMPLARISKE\n" "ELLER KONSEKVENTE SKADER (INLKUSIVE - MEN IKKE BEGRENSET TIL - INNKJØP\n" "AV RESERVEVARER ELLER -TJENESTER, TAP AV DATA, TAP AV FORTJENESTE, ELLER\n" @@ -280,67 +131,69 @@ msgstr "" "PROGRAMVAREN, SELV NÃ…R VEDKOMMENDE ER INFORMERT OM AT SLIK SKADE KAN \n" "OPPSTÃ….\n" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Bruk: %s [valg] [fil …] [-n inndatafil utdatafil …]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii bare konverter linjeskift (standard)\n" -#: common.c:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso konverter mellom tegnsettene DOS og ISO-8859-1\n" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 bruk Windows-kodeside 1252 (Vesteuropeisk)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 bruk DOS-kodeside 437 (US) (standard)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 bruk DOS-kodeside 850 (vesteuropeisk)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 bruk DOS-kodeside 860 (portugisisk)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 bruk DOS-kodeside 863 (fransk-kanadisk)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 bruk DOS-kodeside 865 (nordisk)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konverter 8-bit-tegn til 7-bit\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behold «Byte Order»-merke\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behold «Byte Order»-merke (standard)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -349,37 +202,37 @@ msgstr "" " -c, --convmode konverteringsmodus\n" " convmode ascii, 7bit, iso, mac (standardmodus er ascii)\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force tving konvertering av binærfiler\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjelpeteksten\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold utdata-filens dato\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license vis programvarelisens\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline legg til en ekstra ny linje\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom legg til UTF-8 «Byte Order»-merke\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -390,7 +243,7 @@ msgstr "" " infile opprinnelig fil i ny fil-modus\n" " outfile utdata-fil i ny fil-modus\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -399,46 +252,52 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filer som skal konverteres i gammel fil-modus\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet stillemodus, uten advarsler\n" -" (dette er alltid gjeldende i «stdio»-modus)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet stillemodus, uten advarsler\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke (standard)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe hopp over binærfiler (standard)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 behold UTF-16-koding\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose detaljert utskrift\n" + +#: common.c:260 #, c-format 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:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -447,82 +306,272 @@ msgstr "" " -R, --replace-symlink erstatt symbolske lenker med konverterte filer\n" " (opprinnelig mÃ¥lfil forblir uendret)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version vis versjonsnummer\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-versjon (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-versjon (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-versjon (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-versjon (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS-versjon.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin-versjon.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-versjon (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-versjon (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-versjon (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-versjon (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-versjon (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-versjon (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versjon (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versjon (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Med støtte for Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Uten støtte for Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Med innebygd sprÃ¥kstøtte.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Skriver «Byte Order»-merke %s.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Inndatafil %s har «Byte Order»-merke %s.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "Forventer UTF-16LE-koding.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "Forventer UTF-16BE-koding.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Klarte ikke Ã¥ Ã¥pne midlertidig utdata-fil: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "bruker «%s» som midlertidig fil\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Klarte ikke Ã¥ skrive til den midlertidige utdata-fila «%s». %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Klarte ikke Ã¥ endre rettighetene til den midlertidige utdata-fila «%s». %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Klarte ikke Ã¥ endre eier og gruppetilhørighet for den midlertidige utdata-" +"fila «%s». %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "det oppstod problemer med Ã¥ følge den symbolske lenka «%s»\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " utdata-fil blir liggende i «%s»\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "det oppstod problemer med Ã¥ gi «%s» det nye navnet «%s». %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " som den symbolske lenka «%s» peker til\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Hopper over binærfila «%s»\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "kodesiden %d støttes ikke.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"Hopper over UTF-16-fila «%s». Gjeldende lokaltilpasset tegnkoding er ikke " +"UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, c-format +msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" +msgstr "Hopper over UTF-16-fila «%s». Størrelsen pÃ¥ wchar_t er %d byte.\n" + +#: common.c:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"Hopper over UTF-16-fila «%s». Det oppstod en UTF-16-konverteringsfeil.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "Hopper over «%s», som ikke er en vanlig fil.\n" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "Hopper over «%s». Utdata-fila «%s» er en symbolsk lenke.\n" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "Hopper over den symbolske lenka «%s». MÃ¥let er ikke en vanlig fil.\n" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "" +"Hopper over «%s». MÃ¥let for den symbolske lenka «%s» er ikke en vanlig fil.\n" + +#: common.c:1045 +#, 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:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "konverterer fila «%s» til «%s» i Mac-format …\n" + +#: common.c:1050 +#, 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:1054 +#, 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:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Hopper over den symbolske lenka «%s».\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konverterer fila «%s» til Unix-format …\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konverterer fila «%s» til Mac-format …\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konverterer fila «%s» til DOS-format …\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "det oppstod problemer under konvertering av fila «%s»\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "aktiv kodeside: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "du har valgt en ugyldig %s-konverteringsmodus\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "valget «%s» krever at du bruker et argument\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "mÃ¥let for fila «%s» er ikke valgt i ny fil-modus\n" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom legg til UTF-8 «Byte Order»-merke\n" @@ -5,10 +5,10 @@ # Benno Schulenberg <benno@vertaalt.nl>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.5-b3\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-02-01 14:37+0100\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-30 17:08+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" "Language: nl\n" @@ -34,187 +34,42 @@ msgstr "" "Alle rechten voorbehouden.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Binair teken 0x00%02X gevonden op regel %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "kan niet schrijven naar uitvoerbestand: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "**programmafout**: ongeldige conversiemodus %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Er zijn %d van %d regeleindes geconverteerd.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "codetabel %d wordt gebruikt.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Binair teken 0x%02X gevonden op regel %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "%s wordt als tijdelijk bestand gebruikt\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "" -"Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "" -"Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problemen met het herleiden van symbolische koppeling '%s'\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " uitvoerbestand blijft in '%s'\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problemen met hernoemen van '%s' naar '%s': %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " welke het doel is van symbolische koppeling '%s'\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "actieve codetabel: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "ongeldige conversiemodus %s opgegeven\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "optie '%s' vereist een argument\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "" -"%s wordt overgeslagen, uitvoerbestand %s is een symbolische koppeling.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "" -"Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier " -"bestand is.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "" -"%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen " -"regulier bestand is.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Binair bestand %s wordt overgeslagen\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "Codetabel %d wordt niet ondersteund.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "" -"Skipping UTF-16 file %s, the current locale character encoding is not " -"UTF-8.\n" -msgstr "" -"UTF-16-bestand %s wordt overgeslagen, de tekencodering van de huidige " -"taalregio is niet UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "" -"UTF-16-bestand %s wordt overgeslagen, de grootte van 'wchar_t' is %d bytes.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "" -"UTF-16-bestand %s wordt overgeslagen, er is een UTF-16-conversiefout " -"opgetreden.\n" - -#: dos2unix.c:1161 -#, 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" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemen met conversie van bestand %s naar bestand %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Symbolische koppeling %s wordt overgeslagen.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "converteren van bestand %s naar Unix-opmaak...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problemen met conversie van bestand %s\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -227,27 +82,7 @@ msgstr "" "Alle rechten voorbehouden.\n" "\n" -#: unix2dos.c:1177 -#, 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" - -#: unix2dos.c:1179 -#, 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" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "converteren van bestand %s naar Mac-opmaak...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "converteren van bestand %s naar DOS-opmaak...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -270,7 +105,7 @@ msgstr "" " in de documentatie en/of andere materialen die bij de uitgave horen.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -285,73 +120,73 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "" "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii alleen regeleindes converteren (standaard)\n" -#: common.c:215 +#: common.c:222 #, c-format 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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr "" " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr "" " -7 lettertekens met achtste bit gezet converteren naar " "spaties\n" -#: common.c:224 -#, fuzzy, c-format +#: common.c:231 +#, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" -msgstr " -m, --add-bom een UTF-8 \"Byte Order Mark\" toevoegen\n" +msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n" -#: common.c:226 -#, fuzzy, c-format +#: common.c:233 +#, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -m, --add-bom een UTF-8 \"Byte Order Mark\" toevoegen\n" +msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -361,37 +196,37 @@ msgstr "" " conversiemodus 'ascii', '7bit', 'iso', of 'mac' (standaard is " "'ascii')\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force conversie van binaire bestanden afdwingen\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help deze hulptekst tonen\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license softwarelicentie tonen\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline extra regeleinde toevoegen\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom een UTF-8 \"Byte Order Mark\" toevoegen\n" +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -402,7 +237,7 @@ msgstr "" " invoerbestand het originele bestand in nieuwbestand-modus\n" " uitvoerbestand het geconverteerde bestand in nieuwbestand-modus\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -411,49 +246,55 @@ msgstr "" " -o, --oldfile het oude bestand overschrijven (standaard)\n" " bestand ... te converteren bestanden in oudbestand-modus\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet alle waarschuwingen onderdrukken (altijd " -"ingeschakeld\n" -" bij gebruik van standaardinvoer en -uitvoer)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet alle waarschuwingen onderdrukken\n" -#: common.c:243 -#, fuzzy, c-format +#: common.c:249 +#, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -m, --add-bom een UTF-8 \"Byte Order Mark\" toevoegen\n" +msgstr "" +" -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n" -#: common.c:245 -#, fuzzy, c-format +#: common.c:251 +#, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" -msgstr " -m, --add-bom een UTF-8 \"Byte Order Mark\" toevoegen\n" +msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe binaire bestanden overslaan (standaard)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 UTF-16-codering behouden\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose gedetailleerde uitvoer produceren\n" + +#: common.c:260 #, c-format 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:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -463,7 +304,7 @@ msgstr "" "geconverteerde bestanden\n" " (de originele doelbestanden blijven ongewijzigd)\n" -#: common.c:257 +#: common.c:265 #, c-format msgid "" " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" @@ -471,77 +312,266 @@ msgstr "" " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten " "(standaard)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version programmaversie tonen\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bits versie (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bits versie (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bits versie (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bits versie (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS-versie.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin-versie.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bits versie (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bits versie (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bits versie (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bits versie (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bits versie (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bits versie (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versie (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versie (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Met ondersteuning voor Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Zonder ondersteuning voor Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Met ondersteuning voor taalregio's.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Schrijven van %s-BOM.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Invoerbestand %s heeft %s-BOM.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "UTF-16LE-codering wordt aangenomen.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "UTF-16BE-codering wordt aangenomen.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "%s wordt als tijdelijk bestand gebruikt\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problemen met het herleiden van symbolische koppeling '%s'\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " uitvoerbestand blijft in '%s'\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problemen met hernoemen van '%s' naar '%s': %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " welke het doel is van symbolische koppeling '%s'\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Binair bestand %s wordt overgeslagen\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "Codetabel %d wordt niet ondersteund.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"UTF-16-bestand %s wordt overgeslagen, de tekencodering van de huidige " +"taalregio is niet UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"UTF-16-bestand %s wordt overgeslagen, er is een UTF-16-conversiefout " +"opgetreden.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemen met conversie van bestand %s naar bestand %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Symbolische koppeling %s wordt overgeslagen.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "converteren van bestand %s naar Unix-opmaak...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "converteren van bestand %s naar Mac-opmaak...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "converteren van bestand %s naar DOS-opmaak...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problemen met conversie van bestand %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "actieve codetabel: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "ongeldige conversiemodus %s opgegeven\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "optie '%s' vereist een argument\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-10 18:19+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-29 21:49+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -31,172 +31,42 @@ msgstr "" "Wszelkie prawa zastrzeżone.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Symbol binarny 0x00%02X znaleziono w linii %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "nie można zapisać do pliku wyjÅ›ciowego: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "bÅ‚Ä…d programu, bÅ‚Ä™dny tryb konwersji %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Przekonwertowano znaków koÅ„ca linii: %d z %d.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "użycie strony kodowej %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Symbol binarny 0x%02X znaleziono w linii %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Nie udaÅ‚o siÄ™ otworzyć tymczasowego pliku wyjÅ›ciowego: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "użycie %s jako pliku tymczasowego\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Nie udaÅ‚o siÄ™ zapisać do tymczasowego pliku wyjÅ›ciowego %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Nie udaÅ‚o siÄ™ zmienić uprawnieÅ„ tymczasowego pliku wyjÅ›ciowego %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Nie udaÅ‚o siÄ™ zmienić wÅ‚aÅ›ciciela i grupy tymczasowego pliku wyjÅ›ciowego %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "problemy z rozwiÄ…zaniem dowiÄ…zania symbolicznego '%s'\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " plik wyjÅ›ciowy pozostaje w '%s'\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "problemy ze zmianÄ… nazwy '%s' na '%s': %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " (czyli cel dowiÄ…zania symbolicznego '%s')\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "bÅ‚Ä…d: wartość zmiennej Å›rodowiskowej DOS2UNIX_LOCALEDIR jest zbyt dÅ‚uga.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "aktywna strona kodowa: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "podano bÅ‚Ä™dny tryb konwersji %s\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "opcja '%s' wymaga argumentu\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "PominiÄ™to %s, nie jest zwykÅ‚ym plikiem.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, 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" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "PominiÄ™to plik binarny %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "strona kodowa %d nie jest obsÅ‚ugiwana.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "PominiÄ™to plik UTF-16 %s, kodowanie znaków bieżącej lokalizacji to nie UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "PominiÄ™to plik UTF-16 %s, wystÄ…piÅ‚ bÅ‚Ä…d konwersji UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "konwersja pliku %s do pliku %s w formacie uniksowym...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "problemy z konwersjÄ… pliku %s do pliku %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "PominiÄ™to dowiÄ…zanie symboliczne %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "konwertowanie pliku %s do formatu uniksowego...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "problemy z konwersjÄ… pliku %s\n" +msgstr "" +"bÅ‚Ä…d: wartość zmiennej Å›rodowiskowej DOS2UNIX_LOCALEDIR jest zbyt dÅ‚uga.\n" #: unix2dos.c:66 msgid "" @@ -210,27 +80,7 @@ msgstr "" "Wszelkie prawa zastrzeżone.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "konwersja pliku %s do pliku %s w formacie Mac...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "konwersja pliku %s do formatu Mac...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "konwersja pliku %s do formatu DOS...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -247,12 +97,13 @@ msgstr "" "nastÄ™pujÄ…cych warunków:\n" "1. Przy rozprowadzaniu kodu źródÅ‚owego musi być zachowana powyższa\n" " informacja o prawach autorskich, niniejsza lista warunków oraz\n" -" poniższe oÅ›wiadczenie.n2. Przy rozprowadzaniu w postaci binarnej powyższa informacja o prawach\n" +" poniższe oÅ›wiadczenie.n2. Przy rozprowadzaniu w postaci binarnej powyższa " +"informacja o prawach\n" " autorskich musi być doÅ‚Ä…czona w dokumentacji i/lub innych materiaÅ‚ach\n" " doÅ‚Ä…czonych do dystrybucji.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -278,67 +129,78 @@ 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:213 +#: common.c:220 #, 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:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konwersja tylko koÅ„ców linii (domyÅ›lne)\n" -#: common.c:215 +#: common.c:222 #, c-format -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" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)\n" +msgstr "" +" -1252 użycie strony kodowej Windows 1252 " +"(zachodnioeuropejskiej)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 użycie strony kodowej DOS 437 (US; domyÅ›lna)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 użycie strony kodowej DOS 850 (zachodnioeuropejskiej)\n" +msgstr "" +" -850 użycie strony kodowej DOS 850 " +"(zachodnioeuropejskiej)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 użycie strony kodowej DOS 860 (portugalskiej)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)\n" +msgstr "" +" -863 użycie strony kodowej DOS 863 (kanadyjskiej " +"francuskiej)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 użycie strony kodowej DOS 865 (nordyckiej)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" -msgstr " -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n" +msgstr "" +" -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" -msgstr " -b, --keep-bom zachowanie znaku BOM (Byte Order Mark)\n" +msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark)\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -b, --keep-bom zachowanie znaku BOM (Byte Order Mark) (domyÅ›lne)\n" +msgstr "" +" -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark) " +"(domyÅ›lne)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -347,37 +209,37 @@ msgstr "" " -c, --convmode tryb konwersji\n" " tryb konwersji ascii, 7bit, iso, mac; domyÅ›lnie ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force wymuszenie konwersji plików binarnych\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help wyÅ›wietlenie tego opisu\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate zachowanie daty pliku wyjÅ›ciowego\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license wyÅ›wietlenie licencji oprogramowania\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline dodanie dodatkowego znaku nowej linii\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom dodanie znaku BOM (Byte Order Mark) UTF-8\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -388,7 +250,7 @@ msgstr "" " plik_wej plik oryginalny w trybie nowego pliku\n" " plik_wyj plik wyjÅ›ciowy w trybie nowego pliku\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -397,130 +259,325 @@ msgstr "" " -o, --oldfile zapis do starego pliku (domyÅ›lne)\n" " plik ... pliki do konwersji w trybie starego pliku\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet tryb cichy, pominiÄ™cie wszystkich ostrzeżeÅ„\n" -" (zawsze wÅ‚Ä…czone w trybie stdio)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet tryb cichy, pominiÄ™cie wszystkich ostrzeżeÅ„\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -r, --remove-bom usuniÄ™cie znaku BOM (Byte Order Mark) (domyÅ›lne)\n" +msgstr "" +" -r, --remove-bom usuniÄ™cie znacznika BOM (Byte Order Mark) (domyÅ›lne)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" -msgstr " -r, --remove-bom usuniÄ™cie znaku BOM (Byte Order Mark)\n" +msgstr " -r, --remove-bom usuniÄ™cie znacznika BOM (Byte Order Mark)\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe pomijanie plików binarnych (domyÅ›lne)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 zachowanie kodowania UTF-16\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose dziaÅ‚anie ze szczegółowym opisem\n" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink podążanie za dowiÄ…zaniami symbolicznymi i konwersja " +"celów\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink zastÄ™powanie dowiÄ…zaÅ„ symbolicznych plikami wynikowymi\n" +" -R, --replace-symlink zastÄ™powanie dowiÄ…zaÅ„ symbolicznych plikami " +"wynikowymi\n" " (oryginalne pliki docelowe pozostajÄ… bez zmian)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version wyÅ›wietlenie numeru wersji\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Wersja 16-bitowa DOS (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Wersja 16-bitowa DOS (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa DOS (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Wersja 32-bitowa DOS (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "Wersja MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Wersja Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Wersja 64-bitowa Windows (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa Windows (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Wersja 32-bitowa Windows (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Wersja 32-bitowa Windows (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Wersja 64-bitowa Windows (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Wersja 32-bitowa Windows (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "Wersja OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "Wersja OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Z obsÅ‚ugÄ… Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Bez obsÅ‚ugi Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Z obsÅ‚ugÄ… jÄ™zyków narodowych.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Zapis znacznika BOM %s.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Plik wejÅ›ciowy %s zawiera znacznik BOM %s.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "PrzyjÄ™to kodowanie UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "PrzyjÄ™to kodowanie UTF-16BE.\n" + +#: common.c:746 +#, 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:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "użycie %s jako pliku tymczasowego\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Nie udaÅ‚o siÄ™ zapisać do tymczasowego pliku wyjÅ›ciowego %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Nie udaÅ‚o siÄ™ zmienić uprawnieÅ„ tymczasowego pliku wyjÅ›ciowego %s: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Nie udaÅ‚o siÄ™ zmienić wÅ‚aÅ›ciciela i grupy tymczasowego pliku wyjÅ›ciowego %s: " +"%s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "problemy z rozwiÄ…zaniem dowiÄ…zania symbolicznego '%s'\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " plik wyjÅ›ciowy pozostaje w '%s'\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "problemy ze zmianÄ… nazwy '%s' na '%s': %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " (czyli cel dowiÄ…zania symbolicznego '%s')\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "PominiÄ™to plik binarny %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "strona kodowa %d nie jest obsÅ‚ugiwana.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"PominiÄ™to plik UTF-16 %s, kodowanie znaków bieżącej lokalizacji to nie " +"UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "PominiÄ™to plik UTF-16 %s, wystÄ…piÅ‚ bÅ‚Ä…d konwersji UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "PominiÄ™to %s, nie jest zwykÅ‚ym plikiem.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, 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:1048 +#, 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:1050 +#, 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:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "problemy z konwersjÄ… pliku %s do pliku %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "PominiÄ™to dowiÄ…zanie symboliczne %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "konwertowanie pliku %s do formatu uniksowego...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "konwersja pliku %s do formatu Mac...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "konwersja pliku %s do formatu DOS...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "problemy z konwersjÄ… pliku %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "aktywna strona kodowa: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "podano bÅ‚Ä™dny tryb konwersji %s\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "opcja '%s' wymaga argumentu\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8b76ef4..7d3fd46 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,18 +6,19 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-09 17:52-0300\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-31 23:37-0300\n" "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" -"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n" +"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." +"net>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.7\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.6.5\n" #: dos2unix.c:76 msgid "" @@ -35,172 +36,42 @@ msgstr "" "Todos os direitos reservados.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "SÃmbolo binário 0x00%02X localizado na linha %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, 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" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "erro do programa, modo de conversão %d é inválido\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Convertidas %d de %d quebras de linha.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "usando a página de código %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "SÃmbolo binário 0x%02X localizado na linha %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Ocorreu falha ao abrir o arquivo de saÃda temporário: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "usando %s como arquivo de temporário\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Ocorreu falha ao gravar no arquivo de saÃda temporário %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Ocorreu falha ao alterar as permissões do arquivo de saÃda temporário %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saÃda temporário %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " o arquivo de saÃda permanece em '%s'\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "ocorreram problemas ao renomear '%s' para '%s': %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " que é o destino do link simbólico '%s'\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "erro: O valor da variável de ambiente DOS2UNIX_LOCALEDIR é muito comprido.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "página de código ativa: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "o modo de conversão %s especificado é inválido\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "a opção '%s' requer um argumento\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "Ignorando %s, não é um arquivo comum.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, 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" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Ignorando o arquivo binário %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "não há suporte a página de código %d.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "Ignorando o arquivo UTF-16 %s, a atual codificação local de caractere não é UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "convertendo o arquivo %s para arquivo %s em formato do Unix...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Ignorando o link simbólico %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "convertendo o arquivo %s para formato do Unix...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "ocorreram problemas ao converter o arquivo %s\n" +msgstr "" +"erro: O valor da variável de ambiente DOS2UNIX_LOCALEDIR é muito comprido.\n" #: unix2dos.c:66 msgid "" @@ -214,27 +85,7 @@ msgstr "" "Todos os direitos reservados.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "convertendo o arquivo %s para o arquivo %s em formato do Mac...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "convertendo o arquivo %s para o arquivo %s em formato do DOS...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "convertendo o arquivo %s para formato do Mac...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "convertendo o arquivo %s para formato do DOS...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -256,7 +107,7 @@ msgstr "" " fornecidos com a distribuição.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -273,76 +124,93 @@ msgstr "" "ESTE SOFTWARE É FORNECIDO PELO AUTOR ``COMO ESTÃ'' E SEM\n" "QUAISQUER GARANTIAS EXPRESSAS OU IMPLÃCITAS, INCLUINDO, MAS NÃO LIMITADO A,\n" "IMPLICAR GARANTIAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UM FIM ESPECÃFICO,\n" -"ESTAS SÃO RENUNCIADAS. SOB NENHUM CASO O AUTOR DEVE SER CONSIDERADO RESPONSÃVEL POR\n" +"ESTAS SÃO RENUNCIADAS. SOB NENHUM CASO O AUTOR DEVE SER CONSIDERADO " +"RESPONSÃVEL POR\n" "QUALQUER DANO DIRETO, INDIRETO, ACIDENTAL, ESPECIAL, EXEMPLAR, OU\n" "CONSEQUENCIAL (INCLUINDO, MAS NÃO LIMITADO A, AQUISIÇÃO\n" "DE BENS SUBSTITUTOS OU SERVIÇOS; PERDA DE USO, DADOS, OU LUCROS; OU\n" -"INTERRUPÇÃO DE NEGÓCIOS) CAUSADOS E SOB QUALQUER TEORIA DE RESPONSABILIZAÇÃO,\n" -"SEJA CONTRATUAL, RESPONSABILIZAÇÃO ESTRITA, OU AGRAVO (INCLUINDO NEGLIGÊNCIA\n" -"OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, MESMO\n" +"INTERRUPÇÃO DE NEGÓCIOS) CAUSADOS E SOB QUALQUER TEORIA DE " +"RESPONSABILIZAÇÃO,\n" +"SEJA CONTRATUAL, RESPONSABILIZAÇÃO ESTRITA, OU AGRAVO (INCLUINDO " +"NEGLIGÊNCIA\n" +"OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, " +"MESMO\n" "SE RESSALVADO DA POSSIBILIDADE DE TAL DANO.\n" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" -msgstr "Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n" +msgstr "" +"Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n" +msgstr "" +" -ascii converte-se apenas as quebras de linha (padrão)\n" -#: common.c:215 +#: common.c:222 #, c-format -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" +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:216 +#: common.c:223 #, c-format 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" +msgstr "" +" -1252 usa a página de código 1252 do Windows (Europa " +"ocidental)\n" -#: common.c:217 +#: common.c:224 #, c-format 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" +msgstr "" +" -437 usa a página de código 437 do DOS (EUA) (padrão)\n" -#: common.c:218 +#: common.c:225 #, c-format 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" +msgstr "" +" -850 usa a página de código 850 do DOS (Europa ocidental)\n" -#: common.c:219 +#: common.c:226 #, c-format 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:220 +#: common.c:227 #, c-format 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" +msgstr "" +" -863 usa a página de código 863 do DOS (Francês do " +"Canadá)\n" -#: common.c:221 +#: common.c:228 #, c-format 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:222 +#: common.c:229 #, c-format 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" +msgstr "" +" -7 converte-se caracteres de 8 bit para espaço de 7 bit\n" -#: common.c:224 +#: common.c:231 #, c-format 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:226 +#: common.c:233 #, c-format 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" +msgstr "" +" -b, --keep-bom mantém marca de ordem de byte (B.O.M.) (padrão)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -351,37 +219,39 @@ msgstr "" " -c, --convmode modo de conversão\n" " convmode ascii, 7bit, iso, mac, padrão para ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force força a conversão de arquivos binários\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help exibe este texto de ajuda\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate mantém a data do arquivo de saÃda\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license exibe a licença do software\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline acrescenta nova linha adicional\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom adiciona marca de ordem de byte (B.O.M.) UTF-8\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -392,7 +262,7 @@ msgstr "" " infile arquivo original no modo de novo arquivo\n" " outfile arquivo de saÃda no modo de novo arquivo\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -401,130 +271,333 @@ msgstr "" " -o, --oldfile grava no arquivo antigo (padrão)\n" " file ... arquivos a converter no modo de arquivo antigo\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet modo silencioso, esconde todos os avisos\n" -" (sempre ligado no modo padrão de e/s - stdio)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet modo silencioso, esconde todos os avisos\n" -#: common.c:243 +#: common.c:249 #, c-format 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" +msgstr "" +" -r, --remove-bom remove marca de ordem de byte (B.O.M.) (default)\n" -#: common.c:245 +#: common.c:251 #, c-format 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:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora os arquivos binários (padrão)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 mantém codificação UTF-16\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose operação detalhada\n" + +#: common.c:260 #, c-format 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" +msgstr "" +" -F, --follow-symlink segue os links simbólicos e converte os destinos\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink substitui os links simbólicos por arquivos convertidos\n" -" (os arquivos originais de destino permanecem inalterados)\n" +" -R, --replace-symlink substitui os links simbólicos por arquivos " +"convertidos\n" +" (os arquivos originais de destino permanecem " +"inalterados)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version exibe o número da versão\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS versão de 16 bit (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS versão de 16 bit (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS versão de 32 bit (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS versão de 32 bit (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "Versão do MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Versão do Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows versão de 64 bit (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows versão de 32 bit (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows versão de 32 bit (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows versão de 32 bit (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows versão de 64 bit (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows versão de 32 bit (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "Versão OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "Versão OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Com suporte a Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Sem suporte a Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Com suporte ao idioma nativo.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Escrevendo %s BOM.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Arquivo de entrada %s possui %s BOM\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "Presume codificação UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "Presumo codificação UTF-16BE.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Ocorreu falha ao abrir o arquivo de saÃda temporário: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "usando %s como arquivo de temporário\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Ocorreu falha ao gravar no arquivo de saÃda temporário %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Ocorreu falha ao alterar as permissões do arquivo de saÃda temporário %s: " +"%s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saÃda " +"temporário %s: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " o arquivo de saÃda permanece em '%s'\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "ocorreram problemas ao renomear '%s' para '%s': %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " que é o destino do link simbólico '%s'\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Ignorando o arquivo binário %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, 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:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"Ignorando o arquivo UTF-16 %s, a atual codificação local de caractere não é " +"UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "Ignorando %s, não é um arquivo comum.\n" + +#: common.c:1020 +#, 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:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "convertendo o arquivo %s para arquivo %s em formato do Unix...\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "convertendo o arquivo %s para o arquivo %s em formato do Mac...\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "convertendo o arquivo %s para o arquivo %s em formato do DOS...\n" + +#: common.c:1054 +#, 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:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Ignorando o link simbólico %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "convertendo o arquivo %s para formato do Unix...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "convertendo o arquivo %s para formato do Mac...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "convertendo o arquivo %s para formato do DOS...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "ocorreram problemas ao converter o arquivo %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "página de código ativa: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "o modo de conversão %s especificado é inválido\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "a opção '%s' requer um argumento\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, 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" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr "" +#~ " -m, --add-bom adiciona marca de ordem de byte (B.O.M.) UTF-8\n" @@ -6,17 +6,18 @@ # Yuri Kozlov <yuray@komyakino.ru>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix-6.0.6-beta4\n" +"Project-Id-Version: dos2unix-6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-12 13:21+0400\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-09-06 09:45+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"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" #: dos2unix.c:76 @@ -29,178 +30,48 @@ msgid "" "\n" msgstr "" "ÐвторÑкое право (C) 2009-2014 Erwin Waterlander\n" -"ÐвторÑкое право (C) 1998 Christian Wurll (Version 3.1)\n" -"ÐвторÑкое право (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n" +"ÐвторÑкое право (C) 1998 Christian Wurll (верÑÐ¸Ñ 3.1)\n" +"ÐвторÑкое право (C) 1998 Bernd Johannes Wuebben (верÑÐ¸Ñ 3.0)\n" "ÐвторÑкое право (C) 1994-1995 Benjamin Lin\n" "Ð’Ñе права защищены.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Ð’ Ñтроке %2$d обнаружен двоичный Ñимвол 0x00%1$02X\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "не удалоÑÑŒ запиÑать в выходной файл: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "ошибка в программе, неверный режим Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Преобразовано %d из %d разрывов Ñтроки.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "иÑпользуетÑÑ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Ð’ Ñтроке %2$d обнаружен двоичный Ñимвол 0x%1$02X\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Ðе удалоÑÑŒ открыть временный выходной файл: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "иÑпользование %s в качеÑтве временного файла\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Ðе удалоÑÑŒ запиÑать во временный выходной файл %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Ðе удалоÑÑŒ изменить права доÑтупа ко временному выходному файлу %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Ðе удалоÑÑŒ изменить владельца и группу временного выходного файла %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "конфликт при разрешении ÑимволичеÑкой ÑÑылки «%s»\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " выходной файл оÑтаётÑÑ Ð² «%s»\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "проблемы при переименовании «%s» в «%s»: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " который ÑвлÑетÑÑ Ñ†ÐµÐ»ÑŒÑŽ ÑимволичеÑкой ÑÑылки «%s»\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "ошибка: Значение переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ DOS2UNIX_LOCALEDIR Ñлишком длинное.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ Ñтраница: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "задан неправильный %s режим преобразованиÑ\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "цель файла %s не задана в режиме нового файла\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "ПропуÑк %s, не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "ПропуÑк %s, выходной файл %s ÑвлÑетÑÑ ÑимволичеÑкой ÑÑылкой.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "ПропуÑк ÑимволичеÑкой ÑÑылки %s, цель не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "ПропуÑк %s, цель ÑимволичеÑкой ÑÑылки %s не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "ПропуÑк двоичного файла %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ Ñтраница %d не поддерживаетÑÑ.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "ПропуÑк файла %s Ñ UTF-16, Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° не UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "ПропуÑк файла %s Ñ UTF-16, возникла ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "преобразование файла %s в файл %s в формат Unix…\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "проблемы при преобразовании файла %s в файл %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "ПропуÑк ÑимволичеÑкой ÑÑылки %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "преобразование файла %s в формат Unix…\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "проблемы при преобразовании файла %s\n" +msgstr "" +"ошибка: Значение переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ DOS2UNIX_LOCALEDIR Ñлишком длинное.\n" #: unix2dos.c:66 msgid "" @@ -214,27 +85,7 @@ msgstr "" "Ð’Ñе права защищены.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "преобразование файла %s в файл %s в формат Mac…\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "преобразование файла %s в файл %s в формат DOS…\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "преобразование файла %s в формат Mac…\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "преобразование файла %s в формат DOS…\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -256,7 +107,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -282,67 +133,78 @@ 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:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" -msgstr "ИÑпользование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n" +msgstr "" +"ИÑпользование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii преобразовать только конец Ñтроки (по умолчанию)\n" +msgstr "" +" -ascii преобразовать только конец Ñтроки (по умолчанию)\n" -#: common.c:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" +msgid "" +" -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso преобразовать DOS в ISO-8859-1\n" -#: common.c:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 иÑпользовать кодировку Windows 1252 (Западно-ЕвропейÑкий)\n" +msgstr "" +" -1252 иÑпользовать кодировку Windows 1252 (Западно-" +"ЕвропейÑкий)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 иÑпользовать кодировку DOS 437 (US) (по умолчанию)\n" +msgstr "" +" -437 иÑпользовать кодировку DOS 437 (US) (по умолчанию)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 иÑпользовать кодировку DOS 850 (Западно-ЕвропейÑкий)\n" +msgstr "" +" -850 иÑпользовать кодировку DOS 850 (Западно-ЕвропейÑкий)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" -msgstr " -860 иÑпользовать кодировку DOS 860 (ПортугальÑкий)\n" +msgstr "" +" -860 иÑпользовать кодировку DOS 860 (ПортугальÑкий)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 иÑпользовать кодировку DOS 863 (Франко-КанадÑкий)\n" +msgstr "" +" -863 иÑпользовать кодировку DOS 863 (Франко-КанадÑкий)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" -msgstr " -865 иÑпользовать кодировку DOS 865 (СкандинавÑкий)\n" +msgstr "" +" -865 иÑпользовать кодировку DOS 865 (СкандинавÑкий)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 преобразовать 8-битные Ñимволы в 7-битные\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom Ñохранить метку порÑдка байтов (BOM)\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" -msgstr " -b, --keep-bom Ñохранить метку порÑдка байтов (BOM)(по умолчанию)\n" +msgstr "" +" -b, --keep-bom Ñохранить метку порÑдка байтов (BOM)(по умолчанию)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -351,37 +213,38 @@ msgstr "" " -c, --convmode режим преобразованиÑ\n" " convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force управление преобразованием двоичных файлов\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help вызов Ñправки\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate Ñохранить дату выходного файла\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license отобразить лицензию программного обеÑпечениÑ\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline добавить дополнительный разделитель Ñтрок\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom добавить UTF-8 метку порÑдка байтов (BOM)\n" +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr "" +" -m, --add-bom добавить метку порÑдка байтов (по умолчанию в UTF-8)\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -392,7 +255,7 @@ msgstr "" " infile иÑходный файл в режиме нового файла\n" " outfile выходной файл в режиме нового файла\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -401,130 +264,325 @@ msgstr "" " -o, --oldfile запиÑать в Ñтарый файл (по умолчанию)\n" " file … файлы Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² режиме Ñтарого файла\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet тихий режим, Ñкрыть вÑе предупреждениÑ\n" -" (вÑегда включен в режиме stdio)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet не показывать предупреждениÑ\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" -msgstr " -r, --remove-bom удалить метку порÑдка байтов (BOM) (по умолчанию)\n" +msgstr "" +" -r, --remove-bom удалить метку порÑдка байтов (BOM) (по умолчанию)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom удалить метку порÑдка байтов (BOM)\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропуÑтить двоичные файлы (по умолчанию)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 оÑтавить кодировку UTF-16\n" + +#: common.c:255 #, c-format msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le предположить, что входной формат UTF-16LE\n" -#: common.c:249 +#: common.c:256 #, c-format msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be предположить, что входной формат UTF-16BE\n" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose подробный режим\n" + +#: common.c:260 #, c-format msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" -msgstr " -F, --follow-symlink Ñледовать ÑимволичеÑким ÑÑылкам и преобразовать цели\n" +msgstr "" +" -F, --follow-symlink Ñледовать ÑимволичеÑким ÑÑылкам и преобразовать цели\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -" -R, --replace-symlink заменить ÑимволичеÑкие ÑÑылки преобразованными файлами\n" -" (оригинальные целевые файлы оÑтанутÑÑ Ð±ÐµÐ· изменений)\n" +" -R, --replace-symlink заменить ÑимволичеÑкие ÑÑылки преобразованными " +"файлами\n" +" (оригинальные целевые файлы оÑтанутÑÑ Ð±ÐµÐ· " +"изменений)\n" -#: common.c:257 +#: common.c:265 #, c-format -msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" -msgstr " -S, --skip-symlink оÑтавить ÑимволичеÑкие ÑÑылки и цели без изменений (по умолчанию)\n" +msgid "" +" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" +msgstr "" +" -S, --skip-symlink оÑтавить ÑимволичеÑкие ÑÑылки и цели без изменений " +"(по умолчанию)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version отобразить номер верÑии\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 bit верÑÐ¸Ñ (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 bit верÑÐ¸Ñ (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 bit верÑÐ¸Ñ (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 bit верÑÐ¸Ñ (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS верÑиÑ.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin верÑиÑ.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 bit верÑÐ¸Ñ (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 bit верÑÐ¸Ñ (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 bit верÑÐ¸Ñ (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 bit верÑÐ¸Ñ (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 bit верÑÐ¸Ñ (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 bit верÑÐ¸Ñ (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 верÑÐ¸Ñ (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2 верÑÐ¸Ñ (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "С поддержкой Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Без поддержки Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "С поддержкой родного Ñзыка.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "ЗапиÑываетÑÑ %s BOM.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Входной файл %s Ñодержит %s BOM.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "ПредполагаетÑÑ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "ПредполагаетÑÑ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° UTF-16BE.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Ðе удалоÑÑŒ открыть временный выходной файл: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "иÑпользование %s в качеÑтве временного файла\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Ðе удалоÑÑŒ запиÑать во временный выходной файл %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Ðе удалоÑÑŒ изменить права доÑтупа ко временному выходному файлу %s: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Ðе удалоÑÑŒ изменить владельца и группу временного выходного файла %s: %s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "конфликт при разрешении ÑимволичеÑкой ÑÑылки «%s»\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " выходной файл оÑтаётÑÑ Ð² «%s»\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "проблемы при переименовании «%s» в «%s»: %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " который ÑвлÑетÑÑ Ñ†ÐµÐ»ÑŒÑŽ ÑимволичеÑкой ÑÑылки «%s»\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "ПропуÑк двоичного файла %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ Ñтраница %d не поддерживаетÑÑ.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "ПропуÑк файла %s Ñ UTF-16, Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ° не UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "ПропуÑк файла %s Ñ UTF-16, возникла ошибка Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "ПропуÑк %s, не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "ПропуÑк %s, выходной файл %s ÑвлÑетÑÑ ÑимволичеÑкой ÑÑылкой.\n" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "ПропуÑк ÑимволичеÑкой ÑÑылки %s, цель не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "ПропуÑк %s, цель ÑимволичеÑкой ÑÑылки %s не ÑвлÑетÑÑ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ð¼ файлом.\n" + +#: common.c:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "преобразование файла %s в файл %s в формат Unix…\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "преобразование файла %s в файл %s в формат Mac…\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "преобразование файла %s в файл %s в формат DOS…\n" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "проблемы при преобразовании файла %s в файл %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "ПропуÑк ÑимволичеÑкой ÑÑылки %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "преобразование файла %s в формат Unix…\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "преобразование файла %s в формат Mac…\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "преобразование файла %s в формат DOS…\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "проблемы при преобразовании файла %s\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ Ñтраница: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "задан неправильный %s режим преобразованиÑ\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "цель файла %s не задана в режиме нового файла\n" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom добавить UTF-8 метку порÑдка байтов (BOM)\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix-6.0.6-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" "PO-Revision-Date: 2014-08-01 08:26+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -14,7 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: dos2unix.c:76 msgid "" @@ -32,172 +33,42 @@ msgstr "" "Сва права Ñу задржана.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Бинарни Ñимбол 0x00%02X је пронађен у %d. реду\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "не могу да пишем у излазну датотеку: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "програмÑка грешка, неиÑправан режим претварања %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "кориÑтим кодну Ñтраницу %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Бинарни Ñимбол 0x%02X је пронађен у %d. реду\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "ÐиÑам уÑпео да отворим привремену излазну датотеку: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "кориÑтим „%s“ као привремену датотеку\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "ÐиÑам уÑпео да пишем у привремену излазну датотеку „%s“: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "ÐиÑам уÑпео да изменим овлашћења привремене излазне датотеке „%s“: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "ÐиÑам уÑпео да изменим влаÑника и групу привремене излазне датотеке „%s“: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "проблеми решавања Ñимболичке везе „%s“\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " излазна датотека оÑтаје у „%s“\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "проблеми преименовања „%s“ у „%s“: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " који је мета Ñимболичке везе „%s“\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "грешка: ВредноÑÑ‚ променљиве окружења „ДОС2UNIX_LOCALEDIR“ је предуга.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "радна кодна Ñтраница: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "наведен је неиÑправан „%s“ режим претварања\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "опција „%s“ захтева аргумент\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "ПреÑкачем „%s“, није обична датотека.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "ПреÑкачем „%s“, излазна датотека „%s“ је Ñимболичка веза.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "ПреÑкачем Ñимболичку везу „%s“, мета није обична датотека.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "ПреÑкачем „%s“, мета Ñимболичке везе „%s“ није обична датотека.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "ПреÑкачем бинарну датотеку „%s“\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "Кодна Ñтраница „%d“ није подржана.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "ПреÑкачем УТФ-16 датотеку „%s“, кодни Ñ€Ñпоред текућег језика није УТФ-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "ПреÑкачем УТФ-16 датотеку „%s“, величина „wchar_t“-а је %d бајта.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "ПреÑкачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу ЈуникÑа...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "ПреÑкачем Ñимболичку везу „%s“.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "претварам датотеку „%s“ у запиÑу ЈуникÑа...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "проблеми претварања датотеке „%s“\n" +msgstr "" +"грешка: ВредноÑÑ‚ променљиве окружења „ДОС2UNIX_LOCALEDIR“ је предуга.\n" #: unix2dos.c:66 msgid "" @@ -211,27 +82,7 @@ msgstr "" "Сва права Ñу задржана.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу Мека...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу ДОС-а...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "претварам датотеку „%s“ у запиÑу Мека...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "претварам датотеку „%s“ у запиÑу ДОС-а...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -243,11 +94,15 @@ msgid "" " the distribution.\n" "\n" msgstr "" -"ПрераÑподела и употреба у изворном и бинарном облику, Ñа или без измена, Ñу дозвољене ако Ñу задовољени Ñледећи уÑлови:\n" -"1. РаÑподела изворног кода мора да Ñадржи горње обавештење о ауторÑком праву, овај ÑпиÑак уÑлова и Ñледећи опозив.\n" -"2. РаÑподела у бинарном облику мора да понови обавештење горе наведеног ауторÑког права у документацији и/или у другом материјалу који долази уз диÑтрибуцију.\n" - -#: common.c:196 +"ПрераÑподела и употреба у изворном и бинарном облику, Ñа или без измена, Ñу " +"дозвољене ако Ñу задовољени Ñледећи уÑлови:\n" +"1. РаÑподела изворног кода мора да Ñадржи горње обавештење о ауторÑком " +"праву, овај ÑпиÑак уÑлова и Ñледећи опозив.\n" +"2. РаÑподела у бинарном облику мора да понови обавештење горе наведеног " +"ауторÑког права у документацији и/или у другом материјалу који долази уз " +"диÑтрибуцију.\n" + +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -273,67 +128,75 @@ msgstr "" "ÐЕПÐЖЊУ ИЛИ ДРУГО) ДОВОДЕЋИ ÐРБИЛО КОЈИ ÐÐЧИРДО ПРЕКИДРУПОТРЕБЕ\n" "ОВОГ СОФТВЕРÐ, ЧÐК И ÐКО СТЕ ОБÐВЕШТЕÐИ О МОГУЋÐОСТИ ТÐКВИХ ШТЕТÐ.\n" -#: common.c:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" -msgstr "Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n" +msgstr "" +"Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii претвара Ñамо прекиде реда (оÑновно)\n" -#: common.c:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso претварање између Ñкупа знакова ДОС-а и ИСО-8859-1\n" +msgid "" +" -iso conversion between DOS and ISO-8859-1 character set\n" +msgstr "" +" -iso претварање између Ñкупа знакова ДОС-а и ИСО-8859-1\n" -#: common.c:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 кориÑти Виндоуз кодну Ñтраницу 1252 (западно-европÑки)\n" +msgstr "" +" -1252 кориÑти Виндоуз кодну Ñтраницу 1252 (западно-" +"европÑки)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 кориÑти ДОС кодну Ñтраницу 437 (СÐД) (оÑновно)\n" +msgstr "" +" -437 кориÑти ДОС кодну Ñтраницу 437 (СÐД) (оÑновно)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 кориÑти ДОС кодну Ñтраницу 850 (западно-европÑки)\n" +msgstr "" +" -850 кориÑти ДОС кодну Ñтраницу 850 (западно-европÑки)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 кориÑти ДОС кодну Ñтраницу 860 (португалÑки)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 кориÑти ДОС кодну Ñтраницу 863 (канадÑки француÑки)\n" +msgstr "" +" -863 кориÑти ДОС кодну Ñтраницу 863 (канадÑки француÑки)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 кориÑти ДОС кодну Ñтраницу 865 (норвешки)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 претвара 8-битне знакове у 7-битне размаке\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта (оÑновно)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -342,37 +205,37 @@ msgstr "" " -c, --convmode режим претварања\n" " режим претварања аÑкри, 7бита, иÑо, мек, подразумева аÑкри\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force приÑиљава претварање бинарних датотека\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help приказује овај текÑÑ‚ помоћи\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate задржава датум излазне датотеке\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license приказује дозволу Ñофтвера\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline додаје додатни нови ред\n" -#: common.c:234 -#, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom додаје УТФ-8 назнаку поретка бајта\n" +#: common.c:241 +#, fuzzy, c-format +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr " -b, --keep-bom задржава назнаку поретка бајта (оÑновно)\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -383,7 +246,7 @@ msgstr "" " улазна датотека изворна датотека у режиму нове датотеке\n" " излазна датотека излазна датотека у режиму нове датотеке\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -392,46 +255,52 @@ msgstr "" " -o, --oldfile пише у Ñтару датотеку (оÑновно)\n" " датотека ... датотеке за претварање у режиму Ñтаре датотеке\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet тихи режим, потиÑкује Ñва упозорења\n" -" (увек укључено у режиму Ñтндуи)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet тихи режим, потиÑкује Ñва упозорења\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта (оÑновно)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe преÑкаче бинарне датотеке (оÑновно)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr "" + +#: common.c:255 #, c-format msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le подразумева да је улазни Ð·Ð°Ð¿Ð¸Ñ â€žUTF-16LE“\n" -#: common.c:249 +#: common.c:256 #, c-format msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be подразумева да је улазни Ð·Ð°Ð¿Ð¸Ñ â€žUTF-16BE“\n" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr "" + +#: common.c:260 #, c-format msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink прати Ñимболичке везе и претвара мете\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -440,82 +309,270 @@ msgstr "" " -R, --replace-symlink замењује Ñимболичке везе претвореним датотекама\n" " (изворне датотеке мете оÑтају непромењене)\n" -#: common.c:257 +#: common.c:265 #, c-format -msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" -msgstr " -S, --skip-symlink задржава неизмењеним Ñимболичке везе и мете (оÑновно)\n" +msgid "" +" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" +msgstr "" +" -S, --skip-symlink задржава неизмењеним Ñимболичке везе и мете " +"(оÑновно)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version приказује број издања\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "ДОС 16 бита издање (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "ДОС 16 бита издање (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "ДОС 32 бита издање (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "ДОС 32 бита издање (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "МСИС издање.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Цигвин издање.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Виндоуз 64 бита издање (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Виндоуз 32 бита издање (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Виндоуз 32 бита издање (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Виндоуз 32 бита издање (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Виндоуз 64 бита издање (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Виндоуз 32 бита издање (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "ОС/2 издање (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "ОС/2 издање (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Са подршком Јуникода УТФ-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Без подршке Јуникода УТФ-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Са подршком матерњег језика.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "ÐиÑам уÑпео да отворим привремену излазну датотеку: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "кориÑтим „%s“ као привремену датотеку\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "ÐиÑам уÑпео да пишем у привремену излазну датотеку „%s“: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"ÐиÑам уÑпео да изменим овлашћења привремене излазне датотеке „%s“: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"ÐиÑам уÑпео да изменим влаÑника и групу привремене излазне датотеке „%s“: " +"%s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "проблеми решавања Ñимболичке везе „%s“\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " излазна датотека оÑтаје у „%s“\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "проблеми преименовања „%s“ у „%s“: %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " који је мета Ñимболичке везе „%s“\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "ПреÑкачем бинарну датотеку „%s“\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "Кодна Ñтраница „%d“ није подржана.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"ПреÑкачем УТФ-16 датотеку „%s“, кодни Ñ€Ñпоред текућег језика није УТФ-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"ПреÑкачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "ПреÑкачем „%s“, није обична датотека.\n" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "ПреÑкачем „%s“, излазна датотека „%s“ је Ñимболичка веза.\n" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "ПреÑкачем Ñимболичку везу „%s“, мета није обична датотека.\n" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "ПреÑкачем „%s“, мета Ñимболичке везе „%s“ није обична датотека.\n" + +#: common.c:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу ЈуникÑа...\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу Мека...\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "претварам датотеку „%s“ у датотеку „%s“ у запиÑу ДОС-а...\n" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "ПреÑкачем Ñимболичку везу „%s“.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "претварам датотеку „%s“ у запиÑу ЈуникÑа...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "претварам датотеку „%s“ у запиÑу Мека...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "претварам датотеку „%s“ у запиÑу ДОС-а...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "проблеми претварања датотеке „%s“\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "радна кодна Ñтраница: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "наведен је неиÑправан „%s“ режим претварања\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "опција „%s“ захтева аргумент\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom додаје УТФ-8 назнаку поретка бајта\n" @@ -6,17 +6,18 @@ # Yuri Chornoivan <yurchor@ukr.net>, 2014. msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-09 23:52+0300\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-29 22:17+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"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" #: dos2unix.c:76 @@ -35,172 +36,42 @@ msgstr "" "УÑÑ– права заÑтережено.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Знайдено двійковий Ñимвол 0x00%02X у Ñ€Ñдку %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð´Ð¾ файла результатів: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "помилка програми, некоректний режим перетвореннÑ, %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Перетворено %d з %d Ñимволів розриву Ñ€Ñдка.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "викориÑтовуємо кодову Ñторінку %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "ВиÑвлено двійковий Ñимвол 0x%02X у Ñ€Ñдку %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñових даних: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "викориÑтовуємо %s Ñк тимчаÑовий файл\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дані до тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника Ñ– групу тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "проблеми з обробкою Ñимволічного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Â«%s»\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " файл результатів залишивÑÑ Ñƒ «%s»\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "проблеми з перейменуваннÑм «%s» на «%s»: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " на Ñкий поÑилаєтьÑÑ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Â«%s»\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" -msgstr "помилка: Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ñередовища DOS2UNIX_LOCALEDIR Ñ” надто довгим.\n" - -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "активна кодова Ñторінка: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "вказано некоректний режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %s\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "до параметра «%s» Ñлід вказувати аргумент\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "не вказано Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s у режимі ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "ПропуÑкаємо %s, не Ñ” звичайним файлом.\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "ПропуÑкаємо %s, файл результату, %s, Ñ” Ñимволічним поÑиланнÑм.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "ПропуÑкаємо Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s, Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ Ñ” звичайним файлом.\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "ПропуÑкаємо %s, об’єкт, на Ñкий поÑилаєтьÑÑ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s, не Ñ” звичайним файлом.\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "ПропуÑкаємо двійковий файл %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "підтримки кодової Ñторінки %d не передбачено.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "ПропуÑкаємо файл у кодуванні UTF-16, %s, поточним кодуваннÑм Ñимволів локалі не Ñ” UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "ПропуÑкаємо файл у кодуванні UTF-16, %s, розміром wchar_t Ñ” %d байтів.\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "ПропуÑкаємо файл у кодуванні UTF-16, %s, ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° %s на файл %s виникли проблеми\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "ПропуÑкаємо Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s.\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "перетворюємо файл %s до формату Unix...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° %s виникли проблеми\n" +msgstr "" +"помилка: Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ñередовища DOS2UNIX_LOCALEDIR Ñ” надто довгим.\n" #: unix2dos.c:66 msgid "" @@ -214,27 +85,7 @@ msgstr "" "УÑÑ– права заÑтережено.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "перетворюємо файл %s до формату Mac...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "перетворюємо файл %s до формату DOS...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -263,7 +114,7 @@ msgstr "" " від відповідальноÑÑ‚Ñ– у документації Ñ–/або інших Ñупровідних матеріалах.)\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -289,67 +140,83 @@ 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:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" -msgstr "КориÑтуваннÑ: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n" +msgstr "" +"КориÑтуваннÑ: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" -msgstr " -ascii перетворити лише Ñимволи розриву Ñ€Ñдків (типово)\n" +msgstr "" +" -ascii перетворити лише Ñимволи розриву Ñ€Ñдків (типово)\n" -#: common.c:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" -msgstr " -iso виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð· ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ DOS до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ ISO-8859-1\n" +msgid "" +" -iso conversion between DOS and ISO-8859-1 character set\n" +msgstr "" +" -iso виконати Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð· ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ DOS до ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ " +"ISO-8859-1\n" -#: common.c:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" -msgstr " -1252 викориÑтати кодову таблицю 1252 Windows (західноєвропейÑькі мови)\n" +msgstr "" +" -1252 викориÑтати кодову таблицю 1252 Windows " +"(західноєвропейÑькі мови)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" -msgstr " -437 викориÑтовувати кодову Ñторінку DOS 437 (СШÐ) (типово)\n" +msgstr "" +" -437 викориÑтовувати кодову Ñторінку DOS 437 (СШÐ) " +"(типово)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" -msgstr " -850 викориÑтовувати кодову Ñторінку DOS 850 (західноєвропейÑькі мови)\n" +msgstr "" +" -850 викориÑтовувати кодову Ñторінку DOS 850 " +"(західноєвропейÑькі мови)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" -msgstr " -860 викориÑтовувати Ñторінку DOS 860 (португальÑька)\n" +msgstr "" +" -860 викориÑтовувати Ñторінку DOS 860 (португальÑька)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" -msgstr " -863 викориÑтовувати Ñторінку DOS 863 (канадÑька французька)\n" +msgstr "" +" -863 викориÑтовувати Ñторінку DOS 863 (канадÑька " +"французька)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" -msgstr " -865 викориÑтовувати Ñторінку DOS 865 (ÑкандинавÑькі мови)\n" +msgstr "" +" -865 викориÑтовувати Ñторінку DOS 865 (ÑкандинавÑькі " +"мови)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 перетворювати 8-бітові Ñимволи на 7-бітові\n" -#: common.c:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom зберегти позначку порÑдку байтів (BOM)\n" -#: common.c:226 +#: common.c:233 #, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom зберегти позначку порÑдку байтів (типово)\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -358,37 +225,39 @@ msgstr "" " -c, --convmode режим перетвореннÑ\n" " режим ascii, 7bit, iso, mac, типовим Ñ” ascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force примуÑове Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð±Ñ–Ð½Ð°Ñ€Ð½Ð¸Ñ… файлів\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help показати це довідкове повідомленнÑ\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate зберігати дату ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñƒ\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" -msgstr " -L, --license показати ліцензійну угоду щодо програмного забезпеченнÑ\n" +msgstr "" +" -L, --license показати ліцензійну угоду щодо програмного " +"забезпеченнÑ\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline вÑтавити додатковий Ñимвол розриву Ñ€Ñдка\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom додати позначку порÑдку байтів UTF-8\n" +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" +msgstr " -b, --add-bom додати позначку порÑдку байтів (типово UTF-8)\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -399,139 +268,345 @@ msgstr "" " вхідний_файл початковий файл у режимі ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²\n" " результат файл результату у режимі ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" msgstr "" " -o, --oldfile запиÑати до Ñтарого файла (типово)\n" -" файл ... файли, Ñкі Ñлід перетворити у режимі без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²\n" +" файл ... файли, Ñкі Ñлід перетворити у режимі без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ " +"файлів\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" " -q, --quiet режим без повідомлень, не показувати попередженнÑ\n" -" (завжди увімкнено у режимі Ñтандартного введеннÑ-виведеннÑ)\n" -#: common.c:243 +#: common.c:249 #, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom вилучити позначку порÑдку байтів (типово)\n" -#: common.c:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom вилучити позначку порÑдку байтів (BOM)\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропуÑкати двійкові файли (типово)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 зберегти ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16\n" + +#: common.c:255 #, c-format msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le припуÑкати, що вхідним форматом Ñ” UTF-16LE\n" -#: common.c:249 +#: common.c:256 #, c-format msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be припуÑкати, що вхідним форматом Ñ” UTF-16BE\n" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose режим докладних повідомлень\n" + +#: common.c:260 #, c-format msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" -msgstr " -F, --follow-symlink переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати файли, на Ñкі вони вказують\n" +msgstr "" +" -F, --follow-symlink переходити за Ñимволічними поÑиланнÑм Ñ– перетворювати " +"файли, на Ñкі вони вказують\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" " -R, --replace-symlink замінити Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¼Ð¸ файлами\n" -" (початкові файли, на Ñкі вони вказують, змінено не буде)\n" +" (початкові файли, на Ñкі вони вказують, змінено не " +"буде)\n" -#: common.c:257 +#: common.c:265 #, c-format -msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" -msgstr " -S, --skip-symlink не змінювати Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‚Ð° файли, на Ñкі вони поÑилаютьÑÑ (типово)\n" +msgid "" +" -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" +msgstr "" +" -S, --skip-symlink не змінювати Ñимволічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ‚Ð° файли, на Ñкі " +"вони поÑилаютьÑÑ (типово)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version показати дані щодо номера верÑÑ–Ñ—\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS, 16-бітова верÑÑ–Ñ (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS, 16-бітова верÑÑ–Ñ (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS, 32-бітова верÑÑ–Ñ (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS, 32-бітова верÑÑ–Ñ (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "ВерÑÑ–Ñ MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "ВерÑÑ–Ñ Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows, 64-бітова верÑÑ–Ñ (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows, 32-бітова верÑÑ–Ñ (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows, 32-бітова верÑÑ–Ñ (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows, 32-бітова верÑÑ–Ñ (MinGW)\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows, 64-бітова верÑÑ–Ñ (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows, 32-бітова верÑÑ–Ñ (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "ВерÑÑ–Ñ Ð´Ð»Ñ OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "ВерÑÑ–Ñ Ð´Ð»Ñ OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "З підтримкою Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Без підтримки Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "З підтримкою природної мови.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "ЗапиÑуємо позначку порÑдку байтів %s.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "У вхідному файлі %s позначкою порÑдку байтів Ñ” %s.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "ПрипуÑкаємо ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "ПрипуÑкаємо ÐºÐ¾Ð´ÑƒÐ²Ð°Ð½Ð½Ñ UTF-16BE.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ файл Ð´Ð»Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñових даних: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "викориÑтовуємо %s Ñк тимчаÑовий файл\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати дані до тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "" +"Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу до тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… %s: " +"%s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "" +"Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника Ñ– групу тимчаÑового файла Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… %s: " +"%s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "проблеми з обробкою Ñимволічного поÑÐ¸Ð»Ð°Ð½Ð½Ñ Â«%s»\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " файл результатів залишивÑÑ Ñƒ «%s»\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "проблеми з перейменуваннÑм «%s» на «%s»: %s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " на Ñкий поÑилаєтьÑÑ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Â«%s»\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "ПропуÑкаємо двійковий файл %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "підтримки кодової Ñторінки %d не передбачено.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"ПропуÑкаємо файл у кодуванні UTF-16, %s, поточним кодуваннÑм Ñимволів локалі " +"не Ñ” UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "" +"ПропуÑкаємо файл у кодуванні UTF-16, %s, ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° під Ñ‡Ð°Ñ " +"Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "ПропуÑкаємо %s, не Ñ” звичайним файлом.\n" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "ПропуÑкаємо %s, файл результату, %s, Ñ” Ñимволічним поÑиланнÑм.\n" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "" +"ПропуÑкаємо Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s, Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½Ðµ Ñ” звичайним файлом.\n" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "" +"ПропуÑкаємо %s, об’єкт, на Ñкий поÑилаєтьÑÑ Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s, не Ñ” " +"звичайним файлом.\n" + +#: common.c:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° %s на файл %s виникли проблеми\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "ПропуÑкаємо Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s.\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "перетворюємо файл %s до формату Unix...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "перетворюємо файл %s до формату Mac...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "перетворюємо файл %s до формату DOS...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° %s виникли проблеми\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "активна кодова Ñторінка: %d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "вказано некоректний режим Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ %s\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "до параметра «%s» Ñлід вказувати аргумент\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "не вказано Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s у режимі ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²\n" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom додати позначку порÑдку байтів UTF-8\n" @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 6.0.6-beta4\n" +"Project-Id-Version: dos2unix 6.1-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-09 19:08+0200\n" -"PO-Revision-Date: 2014-07-10 14:35+0700\n" +"POT-Creation-Date: 2014-09-08 22:44+0200\n" +"PO-Revision-Date: 2014-08-30 07:16+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" @@ -33,173 +33,42 @@ msgstr "" "Giữ toà n bá»™ bản quyá»n.\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "Ký hiệu nhị phân 0x00%02X được tìm thấy tại dòng %d\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "không thể ghi và o táºp tin xuất: %s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "lá»—i chÆ°Æ¡ng trình, chế Ä‘á»™ chuyển đổi %d không hợp lệ\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "Äã chuyển đổi %d ngoà i ngắt dòng %d.\n" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "dùng trang mã %d.\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "Ký hiệu nhị phân 0x%02X được tìm thấy tại dòng %d\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "Gặp lá»—i khi mở táºp tin xuất tạm thá»i: %s\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "Ä‘ang dùng %s là m táºp tin tạm\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "Gặp lá»—i khi ghi và o táºp tin xuất tạm thá»i %s: %s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "Gặp lá»—i khi thay đổi quyá»n hạn của táºp tin xuất tạm %s: %s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "Gặp lá»—i khi đổi chủ sở hữu và nhóm của táºp tin xuất tạm %s: %s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, 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" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " táºp tin xuất còn trong “%sâ€\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "gặp lá»—i khi đổi tên “%s†thà nh “%sâ€: %s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, 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" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "lá»—i: Giá trị của biến môi trÆ°á»ng DOS2UNIX_LOCALEDIR quá dà i.\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "trang mã Ä‘ang hoạt Ä‘á»™ng: %d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "đã Ä‘Æ°a ra chế Ä‘á»™ chuyển đổi %s không hợp lệ\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "tùy chá»n “%s†yêu cầu má»™t đối số\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, 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" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, 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" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "Bá» qua %s, táºp tin xuất %s là má»™t liên kết má»m.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, 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" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, 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" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "Bá» qua táºp tin nhị phân %s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "không há»— trợ trang mã %d.\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" -msgstr "Bá» qua táºp tin UTF-16 %s, bảng mã ký tá»± địa phÆ°Æ¡ng hiện tại không phải là UTF-8.\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, 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" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "Bá» qua táºp tin UTF-16 %s, đã xảy ra lá»—i chuyển đổi UTF-16.\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng Unix...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "Bá» qua liên kết má»m %s.\n" - -#: dos2unix.c:1238 -#, 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" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "gặp trục trặc khi chuyển đổi táºp tin %s\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -212,27 +81,7 @@ msgstr "" "Giữ toà n bá»™ bản quyá»n.\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng Mac...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng DOS...\n" - -#: unix2dos.c:1257 -#, 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" - -#: unix2dos.c:1259 -#, 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" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -253,7 +102,7 @@ msgstr "" " bản phân phối.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -268,67 +117,69 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:213 +#: common.c:220 #, 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" +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:214 +#: common.c:221 #, c-format 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:215 +#: common.c:222 #, c-format -msgid " -iso conversion between DOS and ISO-8859-1 character set\n" +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:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 dùng trang mã Windows 1252 (Tây Âu)\n" -#: common.c:217 +#: common.c:224 #, c-format 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:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 dùng trang mã DOS 850 (Tây Âu)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 dùng trang mã DOS 860 (Bồ Äà o Nha)\n" -#: common.c:220 +#: common.c:227 #, c-format 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:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 dùng trang mã DOS 865 (Bắc Âu)\n" -#: common.c:222 +#: common.c:229 #, c-format 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:224 +#: common.c:231 #, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom giữ nguyên “Byte Order Markâ€\n" -#: common.c:226 +#: common.c:233 #, c-format 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:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -337,37 +188,37 @@ msgstr "" " -c, --convmode chế Ä‘á»™ chuyển đổi\n" " chế Ä‘á»™ chuyển đổi: ascii, 7bit, iso, mac, mặc định là ascii\n" -#: common.c:229 +#: common.c:236 #, c-format 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:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help hiển thị trợ giúp nà y\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" -msgstr " -k, --keepdate giữ ngà y tháng táºp tin xuất ra\n" +msgstr " -k, --keepdate giữ nguyên ngà y tháng táºp tin xuất ra\n" -#: common.c:232 +#: common.c:239 #, c-format 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:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline bổ xung thêm dòng má»›i\n" -#: common.c:234 +#: common.c:241 #, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" -msgstr " -m, --add-bom thêm “UTF-8 Byte Order Markâ€\n" +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:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -378,7 +229,7 @@ msgstr "" " táºp-tin-và o táºp tin gốc trong chế Ä‘á»™ táºp-tin-má»›i\n" " táºp-tin-ra táºp tin xuất ra trong chế Ä‘á»™ táºp-tin-má»›i\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -387,130 +238,321 @@ 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:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet chế Ä‘á»™ im lặng, chặn má»i cảnh báo\n" -" (luôn báºt ở chế Ä‘á»™ và o ra tiêu chuẩn)\n" +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:243 +#: common.c:249 #, c-format 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:245 +#: common.c:251 #, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom gỡ bỠ“Byte Order Markâ€\n" -#: common.c:246 +#: common.c:252 #, c-format 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:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr " -u, --keep-utf16 giữ bảng mã UTF-16\n" + +#: common.c:255 #, c-format 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:249 +#: common.c:256 #, c-format 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:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr " -v, --verbose thông báo chi tiết\n" + +#: common.c:260 #, c-format 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:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" 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" +" (các táºp tin Ä‘Ãch nguyên gốc thì để nguyên không " +"thay đổi)\n" -#: common.c:257 +#: common.c:265 #, c-format -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" +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:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version hiển thị số hiệu phiên bản\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 16 bit (WATCOMC).\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Phiên bản DOS 16 bit (TURBOC).\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 32 bit (WATCOMC).\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Phiên bản DOS 32 bit (DJGPP).\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "Phiên bản MSYS.\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Phiên bản Cygwin.\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 64 bit (MinGW-w64).\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Phiên bản Windows 32 bit (WATCOMC).\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 32 bit (MinGW-w64).\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Phiên bản Windows 32 bit (MinGW).\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 64 bit (MSVC %d).\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 32 bit (MSVC %d).\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "Phiên bản OS/2 (WATCOMC).\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "Phiên bản OS/2 (EMX).\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "Có há»— trợ Unicode UTF-16.\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "Không há»— trợ Unicode UTF-16.\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "Có há»— trợ bản địa hóa ngôn ngữ.\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "Äang ghi %s BOM.\n" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "Táºp tin %s có %s BOM.\n" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "Coi là bảng mã UTF-16LE.\n" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "Coi là bảng mã UTF-16BE.\n" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "Gặp lá»—i khi mở táºp tin xuất tạm thá»i: %s\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "Ä‘ang dùng %s là m táºp tin tạm\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "Gặp lá»—i khi ghi và o táºp tin xuất tạm thá»i %s: %s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "Gặp lá»—i khi thay đổi quyá»n hạn của táºp tin xuất tạm %s: %s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "Gặp lá»—i khi đổi chủ sở hữu và nhóm của táºp tin xuất tạm %s: %s\n" + +#: common.c:906 +#, 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:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " táºp tin xuất còn trong “%sâ€\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "gặp lá»—i khi đổi tên “%s†thà nh “%sâ€: %s\n" + +#: common.c:934 +#, 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:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "Bá» qua táºp tin nhị phân %s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "không há»— trợ trang mã %d.\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "" +"Bá» qua táºp tin UTF-16 %s, bảng mã ký tá»± địa phÆ°Æ¡ng hiện tại không phải là " +"UTF-8.\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "Bá» qua táºp tin UTF-16 %s, đã xảy ra lá»—i chuyển đổi UTF-16.\n" + +#: common.c:1017 common.c:1063 +#, 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:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "Bá» qua %s, táºp tin xuất %s là má»™t liên kết má»m.\n" + +#: common.c:1023 common.c:1069 +#, 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:1026 +#, 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:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng Unix...\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng Mac...\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s theo định dạng DOS...\n" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "Ä‘ang chuyển đổi táºp tin %s thà nh %s\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "Bá» qua liên kết má»m %s.\n" + +#: common.c:1088 +#, 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:1091 +#, 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:1093 +#, 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" + +#: common.c:1097 +#, 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:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "trang mã Ä‘ang hoạt Ä‘á»™ng: %d\n" + +#: common.c:1237 +#, 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:1245 +#, 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:1256 common.c:1268 common.c:1325 +#, 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" diff --git a/po/zh_TW.po b/po/zh_TW.po index 69bd48d..a0743d4 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: 2014-07-09 19:08+0200\n" +"POT-Creation-Date: 2014-09-08 22:44+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" @@ -33,175 +33,42 @@ msgstr "" "ä¿ç•™æ‰€æœ‰æ¬Šåˆ©ã€‚\n" "\n" -#: dos2unix.c:164 dos2unix.c:202 unix2dos.c:132 unix2dos.c:185 +#: dos2unix.c:169 dos2unix.c:206 unix2dos.c:133 unix2dos.c:183 #, c-format msgid "Binary symbol 0x00%02X found at line %d\n" msgstr "找到二進ä½ç¬¦è™Ÿ0x00%02X 在第%d è¡Œ\n" -#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:355 dos2unix.c:391 -#: dos2unix.c:413 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238 -#: unix2dos.c:362 unix2dos.c:396 unix2dos.c:414 unix2dos.c:429 +#: dos2unix.c:183 dos2unix.c:220 dos2unix.c:243 dos2unix.c:362 dos2unix.c:397 +#: dos2unix.c:418 unix2dos.c:160 unix2dos.c:195 unix2dos.c:217 unix2dos.c:233 +#: unix2dos.c:362 unix2dos.c:395 unix2dos.c:415 unix2dos.c:429 #, c-format msgid "can not write to output file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: dos2unix.c:259 dos2unix.c:428 unix2dos.c:253 unix2dos.c:443 +#: dos2unix.c:260 dos2unix.c:434 unix2dos.c:249 unix2dos.c:444 #, c-format msgid "program error, invalid conversion mode %d\n" msgstr "程å¼éŒ¯èª¤ï¼Œä¸åˆæ³•çš„轉æ›æ¨¡å¼ %d\n" -#: dos2unix.c:317 unix2dos.c:311 +#: dos2unix.c:266 dos2unix.c:440 unix2dos.c:255 unix2dos.c:450 +#, c-format +msgid "Converted %d out of %d line breaks.\n" +msgstr "" + +#: dos2unix.c:325 unix2dos.c:314 #, c-format msgid "using code page %d.\n" msgstr "使用 %d 編碼é 。\n" -#: dos2unix.c:342 dos2unix.c:377 unix2dos.c:334 unix2dos.c:384 +#: dos2unix.c:349 dos2unix.c:384 unix2dos.c:336 unix2dos.c:384 #, c-format msgid "Binary symbol 0x%02X found at line %d\n" msgstr "找到二進ä½ç¬¦è™Ÿ0x%02X 在第%d è¡Œ\n" -#: dos2unix.c:516 unix2dos.c:531 -#, c-format -msgid "Failed to open temporary output file: %s\n" -msgstr "æš«å˜æª” %s 開啟失敗\n" - -#: dos2unix.c:523 unix2dos.c:538 -#, c-format -msgid "using %s as temporary file\n" -msgstr "使用 %s 作為暫å˜æª”\n" - -#: dos2unix.c:636 unix2dos.c:651 -#, c-format -msgid "Failed to write to temporary output file %s: %s\n" -msgstr "æš«å˜æª”寫入失敗%s：%s\n" - -#: dos2unix.c:671 unix2dos.c:686 -#, c-format -msgid "Failed to change the permissions of temporary output file %s: %s\n" -msgstr "輸出暫å˜æª” %s 權é™è®Šæ›´å¤±æ•—：%s\n" - -#: dos2unix.c:690 unix2dos.c:705 -#, c-format -msgid "Failed to change the owner and group of temporary output file %s: %s\n" -msgstr "輸出暫å˜æª” %s æ“有者åŠç¾¤çµ„變更失敗：%s\n" - -#: dos2unix.c:743 unix2dos.c:758 -#, c-format -msgid "problems resolving symbolic link '%s'\n" -msgstr "解æžç¬¦è™Ÿé€£çµ'%s' 發生å•é¡Œ\n" - -#: dos2unix.c:744 dos2unix.c:778 unix2dos.c:759 unix2dos.c:793 -#, c-format -msgid " output file remains in '%s'\n" -msgstr " 輸出檔案'%s' 未改變\n" - -#: dos2unix.c:773 unix2dos.c:788 -#, c-format -msgid "problems renaming '%s' to '%s': %s\n" -msgstr "é‡æ–°å‘½å「%sã€åˆ°ã€Œ%sã€éŒ¯èª¤ï¼š%s\n" - -#: dos2unix.c:776 unix2dos.c:791 -#, c-format -msgid " which is the target of symbolic link '%s'\n" -msgstr " 後者為符號連çµ'%s' 的目標\n" - -#: dos2unix.c:874 unix2dos.c:889 +#: dos2unix.c:469 unix2dos.c:479 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "錯誤：環境變數DOS2UNIX_LOCALEDIR 的值太長。\n" -#: dos2unix.c:985 dos2unix.c:1022 unix2dos.c:1000 unix2dos.c:1037 -#, c-format -msgid "active code page: %d\n" -msgstr "作用ä¸ç·¨ç¢¼é ：%d\n" - -#: dos2unix.c:1032 unix2dos.c:1047 -#, c-format -msgid "invalid %s conversion mode specified\n" -msgstr "指定的轉æ›æ¨¡å¼ %s ä¸åˆæ³•\n" - -#: dos2unix.c:1042 unix2dos.c:1057 -#, c-format -msgid "option '%s' requires an argument\n" -msgstr "é¸é …'%s' 需è¦ä¸€å€‹å¼•æ•¸\n" - -#: dos2unix.c:1055 dos2unix.c:1069 dos2unix.c:1263 unix2dos.c:1070 -#: unix2dos.c:1084 unix2dos.c:1284 -#, c-format -msgid "target of file %s not specified in new-file mode\n" -msgstr "新檔模å¼ä¸æœªæŒ‡æ˜Žæª”案 %s 的目的ä½ç½®\n" - -#: dos2unix.c:1099 dos2unix.c:1183 unix2dos.c:1114 unix2dos.c:1201 -#, c-format -msgid "Skipping %s, not a regular file.\n" -msgstr "ç•¥éŽ %s，ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" - -#: dos2unix.c:1106 unix2dos.c:1121 -#, c-format -msgid "Skipping %s, output file %s is a symbolic link.\n" -msgstr "ç•¥éŽ %s，輸出檔 %s 是一個符號連çµã€‚.\n" - -#: dos2unix.c:1113 dos2unix.c:1197 unix2dos.c:1128 unix2dos.c:1215 -#, c-format -msgid "Skipping symbolic link %s, target is not a regular file.\n" -msgstr "ç•¥éŽç¬¦è™Ÿé€£çµ %s，目標ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" - -#: dos2unix.c:1120 unix2dos.c:1135 -#, c-format -msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" -msgstr "ç•¥éŽ %sï¼Œç¬¦è™Ÿé€£çµ %s 目標ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" - -#: dos2unix.c:1127 dos2unix.c:1204 unix2dos.c:1142 unix2dos.c:1222 -#, c-format -msgid "Skipping binary file %s\n" -msgstr "ç•¥éŽäºŒé€²ä½æª”案%s\n" - -#: dos2unix.c:1134 dos2unix.c:1211 unix2dos.c:1149 unix2dos.c:1229 -#, c-format -msgid "code page %d is not supported.\n" -msgstr "未支æ´%d 編碼é 。\n" - -#: dos2unix.c:1141 dos2unix.c:1218 unix2dos.c:1156 unix2dos.c:1236 -#, c-format -msgid "" -"Skipping UTF-16 file %s, the current locale character encoding is not " -"UTF-8.\n" -msgstr "ç•¥éŽ UTF-16 檔案 %s，目å‰èªžè¨€å—元編碼並éžUTF-8。\n" - -#: dos2unix.c:1148 dos2unix.c:1225 unix2dos.c:1163 unix2dos.c:1243 -#, c-format -msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" -msgstr "ç•¥éŽ UTF-16 檔案 %s，wchar_t 的大å°æ˜¯ %d ä½å…ƒçµ„。\n" - -#: dos2unix.c:1155 dos2unix.c:1232 unix2dos.c:1170 unix2dos.c:1250 -#, c-format -msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" -msgstr "ç•¥éŽ UTF-16 檔案 %s，UTF-16 轉æ›ç™¼ç”ŸéŒ¯èª¤ã€‚\n" - -#: dos2unix.c:1161 -#, c-format -msgid "converting file %s to file %s in Unix format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為Unix æ ¼å¼åˆ° %s...\n" - -#: dos2unix.c:1168 unix2dos.c:1186 -#, c-format -msgid "problems converting file %s to file %s\n" -msgstr "轉æ›æª”案 %s 到 %s 錯誤\n" - -#: dos2unix.c:1190 unix2dos.c:1208 -#, c-format -msgid "Skipping symbolic link %s.\n" -msgstr "ç•¥éŽç¬¦è™Ÿé€£çµ %s。\n" - -#: dos2unix.c:1238 -#, c-format -msgid "converting file %s to Unix format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為Unix æ ¼å¼...\n" - -#: dos2unix.c:1245 unix2dos.c:1266 -#, c-format -msgid "problems converting file %s\n" -msgstr "轉æ›æª”案 %s 錯誤\n" - #: unix2dos.c:66 msgid "" "Copyright (C) 2009-2014 Erwin Waterlander\n" @@ -214,27 +81,7 @@ msgstr "" "ä¿ç•™æ‰€æœ‰æ¬Šåˆ©ã€‚\n" "\n" -#: unix2dos.c:1177 -#, c-format -msgid "converting file %s to file %s in Mac format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為Mac æ ¼å¼åˆ° %s...\n" - -#: unix2dos.c:1179 -#, c-format -msgid "converting file %s to file %s in DOS format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為DOS æ ¼å¼åˆ° %s...\n" - -#: unix2dos.c:1257 -#, c-format -msgid "converting file %s to Mac format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為Mac æ ¼å¼...\n" - -#: unix2dos.c:1259 -#, c-format -msgid "converting file %s to DOS format...\n" -msgstr "æ£åœ¨è½‰æ› %s 為DOS æ ¼å¼...\n" - -#: common.c:186 +#: common.c:185 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -256,7 +103,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:196 +#: common.c:195 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -282,68 +129,68 @@ 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:213 +#: common.c:220 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "用法: %s [é¸é …] [file ...] [-n infile outfile ...]\n" -#: common.c:214 +#: common.c:221 #, c-format msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii åªè½‰æ›æ›è¡Œå—å…ƒ(é è¨)\n" -#: common.c:215 +#: common.c:222 #, c-format msgid "" " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso 在DOS å’ŒISO-8859-1 å—元集間轉æ›\n" -#: common.c:216 +#: common.c:223 #, c-format msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 使用Windows 1252 編碼é (西æ)\n" -#: common.c:217 +#: common.c:224 #, c-format msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 使用DOS 437 編碼é (US) (é è¨)\n" -#: common.c:218 +#: common.c:225 #, c-format msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 使用DOS 850 編碼é (西æ)\n" -#: common.c:219 +#: common.c:226 #, c-format msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 使用DOS 860 編碼é (è‘¡è„牙)\n" -#: common.c:220 +#: common.c:227 #, c-format msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 使用DOS 863 編碼é (åŠ æ‹¿å¤§æ³•èªž)\n" -#: common.c:221 +#: common.c:228 #, c-format msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 使用DOS 865 編碼é (北æ)\n" -#: common.c:222 +#: common.c:229 #, c-format msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 轉æ›8 ä½å…ƒå—元到7 ä½å…ƒç©ºé–“\n" -#: common.c:224 +#: common.c:231 #, fuzzy, c-format msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" -#: common.c:226 +#: common.c:233 #, fuzzy, c-format msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" -#: common.c:227 +#: common.c:234 #, c-format msgid "" " -c, --convmode conversion mode\n" @@ -352,37 +199,37 @@ msgstr "" " -c, --convmode 轉æ›æ¨¡å¼\n" " convmode ascii, 7bit, iso, mac, é è¨ç‚ºascii\n" -#: common.c:229 +#: common.c:236 #, c-format msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force 強制轉æ›äºŒé€²ä½æª”案\n" -#: common.c:230 +#: common.c:237 #, c-format msgid " -h, --help display this help text\n" msgstr " -h, --help 顯示本說明文å—\n" -#: common.c:231 +#: common.c:238 #, c-format msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate ä¿ç•™è¼¸å‡ºæª”時間\n" -#: common.c:232 +#: common.c:239 #, c-format msgid " -L, --license display software license\n" msgstr " -L, --license 顯示軟體授權\n" -#: common.c:233 +#: common.c:240 #, c-format msgid " -l, --newline add additional newline\n" msgstr " -l, --newline åŠ å…¥é¡å¤–çš„æ›è¡Œ\n" -#: common.c:234 -#, c-format -msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#: common.c:241 +#, fuzzy, c-format +msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" -#: common.c:235 +#: common.c:242 #, c-format msgid "" " -n, --newfile write to new file\n" @@ -393,7 +240,7 @@ msgstr "" " infile 新檔模å¼ä¸çš„原始檔案\n" " outfile 新檔模å¼ä¸çš„輸出檔案\n" -#: common.c:238 +#: common.c:245 #, c-format msgid "" " -o, --oldfile write to old file (default)\n" @@ -402,46 +249,52 @@ msgstr "" " -o, --oldfile 寫入原檔案(é è¨)\n" " file ... 原檔模å¼ä¸è¦è½‰æ›çš„檔案\n" -#: common.c:240 +#: common.c:247 #, c-format -msgid "" -" -q, --quiet quiet mode, suppress all warnings\n" -" (always on in stdio mode)\n" -msgstr "" -" -q, --quiet 安éœæ¨¡å¼ï¼ŒæŠ‘制所有è¦å‘Š\n" -" (標準輸出入模å¼ä¸‹æ°¸é 啟用)\n" +msgid " -q, --quiet quiet mode, suppress all warnings\n" +msgstr " -q, --quiet 安éœæ¨¡å¼ï¼ŒæŠ‘制所有è¦å‘Š\n" -#: common.c:243 +#: common.c:249 #, fuzzy, c-format msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" -#: common.c:245 +#: common.c:251 #, fuzzy, c-format msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" -#: common.c:246 +#: common.c:252 #, c-format msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ç•¥éŽäºŒé€²ä½æª”案(é è¨)\n" -#: common.c:248 +#: common.c:254 +#, c-format +msgid " -u, --keep-utf16 keep UTF-16 encoding\n" +msgstr "" + +#: common.c:255 #, c-format msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le å‡è¨è¼¸å…¥æª”æ ¼å¼ç‚ºUTF-16LE\n" -#: common.c:249 +#: common.c:256 #, c-format msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be å‡è¨è¼¸å…¥æª”æ ¼å¼ç‚ºUTF-16BE\n" -#: common.c:252 +#: common.c:258 +#, c-format +msgid " -v, --verbose verbose operation\n" +msgstr "" + +#: common.c:260 #, c-format msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink ä¾å¾ªç¬¦è™Ÿé€£çµè½‰æ›å…¶ç›®æ¨™æª”案\n" -#: common.c:255 +#: common.c:263 #, c-format msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" @@ -450,83 +303,263 @@ msgstr "" " -R, --replace-symlink å–代符號連çµç‚ºè½‰æ›å¾Œçš„檔案\n" " (原連çµç›®æ¨™æª”案ä¿æŒä¸è®Š)\n" -#: common.c:257 +#: common.c:265 #, c-format msgid "" " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink ä¿æŒç¬¦è™Ÿé€£çµåŠå…¶ç›®æ¨™ä¸è®Š(é è¨)\n" -#: common.c:259 +#: common.c:267 #, c-format msgid " -V, --version display version number\n" msgstr " -V, --version 顯示版本號碼\n" -#: common.c:271 +#: common.c:279 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 ä½å…ƒç‰ˆæœ¬(WATCOMC)。\n" -#: common.c:273 +#: common.c:281 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 ä½å…ƒç‰ˆæœ¬(TURBOC)。\n" -#: common.c:275 +#: common.c:283 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 ä½å…ƒç‰ˆæœ¬(WATCOMC)。\n" -#: common.c:277 +#: common.c:285 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 ä½å…ƒç‰ˆæœ¬(DJGPP)。\n" -#: common.c:279 +#: common.c:287 msgid "MSYS version.\n" msgstr "MSYS 版本。\n" -#: common.c:281 +#: common.c:289 msgid "Cygwin version.\n" msgstr "Cygwin 版本。\n" -#: common.c:283 +#: common.c:291 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 ä½å…ƒç‰ˆæœ¬(MinGW-w64)。\n" -#: common.c:285 +#: common.c:293 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 ä½å…ƒç‰ˆæœ¬(WATCOMC)。\n" -#: common.c:287 +#: common.c:295 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 ä½å…ƒç‰ˆæœ¬(MinGW-w64)。\n" -#: common.c:289 +#: common.c:297 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 ä½å…ƒç‰ˆæœ¬(MinGW)。\n" -#: common.c:291 +#: common.c:299 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 ä½å…ƒç‰ˆæœ¬(MSVC %d)。\n" -#: common.c:293 +#: common.c:301 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 ä½å…ƒç‰ˆæœ¬(MSVC %d)。\n" -#: common.c:295 +#: common.c:303 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 版本(WATCOMC)。\n" -#: common.c:297 +#: common.c:305 msgid "OS/2 version (EMX).\n" msgstr "OS/2 版本(EMX)。\n" -#: common.c:300 +#: common.c:308 msgid "With Unicode UTF-16 support.\n" msgstr "有Unicode UTF-16 支æ´ã€‚\n" -#: common.c:302 +#: common.c:310 msgid "Without Unicode UTF-16 support.\n" msgstr "ç„¡Unicode UTF-16 支æ´ã€‚\n" -#: common.c:305 +#: common.c:313 msgid "With native language support.\n" msgstr "å«æœ¬åœ°èªžè¨€æ”¯æ´ã€‚\n" + +#: common.c:562 common.c:569 common.c:576 common.c:585 +#, c-format +msgid "Writing %s BOM.\n" +msgstr "" + +#: common.c:596 common.c:600 common.c:604 +#, c-format +msgid "Input file %s has %s BOM.\n" +msgstr "" + +#: common.c:619 +#, c-format +msgid "Assuming UTF-16LE encoding.\n" +msgstr "" + +#: common.c:623 +#, c-format +msgid "Assuming UTF-16BE encoding.\n" +msgstr "" + +#: common.c:746 +#, c-format +msgid "Failed to open temporary output file: %s\n" +msgstr "æš«å˜æª” %s 開啟失敗\n" + +#: common.c:753 +#, c-format +msgid "using %s as temporary file\n" +msgstr "使用 %s 作為暫å˜æª”\n" + +#: common.c:816 +#, c-format +msgid "Failed to write to temporary output file %s: %s\n" +msgstr "æš«å˜æª”寫入失敗%s：%s\n" + +#: common.c:846 +#, c-format +msgid "Failed to change the permissions of temporary output file %s: %s\n" +msgstr "輸出暫å˜æª” %s 權é™è®Šæ›´å¤±æ•—：%s\n" + +#: common.c:862 +#, c-format +msgid "Failed to change the owner and group of temporary output file %s: %s\n" +msgstr "輸出暫å˜æª” %s æ“有者åŠç¾¤çµ„變更失敗：%s\n" + +#: common.c:906 +#, c-format +msgid "problems resolving symbolic link '%s'\n" +msgstr "解æžç¬¦è™Ÿé€£çµ'%s' 發生å•é¡Œ\n" + +#: common.c:907 common.c:936 +#, c-format +msgid " output file remains in '%s'\n" +msgstr " 輸出檔案'%s' 未改變\n" + +#: common.c:931 +#, c-format +msgid "problems renaming '%s' to '%s': %s\n" +msgstr "é‡æ–°å‘½å「%sã€åˆ°ã€Œ%sã€éŒ¯èª¤ï¼š%s\n" + +#: common.c:934 +#, c-format +msgid " which is the target of symbolic link '%s'\n" +msgstr " 後者為符號連çµ'%s' 的目標\n" + +#: common.c:997 common.c:1029 common.c:1072 +#, c-format +msgid "Skipping binary file %s\n" +msgstr "ç•¥éŽäºŒé€²ä½æª”案%s\n" + +#: common.c:1000 common.c:1032 common.c:1075 +#, c-format +msgid "code page %d is not supported.\n" +msgstr "未支æ´%d 編碼é 。\n" + +#: common.c:1003 common.c:1035 common.c:1078 +#, c-format +msgid "" +"Skipping UTF-16 file %s, the current locale character encoding is not " +"UTF-8.\n" +msgstr "ç•¥éŽ UTF-16 檔案 %s，目å‰èªžè¨€å—元編碼並éžUTF-8。\n" + +#: common.c:1006 common.c:1038 common.c:1081 +#, 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:1009 common.c:1041 common.c:1084 +#, c-format +msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n" +msgstr "ç•¥éŽ UTF-16 檔案 %s，UTF-16 轉æ›ç™¼ç”ŸéŒ¯èª¤ã€‚\n" + +#: common.c:1017 common.c:1063 +#, c-format +msgid "Skipping %s, not a regular file.\n" +msgstr "ç•¥éŽ %s，ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" + +#: common.c:1020 +#, c-format +msgid "Skipping %s, output file %s is a symbolic link.\n" +msgstr "ç•¥éŽ %s，輸出檔 %s 是一個符號連çµã€‚.\n" + +#: common.c:1023 common.c:1069 +#, c-format +msgid "Skipping symbolic link %s, target is not a regular file.\n" +msgstr "ç•¥éŽç¬¦è™Ÿé€£çµ %s，目標ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" + +#: common.c:1026 +#, c-format +msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" +msgstr "ç•¥éŽ %sï¼Œç¬¦è™Ÿé€£çµ %s 目標ä¸æ˜¯ä¸€å€‹æ™®é€šæª”案。\n" + +#: common.c:1045 +#, c-format +msgid "converting file %s to file %s in Unix format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為Unix æ ¼å¼åˆ° %s...\n" + +#: common.c:1048 +#, c-format +msgid "converting file %s to file %s in Mac format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為Mac æ ¼å¼åˆ° %s...\n" + +#: common.c:1050 +#, c-format +msgid "converting file %s to file %s in DOS format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為DOS æ ¼å¼åˆ° %s...\n" + +#: common.c:1054 +#, c-format +msgid "problems converting file %s to file %s\n" +msgstr "轉æ›æª”案 %s 到 %s 錯誤\n" + +#: common.c:1066 +#, c-format +msgid "Skipping symbolic link %s.\n" +msgstr "ç•¥éŽç¬¦è™Ÿé€£çµ %s。\n" + +#: common.c:1088 +#, c-format +msgid "converting file %s to Unix format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為Unix æ ¼å¼...\n" + +#: common.c:1091 +#, c-format +msgid "converting file %s to Mac format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為Mac æ ¼å¼...\n" + +#: common.c:1093 +#, c-format +msgid "converting file %s to DOS format...\n" +msgstr "æ£åœ¨è½‰æ› %s 為DOS æ ¼å¼...\n" + +#: common.c:1097 +#, c-format +msgid "problems converting file %s\n" +msgstr "轉æ›æª”案 %s 錯誤\n" + +#: common.c:1188 common.c:1225 +#, c-format +msgid "active code page: %d\n" +msgstr "作用ä¸ç·¨ç¢¼é ：%d\n" + +#: common.c:1237 +#, c-format +msgid "invalid %s conversion mode specified\n" +msgstr "指定的轉æ›æ¨¡å¼ %s ä¸åˆæ³•\n" + +#: common.c:1245 +#, c-format +msgid "option '%s' requires an argument\n" +msgstr "é¸é …'%s' 需è¦ä¸€å€‹å¼•æ•¸\n" + +#: common.c:1256 common.c:1268 common.c:1325 +#, c-format +msgid "target of file %s not specified in new-file mode\n" +msgstr "新檔模å¼ä¸æœªæŒ‡æ˜Žæª”案 %s 的目的ä½ç½®\n" + +#~ msgid " -m, --add-bom add UTF-8 Byte Order Mark\n" +#~ msgstr " -m, --add-bom åŠ å…¥UTF-8 BOM\n" diff --git a/test/Makefile b/test/Makefile new file mode 100755 index 0000000..25832a5 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,35 @@ +TESTS = ascii.t iso.t utf8.t utf16.t misc.t + +ifneq ($(findstring MINGW,$(shell uname)),MINGW) +TESTS += symlink.t +endif + + +all: test + +check: test + +test: + prove -v $(TESTS) + + +ascii: + prove -v $@.t + +iso: + prove -v $@.t + +misc: + prove -v $@.t + +utf8: + prove -v $@.t + +utf16: + prove -v $@.t + +symlink: + prove -v $@.t + +clean: + rm -f out*.txt in*.txt diff --git a/test/ascii.t b/test/ascii.t new file mode 100755 index 0000000..64f6c7b --- /dev/null +++ b/test/ascii.t @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 30; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +system("$DOS2UNIX -v -n dos.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'DOS to Unix conversion' ); + +system("$MAC2UNIX -v -n mac.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'DOS to Unix conversion' ); + +system("$UNIX2DOS -v -n unix.txt out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'Unix to DOS conversion' ); + +system("$UNIX2MAC -v -n unix.txt out_mac.txt; cmp out_mac.txt mac.txt"); +ok( $? == 0, 'Unix to Mac conversion' ); + +system("cp -f dos.txt out_unix.txt; $DOS2UNIX -v out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'DOS to Unix conversion, old file mode' ); + +system("cp -f unix.txt out_dos.txt; $UNIX2DOS -v out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'Unix to DOS conversion, old file mode' ); + +system("$DOS2UNIX -v -n unix.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'dos2unix must not change unix line breaks'); +system("$DOS2UNIX -v -n mac.txt out_unix.txt; cmp out_unix.txt mac.txt"); +ok( $? == 0, 'dos2unix must not change mac line breaks'); +system("$MAC2UNIX -v -n unix.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'mac2unix must not change unix line breaks'); +system("$MAC2UNIX -v -n dos.txt out_unix.txt; cmp out_unix.txt dos.txt"); +ok( $? == 0, 'mac2unix must not change dos line breaks'); +system("$UNIX2DOS -v -n dos.txt out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'unix2dos must not change dos line breaks'); +system("$UNIX2DOS -v -n mac.txt out_dos.txt; cmp out_dos.txt mac.txt"); +ok( $? == 0, 'unix2dos must not change mac line breaks'); +system("$UNIX2MAC -v -n dos.txt out_mac.txt; cmp out_mac.txt dos.txt"); +ok( $? == 0, 'unix2mac must not change dos line breaks'); +system("$UNIX2MAC -v -n mac.txt out_mac.txt; cmp out_mac.txt mac.txt"); +ok( $? == 0, 'unix2mac must not change mac line breaks'); + +system("$DOS2UNIX -v -n mixed.txt out.txt; cmp out.txt mixedd2u.txt"); +ok( $? == 0, 'DOS to Unix conversion mixed'); +system("$MAC2UNIX -v -n mixed.txt out.txt; cmp out.txt mixedm2u.txt"); +ok( $? == 0, 'DOS to Unix conversion mixed'); +system("$UNIX2DOS -v -n mixed.txt out.txt; cmp out.txt mixedu2d.txt"); +ok( $? == 0, 'Unix to DOS conversion mixed'); +system("$UNIX2MAC -v -n mixed.txt out.txt; cmp out.txt mixedu2m.txt"); +ok( $? == 0, 'Unix to Mac conversion mixed'); + +system("$DOS2UNIX -v -l -n dos.txt out_unix.txt; cmp out_unix.txt unix_dbl.txt"); +ok( $? == 0, 'DOS to Unix conversion with line doubling'); +system("$MAC2UNIX -v -l -n mac.txt out_unix.txt; cmp out_unix.txt unix_dbl.txt"); +ok( $? == 0, 'DOS to Unix conversion with line doubling'); +system("$UNIX2DOS -v -l -n unix.txt out_dos.txt; cmp out_dos.txt dos_dbl.txt"); +ok( $? == 0, 'Unix to DOS conversion with line doubling'); +system("$UNIX2MAC -v -l -n unix.txt out_mac.txt; cmp out_mac.txt mac_dbl.txt"); +ok( $? == 0, 'Unix to Mac conversion with line doubling'); + +system("$DOS2UNIX -v -l -n unix.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'dos2unix -l must not change unix line breaks'); +system("$DOS2UNIX -v -l -n mac.txt out_unix.txt; cmp out_unix.txt mac.txt"); +ok( $? == 0, 'dos2unix -l must not change mac line breaks'); +system("$MAC2UNIX -v -l -n unix.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'mac2unix -l must not change unix line breaks'); +system("$MAC2UNIX -v -l -n dos.txt out_unix.txt; cmp out_unix.txt dos.txt"); +ok( $? == 0, 'mac2unix -l must not change dos line breaks'); +system("$UNIX2DOS -v -l -n dos.txt out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'unix2dos -l must not change dos line breaks'); +system("$UNIX2DOS -v -l -n mac.txt out_dos.txt; cmp out_dos.txt mac.txt"); +ok( $? == 0, 'unix2dos -l must not change mac line breaks'); +system("$UNIX2MAC -v -l -n dos.txt out_mac.txt; cmp out_mac.txt dos.txt"); +ok( $? == 0, 'unix2mac -l must not change dos line breaks'); +system("$UNIX2MAC -v -l -n mac.txt out_mac.txt; cmp out_mac.txt mac.txt"); +ok( $? == 0, 'unix2mac -l must not change mac line breaks'); + diff --git a/test/chard7.txt b/test/chard7.txt new file mode 100755 index 0000000..3b3c9fc --- /dev/null +++ b/test/chard7.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+
+
+
+
+
+
+
+
diff --git a/test/chardos.txt b/test/chardos.txt new file mode 100755 index 0000000..ff85358 --- /dev/null +++ b/test/chardos.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+€‚ƒ„…†‡ˆ‰Š‹ŒŽ
+‘’“”•–—˜™š›œžŸ
+ ¡¢£¤¥¦§¨©ª«¬®¯
+°±²³´µ¶·¸¹º»¼½¾¿
+ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ
+ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß
+àáâãäåæçèéêëìíîï
+ðñòóôõö÷øùúûüýþÿ
diff --git a/test/charu7.txt b/test/charu7.txt new file mode 100755 index 0000000..0073580 --- /dev/null +++ b/test/charu7.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ + + + + + + + + diff --git a/test/charunix.txt b/test/charunix.txt new file mode 100644 index 0000000..e78f391 --- /dev/null +++ b/test/charunix.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +€‚ƒ„…†‡ˆ‰Š‹ŒŽ +‘’“”•–—˜™š›œžŸ + ¡¢£¤¥¦§¨©ª«¬®¯ +°±²³´µ¶·¸¹º»¼½¾¿ +ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ +ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß +àáâãäåæçèéêëìíîï +ðñòóôõö÷øùúûüýþÿ diff --git a/test/cp_1252.txt b/test/cp_1252.txt new file mode 100644 index 0000000..5448e22 --- /dev/null +++ b/test/cp_1252.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ ¡¢£¤¥¦§¨©ª«¬®¯
+°±²³´µ¶·¸¹º»¼½¾¿
+ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ
+ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß
+àáâãäåæçèéêëìíîï
+ðñòóôõö÷øùúûüýþÿ
diff --git a/test/cp_437.txt b/test/cp_437.txt new file mode 100644 index 0000000..ed80363 --- /dev/null +++ b/test/cp_437.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ÿ›œ.....¦®ª...
+øñý..æ.ú..§¯¬«.¨
+....Ž’€.......
+.¥....™.....š..á
+… ƒ.„†‘‡Š‚ˆ‰¡Œ‹
+.¤•¢“.”ö.—£–..˜
diff --git a/test/cp_850.txt b/test/cp_850.txt new file mode 100644 index 0000000..6cf3427 --- /dev/null +++ b/test/cp_850.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ÿ½œÏ¾Ýõù¸¦®ªð©î
+øñýüïæôú÷û§¯¬«ó¨
+·µ¶ÇŽ’€ÔÒÓÞÖ×Ø
+Ñ¥ãàâ噞ëéêšíèá
+… ƒÆ„†‘‡Š‚ˆ‰¡Œ‹
+Ф•¢“ä”ö›—£–ìç˜
diff --git a/test/cp_860.txt b/test/cp_860.txt new file mode 100644 index 0000000..69904de --- /dev/null +++ b/test/cp_860.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ÿ›œ......¦®ª...
+øñý..æ.ú..§¯¬«.¨
+‘†Ž...€’‰.˜‹..
+.¥©ŸŒ™...–.š..á
+… ƒ„...‡Š‚ˆ.¡..
+.¤•¢“”.ö.—£....
diff --git a/test/cp_863.txt b/test/cp_863.txt new file mode 100644 index 0000000..cba6911 --- /dev/null +++ b/test/cp_863.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ÿ›œ˜ ¤.¦®ª..§
+øñý¦¡æ†ú¥.§¯¬«¨
+Ž.„.Ž’€‘’”..¨•
+.¥..™.™...žš..á
+… ƒ.„†‘‡Š‚ˆ‰¡Œ‹
+.¤•¢“.”ö.—£–..˜
diff --git a/test/cp_865.txt b/test/cp_865.txt new file mode 100644 index 0000000..6148fe7 --- /dev/null +++ b/test/cp_865.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./
+0123456789:;<=>?
+@ABCDEFGHIJKLMNO
+PQRSTUVWXYZ[\]^_
+`abcdefghijklmno
+pqrstuvwxyz{|}~
+................
+................
+ÿ.œ¯.....¦®ª...
+øñý..æ.ú..§.¬«.¨
+....Ž’€.......
+.¥....™....š..á
+… ƒ.„†‘‡Š‚ˆ‰¡Œ‹
+.¤•¢“.”ö›—£–..˜
diff --git a/test/dos.txt b/test/dos.txt new file mode 100644 index 0000000..fc8b4db --- /dev/null +++ b/test/dos.txt @@ -0,0 +1,6 @@ +hello
+world
+
+take
+a
+break
diff --git a/test/dos_bom.txt b/test/dos_bom.txt new file mode 100644 index 0000000..1216471 --- /dev/null +++ b/test/dos_bom.txt @@ -0,0 +1,6 @@ +hello
+world
+
+take
+a
+break
diff --git a/test/dos_dbl.txt b/test/dos_dbl.txt new file mode 100644 index 0000000..651b0b3 --- /dev/null +++ b/test/dos_dbl.txt @@ -0,0 +1,12 @@ +hello
+
+world
+
+
+
+take
+
+a
+
+break
+
diff --git a/test/iso.t b/test/iso.t new file mode 100755 index 0000000..69af494 --- /dev/null +++ b/test/iso.t @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 12; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +# To check for instance cp850 to iso88591 conversion +# you can do a visual check like this (on Windows). +# +# In a Windows Command Prompt, set font to Lucida Console. +# Then set the code page to 850: +# chcp 850 +# Display complete cp850 code page: +# type chardos.txt +# +# In a Cygwin Mintty terminal, under Options->Text +# set Character set to ISO-8859-1 +# Display converted character set: +# cat iso_850.txt +# +# You now see the same characters as in the Windows Command Prompt +# with the non-convertable characters replaced with a dot. + +system("$DOS2UNIX -v -437 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_437.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp437 to iso88591' ); + +system("$DOS2UNIX -v -850 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_850.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp850 to iso88591' ); + +system("$DOS2UNIX -v -860 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_860.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp860 to iso88591' ); + +system("$DOS2UNIX -v -863 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_863.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp863 to iso88591' ); + +system("$DOS2UNIX -v -865 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_865.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp865 to iso88591' ); + +system("$DOS2UNIX -v -1252 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_1252.txt"); +ok( $? == 0, 'DOS to Unix conversion, cp1252 to iso88591' ); + + +# To check for instance iso88591 to cp850 conversion +# you can do a visual check like this (on Windows). +# +# In a Cygwin Mintty terminal, under Options->Text +# set Character set to ISO-8859-1 +# Display complete ISO-8859-1 character set: +# cat charunix.txt +# +# In a Windows Command Prompt, set font to Lucida Console. +# Then set the code page to 850: +# chcp 850 +# Display converted cp850 code page: +# type cp_850.txt +# +# You now see the same characters as in the Mintty terminal +# with the non-convertable characters replaced with a dot. + +system("$UNIX2DOS -v -437 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_437.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp437' ); + +system("$UNIX2DOS -v -850 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_850.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp850' ); + +system("$UNIX2DOS -v -860 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_860.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp860' ); + +system("$UNIX2DOS -v -863 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_863.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp863' ); + +system("$UNIX2DOS -v -865 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_865.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp865' ); + +system("$UNIX2DOS -v -1252 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_1252.txt"); +ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp1252' ); diff --git a/test/iso_1252.txt b/test/iso_1252.txt new file mode 100644 index 0000000..99b9fce --- /dev/null +++ b/test/iso_1252.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +................ +................ + ¡¢£¤¥¦§¨©ª«¬®¯ +°±²³´µ¶·¸¹º»¼½¾¿ +ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ +ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß +àáâãäåæçèéêëìíîï +ðñòóôõö÷øùúûüýþÿ diff --git a/test/iso_437.txt b/test/iso_437.txt new file mode 100644 index 0000000..ea47879 --- /dev/null +++ b/test/iso_437.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +ÇüéâäàåçêëèïîìÄÅ +ÉæÆôöòûùÿÖÜ¢£¥.. +áíóúñѪº¿.¬½¼¡«» +................ +................ +................ +.ß....µ......... +.±....÷.°.·..². diff --git a/test/iso_850.txt b/test/iso_850.txt new file mode 100644 index 0000000..4ed6141 --- /dev/null +++ b/test/iso_850.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +ÇüéâäàåçêëèïîìÄÅ +ÉæÆôöòûùÿÖÜø£Ø×. +áíóúñѪº¿®¬½¼¡«» +.....ÁÂÀ©....¢¥. +......ãÃ.......¤ +ðÐÊËÈ.ÍÎÏ....¦Ì. +ÓßÔÒõÕµþÞÚÛÙýݯ´ +±.¾¶§÷¸°¨·¹³². diff --git a/test/iso_860.txt b/test/iso_860.txt new file mode 100644 index 0000000..045bc44 --- /dev/null +++ b/test/iso_860.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +ÇüéâãàÁçêÊèÍÔìà+ÉÀÈôõòÚùÌÕÜ¢£Ù.Ó +áíóúñѪº¿Ò¬½¼¡«» +................ +................ +................ +.ß....µ......... +.±....÷.°.·..². diff --git a/test/iso_863.txt b/test/iso_863.txt new file mode 100644 index 0000000..ec1e86f --- /dev/null +++ b/test/iso_863.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +ÇüéâÂà¶çêëèïî.À§ +ÉÈÊôËÏûù¤ÔÜ¢£ÙÛ. +¦´óú¨¸³¯Î.¬½¼¾«» +................ +................ +................ +.ß....µ......... +.±....÷.°.·..². diff --git a/test/iso_865.txt b/test/iso_865.txt new file mode 100644 index 0000000..4a4fad6 --- /dev/null +++ b/test/iso_865.txt @@ -0,0 +1,14 @@ + !"#$%&'()*+,-./ +0123456789:;<=>? +@ABCDEFGHIJKLMNO +PQRSTUVWXYZ[\]^_ +`abcdefghijklmno +pqrstuvwxyz{|}~ +ÇüéâäàåçêëèïîìÄÅ +ÉæÆôöòûùÿÖÜø£Ø.. +áíóúñѪº¿.¬½¼¡«¤ +................ +................ +................ +.ß....µ......... +.±....÷.°.·..². diff --git a/test/mac.txt b/test/mac.txt new file mode 100644 index 0000000..50c0936 --- /dev/null +++ b/test/mac.txt @@ -0,0 +1 @@ +hello
world
take
a
break
\ No newline at end of file diff --git a/test/mac_dbl.txt b/test/mac_dbl.txt new file mode 100644 index 0000000..ebff9eb --- /dev/null +++ b/test/mac_dbl.txt @@ -0,0 +1 @@ +hello
world
take
a
break
\ No newline at end of file diff --git a/test/misc.t b/test/misc.t new file mode 100755 index 0000000..b8da955 --- /dev/null +++ b/test/misc.t @@ -0,0 +1,92 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 16; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +$ENV{'LC_ALL'} = 'en_US.UTF-8'; + +system("$DOS2UNIX -v -7 -n chardos.txt out_unix.txt; cmp out_unix.txt charu7.txt"); +ok( $? == 0, '7bit'); + +system("$DOS2UNIX -v < dos.txt > out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'DOS to Unix conversion, stdin/out' ); + +system("$UNIX2DOS -v < unix.txt > out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'Unix to DOS conversion, stdin/out' ); + +system("cat utf16le.txt | $DOS2UNIX -v > out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'UTF-16LE with BOM to UTF-8, stdin/out' ); + +system("cat utf16u.txt | $UNIX2DOS -v -u > out_dos.txt; cmp out_dos.txt utf16.txt"); +ok( $? == 0, 'UTF-16LE with BOM to UTF-16LE, stdin/out' ); + +system("$DOS2UNIX -v -n utf16len.txt out_bin.txt"); +# file out_bin.txt may not exist. +if (-e "out_bin.txt") { + $exists = "1"; +} else { + $exists = "0"; +} +ok( $exists == 0, 'dos2unix skip binary file.' ); + +system("$UNIX2DOS -v -n utf16len.txt out_bin.txt"); +# file out_bin.txt may not exist. +if (-e "out_bin.txt") { + $exists = "1"; +} else { + $exists = "0"; +} +ok( $exists == 0, 'unix2dos skip binary file.' ); + +system("$DOS2UNIX -v < utf16len.txt > out.txt"); +$result = ($? >> 8); +ok( $result == 1, 'Dos2unix stdio returns error on binary input.' ); + +system("$UNIX2DOS -v < utf16len.txt > out.txt"); +$result = ($? >> 8); +ok( $result == 1, 'Unix2dos stdio returns error on binary input.' ); + +system("rm -f out_forc.txt"); +system("$DOS2UNIX -v -n utf16len.txt out_forc.txt"); +# file out_bin.txt may not exist. +if (-e "out_forc.txt") { + $exists = "1"; +} else { + $exists = "0"; +} +ok( $exists == 0, 'dos2unix force binary file.' ); + +system("rm -f out_forc.txt"); +system("$UNIX2DOS -v -n utf16len.txt out_forc.txt"); +# file out_bin.txt may not exist. +if (-e "out_forc.txt") { + $exists = "1"; +} else { + $exists = "0"; +} +ok( $exists == 0, 'unix2dos force binary file.' ); + +system("$DOS2UNIX -v -7 -n utf16le.txt out_unix.txt chardos.txt out_u7.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, '7bit disabled for utf16'); + +system("cmp out_u7.txt charu7.txt"); +ok( $? == 0, '7bit enabled again, dos2unix'); + +system("$UNIX2DOS -v -7 -n utf8unxb.txt out_dos.txt charunix.txt out_d7.txt; cmp out_dos.txt utf8dos.txt"); +ok( $? == 0, '7bit disabled for utf8 with BOM'); + +system("cmp out_d7.txt chard7.txt"); +ok( $? == 0, '7bit enabled again, unix2dos'); + +system("$UNIX2DOS -v -u -m -n unix.txt out_dos.txt; cmp out_dos.txt dos_bom.txt"); +ok( $? == 0, 'Option -u must not disable -m on ASCII input'); + diff --git a/test/mixed.txt b/test/mixed.txt new file mode 100644 index 0000000..51ac4c3 --- /dev/null +++ b/test/mixed.txt @@ -0,0 +1,13 @@ +hello +world + +take +a +break +hello
+world
+
+take
+a
+break
+hello
world
take
a
break
\ No newline at end of file diff --git a/test/mixedd2u.txt b/test/mixedd2u.txt new file mode 100644 index 0000000..45b737b --- /dev/null +++ b/test/mixedd2u.txt @@ -0,0 +1,13 @@ +hello +world + +take +a +break +hello +world + +take +a +break +hello
world
take
a
break
\ No newline at end of file diff --git a/test/mixedm2u.txt b/test/mixedm2u.txt new file mode 100644 index 0000000..f0aa9e4 --- /dev/null +++ b/test/mixedm2u.txt @@ -0,0 +1,18 @@ +hello +world + +take +a +break +hello
+world
+
+take
+a
+break
+hello +world + +take +a +break diff --git a/test/mixedu2d.txt b/test/mixedu2d.txt new file mode 100644 index 0000000..7f2d646 --- /dev/null +++ b/test/mixedu2d.txt @@ -0,0 +1,13 @@ +hello
+world
+
+take
+a
+break
+hello
+world
+
+take
+a
+break
+hello
world
take
a
break
\ No newline at end of file diff --git a/test/mixedu2m.txt b/test/mixedu2m.txt new file mode 100644 index 0000000..12c97a8 --- /dev/null +++ b/test/mixedu2m.txt @@ -0,0 +1,7 @@ +hello
world
take
a
break
hello
+world
+
+take
+a
+break
+hello
world
take
a
break
\ No newline at end of file diff --git a/test/symlink.t b/test/symlink.t new file mode 100755 index 0000000..6baa0a4 --- /dev/null +++ b/test/symlink.t @@ -0,0 +1,119 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 14; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +# dos2unix skip symlink + +system("cp -f dos.txt out_link.txt"); +system("rm -f in_link.txt; ln -s out_link.txt in_link.txt"); + +system("$DOS2UNIX -v in_link.txt; cmp out_link.txt dos.txt"); +ok( $? == 0, 'dos2unix, skip symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 1, 'dos2unix, skip symlink, check symlink.' ); + + +# dos2unix replace symlink + + +system("$DOS2UNIX -v -R in_link.txt; cmp out_link.txt dos.txt"); +ok( $? == 0, 'dos2unix, replace symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 0, 'dos2unix, replace symlink, check symlink.' ); + +system("cmp in_link.txt unix.txt"); +ok( $? == 0, 'dos2unix, replace symlink, check conversion.' ); + + +# dos2unix follow symlink + + +system("cp -f dos.txt out_link.txt"); +system("rm -f in_link.txt; ln -s out_link.txt in_link.txt"); + +system("$DOS2UNIX -v -F in_link.txt; cmp out_link.txt unix.txt"); +ok( $? == 0, 'dos2unix, follow symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 1, 'dos2unix, follow symlink, check symlink.' ); + + + +# unix2dos skip symlink + +system("cp -f unix.txt out_link.txt"); +system("rm -f in_link.txt; ln -s out_link.txt in_link.txt"); + +system("$UNIX2DOS -v in_link.txt; cmp out_link.txt unix.txt"); +ok( $? == 0, 'unix2dos, skip symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 1, 'unix2dos, skip symlink, check symlink.' ); + + +# unix2dos replace symlink + + +system("$UNIX2DOS -v -R in_link.txt; cmp out_link.txt unix.txt"); +ok( $? == 0, 'unix2dos, replace symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 0, 'unix2dos, replace symlink, check symlink.' ); + +system("cmp in_link.txt dos.txt"); +ok( $? == 0, 'unix2dos, replace symlink, check conversion.' ); + + +# unix2dos follow symlink + + +system("cp -f unix.txt out_link.txt"); +system("rm -f in_link.txt; ln -s out_link.txt in_link.txt"); + +system("$UNIX2DOS -v -F in_link.txt; cmp out_link.txt dos.txt"); +ok( $? == 0, 'unix2dos, follow symlink, check symlink target.' ); + +if (-l "in_link.txt") { + $symlink = "1"; +} else { + $symlink = "0"; +} + +ok( $symlink == 1, 'unix2dos, follow symlink, check symlink.' ); diff --git a/test/unix.txt b/test/unix.txt new file mode 100644 index 0000000..f8fe2cd --- /dev/null +++ b/test/unix.txt @@ -0,0 +1,6 @@ +hello +world + +take +a +break diff --git a/test/unix_bom.txt b/test/unix_bom.txt new file mode 100644 index 0000000..f33510b --- /dev/null +++ b/test/unix_bom.txt @@ -0,0 +1,6 @@ +hello +world + +take +a +break diff --git a/test/unix_dbl.txt b/test/unix_dbl.txt new file mode 100644 index 0000000..35f45a4 --- /dev/null +++ b/test/unix_dbl.txt @@ -0,0 +1,12 @@ +hello + +world + + + +take + +a + +break + diff --git a/test/utf16.t b/test/utf16.t new file mode 100755 index 0000000..3f4960a --- /dev/null +++ b/test/utf16.t @@ -0,0 +1,74 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 19; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} + +$system = `uname -s`; +if ($system =~ m/MINGW/) +{ + $unix=0; +} else { + $unix=1; +} + +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +$ENV{'LC_ALL'} = 'en_US.UTF-8'; + +system("$DOS2UNIX -v -n utf16le.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'DOS UTF-16LE to Unix UTF-8' ); +system("$DOS2UNIX -v -n utf16be.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'DOS UTF-16BE to Unix UTF-8' ); +system("$UNIX2DOS -v -n utf16le.txt out_dos.txt; cmp out_dos.txt utf8dos.txt"); +ok( $? == 0, 'DOS UTF-16LE to DOS UTF-8' ); +system("$UNIX2DOS -v -n utf16be.txt out_dos.txt; cmp out_dos.txt utf8dos.txt"); +ok( $? == 0, 'DOS UTF-16BE to DOS UTF-8' ); + +system("$DOS2UNIX -v -ul -n utf16len.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'UTF-16LE without BOM to UTF-8' ); +system("$DOS2UNIX -v -ub -n utf16ben.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'UTF-16BE without BOM to UTF-8' ); +system("$DOS2UNIX -v -ul -n utf16be.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'BOM overrides -ul' ); +system("$DOS2UNIX -v -ub -n utf16le.txt out_unix.txt; cmp out_unix.txt utf8unix.txt"); +ok( $? == 0, 'BOM overrides -ub' ); + +system("$DOS2UNIX -v -b -n utf16le.txt out_unix.txt; cmp out_unix.txt utf8unxb.txt"); +ok( $? == 0, 'DOS UTF-16LE to Unix UTF-8, keep BOM' ); +system("$UNIX2DOS -v -r -n utf16le.txt out_dos.txt; cmp out_dos.txt utf8dosn.txt"); +ok( $? == 0, 'DOS UTF-16LE to DOS UTF-8, remove BOM' ); + +system("$MAC2UNIX -v -n utf16le.txt out_unix.txt; cmp out_unix.txt utf8dosn.txt"); +ok( $? == 0, 'mac2unix does not change utf16 DOS line breaks.' ); +system("$UNIX2MAC -v -n utf16le.txt out_mac.txt; cmp out_mac.txt utf8dos.txt"); +ok( $? == 0, 'unix2mac does not change utf16 DOS line breaks.' ); + +system("$UNIX2DOS -v -u -n utf16le.txt out_dos.txt; cmp out_dos.txt utf16le.txt"); +ok( $? == 0, 'DOS UTF-16LE to DOS UTF-16' ); +system("$UNIX2DOS -v -u -n utf16be.txt out_dos.txt; cmp out_dos.txt utf16be.txt"); +ok( $? == 0, 'DOS UTF-16BE to DOS UTF-16' ); +system("$DOS2UNIX -v -b -u -n utf16.txt out_unix.txt; cmp out_unix.txt utf16u.txt"); +ok( $? == 0, 'DOS UTF-16LE to Unix UTF-16' ); +system("$MAC2UNIX -v -b -u -n utf16m.txt out_unix.txt; cmp out_unix.txt utf16u.txt"); +ok( $? == 0, 'Mac UTF-16LE to Unix UTF-16' ); +system("$UNIX2DOS -v -b -u -n utf16u.txt out_dos.txt; cmp out_dos.txt utf16.txt"); +ok( $? == 0, 'Unix UTF-16 to DOS UTF-16LE' ); +system("$UNIX2MAC -v -b -u -n utf16u.txt out_mac.txt; cmp out_mac.txt utf16m.txt"); +ok( $? == 0, 'Unix UTF-16 to Mac UTF-16LE' ); + +$ENV{'LC_ALL'} = 'en_US.ISO-8859-1'; + +system("$DOS2UNIX -v -n utf16le.txt out_unix.txt"); +$result = ($? >> 8); +if ( $unix ) { $expected = 1; } else { $expected = 0 }; +print "UNIX" . $unix . "\n"; +print "EXP" . $expected . "\n"; +ok( $result == $expected, 'DOS UTF-16LE to Unix UTF-8, env is not UTF-8' ); diff --git a/test/utf16.txt b/test/utf16.txt Binary files differnew file mode 100755 index 0000000..868b5af --- /dev/null +++ b/test/utf16.txt diff --git a/test/utf16_be.txt b/test/utf16be.txt Binary files differindex 1be5db9..1be5db9 100755 --- a/test/utf16_be.txt +++ b/test/utf16be.txt diff --git a/test/utf16_be_nobom.txt b/test/utf16ben.txt Binary files differindex 2efd41a..2efd41a 100644 --- a/test/utf16_be_nobom.txt +++ b/test/utf16ben.txt diff --git a/test/utf16_le.txt b/test/utf16le.txt Binary files differindex db9f535..db9f535 100755 --- a/test/utf16_le.txt +++ b/test/utf16le.txt diff --git a/test/utf16_le_nobom.txt b/test/utf16len.txt Binary files differindex 1861149..1861149 100644 --- a/test/utf16_le_nobom.txt +++ b/test/utf16len.txt diff --git a/test/utf16m.txt b/test/utf16m.txt Binary files differnew file mode 100755 index 0000000..cd523f8 --- /dev/null +++ b/test/utf16m.txt diff --git a/test/utf16u.txt b/test/utf16u.txt Binary files differnew file mode 100755 index 0000000..2bd9b3b --- /dev/null +++ b/test/utf16u.txt diff --git a/test/utf8.t b/test/utf8.t new file mode 100755 index 0000000..454ed99 --- /dev/null +++ b/test/utf8.t @@ -0,0 +1,33 @@ +#!/usr/bin/perl + +# Requires perl-Test-Simple installation. +use Test::More tests => 6; + +$suffix = ""; +if (-e "../dos2unix.exe") { + $suffix = ".exe"; +} +$DOS2UNIX = "../dos2unix" . $suffix; +$MAC2UNIX = "../mac2unix" . $suffix; +$UNIX2DOS = "../unix2dos" . $suffix; +$UNIX2MAC = "../unix2mac" . $suffix; + +system("$DOS2UNIX -v -n dos_bom.txt out_unix.txt; cmp out_unix.txt unix.txt"); +ok( $? == 0, 'dos2unix removes BOM' ); + +system("$DOS2UNIX -v -b -n dos_bom.txt out_unix.txt; cmp out_unix.txt unix_bom.txt"); +ok( $? == 0, 'dos2unix -b keeps BOM' ); + +system("$DOS2UNIX -v -m -n dos.txt out_unix.txt; cmp out_unix.txt unix_bom.txt"); +ok( $? == 0, 'dos2unix -m adds BOM' ); + +system("$UNIX2DOS -v -n unix_bom.txt out_dos.txt; cmp out_dos.txt dos_bom.txt"); +ok( $? == 0, 'unix2dos keeps BOM' ); + +system("$UNIX2DOS -v -r -n unix_bom.txt out_dos.txt; cmp out_dos.txt dos.txt"); +ok( $? == 0, 'unix2dos -r removes BOM' ); + +system("$UNIX2DOS -v -m -n unix.txt out_dos.txt; cmp out_dos.txt dos_bom.txt"); +ok( $? == 0, 'unix2dos -m adds BOM' ); + + diff --git a/test/utf8dos.txt b/test/utf8dos.txt new file mode 100755 index 0000000..76afa4f --- /dev/null +++ b/test/utf8dos.txt @@ -0,0 +1,51 @@ +è¨å°”èŒ¨å ¡ï¼Œå¥¥åœ°åˆ©å…±å’Œå›½è¨å°”èŒ¨å ¡å·žçš„é¦–åºœï¼Œ2007年人å£çº¦15万，是继维也纳ã€æ ¼æ‹‰èŒ¨å’Œæž—茨之åŽçš„奥地利第四大城市。è¨å°”èŒ¨å ¡ä½äºŽå¥¥åœ°åˆ©çš„西部，是阿尔å‘斯山脉的门åºï¼ŒåŸŽå¸‚的建ç‘é£Žæ ¼ä»¥å·´æ´›å…‹ä¸ºä¸»ï¼ŒåŸŽå¸‚çš„åŽ†å²ç›¸å½“æ‚ ä¹…ï¼Œæ®å²æ–™è®°è½½ï¼Œè¨å°”èŒ¨å ¡æ˜¯çŽ°ä»Šå¥¥åœ°åˆ©ç®¡è¾–åœ°åŸŸå†…åŽ†å²æœ€æ‚ 久的城市。è¨å°”èŒ¨å ¡æ˜¯éŸ³ä¹å¤©æ‰èŽ«æ‰Žç‰¹çš„出生地，莫扎特ä¸åˆ°36å¹´çš„çŸæš‚生命ä¸è¶…过一åŠçš„å²æœˆæ˜¯åœ¨è¨å°”èŒ¨å ¡åº¦è¿‡çš„ã€‚è¨å°”èŒ¨å ¡ä¹Ÿæ˜¯æŒ‡æŒ¥å®¶èµ«ä¼¯ç‰¹Â·å†¯Â·å¡æ‹‰æ‰¬çš„故乡，电影《音ä¹ä¹‹å£°ã€‹çš„æ‹æ‘„地。è¨å°”èŒ¨å ¡è€åŸŽåœ¨1996年被è”åˆå›½æ•™ç§‘文组织列入世界é—产å录。
+
+ðŒ†
+Unicode
+Scalar
+Value UTF-8 NCR
+U+2070E 𠜎 𠜎
+U+20731 𠜱 𠜱
+U+20779 ð ¹ ð ¹
+U+20C53 𠱓 𠱓
+U+20C78 𠱸 𠱸
+U+20C96 ð ²– ð ²–
+U+20CCF ð ³ ð ³
+U+20CD5 𠳕 𠳕
+U+20D15 ð ´• ð ´•
+U+20D7C ð µ¼ ð µ¼
+U+20D7F 𠵿 𠵿
+U+20E0E 𠸎 𠸎
+U+20E0F ð ¸ ð ¸
+U+20E77 ð ¹· ð ¹·
+U+20E9D ð º ð º
+U+20EA2 𠺢 𠺢
+U+20ED7 ð »— ð »—
+U+20EF9 ð »¹ ð »¹
+U+20EFA 𠻺 𠻺
+U+20F2D ð ¼ ð ¼
+U+20F2E ð ¼® ð ¼®
+U+20F4C 𠽌 𠽌
+U+20FB4 ð ¾´ ð ¾´
+U+20FBC ð ¾¼ ð ¾¼
+U+20FEA 𠿪 𠿪
+U+2105C 𡜠ð¡œ
+U+2106F 𡯠ð¡¯
+U+21075 𡵠ð¡µ
+U+21076 𡶠ð¡¶
+U+2107B ð¡» ð¡»
+U+210C1 𡃠ð¡ƒ
+U+210C9 𡃉 𡃉
+U+211D9 𡇙 𡇙
+U+220C7 𢃇 𢃇
+U+227B5 𢞵 𢞵
+U+22AD5 𢫕 𢫕
+U+22B43 𢃠ð¢ƒ
+U+22BCA 𢯊 𢯊
+U+22C51 𢱑 𢱑
+U+22C55 𢱕 𢱕
+U+22CC2 𢳂 𢳂
+U+22D08 𢴈 𢴈
+U+22D4C 𢵌 𢵌
+U+22D67 𢵧 𢵧
+U+22EB3 𢺳 𢺳
\ No newline at end of file diff --git a/test/utf8dosn.txt b/test/utf8dosn.txt new file mode 100755 index 0000000..154aa88 --- /dev/null +++ b/test/utf8dosn.txt @@ -0,0 +1,51 @@ +è¨å°”èŒ¨å ¡ï¼Œå¥¥åœ°åˆ©å…±å’Œå›½è¨å°”èŒ¨å ¡å·žçš„é¦–åºœï¼Œ2007年人å£çº¦15万，是继维也纳ã€æ ¼æ‹‰èŒ¨å’Œæž—茨之åŽçš„奥地利第四大城市。è¨å°”èŒ¨å ¡ä½äºŽå¥¥åœ°åˆ©çš„西部，是阿尔å‘斯山脉的门åºï¼ŒåŸŽå¸‚的建ç‘é£Žæ ¼ä»¥å·´æ´›å…‹ä¸ºä¸»ï¼ŒåŸŽå¸‚çš„åŽ†å²ç›¸å½“æ‚ ä¹…ï¼Œæ®å²æ–™è®°è½½ï¼Œè¨å°”èŒ¨å ¡æ˜¯çŽ°ä»Šå¥¥åœ°åˆ©ç®¡è¾–åœ°åŸŸå†…åŽ†å²æœ€æ‚ 久的城市。è¨å°”èŒ¨å ¡æ˜¯éŸ³ä¹å¤©æ‰èŽ«æ‰Žç‰¹çš„出生地，莫扎特ä¸åˆ°36å¹´çš„çŸæš‚生命ä¸è¶…过一åŠçš„å²æœˆæ˜¯åœ¨è¨å°”èŒ¨å ¡åº¦è¿‡çš„ã€‚è¨å°”èŒ¨å ¡ä¹Ÿæ˜¯æŒ‡æŒ¥å®¶èµ«ä¼¯ç‰¹Â·å†¯Â·å¡æ‹‰æ‰¬çš„故乡，电影《音ä¹ä¹‹å£°ã€‹çš„æ‹æ‘„地。è¨å°”èŒ¨å ¡è€åŸŽåœ¨1996年被è”åˆå›½æ•™ç§‘文组织列入世界é—产å录。
+
+ðŒ†
+Unicode
+Scalar
+Value UTF-8 NCR
+U+2070E 𠜎 𠜎
+U+20731 𠜱 𠜱
+U+20779 ð ¹ ð ¹
+U+20C53 𠱓 𠱓
+U+20C78 𠱸 𠱸
+U+20C96 ð ²– ð ²–
+U+20CCF ð ³ ð ³
+U+20CD5 𠳕 𠳕
+U+20D15 ð ´• ð ´•
+U+20D7C ð µ¼ ð µ¼
+U+20D7F 𠵿 𠵿
+U+20E0E 𠸎 𠸎
+U+20E0F ð ¸ ð ¸
+U+20E77 ð ¹· ð ¹·
+U+20E9D ð º ð º
+U+20EA2 𠺢 𠺢
+U+20ED7 ð »— ð »—
+U+20EF9 ð »¹ ð »¹
+U+20EFA 𠻺 𠻺
+U+20F2D ð ¼ ð ¼
+U+20F2E ð ¼® ð ¼®
+U+20F4C 𠽌 𠽌
+U+20FB4 ð ¾´ ð ¾´
+U+20FBC ð ¾¼ ð ¾¼
+U+20FEA 𠿪 𠿪
+U+2105C 𡜠ð¡œ
+U+2106F 𡯠ð¡¯
+U+21075 𡵠ð¡µ
+U+21076 𡶠ð¡¶
+U+2107B ð¡» ð¡»
+U+210C1 𡃠ð¡ƒ
+U+210C9 𡃉 𡃉
+U+211D9 𡇙 𡇙
+U+220C7 𢃇 𢃇
+U+227B5 𢞵 𢞵
+U+22AD5 𢫕 𢫕
+U+22B43 𢃠ð¢ƒ
+U+22BCA 𢯊 𢯊
+U+22C51 𢱑 𢱑
+U+22C55 𢱕 𢱕
+U+22CC2 𢳂 𢳂
+U+22D08 𢴈 𢴈
+U+22D4C 𢵌 𢵌
+U+22D67 𢵧 𢵧
+U+22EB3 𢺳 𢺳
\ No newline at end of file diff --git a/test/utf8unix.txt b/test/utf8unix.txt new file mode 100755 index 0000000..8b93c0c --- /dev/null +++ b/test/utf8unix.txt @@ -0,0 +1,51 @@ +è¨å°”èŒ¨å ¡ï¼Œå¥¥åœ°åˆ©å…±å’Œå›½è¨å°”èŒ¨å ¡å·žçš„é¦–åºœï¼Œ2007年人å£çº¦15万，是继维也纳ã€æ ¼æ‹‰èŒ¨å’Œæž—茨之åŽçš„奥地利第四大城市。è¨å°”èŒ¨å ¡ä½äºŽå¥¥åœ°åˆ©çš„西部，是阿尔å‘斯山脉的门åºï¼ŒåŸŽå¸‚的建ç‘é£Žæ ¼ä»¥å·´æ´›å…‹ä¸ºä¸»ï¼ŒåŸŽå¸‚çš„åŽ†å²ç›¸å½“æ‚ ä¹…ï¼Œæ®å²æ–™è®°è½½ï¼Œè¨å°”èŒ¨å ¡æ˜¯çŽ°ä»Šå¥¥åœ°åˆ©ç®¡è¾–åœ°åŸŸå†…åŽ†å²æœ€æ‚ 久的城市。è¨å°”èŒ¨å ¡æ˜¯éŸ³ä¹å¤©æ‰èŽ«æ‰Žç‰¹çš„出生地，莫扎特ä¸åˆ°36å¹´çš„çŸæš‚生命ä¸è¶…过一åŠçš„å²æœˆæ˜¯åœ¨è¨å°”èŒ¨å ¡åº¦è¿‡çš„ã€‚è¨å°”èŒ¨å ¡ä¹Ÿæ˜¯æŒ‡æŒ¥å®¶èµ«ä¼¯ç‰¹Â·å†¯Â·å¡æ‹‰æ‰¬çš„故乡，电影《音ä¹ä¹‹å£°ã€‹çš„æ‹æ‘„地。è¨å°”èŒ¨å ¡è€åŸŽåœ¨1996年被è”åˆå›½æ•™ç§‘文组织列入世界é—产å录。 + +ðŒ† +Unicode +Scalar +Value UTF-8 NCR +U+2070E 𠜎 𠜎 +U+20731 𠜱 𠜱 +U+20779 ð ¹ ð ¹ +U+20C53 𠱓 𠱓 +U+20C78 𠱸 𠱸 +U+20C96 ð ²– ð ²– +U+20CCF ð ³ ð ³ +U+20CD5 𠳕 𠳕 +U+20D15 ð ´• ð ´• +U+20D7C ð µ¼ ð µ¼ +U+20D7F 𠵿 𠵿 +U+20E0E 𠸎 𠸎 +U+20E0F ð ¸ ð ¸ +U+20E77 ð ¹· ð ¹· +U+20E9D ð º ð º +U+20EA2 𠺢 𠺢 +U+20ED7 ð »— ð »— +U+20EF9 ð »¹ ð »¹ +U+20EFA 𠻺 𠻺 +U+20F2D ð ¼ ð ¼ +U+20F2E ð ¼® ð ¼® +U+20F4C 𠽌 𠽌 +U+20FB4 ð ¾´ ð ¾´ +U+20FBC ð ¾¼ ð ¾¼ +U+20FEA 𠿪 𠿪 +U+2105C 𡜠𡜠+U+2106F 𡯠𡯠+U+21075 𡵠𡵠+U+21076 𡶠𡶠+U+2107B ð¡» ð¡» +U+210C1 𡃠𡃠+U+210C9 𡃉 𡃉 +U+211D9 𡇙 𡇙 +U+220C7 𢃇 𢃇 +U+227B5 𢞵 𢞵 +U+22AD5 𢫕 𢫕 +U+22B43 𢃠𢃠+U+22BCA 𢯊 𢯊 +U+22C51 𢱑 𢱑 +U+22C55 𢱕 𢱕 +U+22CC2 𢳂 𢳂 +U+22D08 𢴈 𢴈 +U+22D4C 𢵌 𢵌 +U+22D67 𢵧 𢵧 +U+22EB3 𢺳 𢺳
\ No newline at end of file diff --git a/test/utf8unxb.txt b/test/utf8unxb.txt new file mode 100755 index 0000000..f670e9b --- /dev/null +++ b/test/utf8unxb.txt @@ -0,0 +1,51 @@ +è¨å°”èŒ¨å ¡ï¼Œå¥¥åœ°åˆ©å…±å’Œå›½è¨å°”èŒ¨å ¡å·žçš„é¦–åºœï¼Œ2007年人å£çº¦15万，是继维也纳ã€æ ¼æ‹‰èŒ¨å’Œæž—茨之åŽçš„奥地利第四大城市。è¨å°”èŒ¨å ¡ä½äºŽå¥¥åœ°åˆ©çš„西部，是阿尔å‘斯山脉的门åºï¼ŒåŸŽå¸‚的建ç‘é£Žæ ¼ä»¥å·´æ´›å…‹ä¸ºä¸»ï¼ŒåŸŽå¸‚çš„åŽ†å²ç›¸å½“æ‚ ä¹…ï¼Œæ®å²æ–™è®°è½½ï¼Œè¨å°”èŒ¨å ¡æ˜¯çŽ°ä»Šå¥¥åœ°åˆ©ç®¡è¾–åœ°åŸŸå†…åŽ†å²æœ€æ‚ 久的城市。è¨å°”èŒ¨å ¡æ˜¯éŸ³ä¹å¤©æ‰èŽ«æ‰Žç‰¹çš„出生地，莫扎特ä¸åˆ°36å¹´çš„çŸæš‚生命ä¸è¶…过一åŠçš„å²æœˆæ˜¯åœ¨è¨å°”èŒ¨å ¡åº¦è¿‡çš„ã€‚è¨å°”èŒ¨å ¡ä¹Ÿæ˜¯æŒ‡æŒ¥å®¶èµ«ä¼¯ç‰¹Â·å†¯Â·å¡æ‹‰æ‰¬çš„故乡，电影《音ä¹ä¹‹å£°ã€‹çš„æ‹æ‘„地。è¨å°”èŒ¨å ¡è€åŸŽåœ¨1996年被è”åˆå›½æ•™ç§‘文组织列入世界é—产å录。 + +ðŒ† +Unicode +Scalar +Value UTF-8 NCR +U+2070E 𠜎 𠜎 +U+20731 𠜱 𠜱 +U+20779 ð ¹ ð ¹ +U+20C53 𠱓 𠱓 +U+20C78 𠱸 𠱸 +U+20C96 ð ²– ð ²– +U+20CCF ð ³ ð ³ +U+20CD5 𠳕 𠳕 +U+20D15 ð ´• ð ´• +U+20D7C ð µ¼ ð µ¼ +U+20D7F 𠵿 𠵿 +U+20E0E 𠸎 𠸎 +U+20E0F ð ¸ ð ¸ +U+20E77 ð ¹· ð ¹· +U+20E9D ð º ð º +U+20EA2 𠺢 𠺢 +U+20ED7 ð »— ð »— +U+20EF9 ð »¹ ð »¹ +U+20EFA 𠻺 𠻺 +U+20F2D ð ¼ ð ¼ +U+20F2E ð ¼® ð ¼® +U+20F4C 𠽌 𠽌 +U+20FB4 ð ¾´ ð ¾´ +U+20FBC ð ¾¼ ð ¾¼ +U+20FEA 𠿪 𠿪 +U+2105C 𡜠𡜠+U+2106F 𡯠𡯠+U+21075 𡵠𡵠+U+21076 𡶠𡶠+U+2107B ð¡» ð¡» +U+210C1 𡃠𡃠+U+210C9 𡃉 𡃉 +U+211D9 𡇙 𡇙 +U+220C7 𢃇 𢃇 +U+227B5 𢞵 𢞵 +U+22AD5 𢫕 𢫕 +U+22B43 𢃠𢃠+U+22BCA 𢯊 𢯊 +U+22C51 𢱑 𢱑 +U+22C55 𢱕 𢱕 +U+22CC2 𢳂 𢳂 +U+22D08 𢴈 𢴈 +U+22D4C 𢵌 𢵌 +U+22D67 𢵧 𢵧 +U+22EB3 𢺳 𢺳
\ No newline at end of file @@ -51,10 +51,10 @@ /* #define DEBUG 1 */ +#define __UNIX2DOS_C #include "common.h" #include "unix2dos.h" -#include "querycp.h" #ifdef D2U_UNICODE #if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ # include <langinfo.h> @@ -99,12 +99,13 @@ void AddDOSNewLine(FILE* ipOutF, CFlag *ipFlag, int CurChar, int PrevChar) * -1 otherwise */ #ifdef D2U_UNICODE -int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) +int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname) { int RetVal = 0; wint_t TempChar; wint_t PreviousChar = 0; - int line_nr = 1; + unsigned int line_nr = 1; + unsigned int converted = 0; char *errstr; ipFlag->status = 0; @@ -126,23 +127,21 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != 0x0c)) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr); } break; } - if (TempChar == 0x0a) - { + if (TempChar == 0x0a) { d2u_putwc(0x0d, ipOutF, ipFlag); /* got LF, put extra CR */ + converted++; } else { - if (TempChar == 0x0d) /* got CR */ - { + if (TempChar == 0x0d) { /* got CR */ if ((TempChar = d2u_getwc(ipInF, ipFlag->bomtype)) == WEOF) /* get next char (possibly LF) */ TempChar = 0x0d; /* Read error, or end of file. */ - else - { + else { d2u_putwc(0x0d, ipOutF, ipFlag); /* put CR */ PreviousChar = 0x0d; } @@ -153,10 +152,9 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) if (d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF) { RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -179,42 +177,41 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != 0x0c)) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x00%02X found at line %d\n"),TempChar, line_nr); } break; } - if ((TempChar != 0x0a)) /* Not an LF */ - { - if(d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF){ - RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("can not write to output file: %s\n"), errstr); - } + if (TempChar != 0x0a) { /* Not an LF */ + if(d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF) { + RetVal = -1; + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("can not write to output file: %s\n"), errstr); } - break; } - PreviousChar = TempChar; + break; } + PreviousChar = TempChar; + if (TempChar == 0x0d) /* CR */ + ++line_nr; + } else{ /* TempChar is an LF */ - ++line_nr; + if (PreviousChar != 0x0d) /* CR already counted */ + ++line_nr; /* Don't touch this delimiter if it's a CR,LF pair. */ if ( PreviousChar == 0x0d ) { - if (d2u_putwc(0x0a, ipOutF, ipFlag) == WEOF) /* CR,LF pair. Put LF */ - { + if (d2u_putwc(0x0a, ipOutF, ipFlag) == WEOF) { /* CR,LF pair. Put LF */ RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -226,13 +223,11 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) continue; } PreviousChar = TempChar; - if (d2u_putwc(0x0d, ipOutF, ipFlag) == WEOF) /* Unix line end (LF). Put CR */ - { + if (d2u_putwc(0x0d, ipOutF, ipFlag) == WEOF) { /* Unix line end (LF). Put CR */ RetVal = -1; - if (!ipFlag->Quiet) - { - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) - { + if (ipFlag->verbose) { + if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -240,6 +235,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) } break; } + converted++; if (ipFlag->NewLine) { /* add additional CR? */ d2u_putwc(0x0d, ipOutF, ipFlag); } @@ -254,6 +250,10 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) exit(1); #endif } + if (ipFlag->verbose > 1) { + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("Converted %d out of %d line breaks.\n"),converted, line_nr -1); + } return RetVal; } #endif @@ -262,19 +262,19 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) * RetVal: 0 if success * -1 otherwise */ -int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) +int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname) { int RetVal = 0; int TempChar; int PreviousChar = 0; int *ConvTable; - int line_nr = 1; + unsigned int line_nr = 1; + unsigned int converted = 0; char *errstr; ipFlag->status = 0; - switch (ipFlag->ConvMode) - { + switch (ipFlag->ConvMode) { case CONVMODE_ASCII: /* ascii */ case CONVMODE_UTF16LE: /* Assume UTF-16LE, bomtype = FILE_UTF8 */ case CONVMODE_UTF16BE: /* Assume UTF-16BE, bomtype = FILE_UTF8 */ @@ -305,8 +305,11 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) ipFlag->status |= WRONG_CODEPAGE ; return(-1); } - if ((ipFlag->ConvMode > 1) && (!ipFlag->Quiet)) /* not ascii or 7bit */ - { + /* Turn off ISO and 7-bit conversion for Unicode text files */ + if (ipFlag->bomtype > 0) + ConvTable = U2DAsciiTable; + + if ((ipFlag->ConvMode > CONVMODE_7BIT) && (ipFlag->verbose)) { /* not ascii or 7bit */ fprintf(stderr, "%s: ", progname); fprintf(stderr, _("using code page %d.\n"), ipFlag->ConvMode); } @@ -316,8 +319,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) /* \x0a = Newline/Line Feed (LF) */ /* \x0d = Carriage Return (CR) */ - switch (ipFlag->FromToMode) - { + switch (ipFlag->FromToMode) { case FROMTO_UNIX2DOS: /* unix2dos */ while ((TempChar = fgetc(ipInF)) != EOF) { /* get character */ if ((ipFlag->Force == 0) && @@ -328,8 +330,8 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != '\x0c')) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr); } @@ -338,13 +340,12 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) if (TempChar == '\x0a') { fputc('\x0d', ipOutF); /* got LF, put extra CR */ + converted++; } else { - if (TempChar == '\x0d') /* got CR */ - { + if (TempChar == '\x0d') { /* got CR */ if ((TempChar = fgetc(ipInF)) == EOF) /* get next char (possibly LF) */ TempChar = '\x0d'; /* Read error, or end of file. */ - else - { + else { fputc('\x0d', ipOutF); /* put CR */ PreviousChar = '\x0d'; } @@ -352,11 +353,10 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) } if (TempChar == '\x0a') /* Count all DOS and Unix line breaks */ ++line_nr; - if (fputc(ConvTable[TempChar], ipOutF) == EOF) /* put LF or other char */ - { + if (fputc(ConvTable[TempChar], ipOutF) == EOF) { /* put LF or other char */ RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -378,37 +378,38 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) (TempChar != '\x0c')) { /* Not a form feed */ RetVal = -1; ipFlag->status |= BINARY_FILE ; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + if ((ipFlag->stdio_mode) && (!ipFlag->error)) ipFlag->error = 1; fprintf(stderr, "%s: ", progname); fprintf(stderr, _("Binary symbol 0x%02X found at line %d\n"),TempChar, line_nr); } break; } - if ((TempChar != '\x0a')) /* Not an LF */ - { - if(fputc(ConvTable[TempChar], ipOutF) == EOF){ - RetVal = -1; - if (!ipFlag->Quiet) - { - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("can not write to output file: %s\n"), errstr); - } - break; + if (TempChar != '\x0a') { /* Not an LF */ + if(fputc(ConvTable[TempChar], ipOutF) == EOF) { + RetVal = -1; + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + fprintf(stderr, "%s: ", progname); + fprintf(stderr, _("can not write to output file: %s\n"), errstr); } - PreviousChar = TempChar; + break; } - else{ + PreviousChar = TempChar; + if (TempChar == '\x0d') /* CR */ + ++line_nr; + } + else { /* TempChar is an LF */ - ++line_nr; + if (PreviousChar != '\x0d') /* CR already counted */ + ++line_nr; /* Don't touch this delimiter if it's a CR,LF pair. */ if ( PreviousChar == '\x0d' ) { - if (fputc('\x0a', ipOutF) == EOF) /* CR,LF pair. Put LF */ - { + if (fputc('\x0a', ipOutF) == EOF) { /* CR,LF pair. Put LF */ RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); @@ -419,17 +420,17 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) continue; } PreviousChar = TempChar; - if (fputc('\x0d', ipOutF) == EOF) /* Unix line end (LF). Put CR */ - { + if (fputc('\x0d', ipOutF) == EOF) { /* Unix line end (LF). Put CR */ RetVal = -1; - if (!ipFlag->Quiet) - { + if (ipFlag->verbose) { + ipFlag->error = errno; errstr = strerror(errno); fprintf(stderr, "%s: ", progname); fprintf(stderr, _("can not write to output file: %s\n"), errstr); } break; } + converted++; if (ipFlag->NewLine) { /* add additional CR? */ fputc('\x0d', ipOutF); } @@ -444,413 +445,11 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname) exit(1); #endif } - return RetVal; -} - -/* convert file ipInFN to DOS format text and write to file ipOutFN - * RetVal: 0 if success - * -1 otherwise - */ -int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *progname) -{ - int RetVal = 0; - FILE *InF = NULL; - FILE *TempF = NULL; - char *TempPath; - char *errstr; - struct stat StatBuf; - struct utimbuf UTimeBuf; -#ifndef NO_CHMOD - mode_t mask; -#endif -#ifdef NO_MKSTEMP - FILE* fd; -#else - int fd; -#endif - char *TargetFN = NULL; - int ResolveSymlinkResult = 0; - - ipFlag->status = 0 ; - - /* Test if output file is a symbolic link */ - if (symbolic_link(ipOutFN) && !ipFlag->Follow) - { - ipFlag->status |= OUTPUTFILE_SYMLINK ; - /* Not a failure, skipping input file according spec. (keep symbolic link unchanged) */ - return -1; - } - - /* Test if input file is a regular file or symbolic link */ - if (regfile(ipInFN, 1, ipFlag, progname)) - { - ipFlag->status |= NO_REGFILE ; - /* Not a failure, skipping non-regular input file according spec. */ - return -1; - } - - /* Test if input file target is a regular file */ - if (symbolic_link(ipInFN) && regfile_target(ipInFN, ipFlag,progname)) - { - ipFlag->status |= INPUT_TARGET_NO_REGFILE ; - /* Not a failure, skipping non-regular input file according spec. */ - return -1; - } - - /* Test if output file target is a regular file */ - if (symbolic_link(ipOutFN) && (ipFlag->Follow == SYMLINK_FOLLOW) && regfile_target(ipOutFN, ipFlag,progname)) - { - ipFlag->status |= OUTPUT_TARGET_NO_REGFILE ; - /* Failure, input is regular, cannot produce output. */ - if (!ipFlag->error) ipFlag->error = 1; - return -1; - } - - /* retrieve ipInFN file date stamp */ - if (stat(ipInFN, &StatBuf)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); - } - RetVal = -1; - } - -#ifdef NO_MKSTEMP - if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) { -#else - if((fd = MakeTempFileFrom (ipOutFN, &TempPath)) < 0) { -#endif - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); + if (ipFlag->verbose > 1) { fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to open temporary output file: %s\n"), errstr); - } - RetVal = -1; - } - -#if DEBUG - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("using %s as temporary file\n"), TempPath); -#endif - - /* can open in file? */ - if (!RetVal) - { - InF=OpenInFile(ipInFN); - if (InF == NULL) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, ipInFN, errstr); - RetVal = -1; - } - } - - /* can open output file? */ - if ((!RetVal) && (InF)) - { -#ifdef NO_MKSTEMP - if ((TempF=fd) == NULL) - { -#else - if ((TempF=OpenOutFile(fd)) == NULL) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s\n", progname, errstr); -#endif - fclose (InF); - InF = NULL; - RetVal = -1; - } - } - - InF = read_bom(InF, &ipFlag->bomtype); -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE)) - ipFlag->bomtype = FILE_UTF16LE; - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE)) - ipFlag->bomtype = FILE_UTF16BE; -#endif - -#ifdef D2U_UNICODE -#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */ - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0) - { - /* Don't convert UTF-16 files when the locale encoding is not UTF-8 - * to prevent loss of characters. */ - ipFlag->status |= LOCALE_NOT_UTF8 ; - if (!ipFlag->error) ipFlag->error = 1; - RetVal = -1; - } - } -#endif -#if !defined(_WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */ - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if (sizeof(wchar_t) < 4) - { - /* 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; - } - } -#endif -#endif - - if ((ipFlag->add_bom) || ((ipFlag->keep_bom) && (ipFlag->bomtype > 0))) - fprintf(TempF, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */ - - /* Turn off ISO and 7-bit conversion for Unicode text files */ - /* When we assume UTF16, don't change the conversion mode. We need to remember it. */ - if ((ipFlag->bomtype > 0) && (ipFlag->ConvMode != CONVMODE_UTF16LE) && (ipFlag->ConvMode != CONVMODE_UTF16BE)) - ipFlag->ConvMode = CONVMODE_ASCII; - - /* conversion sucessful? */ -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - if ((!RetVal) && (ConvertUnixToDosW(InF, TempF, ipFlag, progname))) - RetVal = -1; - if (ipFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!ipFlag->error) ipFlag->error = 1; - RetVal = -1; - } - } else { - if ((!RetVal) && (ConvertUnixToDos(InF, TempF, ipFlag, progname))) - RetVal = -1; - } -#else - if ((!RetVal) && (ConvertUnixToDos(InF, TempF, ipFlag, progname))) - RetVal = -1; -#endif - - /* can close in file? */ - if ((InF) && (fclose(InF) == EOF)) - RetVal = -1; - - /* can close output file? */ - if (TempF) - { - if (fclose(TempF) == EOF) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to write to temporary output file %s: %s\n"), TempPath, errstr); - } - RetVal = -1; - } - } - -#ifdef NO_MKSTEMP - if(fd!=NULL) - fclose(fd); -#else - if(fd>=0) - close(fd); -#endif - -#ifndef NO_CHMOD - if (!RetVal) - { - if (ipFlag->NewFile == 0) /* old-file mode */ - { - RetVal = chmod (TempPath, StatBuf.st_mode); /* set original permissions */ - } - else - { - 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->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to change the permissions of temporary output file %s: %s\n"), TempPath, errstr); - } - } - } -#endif - -#ifndef NO_CHOWN - if (!RetVal && (ipFlag->NewFile == 0)) /* old-file mode */ - { - /* Change owner and group of the temporary output file to the original file's uid and gid. */ - /* 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->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("Failed to change the owner and group of temporary output file %s: %s\n"), TempPath, errstr); - } - RetVal = -1; - } - } -#endif - - if ((!RetVal) && (ipFlag->KeepDate)) - { - UTimeBuf.actime = StatBuf.st_atime; - UTimeBuf.modtime = StatBuf.st_mtime; - /* can change output file time to in file time? */ - if (utime(TempPath, &UTimeBuf) == -1) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); - } - RetVal = -1; + fprintf(stderr, _("Converted %d out of %d line breaks.\n"),converted, line_nr -1); } - } - - /* any error? cleanup the temp file */ - if (RetVal && (TempPath != NULL)) - { - if (unlink(TempPath) && (errno != ENOENT)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TempPath, errstr); - } - RetVal = -1; - } - } - - /* If output file is a symbolic link, optional resolve the link and modify */ - /* the target, instead of removing the link and creating a new regular file */ - TargetFN = ipOutFN; - if (symbolic_link(ipOutFN) && !RetVal) - { - ResolveSymlinkResult = 0; /* indicates that TargetFN need not be freed */ - if (ipFlag->Follow == SYMLINK_FOLLOW) - { - ResolveSymlinkResult = ResolveSymbolicLink(ipOutFN, &TargetFN, ipFlag, progname); - if (ResolveSymlinkResult < 0) - { - if (!ipFlag->Quiet) - { - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("problems resolving symbolic link '%s'\n"), ipOutFN); - fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); - } - RetVal = -1; - } - } - } - - /* can rename temporary file to output file? */ - if (!RetVal) - { -#ifdef NEED_REMOVE - if (unlink(TargetFN) && (errno != ENOENT)) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: %s: %s\n", progname, TargetFN, errstr); - } - RetVal = -1; - } -#endif - if (rename(TempPath, TargetFN) == -1) - { - if (!ipFlag->Quiet) - { - ipFlag->error = errno; - errstr = strerror(errno); - fprintf(stderr, "%s: ", progname); - fprintf(stderr, _("problems renaming '%s' to '%s': %s\n"), TempPath, TargetFN, errstr); -#ifdef S_ISLNK - if (ResolveSymlinkResult > 0) - fprintf(stderr, _(" which is the target of symbolic link '%s'\n"), ipOutFN); -#endif - fprintf(stderr, _(" output file remains in '%s'\n"), TempPath); - } - RetVal = -1; - } - - if (ResolveSymlinkResult > 0) - free(TargetFN); - } - free(TempPath); - return RetVal; -} - -/* convert stdin to DOS format text and write to stdout - * RetVal: 0 if success - * -1 otherwise - */ -int ConvertUnixToDosStdio(CFlag *ipFlag, char *progname) -{ - ipFlag->NewFile = 1; - ipFlag->Quiet = 1; - ipFlag->KeepDate = 0; - ipFlag->Force = 1; - -#if defined(_WIN32) && !defined(__CYGWIN__) - - /* stdin and stdout are by default text streams. We need - * to set them to binary mode. Otherwise an LF will - * automatically be converted to CR-LF on DOS/Windows. - * Erwin */ - - /* POSIX 'setmode' was deprecated by MicroSoft since - * Visual C++ 2005. Use ISO C++ conformant '_setmode' instead. */ - - _setmode(_fileno(stdout), _O_BINARY); - _setmode(_fileno(stdin), _O_BINARY); -#elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__) - setmode(fileno(stdout), O_BINARY); - setmode(fileno(stdin), O_BINARY); -#endif - - read_bom(stdin, &ipFlag->bomtype); -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16LE)) - ipFlag->bomtype = FILE_UTF16LE; - if ((ipFlag->bomtype == FILE_MBS) && (ipFlag->ConvMode == CONVMODE_UTF16BE)) - ipFlag->bomtype = FILE_UTF16BE; -#endif - - if ((ipFlag->add_bom) || ((ipFlag->keep_bom) && (ipFlag->bomtype > 0))) - fprintf(stdout, "%s", "\xEF\xBB\xBF"); /* UTF-8 BOM */ - -#ifdef D2U_UNICODE - if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE)) - { - return (ConvertUnixToDosW(stdin, stdout, ipFlag, progname)); - } else { - return (ConvertUnixToDos(stdin, stdout, ipFlag, progname)); - } -#else - return (ConvertUnixToDos(stdin, stdout, ipFlag, progname)); -#endif + return RetVal; } @@ -858,16 +457,9 @@ int main (int argc, char *argv[]) { /* variable declarations */ char progname[9]; - int ArgIdx; - int CanSwitchFileMode; - int ShouldExit; - int RetVal = 0; - int process_options = 1; CFlag *pFlag; char *ptr; -#ifdef ENABLE_NLS char localedir[1024]; -#endif # ifdef __MINGW64__ int _dowildcard = -1; /* enable wildcard expansion for Win64 */ # endif @@ -879,12 +471,10 @@ int main (int argc, char *argv[]) ptr = getenv("DOS2UNIX_LOCALEDIR"); if (ptr == NULL) strcpy(localedir,LOCALEDIR); - else - { + else { if (strlen(ptr) < sizeof(localedir)) strcpy(localedir,ptr); - else - { + else { fprintf(stderr,"%s: ",progname); fprintf(stderr, "%s", _("error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n")); strcpy(localedir,LOCALEDIR); @@ -904,25 +494,8 @@ int main (int argc, char *argv[]) /* variable initialisations */ - ArgIdx = 0; - CanSwitchFileMode = 1; - ShouldExit = 0; pFlag = (CFlag*)malloc(sizeof(CFlag)); - pFlag->NewFile = 0; - pFlag->Quiet = 0; - pFlag->KeepDate = 0; - pFlag->ConvMode = CONVMODE_ASCII; /* default ascii */ pFlag->FromToMode = FROMTO_UNIX2DOS; /* default unix2dos */ - pFlag->NewLine = 0; - pFlag->Force = 0; - pFlag->Follow = SYMLINK_SKIP; - pFlag->status = 0; - pFlag->stdio_mode = 1; - pFlag->error = 0; -#ifdef D2U_UNICODE - pFlag->bomtype = FILE_MBS; -#endif - pFlag->add_bom = 0; pFlag->keep_bom = 1; if ( ((ptr=strrchr(argv[0],'/')) == NULL) && ((ptr=strrchr(argv[0],'\\')) == NULL) ) @@ -930,360 +503,15 @@ int main (int argc, char *argv[]) else ptr++; - if ((strcmpi("unix2mac", ptr) == 0) || (strcmpi("unix2mac.exe", ptr) == 0)) - { + if ((strcmpi("unix2mac", ptr) == 0) || (strcmpi("unix2mac.exe", ptr) == 0)) { pFlag->FromToMode = FROMTO_UNIX2MAC; strcpy(progname,"unix2mac"); } - while ((++ArgIdx < argc) && (!ShouldExit)) - { - /* is it an option? */ - if ((argv[ArgIdx][0] == '-') && process_options) - { - /* an option */ - if (strcmp(argv[ArgIdx],"--") == 0) - process_options = 0; - else if ((strcmp(argv[ArgIdx],"-h") == 0) || (strcmp(argv[ArgIdx],"--help") == 0)) - { - PrintUsage(progname); - return(pFlag->error); - } - else if ((strcmp(argv[ArgIdx],"-b") == 0) || (strcmp(argv[ArgIdx],"--keep-bom") == 0)) - pFlag->keep_bom = 1; - else if ((strcmp(argv[ArgIdx],"-k") == 0) || (strcmp(argv[ArgIdx],"--keepdate") == 0)) - pFlag->KeepDate = 1; - else if ((strcmp(argv[ArgIdx],"-f") == 0) || (strcmp(argv[ArgIdx],"--force") == 0)) - pFlag->Force = 1; - else if ((strcmp(argv[ArgIdx],"-s") == 0) || (strcmp(argv[ArgIdx],"--safe") == 0)) - pFlag->Force = 0; - else if ((strcmp(argv[ArgIdx],"-q") == 0) || (strcmp(argv[ArgIdx],"--quiet") == 0)) - pFlag->Quiet = 1; - else if ((strcmp(argv[ArgIdx],"-l") == 0) || (strcmp(argv[ArgIdx],"--newline") == 0)) - pFlag->NewLine = 1; - else if ((strcmp(argv[ArgIdx],"-m") == 0) || (strcmp(argv[ArgIdx],"--add-bom") == 0)) - pFlag->add_bom = 1; - else if ((strcmp(argv[ArgIdx],"-r") == 0) || (strcmp(argv[ArgIdx],"--remove-bom") == 0)) - { - pFlag->keep_bom = 0; - pFlag->add_bom = 0; - } - else if ((strcmp(argv[ArgIdx],"-S") == 0) || (strcmp(argv[ArgIdx],"--skip-symlink") == 0)) - pFlag->Follow = SYMLINK_SKIP; - else if ((strcmp(argv[ArgIdx],"-F") == 0) || (strcmp(argv[ArgIdx],"--follow-symlink") == 0)) - pFlag->Follow = SYMLINK_FOLLOW; - else if ((strcmp(argv[ArgIdx],"-R") == 0) || (strcmp(argv[ArgIdx],"--replace-symlink") == 0)) - pFlag->Follow = SYMLINK_REPLACE; - else if ((strcmp(argv[ArgIdx],"-V") == 0) || (strcmp(argv[ArgIdx],"--version") == 0)) - { - PrintVersion(progname); -#ifdef ENABLE_NLS - PrintLocaledir(localedir); -#endif - return(pFlag->error); - } - else if ((strcmp(argv[ArgIdx],"-L") == 0) || (strcmp(argv[ArgIdx],"--license") == 0)) - { - PrintLicense(); - return(pFlag->error); - } - else if (strcmp(argv[ArgIdx],"-ascii") == 0) /* SunOS compatible options */ - pFlag->ConvMode = CONVMODE_ASCII; - else if (strcmp(argv[ArgIdx],"-7") == 0) - pFlag->ConvMode = CONVMODE_7BIT; - else if (strcmp(argv[ArgIdx],"-iso") == 0) - { - pFlag->ConvMode = (int)query_con_codepage(); - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); - } - if (pFlag->ConvMode < 2) - pFlag->ConvMode = CONVMODE_437; - } - else if (strcmp(argv[ArgIdx],"-437") == 0) - pFlag->ConvMode = CONVMODE_437; - else if (strcmp(argv[ArgIdx],"-850") == 0) - pFlag->ConvMode = CONVMODE_850; - else if (strcmp(argv[ArgIdx],"-860") == 0) - pFlag->ConvMode = CONVMODE_860; - else if (strcmp(argv[ArgIdx],"-863") == 0) - pFlag->ConvMode = CONVMODE_863; - else if (strcmp(argv[ArgIdx],"-865") == 0) - pFlag->ConvMode = CONVMODE_865; - else if (strcmp(argv[ArgIdx],"-1252") == 0) - pFlag->ConvMode = CONVMODE_1252; #ifdef D2U_UNICODE - else if ((strcmp(argv[ArgIdx],"-ul") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16le") == 0)) - pFlag->ConvMode = CONVMODE_UTF16LE; - else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0)) - pFlag->ConvMode = CONVMODE_UTF16BE; + return parse_options(argc, argv, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos, ConvertUnixToDosW); +#else + return parse_options(argc, argv, pFlag, localedir, progname, PrintLicense, ConvertUnixToDos); #endif - else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0)) - { - if (++ArgIdx < argc) - { - if (strcmpi(argv[ArgIdx],"ascii") == 0) /* Benjamin Lin's legacy options */ - pFlag->ConvMode = CONVMODE_ASCII; - else if (strcmpi(argv[ArgIdx], "7bit") == 0) - pFlag->ConvMode = CONVMODE_7BIT; - else if (strcmpi(argv[ArgIdx], "iso") == 0) - { - pFlag->ConvMode = (int)query_con_codepage(); - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("active code page: %d\n"), pFlag->ConvMode); - } - if (pFlag->ConvMode < 2) - pFlag->ConvMode = CONVMODE_437; - } - else if (strcmpi(argv[ArgIdx], "mac") == 0) - pFlag->FromToMode = FROMTO_UNIX2MAC; - else - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("invalid %s conversion mode specified\n"),argv[ArgIdx]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - } - else - { - ArgIdx--; - fprintf(stderr,"%s: ",progname); - fprintf(stderr,_("option '%s' requires an argument\n"),argv[ArgIdx]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - } - - else if ((strcmp(argv[ArgIdx],"-o") == 0) || (strcmp(argv[ArgIdx],"--oldfile") == 0)) - { - /* last convert not paired */ - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - pFlag->NewFile = 0; - } - - else if ((strcmp(argv[ArgIdx],"-n") == 0) || (strcmp(argv[ArgIdx],"--newfile") == 0)) - { - /* last convert not paired */ - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - ShouldExit = 1; - pFlag->stdio_mode = 0; - } - pFlag->NewFile = 1; - } - else { /* wrong option */ - PrintUsage(progname); - ShouldExit = 1; - pFlag->error = 1; - pFlag->stdio_mode = 0; - } - } - else - { - pFlag->stdio_mode = 0; - /* not an option */ - if (pFlag->NewFile) - { - if (CanSwitchFileMode) - CanSwitchFileMode = 0; - else - { - RetVal = ConvertUnixToDosNewFile(argv[ArgIdx-1], argv[ArgIdx], pFlag, progname); - if (pFlag->status & NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, not a regular file.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & OUTPUTFILE_SYMLINK) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, output file %s is a symbolic link.\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & OUTPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, target of symbolic link %s is not a regular file.\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } else if (pFlag->status & BINARY_FILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping binary file %s\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & WRONG_CODEPAGE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); - } - } else if (pFlag->status & LOCALE_NOT_UTF8) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), argv[ArgIdx-1]); - } - } else if (pFlag->status & WCHAR_T_TOO_SMALL) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), argv[ArgIdx-1], (int)sizeof(wchar_t)); - } - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), argv[ArgIdx-1]); - } - } else { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - if (pFlag->FromToMode == FROMTO_UNIX2MAC) - fprintf(stderr, _("converting file %s to file %s in Mac format...\n"), argv[ArgIdx-1], argv[ArgIdx]); - else - fprintf(stderr, _("converting file %s to file %s in DOS format...\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - if (RetVal) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("problems converting file %s to file %s\n"), argv[ArgIdx-1], argv[ArgIdx]); - } - } - } - CanSwitchFileMode = 1; - } - } - else - { - RetVal = ConvertUnixToDosNewFile(argv[ArgIdx], argv[ArgIdx], pFlag, progname); - if (pFlag->status & NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping %s, not a regular file.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & OUTPUTFILE_SYMLINK) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & INPUT_TARGET_NO_REGFILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping symbolic link %s, target is not a regular file.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & BINARY_FILE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping binary file %s\n"), argv[ArgIdx]); - } - } else if (pFlag->status & WRONG_CODEPAGE) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("code page %d is not supported.\n"), pFlag->ConvMode); - } - } else if (pFlag->status & LOCALE_NOT_UTF8) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"), argv[ArgIdx]); - } - } else if (pFlag->status & WCHAR_T_TOO_SMALL) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"), argv[ArgIdx], (int)sizeof(wchar_t)); - } - } else if (pFlag->status & UNICODE_CONVERSION_ERROR) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"), argv[ArgIdx]); - } - } else { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - if (pFlag->FromToMode == FROMTO_UNIX2MAC) - fprintf(stderr, _("converting file %s to Mac format...\n"), argv[ArgIdx]); - else - fprintf(stderr, _("converting file %s to DOS format...\n"), argv[ArgIdx]); - } - if (RetVal) - { - if (!pFlag->Quiet) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("problems converting file %s\n"), argv[ArgIdx]); - } - } - } - } - } - } - - /* no file argument, use stdin and stdout */ - if (pFlag->stdio_mode) - { - exit(ConvertUnixToDosStdio(pFlag, progname)); - } - - - if (!CanSwitchFileMode) - { - fprintf(stderr,"%s: ",progname); - fprintf(stderr, _("target of file %s not specified in new-file mode\n"), argv[ArgIdx-1]); - pFlag->error = 1; - } - return (pFlag->error); } @@ -28,6 +28,7 @@ #ifndef __UNIX2DOS_H #define __UNIX2DOS_H +#ifdef __UNIX2DOS_C /* ASCII mode. No conversion. */ static int U2DAsciiTable[256] = @@ -212,5 +213,11 @@ static int U2DIso1252Table[256] = '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7', '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef', '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7', '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff', }; +#endif + +#ifdef D2U_UNICODE +int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname); +#endif +int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, const char *progname); #endif @@ -1,4 +1,4 @@ -DOS2UNIX_VERSION = 6.0.6 -DOS2UNIX_VERSION_SHORT = 606 -DOS2UNIX_DATE = 2014-08-03 +DOS2UNIX_VERSION = 7.0 +DOS2UNIX_VERSION_SHORT = 70 +DOS2UNIX_DATE = 2014-09-09 DOS2UNIX_AUTHOR = 'Erwin Waterlander' |