From 2fb41ec277dc25c2a3988fc0b3fc8dde07d36062 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 20 Oct 2016 13:30:18 +0900 Subject: [PATCH] Imported Upstream version 7.3.4 Change-Id: I2a4662ebe90fafe4d22e8c9abcd81b99f3a700e6 Signed-off-by: DongHun Kwak --- ChangeLog.txt | 40 +++++ INSTALL.txt | 34 +++- Makefile | 2 +- NEWS.txt | 5 + README.txt | 37 ++--- common.c | 379 +++++++++++++++++++++++++++----------------- common.h | 16 +- djgpp.mak | 48 ++++-- dos2unix.c | 7 +- man/de/man1/dos2unix.1 | 2 +- man/de/man1/dos2unix.htm | 2 +- man/es/man1/dos2unix.1 | 2 +- man/es/man1/dos2unix.htm | 2 +- man/fr/man1/dos2unix.1 | 2 +- man/fr/man1/dos2unix.htm | 2 +- man/man1/dos2unix.1 | 2 +- man/man1/dos2unix.htm | 2 +- man/nl/man1/dos2unix.1 | 2 +- man/nl/man1/dos2unix.htm | 2 +- man/pl/man1/dos2unix.1 | 2 +- man/pl/man1/dos2unix.htm | 2 +- man/pt_BR/man1/dos2unix.1 | 6 +- man/pt_BR/man1/dos2unix.htm | 6 +- man/pt_BR/man1/dos2unix.pod | 4 +- man/pt_BR/man1/dos2unix.txt | 4 +- man/sv/man1/dos2unix.1 | 2 +- man/sv/man1/dos2unix.htm | 2 +- man/uk/man1/dos2unix.1 | 2 +- man/uk/man1/dos2unix.htm | 2 +- man/zh_CN/man1/dos2unix.1 | 2 +- man/zh_CN/man1/dos2unix.htm | 2 +- po-man/dos2unix-man.pot | 2 +- po-man/pt_BR.po | 29 ++-- po/da.po | 239 ++++++++++++++-------------- po/de.po | 249 +++++++++++++++-------------- po/dos2unix.pot | 235 ++++++++++++++------------- po/eo.po | 236 ++++++++++++++------------- po/es.po | 236 ++++++++++++++------------- po/fr.po | 241 ++++++++++++++-------------- po/hu.po | 236 ++++++++++++++------------- po/ja.po | 351 ++++++++++++++++++++-------------------- po/nb.po | 239 ++++++++++++++-------------- po/nl.po | 253 +++++++++++++++-------------- po/pl.po | 239 ++++++++++++++-------------- po/pt_BR.po | 260 +++++++++++++++--------------- po/ru.po | 239 ++++++++++++++-------------- po/sr.po | 278 ++++++++++++++++---------------- po/sv.po | 241 ++++++++++++++-------------- po/uk.po | 241 ++++++++++++++-------------- po/vi.po | 239 ++++++++++++++-------------- po/zh_CN.po | 236 ++++++++++++++------------- po/zh_TW.po | 236 ++++++++++++++------------- test/wcstombs_test.c | 3 +- unix2dos.c | 7 +- vc.mak | 5 +- version.mk | 6 +- wcc.mif | 8 + wccdos16.mak | 2 +- wccdos32.mak | 2 +- wccos2.mak | 2 +- wccwin32.mak | 3 +- 61 files changed, 2894 insertions(+), 2523 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 904ba5a..b3a6867 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,43 @@ +2016-05-24 Erwin Waterlander + * Version 7.3.4 + * djgpp.mak: Fix targets install and dist by setting SHELL variable. + +2016-05-03 Erwin Waterlander + * common.c: Fix malloc() check in glob_warg(); + +2016-05-02 Erwin Waterlander + * common.c: Cleanup d2u_mktemp and MakeTempFileFrom(). + +2016-04-30 Erwin Waterlander + * common.c: New function d2u_mktemp(). Wrapper for mktemp() that uses + GetTempFileName() on Windows. Use of mktemp() is not safe. + * common.h: Use mktemp wrapper also for Watcom C on Windows. Now dos2unix + built with Watcom C can also support Unicode file names on Windows. + * wcc*.mak, wcc.mif: Enable Unicode file name support for Watcom C. + * wcc*.mak, wcc.mif, vc.mak: Allow use of DEBUGMSG. + * common.c, dos2unix.c, unix2dos.c: Fix compilation for Watcom C. Reducing + scope of some variables (done on 2016-03-19) led to compile errors for + Watcom C. Watcom C supports only declaration of variables at the + beginning of a scope. + +2016-04-29 Erwin Waterlander + * common.c: Code cleanup. Simplify use of MakeTempFileFrom(). + +2016-04-15 Erwin Waterlander + * djgpp.mak: Extra comment for DJGPP 2.05. Extra + variable CROSS_COMP. + * INSTALL.txt: Extra info for DJGPP. + +2016-03-28 Erwin Waterlander + * INSTALL.txt: Mention that MSYS(2) is required for building + with MinGW(-w64). + +2016-03-19 Erwin Waterlander + * *.c: Fix all cppcheck warnings. + +2016-02-16 Erwin Waterlander + * djgpp.mak: Support cross compilation from Cygwin. + 2016-02-13 Erwin Waterlander * Version 7.3.3 diff --git a/INSTALL.txt b/INSTALL.txt index e82c4d6..34d3b24 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -82,6 +82,11 @@ SELF-TESTS To check the native Windows ports you need to run the tests in the MSYS2 shell. + To run the tests in a DJGPP environment you need to make sure + that the bash shell is available (sh.exe). And you need to be + in an environment that supports long file names (LFN), e.g. on + 32 bit Windows. + INSTALLATION NAMES By default the 'install' target will install the program in @@ -194,8 +199,15 @@ UNICODE FILE NAME SUPPORT ON WINDOWS Unicode file name support on Windows is enabled by setting UNIFILE=1 in the makefile or on the make command line. - Unicode file name support is by default enabled for MinGW and MSVC compiler. - It is disabled and not supported for the Watcom compiler. + To disable Unicode file name support, make UNIFILE empty: + + make UNIFILE= + + Unicode file name support is by default enabled. + + Dos2unix built with Watcom C is not able to display foreign characters + correctly, even when option -D unicode is used. The correct file names + are written though. DOCUMENTATION @@ -249,6 +261,9 @@ WINDOWS 32 BIT PORT I am using the MSYS2 project which includes the MinGW-w64 compiler. + The MSYS(2) environment is required for building dos2unix with MinGW(-w64). + + Type these commands to build with mingw(-w64): make clean @@ -283,6 +298,8 @@ WINDOWS 64 BIT PORT I am using the MSYS2 project which includes the MinGW-w64 compiler. + The MSYS2 environment is required for building dos2unix with MinGW-w64. + make clean make make strip @@ -302,9 +319,13 @@ DOS PORT, 32 BIT To compile a version for DOS, get the DJGPP compiler , and use makefile djgpp.mak. - DJGPP gcc >= 4.6 seems to cause problems. Crashes of gcc itself, + DJGPP 2.03 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. + Use DJGPP 2.03 gcc <= 4.5.3. + + DJGPP 2.05 seems to produce correct binaries (I tried gcc 5.3.0). + The problem with 2.05 is that 'ln' works differently. If you use + DJGPP 2.05 edit djgpp.mak and change the LINK variable to cp -f. make -f djgpp.mak clean @@ -312,6 +333,11 @@ DOS PORT, 32 BIT make -f djgpp.mak strip make -f djgpp.mak install + Cross compilation with djgpp.mak works out-of-the-box in Cygwin if + you have djgpp-gcc-core installed. On Linux you can add CROSS_COMP=1 + to the command line. + + Or use Open Watcom Cross compiling from Windows 32 bit. This works. diff --git a/Makefile b/Makefile index b155d31..db0356f 100644 --- a/Makefile +++ b/Makefile @@ -592,7 +592,7 @@ mostlyclean: rm -f man/man1/*.bak man/man1/*~ rm -f man/*/man1/*.bak man/*/man1/*~ rm -f po/*.bak po/*~ - rm -f po/*.mo + rm -f po/*.mo po-man/*~ cd test; $(MAKE) clean # Don't distribute PostScript and PDF manuals in the source package. diff --git a/NEWS.txt b/NEWS.txt index 9160593..8b1c5e1 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -1,3 +1,8 @@ +2016-05-24: Version 7.3.4 + * Safer temporary file creation on Windows. + * Code cleanup. + * Updated translations. + 2016-02-13: Version 7.3.3 * Fixed printing of East-Asian text on Windows with an East-Asian regional setting. diff --git a/README.txt b/README.txt index 309cebb..8ef8352 100644 --- a/README.txt +++ b/README.txt @@ -58,11 +58,11 @@ HISTORY AUTHORS - Erwin Waterlander version 3.2-7.3.3 2009-2016 - Christian Wurll version 3.1 1998 - Bernd Johannes Wuebben version 3.0 1998 - Benjamin Lin version 1.1-2.3 1994-1995 - John Birchfield version 1.0 1989 + Erwin Waterlander version 3.2 - 7.3.4 2009-2016 + Christian Wurll version 3.1 1998 + Bernd Johannes Wuebben version 3.0 1998 + Benjamin Lin version 1.1 - 2.3 1994-1995 + John Birchfield version 1.0 1989 TRANSLATORS @@ -74,38 +74,39 @@ TRANSLATORS Brazilian Portuguese Enrico Nicoletto Version 6.0.5 Brazilian Portuguese Rafael Ferreira Version 6.0.6 - 7.2 - Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.3 + Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.4 Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.3 Chinese (traditional) mail6543210 Version 6.0.5 Danish Thomas Pryds Version 6.0.5 - 6.0.6 - Danish Joe Hansen Version 7.2.3 - 7.3.3 + Danish Joe Hansen Version 7.2.3 - 7.3.4 Dutch Erwin Waterlander Version 4.0 - 6.0.4 - Dutch Benno Schulenberg Version 6.0.5 - 7.3.1 + Dutch Benno Schulenberg Version 6.0.5 - 7.3.4 Esperanto Rugxulo Version 5.1 - 6.0.4 Esperanto Benno Schulenberg Version 6.0.5 - 7.3 - French Frédéric Marchal Version 6.0.5 - 7.3.3 + French Frédéric Marchal Version 6.0.5 - 7.3.4 German Philipp Thomas Version 5.0 - 6.0.3, 7.0, - 7.2.2 - 7.3.1 + 7.2.2 - 7.3.4 German Lars Wendler Version 6.0.4 German Mario Blättermann Version 6.0.6, 7.1 - 7.2 Hungarian Balázs Úr Version 6.0.5 - 7.2.3 Japanese Yasuaki Taniguchi Version 7.1.1 - Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.3.3 - Polish Jakub Bogusz Version 6.0.5 - 7.3.3 + Japanese Takeshi Hamasaki Version 7.3.4 + Norwegian Bokmaal Åka Sikrom Version 6.0.6 - 7.3.4 + Polish Jakub Bogusz Version 6.0.5 - 7.3.4 Russian Андрей Углик (Andrei Uhlik) Version 6.0.4 - Russian Yuri Kozlov Version 6.0.6 - 7.3.3 - Serbian Мирослав Николић Version 6.0.5 - 7.3.3 + Russian Yuri Kozlov Version 6.0.6 - 7.3.4 + Serbian Мирослав Николић Version 6.0.5 - 7.3.4 Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4 Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.3.1 - Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.3 - Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.3 - Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.3 + Swedish Sebastian Rasmussen Version 7.3.2 - 7.3.4 + Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.4 + Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.4 Translation of the manual. See http://translationproject.org/domain/dos2unix-man.html Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 7.2 - Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.3 + Brazilian Portuguese Rafael Fontenelle Version 7.3.2 - 7.3.4 Chinese (simplified) Tianze Wang Version 7.3.1 - 7.3.3 Dutch Erwin Waterlander Version 5.1.1 - 6.0.4 Dutch Benno Schulenberg Version 6.0.5 - 7.3.3 diff --git a/common.c b/common.c index b96a8aa..fcd1b42 100644 --- a/common.c +++ b/common.c @@ -365,7 +365,6 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname) #else struct stat buf; #endif - char *errstr; #ifdef D2U_UNIFILE d2u_MultiByteToWideChar(CP_UTF8, 0, path, -1, pathw, D2U_MAX_PATH); @@ -409,8 +408,8 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, const char *progname) } else { if (ipFlag->verbose) { + char *errstr = strerror(errno); ipFlag->error = errno; - errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, path); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); } @@ -435,7 +434,6 @@ int regfile_target(char *path, CFlag *ipFlag, const char *progname) #else struct stat buf; #endif - char *errstr; #ifdef D2U_UNIFILE d2u_MultiByteToWideChar(CP_UTF8, 0, path, -1, pathw, D2U_MAX_PATH); @@ -450,8 +448,8 @@ int regfile_target(char *path, CFlag *ipFlag, const char *progname) } else { if (ipFlag->verbose) { + char *errstr = strerror(errno); ipFlag->error = errno; - errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, path); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); } @@ -490,7 +488,7 @@ int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const cha len = (size_t)d2u_WideCharToMultiByte(CP_UTF8, 0, wargv[0], -1, NULL, 0, NULL, NULL); arg = (char *)malloc(len); - if (argv == NULL) goto glob_failed; + if (arg == NULL) goto glob_failed; d2u_WideCharToMultiByte(CP_UTF8, 0, wargv[argc_glob], -1, arg, (int)len, NULL, NULL); argv_new[argc_glob] = arg; @@ -514,6 +512,7 @@ int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const cha hFind = FindFirstFileW(warg, &FindFileData); while (hFind != INVALID_HANDLE_VALUE) { + char **new_argv_new; len = wcslen(path) + wcslen(FindFileData.cFileName) + 2; path_and_filename = (wchar_t *)malloc(len*sizeof(wchar_t)); if (path_and_filename == NULL) goto glob_failed; @@ -528,11 +527,13 @@ int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const cha ++argc_glob; len =(size_t) d2u_WideCharToMultiByte(CP_UTF8, 0, path_and_filename, -1, NULL, 0, NULL, NULL); arg = (char *)malloc((size_t)len); - if (argv == NULL) goto glob_failed; + if (arg == NULL) goto glob_failed; d2u_WideCharToMultiByte(CP_UTF8, 0, path_and_filename, -1, arg, (int)len, NULL, NULL); free(path_and_filename); - argv_new = (char **)realloc(argv_new, (size_t)(argc_glob+1)*sizeof(char**)); - if (argv_new == NULL) goto glob_failed; + new_argv_new = (char **)realloc(argv_new, (size_t)(argc_glob+1)*sizeof(char**)); + if (new_argv_new == NULL) goto glob_failed; + else + argv_new = new_argv_new; argv_new[argc_glob] = arg; if (!FindNextFileW(hFind, &FindFileData)) { @@ -543,13 +544,16 @@ int glob_warg(int argc, wchar_t *wargv[], char ***argv, CFlag *ipFlag, const cha free(path); if (found == 0) { /* Not a file. Just copy the argument */ + char **new_argv_new; ++argc_glob; len =(size_t) d2u_WideCharToMultiByte(CP_UTF8, 0, warg, -1, NULL, 0, NULL, NULL); arg = (char *)malloc((size_t)len); - if (argv == NULL) goto glob_failed; + if (arg == NULL) goto glob_failed; d2u_WideCharToMultiByte(CP_UTF8, 0, warg, -1, arg, (int)len, NULL, NULL); - argv_new = (char **)realloc(argv_new, (size_t)(argc_glob+1)*sizeof(char**)); - if (argv_new == NULL) goto glob_failed; + new_argv_new = (char **)realloc(argv_new, (size_t)(argc_glob+1)*sizeof(char**)); + if (new_argv_new == NULL) goto glob_failed; + else + argv_new = new_argv_new; argv_new[argc_glob] = arg; } } @@ -730,7 +734,6 @@ void PrintVersion(const char *progname, const char *localedir) D2U_ANSI_FPRINTF(stdout,"http://waterlan.home.xs4all.nl/dos2unix.html\n"); } - /* opens file of name ipFN in read only mode * RetVal: NULL if failure * file stream otherwise @@ -748,48 +751,172 @@ FILE* OpenInFile(char *ipFN) } -/* opens file of name ipFN in write only mode +/* opens file of name opFN in write only mode * RetVal: NULL if failure * file stream otherwise */ -FILE* OpenOutFile(int fd) +FILE* OpenOutFile(char *opFN) +{ +#ifdef D2U_UNIFILE + wchar_t pathw[D2U_MAX_PATH]; + + d2u_MultiByteToWideChar(CP_UTF8, 0, opFN, -1, pathw, D2U_MAX_PATH); + return _wfopen(pathw, W_CNTRLW); +#else + return (fopen(opFN, W_CNTRL)); +#endif +} + +/* opens file descriptor in write only mode + * RetVal: NULL if failure + * file stream otherwise + */ +FILE* OpenOutFiled(int fd) { return (fdopen(fd, W_CNTRL)); } #if defined(__TURBOC__) || defined(__MSYS__) || defined(_MSC_VER) +/* Both dirname() and basename() may modify the contents of path. + * It may be desirable to pass a copy. */ char *dirname(char *path) { char *ptr; - if (( path == NULL) || (((ptr=strrchr(path,'/')) == NULL) && ((ptr=strrchr(path,'\\')) == NULL)) ) + /* replace all back slashes with slashes */ + while ( (ptr = strchr(path,'\\')) != NULL) + *ptr = '/'; + /* Code checkers may report that the condition (path == NULL) is redundant. + E.g. Cppcheck 1.72. The condition (path == NULL) is needed, because + the behaviour of strrchr is not specified when it get's a NULL string. + The behaviour may be undefined, dependent on the implementation. */ + if ((path == NULL) || ((ptr=strrchr(path,'/')) == NULL)) return "."; - else { - *ptr = '\0'; - return(path); - } + + if (strcmp(path,"/") == 0) + return "/"; + + *ptr = '\0'; + return path; +} + +char *basename(char *path) +{ + char *ptr; + + /* replace all back slashes with slashes */ + while ( (ptr = strchr(path,'\\')) != NULL) + *ptr = '/'; + /* Code checkers may report that the condition (path == NULL) is redundant. + E.g. Cppcheck 1.72. The condition (path == NULL) is needed, because + the behaviour of strrchr is not specified when it get's a NULL string. + The behaviour may be undefined, dependent on the implementation. */ + if ((path == NULL) || ((ptr=strrchr(path,'/')) == NULL)) + return path ; + + if (strcmp(path,"/") == 0) + return "/"; + + ptr++; + return ptr ; } #endif +/* Standard mktemp() is not safe to use (See mktemp(3)). + * On Windows it is recommended to use GetTempFileName() (See MSDN). + * This mktemp() wrapper redirects to GetTempFileName() on Windows. + * On Windows template is not modified, the returned pointer has to + * be used. + */ #ifdef NO_MKSTEMP -FILE* MakeTempFileFrom(const char *OutFN, char **fname_ret) +char *d2u_mktemp(char *template) +{ +#if defined(_WIN32) && !defined(__CYGWIN__) + + unsigned int uRetVal; + char *cpy1, *cpy2, *dn, *bn; + char *ptr; + size_t len; +#ifdef D2U_UNIFILE /* template is UTF-8 formatted. */ + wchar_t dnw[MAX_PATH]; + wchar_t bnw[MAX_PATH]; + wchar_t szTempFileNamew[MAX_PATH]; + char *fname_str; + int error = 0; #else -int MakeTempFileFrom(const char *OutFN, char **fname_ret) + char szTempFileName[MAX_PATH]; + char *fname_str; +#endif + if ((cpy1 = strdup(template)) == NULL) + return NULL; + if ((cpy2 = strdup(template)) == NULL) { + free(cpy1); + return NULL; + } + dn = dirname(cpy1); + bn = basename(cpy2); +#ifdef D2U_UNIFILE /* template is UTF-8 formatted. */ + if (d2u_MultiByteToWideChar(CP_UTF8, 0, dn, -1, NULL, 0) > (MAX_PATH - 15)) { + D2U_UTF8_FPRINTF(stderr, "%s: ", "dos2unix"); + D2U_ANSI_FPRINTF(stderr, _("Path for temporary output file is too long:")); + D2U_UTF8_FPRINTF(stderr, " %s\n", dn); + error=1; + } + if ((!error) && (d2u_MultiByteToWideChar(CP_UTF8, 0, dn, -1, dnw, MAX_PATH) == 0)) + error=1; + if ((!error) && (d2u_MultiByteToWideChar(CP_UTF8, 0, bn, -1, bnw, MAX_PATH) == 0)) + error=1; + free(cpy1); + free(cpy2); + if (error) + return NULL; + uRetVal = GetTempFileNameW(dnw, bnw, 0, szTempFileNamew); + if (! uRetVal) { + d2u_PrintLastError("dos2unix"); + return NULL; + } + len =(size_t) d2u_WideCharToMultiByte(CP_UTF8, 0, szTempFileNamew, -1, NULL, 0, NULL, NULL); + fname_str = (char *)malloc(len); + if (! fname_str) + return NULL; + if (d2u_WideCharToMultiByte(CP_UTF8, 0, szTempFileNamew, -1, fname_str, MAX_PATH, NULL, NULL) == 0) + return NULL; +#else + uRetVal = GetTempFileNameA(dn, bn, 0, szTempFileName); + free(cpy1); + free(cpy2); + if (! uRetVal) { + d2u_PrintLastError("dos2unix"); + return NULL; + } + len = strlen(szTempFileName) +1; + fname_str = (char *)malloc(len); + if (! fname_str) + return NULL; + strcpy(fname_str, szTempFileName); +#endif + /* replace all back slashes with slashes */ + while ( (ptr = strchr(fname_str,'\\')) != NULL) + *ptr = '/'; + return fname_str; + +#else + return mktemp(template); +#endif +} #endif + +FILE* MakeTempFileFrom(const char *OutFN, char **fname_ret) { char *cpy = strdup(OutFN); char *dir = NULL; size_t fname_len = 0; char *fname_str = NULL; + FILE *fp = NULL; /* file pointer */ #ifdef NO_MKSTEMP char *name; - FILE *fd = NULL; #else - int fd = -1; -#endif -#ifdef D2U_UNIFILE - wchar_t fname_strw[D2U_MAX_PATH]; - wchar_t *namew; + int fd = -1; /* file descriptor */ #endif *fname_ret = NULL; @@ -799,11 +926,7 @@ int MakeTempFileFrom(const char *OutFN, char **fname_ret) dir = dirname(cpy); -#ifdef D2U_UNIFILE - fname_len = D2U_MAX_PATH; -#else fname_len = strlen(dir) + strlen("/d2utmpXXXXXX") + sizeof (char); -#endif if (!(fname_str = (char *)malloc(fname_len))) goto make_failed; sprintf(fname_str, "%s%s", dir, "/d2utmpXXXXXX"); @@ -812,34 +935,25 @@ int MakeTempFileFrom(const char *OutFN, char **fname_ret) free(cpy); #ifdef NO_MKSTEMP -#ifdef D2U_UNIFILE - d2u_MultiByteToWideChar(CP_UTF8, 0, fname_str, -1, fname_strw, D2U_MAX_PATH); - namew = _wmktemp(fname_strw); - d2u_WideCharToMultiByte(CP_UTF8, 0, namew, -1, fname_str, (int)fname_len, NULL, NULL); - *fname_ret = fname_str; - if ((fd = _wfopen(fname_strw, W_CNTRLW)) == NULL) + if ((name = d2u_mktemp(fname_str)) == NULL) goto make_failed; -#else - name = mktemp(fname_str); *fname_ret = name; - if ((fd = fopen(fname_str, W_CNTRL)) == NULL) + if ((fp = OpenOutFile(name)) == NULL) goto make_failed; -#endif #else if ((fd = mkstemp(fname_str)) == -1) goto make_failed; + + if ((fp=OpenOutFiled(fd)) == NULL) + goto make_failed; #endif - return (fd); + return (fp); - make_failed: - free(*fname_ret); - *fname_ret = NULL; -#ifdef NO_MKSTEMP - return (NULL); -#else - return (-1); -#endif + make_failed: + free(*fname_ret); + *fname_ret = NULL; + return NULL; } /* Test if *lFN is the name of a symbolic link. If not, set *rFN equal @@ -936,7 +1050,6 @@ int ResolveSymbolicLink(char *lFN, char **rFN, CFlag *ipFlag, const char *progna FILE *read_bom (FILE *f, int *bomtype) { - int bom[4]; /* BOMs * UTF16-LE ff fe * UTF16-BE fe ff @@ -948,6 +1061,7 @@ FILE *read_bom (FILE *f, int *bomtype) /* Check for BOM */ if (f != NULL) { + int bom[4]; if ((bom[0] = fgetc(f)) == EOF) { if (ferror(f)) { return NULL; @@ -1074,10 +1188,7 @@ FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname) void print_bom (const int bomtype, const char *filename, const char *progname) { - char informat[64]; -# ifdef D2U_UNIFILE - wchar_t informatw[64]; -#endif + char informat[64]; switch (bomtype) { case FILE_UTF16LE: /* UTF-16 Little Endian */ @@ -1097,10 +1208,13 @@ void print_bom (const int bomtype, const char *filename, const char *progname) } if (bomtype > 0) { +#ifdef D2U_UNIFILE + wchar_t informatw[64]; +#endif informat[sizeof(informat)-1] = '\0'; /* Change informat to UTF-8 for d2u_utf8_fprintf. */ -# ifdef D2U_UNIFILE +#ifdef D2U_UNIFILE /* The format string is encoded in the system default * Windows ANSI code page. May have been translated * by gettext. Convert it to wide characters. */ @@ -1269,11 +1383,6 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn #ifndef NO_CHMOD mode_t mask; #endif -#ifdef NO_MKSTEMP - FILE* fd; -#else - int fd; -#endif char *TargetFN = NULL; int ResolveSymlinkResult = 0; @@ -1310,8 +1419,8 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn /* retrieve ipInFN file date stamp */ #ifdef D2U_UNIFILE - d2u_MultiByteToWideChar(CP_UTF8, 0, ipInFN, -1, pathw, D2U_MAX_PATH); - if (_wstat(pathw, &StatBuf)) { + d2u_MultiByteToWideChar(CP_UTF8, 0, ipInFN, -1, pathw, D2U_MAX_PATH); + if (_wstat(pathw, &StatBuf)) { #else if (stat(ipInFN, &StatBuf)) { #endif @@ -1321,60 +1430,43 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, ipInFN); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); } - RetVal = -1; + return -1; } -#ifdef NO_MKSTEMP - if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) { -#else - if((fd = MakeTempFileFrom (ipOutFN, &TempPath)) < 0) { -#endif + /* can open in file? */ + InF=OpenInFile(ipInFN); + if (InF == NULL) { if (ipFlag->verbose) { ipFlag->error = errno; errstr = strerror(errno); - D2U_UTF8_FPRINTF(stderr, "%s: ", progname); - D2U_ANSI_FPRINTF(stderr, _("Failed to open temporary output file: %s\n"), errstr); + D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, ipInFN); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); } - RetVal = -1; + return -1; } -#if DEBUG - D2U_UTF8_FPRINTF(stderr, "%s: ", progname); - D2U_UTF8_FPRINTF(stderr, _("using %s as temporary file\n"), TempPath); -#endif - - /* can open in file? */ - if (!RetVal) { - InF=OpenInFile(ipInFN); - if (InF == NULL) { - if (ipFlag->verbose) { + /* can open temp output file? */ + if((TempF = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) { + if (ipFlag->verbose) { + if (errno) { ipFlag->error = errno; errstr = strerror(errno); - D2U_UTF8_FPRINTF(stderr, "%s: %s:", progname, ipInFN); - D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_ANSI_FPRINTF(stderr, _("Failed to open temporary output file: %s\n"), errstr); + } else { + /* In case temp path was too long on Windows, errno is 0. */ + if (!ipFlag->error) ipFlag->error = 1; } - RetVal = -1; } + RetVal = -1; } - /* can open output file? */ - if ((!RetVal) && (InF)) { -#ifdef NO_MKSTEMP - if ((TempF=fd) == NULL) { -#else - if ((TempF=OpenOutFile(fd)) == NULL) { - if (ipFlag->verbose) { - ipFlag->error = errno; - errstr = strerror(errno); - D2U_UTF8_FPRINTF(stderr, "%s:", progname); - D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); - } -#endif - fclose (InF); - InF = NULL; - RetVal = -1; - } +#if DEBUG + if (TempPath != NULL) { + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("using %s as temporary file\n"), TempPath); } +#endif if (!RetVal) if (check_unicode(InF, TempF, ipFlag, ipInFN, progname)) @@ -1399,31 +1491,31 @@ int ConvertNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, const char *progn #endif /* can close in file? */ - if ((InF) && (fclose(InF) == EOF)) + if (fclose(InF) == EOF) { + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("Failed to close input file %s:"), ipInFN); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + } RetVal = -1; + } /* can close output file? */ if (TempF) { if (fclose(TempF) == EOF) { - if (ipFlag->verbose) { - ipFlag->error = errno; - errstr = strerror(errno); - D2U_UTF8_FPRINTF(stderr, "%s: ", progname); - D2U_UTF8_FPRINTF(stderr, _("Failed to write to temporary output file %s:"), TempPath); - D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); - } + if (ipFlag->verbose) { + ipFlag->error = errno; + errstr = strerror(errno); + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("Failed to write to temporary output file %s:"), TempPath); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + } RetVal = -1; } } -#ifdef NO_MKSTEMP - if(fd!=NULL) - fclose(fd); -#else - if(fd>=0) - close(fd); -#endif - #ifndef NO_CHMOD if (!RetVal) { @@ -1851,8 +1943,6 @@ void print_messages_info(const CFlag *pFlag, const char *infile, const char *pro void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb_dos, unsigned int lb_unix, unsigned int lb_mac) { - const char *ptr; - if (ipFlag->file_info & INFO_CONVERT) { if ((ipFlag->FromToMode == FROMTO_DOS2UNIX) && (lb_dos == 0)) return; @@ -1896,6 +1986,7 @@ void printInfo(CFlag *ipFlag, const char *filename, int bomtype, unsigned int lb D2U_UTF8_FPRINTF(stdout, " text "); } if (*filename != '\0') { + const char *ptr; if ((ipFlag->file_info & INFO_NOPATH) && (((ptr=strrchr(filename,'/')) != NULL) || ((ptr=strrchr(filename,'\\')) != NULL)) ) ptr++; else @@ -1913,7 +2004,6 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co unsigned int lb_dos = 0; unsigned int lb_unix = 0; unsigned int lb_mac = 0; - char *errstr; ipFlag->status = 0; @@ -1944,7 +2034,7 @@ void FileInfoW(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, co if ((TempChar == WEOF) && ferror(ipInF)) { ipFlag->error = errno; if (ipFlag->verbose) { - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_UTF8_FPRINTF(stderr, _("can not read from input file %s:"), filename); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); @@ -1964,8 +2054,6 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con unsigned int lb_dos = 0; unsigned int lb_unix = 0; unsigned int lb_mac = 0; - char *errstr; - ipFlag->status = 0; @@ -1996,7 +2084,7 @@ void FileInfo(FILE* ipInF, CFlag *ipFlag, const char *filename, int bomtype, con if ((TempChar == EOF) && ferror(ipInF)) { ipFlag->error = errno; if (ipFlag->verbose) { - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_UTF8_FPRINTF(stderr, _("can not read from input file %s:"), filename); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); @@ -2011,7 +2099,6 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) { int RetVal = 0; FILE *InF = NULL; - char *errstr; int bomtype_orig = FILE_MBS; /* messages must print the real bomtype, not the assumed bomtype */ ipFlag->status = 0 ; @@ -2035,8 +2122,8 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) InF=OpenInFile(ipInFN); if (InF == NULL) { if (ipFlag->verbose) { + char *errstr = strerror(errno); ipFlag->error = errno; - errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: %s: ", progname, ipInFN); D2U_ANSI_FPRINTF(stderr, "%s\n", errstr); } @@ -2062,9 +2149,17 @@ int GetFileInfo(char *ipInFN, CFlag *ipFlag, const char *progname) FileInfo(InF, ipFlag, ipInFN, bomtype_orig, progname); #endif - /* can close in file? */ - if ((InF) && (fclose(InF) == EOF)) + /* can close in file? */ + if (fclose(InF) == EOF) { + if (ipFlag->verbose) { + char *errstr = strerror(errno); + ipFlag->error = errno; + D2U_UTF8_FPRINTF(stderr, "%s: ", progname); + D2U_UTF8_FPRINTF(stderr, _("Failed to close input file %s:"), ipInFN); + D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); + } RetVal = -1; + } return RetVal; } @@ -2452,7 +2547,7 @@ int parse_options(int argc, char *argv[], /* no file argument, use stdin and stdout */ if ( (argc > 0) && pFlag->stdio_mode) { if (pFlag->file_info) { - RetVal = GetFileInfoStdio(pFlag, progname); + GetFileInfoStdio(pFlag, progname); print_messages_info(pFlag, "stdin", progname); } else { #ifdef D2U_UNICODE @@ -2476,11 +2571,9 @@ int parse_options(int argc, char *argv[], void d2u_getc_error(CFlag *ipFlag, const char *progname) { - char *errstr; - ipFlag->error = errno; if (ipFlag->verbose) { - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_ANSI_FPRINTF(stderr, _("can not read from input file: %s\n"), errstr); } @@ -2488,11 +2581,9 @@ void d2u_getc_error(CFlag *ipFlag, const char *progname) void d2u_putc_error(CFlag *ipFlag, const char *progname) { - char *errstr; - ipFlag->error = errno; if (ipFlag->verbose) { - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_ANSI_FPRINTF(stderr, _("can not write to output file: %s\n"), errstr); } @@ -2501,12 +2592,10 @@ void d2u_putc_error(CFlag *ipFlag, const char *progname) #ifdef D2U_UNICODE void d2u_putwc_error(CFlag *ipFlag, const char *progname) { - char *errstr; - if (!(ipFlag->status & UNICODE_CONVERSION_ERROR)) { ipFlag->error = errno; if (ipFlag->verbose) { - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s: ", progname); D2U_ANSI_FPRINTF(stderr, _("can not write to output file: %s\n"), errstr); } @@ -2555,17 +2644,15 @@ wint_t d2u_ungetwc(wint_t wc, FILE *f, int bomtype) wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname) { static char mbs[8]; - static wchar_t lead=0x01, trail; /* lead get's invalid value */ + static wchar_t lead=0x01; /* lead get's invalid value */ static wchar_t wstr[3]; - size_t i,len; - int c_trail, c_lead; + size_t len; #if (defined(_WIN32) && !defined(__CYGWIN__)) DWORD dwFlags; -#else - char *errstr; #endif if (ipFlag->keep_utf16) { + int c_trail, c_lead; if (ipFlag->bomtype == FILE_UTF16LE) { /* UTF16 little endian */ c_trail = (int)(wc & 0xff00); c_trail >>=8; @@ -2596,6 +2683,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname) return(wc); } if ((wc >= 0xdc00) && (wc < 0xe000)) { /* Surrogate trail */ + static wchar_t trail; /* check for trail without a lead */ if ((lead < 0xd800) || (lead >= 0xdc00)) { @@ -2681,7 +2769,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname) #if (defined(_WIN32) && !defined(__CYGWIN__)) d2u_PrintLastError(progname); #else - errstr = strerror(errno); + char *errstr = strerror(errno); D2U_UTF8_FPRINTF(stderr, "%s:", progname); D2U_ANSI_FPRINTF(stderr, " %s\n", errstr); #endif @@ -2689,6 +2777,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag, const char *progname) ipFlag->status |= UNICODE_CONVERSION_ERROR ; return(WEOF); } else { + size_t i; for (i=0; i #endif -/* Watcom C has mkstemp, but assume that none of the Windows compilers have it. To make MakeTempFileFrom() simpler */ -#if defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__) || defined(_MSC_VER) +/* Watcom C has mkstemp, but no mktemp(). + * MinGW has mktemp() and mkstemp(). MinGW mkstemp() is not working for me. + * MSVC has mktemp(), but no mkstemp(). + * Assume that none of the Windows compilers have mkstemp(). + * On Windows I need something that can also work with Unicode file names (UTF-16). + * On Windows GetTempFileName() will be used, as is adviced on MSDN. */ +#if defined(__TURBOC__) || defined(__DJGPP__) || (defined(_WIN32) && !defined(__CYGWIN__)) /* Some compilers have no mkstemp(). * Use mktemp() instead. * BORLANDC, DJGPP, MINGW32, MSVC */ @@ -253,15 +258,12 @@ void PrintVersion(const char *progname, const char *localedir); void PrintLocaledir(const char *localedir); #endif FILE* OpenInFile(char *ipFN); -FILE* OpenOutFile(int fd); +FILE* OpenOutFile(char *opFN); +FILE* OpenOutFiled(int fd); #if defined(__TURBOC__) || defined(__MSYS__) char *dirname(char *path); #endif -#ifdef NO_MKSTEMP 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, const char *progname); FILE *read_bom (FILE *f, int *bomtype); FILE *write_bom (FILE *f, CFlag *ipFlag, const char *progname); diff --git a/djgpp.mak b/djgpp.mak index a77e4e8..44564a9 100644 --- a/djgpp.mak +++ b/djgpp.mak @@ -1,10 +1,38 @@ - # Author: Erwin Waterlander -# Copyright (C) 2009-2014 Erwin Waterlander +# Copyright (C) 2009-2016 Erwin Waterlander # This file is distributed under the same license as the dos2unix package. include version.mk +d2u_os=$(shell uname -s) + +# DJGPP 2.03 +LINK = ln -sf +# DJGPP 2.05 +# In DJGPP 2.05 linking with ln works differently. The links created +# with DJGPP 2.05 do not work. +#LINK = cp -f + +# On DOS we need to set SHELL to sh.exe or bash.exe, otherwise targets may fail +# (targets install and dist fail certainly). SHELL can't be overridden in this +# make level. It sticks to command.com (at least with DJGPP 2.03 make 3.79.1). +# SHELL has to be set in a parent process, so we pass it to the sub make instances. +D2U_MAKESHELL=$(shell which sh) + +CROSS_COMP=0 + +ifeq ($(findstring CYGWIN,$(d2u_os)),CYGWIN) + CROSS_COMP=1 +endif + +ifeq ($(CROSS_COMP),1) + CROSS_COMPILE=i586-pc-msdosdjgpp- + LINK = cp -f +endif + +CC=$(CROSS_COMPILE)gcc +STRIP=$(CROSS_COMPILE)strip + prefix=c:/dos32 ENABLE_NLS= VERSIONSUFFIX=-dos32 @@ -19,30 +47,30 @@ ZIPOBJ_EXTRA = bin/cwsdpmi.exe docsubdir = dos2unix all: - $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS= + $(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="$(LINK)" LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS= CC=$(CC) D2U_OS=msdos SHELL=$(D2U_MAKESHELL) test: all - cd test; $(MAKE) test UCS= SHELL=$(shell which sh) + cd test; $(MAKE) test UCS= SHELL=$(D2U_MAKESHELL) check: test install: - $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS= + $(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK="$(LINK)" LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS= CC=$(CC) D2U_OS=msdos SHELL=$(D2U_MAKESHELL) uninstall: - $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir) + $(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir) SHELL=$(D2U_MAKESHELL) clean: - $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix) + $(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix) SHELL=$(D2U_MAKESHELL) mostlyclean: - $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix) + $(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix) SHELL=$(D2U_MAKESHELL) dist: - $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) ZIPFILE=${ZIPFILE} docsubdir=$(docsubdir) + $(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) ZIPFILE=${ZIPFILE} docsubdir=$(docsubdir) SHELL=$(D2U_MAKESHELL) strip: - $(MAKE) strip LINK_MAN="cp -f" EXE=.exe + $(MAKE) strip LINK="$(LINK)" LINK_MAN="cp -f" EXE=.exe STRIP=$(STRIP) # Fix time stamps. Otherwise make install may rebuild mac2unix unix2mac. # Now make install can be done in MSYS. In djgpp bash install is problematic. sleep 10 diff --git a/dos2unix.c b/dos2unix.c index 6409408..ab63aaa 100644 --- a/dos2unix.c +++ b/dos2unix.c @@ -509,6 +509,10 @@ int main (int argc, char *argv[]) # endif int argc_new; char **argv_new; +#ifdef D2U_UNIFILE + wchar_t **wargv; + char ***argv_glob; +# endif progname[8] = '\0'; strcpy(progname,"dos2unix"); @@ -569,8 +573,6 @@ int main (int argc, char *argv[]) #ifdef D2U_UNIFILE /* Get arguments in wide Unicode format in the Windows Command Prompt */ - wchar_t **wargv; - char ***argv_glob; /* This does not support wildcard expansion (globbing) */ wargv = CommandLineToArgvW(GetCommandLineW(), &argc); @@ -579,6 +581,7 @@ int main (int argc, char *argv[]) if (argv_glob == NULL) { D2U_UTF8_FPRINTF(stderr, "%s:", progname); D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno)); + free(pFlag); return errno; } /* Glob the arguments and convert them to UTF-8 */ diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1 index 453947b..f465922 100644 --- a/man/de/man1/dos2unix.1 +++ b/man/de/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm index e7c9f96..ed3d8d9 100644 --- a/man/de/man1/dos2unix.htm +++ b/man/de/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt +dos2unix 7.3.4 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1 index 30df5a9..62ce119 100644 --- a/man/es/man1/dos2unix.1 +++ b/man/es/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm index 4c1f94c..99d8963 100644 --- a/man/es/man1/dos2unix.htm +++ b/man/es/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa +dos2unix 7.3.4 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1 index 0e8691d..b3f4ba4 100644 --- a/man/fr/man1/dos2unix.1 +++ b/man/fr/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm index a83842b..43673e3 100644 --- a/man/fr/man1/dos2unix.htm +++ b/man/fr/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement +dos2unix 7.3.4 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1 index 4a83ac2..46490fe 100644 --- a/man/man1/dos2unix.1 +++ b/man/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm index 4c53109..d1cf586 100644 --- a/man/man1/dos2unix.htm +++ b/man/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - DOS/MAC to UNIX and vice versa text file format converter +dos2unix 7.3.4 - DOS/MAC to UNIX and vice versa text file format converter diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1 index 9ecf630..ae2f906 100644 --- a/man/nl/man1/dos2unix.1 +++ b/man/nl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm index 13b45b7..22b7c32 100644 --- a/man/nl/man1/dos2unix.htm +++ b/man/nl/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter +dos2unix 7.3.4 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1 index de962a7..fa521a7 100644 --- a/man/pl/man1/dos2unix.1 +++ b/man/pl/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm index 787e964..f2f4ab5 100644 --- a/man/pl/man1/dos2unix.htm +++ b/man/pl/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem +dos2unix 7.3.4 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1 index 01e403e..a1672ea 100644 --- a/man/pt_BR/man1/dos2unix.1 +++ b/man/pt_BR/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -309,10 +309,10 @@ de linha do \s-1DOS,\s0 unix2dos vai exibir apenas os nomes de arquivos que cont quebras de linha do Unix. .IP "\fBh\fR" 4 .IX Item "h" -Print a header. +Exibe um cabeçalho. .IP "\fBp\fR" 4 .IX Item "p" -Show file names without path. +Mostra nomes de arquivos sem caminho. .RE .RS 4 .Sp diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm index 10d4ca9..8642861 100644 --- a/man/pt_BR/man1/dos2unix.htm +++ b/man/pt_BR/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa +dos2unix 7.3.4 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa @@ -275,13 +275,13 @@
h
-

Print a header.

+

Exibe um cabeçalho.

p
-

Show file names without path.

+

Mostra nomes de arquivos sem caminho.

diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod index 917bae8..2b4aa5e 100644 --- a/man/pt_BR/man1/dos2unix.pod +++ b/man/pt_BR/man1/dos2unix.pod @@ -278,11 +278,11 @@ quebras de linha do Unix. =item B -Print a header. +Exibe um cabeçalho. =item B

-Show file names without path. +Mostra nomes de arquivos sem caminho. =back diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt index e7aaf80..df6a8c1 100644 --- a/man/pt_BR/man1/dos2unix.txt +++ b/man/pt_BR/man1/dos2unix.txt @@ -221,9 +221,9 @@ OPÇÕES contêm quebras de linha do DOS, unix2dos vai exibir apenas os nomes de arquivos que contêm quebras de linha do Unix. - h Print a header. + h Exibe um cabeçalho. - p Show file names without path. + p Mostra nomes de arquivos sem caminho. Exemplos: diff --git a/man/sv/man1/dos2unix.1 b/man/sv/man1/dos2unix.1 index 9d36d2c..be4465e 100644 --- a/man/sv/man1/dos2unix.1 +++ b/man/sv/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/sv/man1/dos2unix.htm b/man/sv/man1/dos2unix.htm index 9f9c1b9..919f5ee 100644 --- a/man/sv/man1/dos2unix.htm +++ b/man/sv/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa +dos2unix 7.3.4 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1 index d6edadd..ef5ff76 100644 --- a/man/uk/man1/dos2unix.1 +++ b/man/uk/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm index 33d75ec..c3266a1 100644 --- a/man/uk/man1/dos2unix.htm +++ b/man/uk/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки +dos2unix 7.3.4 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки diff --git a/man/zh_CN/man1/dos2unix.1 b/man/zh_CN/man1/dos2unix.1 index bd00e0f..f3c31fd 100644 --- a/man/zh_CN/man1/dos2unix.1 +++ b/man/zh_CN/man1/dos2unix.1 @@ -71,7 +71,7 @@ .\" ======================================================================== .\" .IX Title "dos2unix 1" -.TH dos2unix 1 "2016-02-13" "dos2unix" "2016-02-13" +.TH dos2unix 1 "2016-05-24" "dos2unix" "2016-05-24" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/man/zh_CN/man1/dos2unix.htm b/man/zh_CN/man1/dos2unix.htm index 40846cd..957ea0e 100644 --- a/man/zh_CN/man1/dos2unix.htm +++ b/man/zh_CN/man1/dos2unix.htm @@ -2,7 +2,7 @@ -dos2unix 7.3.3 - DOS/Mac - Unix文件格式转换器 +dos2unix 7.3.4 - DOS/Mac - Unix文件格式转换器 diff --git a/po-man/dos2unix-man.pot b/po-man/dos2unix-man.pot index 21c5bcf..7e8794d 100644 --- a/po-man/dos2unix-man.pot +++ b/po-man/dos2unix-man.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2016-02-13 14:27+0100\n" +"POT-Creation-Date: 2016-05-24 22:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po-man/pt_BR.po b/po-man/pt_BR.po index 052098a..1d504e9 100644 --- a/po-man/pt_BR.po +++ b/po-man/pt_BR.po @@ -1,14 +1,14 @@ # Brazilian Portuguese translation for dos2unix-man -# Copyright (c) 2015 Erwin Waterlander (msgids) -# Copyright (C) 2015 Free Software Foundation, Inc. +# Copyright (c) 2016 Erwin Waterlander (msgids) +# Copyright (C) 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the dos2unix package. # Rafael Fontenelle , 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix-man 7.3.3-beta6\n" +"Project-Id-Version: dos2unix-man 7.3.3-beta9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-11 20:33+0100\n" -"PO-Revision-Date: 2016-01-28 09:08-0200\n" +"POT-Creation-Date: 2016-02-05 20:20+0100\n" +"PO-Revision-Date: 2016-03-15 00:21-0300\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.8.7\n" #. type: =head1 #: dos2unix.pod:52 @@ -477,22 +477,22 @@ msgstr "Com a opção C, dos2unix vai exibir apenas os arquivos que contêm q #. type: =item #: dos2unix.pod:296 msgid "B" -msgstr "" +msgstr "B" #. type: textblock #: dos2unix.pod:298 msgid "Print a header." -msgstr "" +msgstr "Exibe um cabeçalho." #. type: =item #: dos2unix.pod:300 msgid "B

" -msgstr "" +msgstr "B

" #. type: textblock #: dos2unix.pod:302 msgid "Show file names without path." -msgstr "" +msgstr "Mostra nomes de arquivos sem caminho." #. type: textblock #: dos2unix.pod:306 @@ -1639,15 +1639,6 @@ msgstr "Veja também" msgid "file(1) find(1) iconv(1) locale(1) xargs(1)" msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)" -#~ msgid "" -#~ " dos2unix\n" -#~ " dos2unix -l -c mac\n" -#~ "\n" -#~ msgstr "" -#~ " dos2unix\n" -#~ " dos2unix -l -c mac\n" -#~ "\n" - #~ msgid "Freecode: L" #~ msgstr "Freecode: L" diff --git a/po/da.po b/po/da.po index f397509..418e613 100644 --- a/po/da.po +++ b/po/da.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-23 12:07+0100\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-15 12:07+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -60,7 +60,7 @@ msgstr "bruger tegnkodningstabel %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Binært symbol 0x%02X fundet på linje %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -77,7 +77,7 @@ msgstr "" "Alle rettigheder forbeholdes.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -100,7 +100,7 @@ msgstr "" " stilles til rådighed med distribueringen.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -126,56 +126,56 @@ msgstr "" "(GÆLDER SELV VED IGNORERING ELLER ANDET) SOM KOMMER UD AF BRUGEN AF\n" "DENNE SOFTWARE, SELVOM INFORMATION ER GIVET, AT DET VIL MEDFØRE SKADE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Brug: %s [tilvalg] [fil …] [-n indfil udfil …]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii omdan kun linjeskift (standard)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 brug Windows-tegnkodningstabel 1252 (Vesteuropa)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 brug DOS-tegnkodningstabel 437 (US) (standard)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 brug DOS-tegnkodningstabel 850 (Vesteuropa)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 brug DOS-tegnkodningstabel 860 (portugisisk)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 brug DOS-tegnkodningstabel 863 (fransk-canadisk)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 brug DOS-tegnkodningstabel 865 (nordisk)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 omdan 8-bit-tegn til 7-bit-plads\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behold byte-rækkefølge-markering (BOM)\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behold byte-rækkefølge-markering (standard)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -183,7 +183,7 @@ msgstr "" " -c, --convmode omdannelsestilstand\n" " convmode ascii, 7bit, iso, mac, standard er ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -191,19 +191,19 @@ msgstr "" " -D, --display-enc angiv kodning for viste tekstbeskeder\n" " kodning ansi, unicode, utf8, standarden er ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force gennemtving omdannelse af binære filer\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjælpetekst\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -211,23 +211,23 @@ msgstr "" " -i, --info[=FLAG] vis filinformation\n" " fil … filer at analysere\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold outputfils dato\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license vis softwarelicens\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline tilføj ekstra linjeskift\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom tilføj byte-rækkefølge-markering (standard UTF-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -237,7 +237,7 @@ msgstr "" " infile originalfil i ny-fil-tilstand\n" " outfile outputfil i ny-fil-tilstand\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -245,43 +245,43 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filter til omdannelse i gammel-fil-tilstand\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stilletilstand, tilbagehold alle advarsler\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom fjern byte-rækkefølge-markering (standard)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom fjern byte-rækkefølge-markering\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe spring binære filer over (standard)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behold UTF-16-kodning\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose uddybende operation\n" -#: common.c:658 +#: common.c:662 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:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -289,233 +289,242 @@ msgstr "" " -R, --replace-symlink erstat symbolske henvisninger med omdannede filer\n" " (oprindelige målfiler forbliver uændrede)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink behold symbolske henvisninger og deres mål uændrede (standard)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version vis versionsnummer\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-version (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-version (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-version (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-version (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-version.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-version.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-version (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-version (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-version (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-version (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-version (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-version (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-version (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-version (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s-version.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Med Unicode UTF-16-understøttelse.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Uden Unicode UTF-16-understøttelse.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Med Unicode filnavnsunderstøttelse.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Uden Unicode filnavnsunderstøttelse.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Med understøttelse for lokale sprog.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Sti til midlertidig uddatafil er for lang:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Inddatafilen %s har %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Antager UTF-16LE-kodning.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Antager UTF-16BE-kodning.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Åbning af midlertidig outputfil mislykkedes: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "bruger %s som midlertidig fil\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Kunne ikke lukke inddatafil %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Skrivning til midlertidig outputfil %s mislykkedes:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemer med at følge symbolsk henvisning \"%s\"\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " outputfil forbliver i \"%s\"\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "der opstod problemer under omdøbning af »%s« til »%s«:" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som er målet for symbolsk henvisning \"%s\"\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Springer binær fil %s over\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "tegnkodningstabel %d understøttes ikke.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Springer UTF-16-filen %s over. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Springer UTF-16-filen %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Springer UTF-16-filen %s over. UTF-16-konvertering er ikke understøttet i denne version af %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Springer %s over, ikke en almindelig fil.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "omdanner fil %s til fil %s i DOS-format …\n" @@ -526,42 +535,42 @@ msgstr "omdanner fil %s til fil %s i DOS-format …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemer under omdannelse af fil %s til fil %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Springer symbolsk henvisning %s over.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "omdanner fil %s til Unix-format …\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "omdanner fil %s til Mac-format …\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "omdanner fil %s til DOS-format …\n" @@ -571,75 +580,75 @@ msgstr "omdanner fil %s til DOS-format …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "omdanner %s-filen %s til %s-Unix-format …\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "omdanner %s-filen %s til %s-Mac-format …\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "omdanner %s-filen %s til %s-DOS-format …\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problemer under omdannelse af fil %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "kan ikke læse fra inputfilen %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "forkert flag »%c« for tilvalget -i eller --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktuel tegnkodningstabel: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ugyldig %s omdannelsestilstand specificeret\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "tilvalg \"%s\" kræver et argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ugyldig %s visningstilstand specificeret\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fil %s er ikke angivet i ny-fil-tilstand\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "kan ikke læse fra inputfil: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "kan ikke skrive til outputfil: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler lav surrogat.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fejl: Ugyldigt surrogatpar. Mangler høj surrogat.\n" diff --git a/po/de.po b/po/de.po index b6afb81..3cd43b3 100644 --- a/po/de.po +++ b/po/de.po @@ -3,13 +3,13 @@ # Philipp Thomas , 2009, 2010, 2011, 2012. # Lars Wendler , 2013. # Mario Blättermann , 2014, 2015. -# Philipp Thomas , 2014, 2015. +# Philipp Thomas , 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.1-beta5\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2015-09-15 16:30+0200\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-17 07:50+0200\n" "Last-Translator: Philipp Thomas \n" "Language-Team: German \n" "Language: de\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: dos2unix.c:79 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (Version 3.1)\n" @@ -29,7 +29,7 @@ msgid "" "All rights reserved.\n" "\n" msgstr "" -"Copyright © 2009-2015 Erwin Waterlander\n" +"Copyright © 2009-%d Erwin Waterlander\n" "Copyright © 1998 Christian Wurll (Version 3.1)\n" "Copyright © 1998 Bernd Johannes Wuebben (Version 3.0)\n" "Copyright © 1994,1995 Benjamin Lin\n" @@ -61,24 +61,24 @@ msgstr "Codepage %d wird verwendet.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Das binäres Symbol 0x%02X wurde in Zeile %u gefunden\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n" #: unix2dos.c:69 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "All rights reserved.\n" "\n" msgstr "" -"Copyright © 2009-2015 Erwin Waterlander\n" +"Copyright © 2009-%d Erwin Waterlander\n" "Copyright © 1994,1995 Benjamin Lin\n" "Alle Rechte vorbehalten.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -101,7 +101,7 @@ msgstr "" " Material wiedergeben.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -130,56 +130,56 @@ msgstr "" "FAHRLÄSSIGKEIT), DIE AUS DER VERWENDUNG DIESER SOFTWARE ERWÄCHST,\n" "SELBST WENN AUF DIE MÖGLICHKEIT SOLCHER SCHÄDEN HINGEWIESEN WURDE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Aufruf: %s [Optionen] [Datei …] [-n Eingabedatei Ausgabedatei …]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 verwendet DOS Codepage 437 (US) (Vorgabe)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 verwendet DOS Codepage 850 (Westeuropäisch)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 verwendet DOS Codepage 860 (Portugiesisch)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 verwendet DOS Codepage 865 (Nordisch)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -187,7 +187,7 @@ msgstr "" " -c, --convmode gibt den Umwandlungsmodus an\n" " convmode ascii, 7bit, iso, mac, Standard ist nach ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -195,19 +195,19 @@ msgstr "" " -D, --display-enc die Kodierung für angezeigte Meldungen setzen\n" " encoding ansi, unicode, utf8, Vorgabe ist ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force erzwingt die Umwandlung binärer Dateien\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 wandelt UTF-16 in GB18030 um\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help gibt diese Hilfe aus\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -215,23 +215,23 @@ msgstr "" " -i, --info[=FLAGS] Dateiinformation anzeigen\n" " Datei … zu analysierende Dateien\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate erhält das Datum der Ausgabedatei\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license gibt die Software-Lizenz aus\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline fügt einen Zeilenumbruch hinzu\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -241,7 +241,7 @@ msgstr "" " Eingabedatei Originaldatei im Neue-Datei-Modus\n" " Ausgabedatei Ausgabedatei im Neue-Datei-Modus\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -249,43 +249,43 @@ msgstr "" " -o, --oldfile überschreibt die alte Datei (Vorgabe)\n" " Datei ... die im Alte-Datei-Modus umzuwandelnden Dateien\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stiller Modus, unterdrückt alle Warnungen\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe überspringt binäre Dateien (Vorgabe)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16-Kodierung beibehalten\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose ausführliche Ausgabe\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink folgt symbolischen Verknüpfungen und wandelt die Ziele um\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -293,235 +293,244 @@ msgstr "" " -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die umgewandelten\n" " Dateien (die originale Ziele bleiben unangetastet)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version gibt die Versionsnummer aus\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-Version (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-Version (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-Version (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-Version (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-Version.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-Version.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-Version (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-Version (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-Version (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-Version (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-Version (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-Version (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-Version (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-Version (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s-Version.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Mit Unterstützung für Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Ohne Unterstützung für Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Mit Unterstützung für Unicode-Dateinamen.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Ohne Unterstützung für Unicode-Dateinamen.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Mit Unterstützung von Landessprachen.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Der Pfad für die temporäre Ausgabedatei ist zu lang:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Das %s BOM wird geschrieben.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Die EIngabedatei %s hat ein %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Es wird UTF-16LE-Kodierung angenommen.\n" -#: common.c:1336 +#: common.c:1455 #, 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:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "%s wird als temporäre Datei verwendet\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Die Eingabedatei konnte nicht geschlossen werden: %s" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " Die Ausgabedatei verbleibt in »%s«\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten:" -#: common.c:1538 +#: common.c:1630 #, 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:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "binäre Datei %s wird übersprungen\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "Codepage %d wird nicht unterstützt.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-Datei %s wird übersprungen, da beim Umwandeln ein Fehler in Zeile %u auftrat.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-Datei %s wird übersprungen, da die Umwandlung von UTF-16 in dieser Version von %s nicht unterstützt wird.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, 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" @@ -532,42 +541,42 @@ msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n" -#: common.c:1740 +#: common.c:1832 #, 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:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Symbolische Verknüpfung %s wird übersprungen.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "Datei %s wird ins Unix-Format umgewandelt …\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "Datei %s wird ins Mac-Format umgewandelt …\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" @@ -577,76 +586,76 @@ msgstr "Datei %s wird ins DOS-Format umgewandelt …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "%s-Datei %s wird ins %s-Unix-Format umgewandelt …\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "%s-Datei %s wird ins %s-Mac-Format umgewandelt …\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "%s-Datei %s wird ins %s-DOS-Format umgewandelt …\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "Aus der Eingabedatei %s kann nicht gelesen werden:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "falsches Flag »%c« für Option -i oder --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "Aktive Codepage: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "Die Option »%s« benötigt ein Argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "Die angegebene Ausgabekodierung %s ist unzulässig\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "Aus der Eingabedatei kann nicht gelesen werden: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das Low-Surrogate fehlt.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "Fehler: Ungültiges Surrogate-Paar. Das High-Surrogate fehlt.\n" diff --git a/po/dos2unix.pot b/po/dos2unix.pot index aac2369..0d76e66 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: 2016-02-13 14:28+0100\n" +"POT-Creation-Date: 2016-05-24 22:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -53,7 +53,7 @@ msgstr "" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "" @@ -66,7 +66,7 @@ msgid "" "\n" msgstr "" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -79,7 +79,7 @@ msgid "" "\n" msgstr "" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -94,383 +94,392 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr "" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr "" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr "" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr "" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr "" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr "" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr "" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr "" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr "" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr "" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr "" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" msgstr "" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr "" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr "" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr "" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" msgstr "" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr "" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr "" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr "" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr "" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" " outfile output file in new-file mode\n" msgstr "" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" msgstr "" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr "" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr "" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr "" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr "" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr "" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr "" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr "" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr "" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr "" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" msgstr "" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr "" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr "" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr "" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr "" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "" -#: common.c:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "" @@ -481,42 +490,42 @@ msgstr "" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "" @@ -526,75 +535,75 @@ msgstr "" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "" diff --git a/po/eo.po b/po/eo.po index 12f5c55..7944b56 100644 --- a/po/eo.po +++ b/po/eo.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3-beta8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" "PO-Revision-Date: 2015-08-23 11:37+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Esperanto \n" @@ -62,7 +62,7 @@ msgstr "uziĝas kodpaĝo %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Duuma signo 0x%02X troviĝis en linio %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -79,7 +79,7 @@ msgstr "" "Ĉiuj rajtoj estas rezervitaj.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -99,7 +99,7 @@ msgstr "" " la manlibro kaj/aŭ en la aliaj materialoj kiuj akompanis la distribuon.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -114,56 +114,56 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uzmaniero: %s [opcioj] [dosiero ...] [-n enigdosiero eligdosiero ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konverti nur linifinojn (defaŭlto)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 uzi Vindozan kodpaĝon 1252 (Okcident-Eŭropa)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 uzi DOS-kodpaĝon 437 (Usona) (defaŭlto)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 uzi DOS-kodpaĝon 850 (Okcident-Eŭropa)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 uzi DOS-kodpaĝon 860 (Portugala)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 uzi DOS-kodpaĝon 863 (Kebekia)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 uzi DOS-kodpaĝon 865 (Nordlandaj)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konverti signojn kun jesa oka bito al spacetojn\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom reteni bajtordo-markon\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom reteni bajtordo-markon (defaŭlto)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -171,7 +171,7 @@ msgstr "" " -c, --convmode uzenda konvertmoduso\n" " MODUSO 'ascii', '7bit', 'iso', aŭ 'mac' (defaŭltas al 'ascii')\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -179,19 +179,19 @@ msgstr "" " -D, --display-enc uzenda kodprezento por montritaj mesaĝoj\n" " KODPREZENTO 'ansi', 'unicode', aŭ 'utf8' (defaŭltas al 'ansi')\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force perforte konverti ankaŭ duumajn dosierojn\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverti UTF-16 al GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help montri ĉi tiun helptekston\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -199,23 +199,23 @@ msgstr "" " -i, --info[=FLAGOJ] montri (specifajn) informojn pri dosieroj\n" " DOSIERO... ekzamenendaj dosieroj\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate konservi dattempon de eliga dosiero\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license montri la permesilon de la programo\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline aldoni aldonan linifinon\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom aldoni bajtordo-markon\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -225,7 +225,7 @@ msgstr "" " ENIGDOSIERO eniga dosiero en novdosiera moduso\n" " ELIGDOSIERO eliga dosiero en novdosiera moduso\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -233,43 +233,43 @@ msgstr "" " -o, --oldfile skribi al ekzistanta dosiero (defaŭlto)\n" " DOSIERO... konvertendaj dosieroj en olddosiera moduso\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet subpremi ĉiujn avertojn\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom forigi bajtordo-markon (defaŭlto)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom forigi bajtordo-markon\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe preterpasi duumajn dosierojn (defaŭlto)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 reteni UTF-16-kodprezenton\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose parolema funkciado\n" -#: common.c:658 +#: common.c:662 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:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -277,233 +277,243 @@ msgstr "" " -R, --replace-symlink anstataŭigi simbolajn ligojn per la konvertitaj dosieroj\n" " (la celaj dosieroj ne ŝanĝiĝas)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink ne ŝanĝi simbolajn ligojn nek ties celojn (defaŭlto)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version montri programversion\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bita versio (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bita versio (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bita versio (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bita versio (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-versio.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-versio.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bita versio (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bita versio (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bita versio (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bita versio (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bita versio (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bita versio (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versio (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versio (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s-versio.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Kun subteno por Unikoda UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Sen subteno por Unikoda UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Kun subteno por Unikodaj dosiernomoj.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Sen subteno por Unikodaj dosiernomoj.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Kun subteno por lokaĵoj.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "Malsukcesis skribi al provizora eliga dosiero %s:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Skribiĝas %s-BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Eniga dosiero %s havas %s-BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Supoziĝas UTF-16LE-kodprezento.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Supoziĝas UTF-16BE-kodprezento.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "uziĝas %s kiel provizora dosiero\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Malsukcesis skribi al provizora eliga dosiero %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Malsukcesis ŝanĝi la permesojn de provizora eliga dosiero %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Malsukcesis ŝanĝi posedanton kaj grupon de provizora eliga dosiero %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemoj dum redukto de simbola ligo '%s'\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " eliga dosiero restas en '%s'\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemoj dum alinomigo de '%s' al '%s':" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " kiu estas la celo de simbola ligo '%s'\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Preterpasiĝas duuma dosiero %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "Kodpaĝo %d ne subtenatas.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Preterpasiĝas %s; ĝi ne estas normala dosiero.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n" @@ -514,42 +524,42 @@ msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Preterpasiĝas simbola ligo %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konvertiĝas dosiero %s Unix-en...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konvertiĝas dosiero %s Mac-en...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konvertiĝas dosiero %s DOS-en...\n" @@ -559,76 +569,76 @@ msgstr "konvertiĝas dosiero %s DOS-en...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en (%3$s)...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en (%3$s)...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en (%3$s)...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problemoj dum konverto de dosiero %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "ne eblas legi el eniga dosiero %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "malĝusta flago '%c' por opcio '-i' aŭ '--info'\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktiva kodpaĝo: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "malvalida konvertmoduso %s indikatas\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcio '%s' bezonas argumenton\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "malvalida montra kodprezento %s indikatas\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "celo de dosiero %s ne indikatas (en novdosiera moduso)\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "ne eblas legi el eniga dosiero: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "ne eblas skribi al eliga dosiero: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la baza parto\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "eraro: nevalida surogata paro -- mankas la supra parto\n" diff --git a/po/es.po b/po/es.po index a34ae90..65f7923 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.1-beta5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" "PO-Revision-Date: 2015-09-20 14:17+0200\n" "Last-Translator: Enrique Lazcorreta Puigmartí \n" "Language-Team: Spanish \n" @@ -62,7 +62,7 @@ msgstr "usando página de códigos %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Símbolo binario 0x%02X encontrado en la línea %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -80,7 +80,7 @@ msgstr "" "\n" # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -103,7 +103,7 @@ msgstr "" "\n" # Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -129,56 +129,56 @@ msgstr "" "O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER MANERA DEL USO DE ESTE\n" "SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uso: %s [parámetros] [archivo ...] [-n archivo_de_entrada archivo_de_salida ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii solamente convierte los saltos de línea (por defecto)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 usa la página de códigos Windows 1252 (Europa Occidental)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 usa la página de códigos DOS 437 (EE. UU.) (por defecto)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 usa la página de códigos DOS 850 (Europa Occidental)\n" -#: common.c:613 +#: common.c:617 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:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 usa la página de códigos DOS 863 (Francocanadiense)\n" -#: common.c:615 +#: common.c:619 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:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 convierte caracteres de 8 bits al espacio de 7 bits\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por defecto)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -186,7 +186,7 @@ msgstr "" " -c, --convmode modo de conversión\n" " modo_de_conversion ascii, 7bit, iso, mac, por defecto es ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -194,19 +194,19 @@ msgstr "" " -D, --display-enc establece la codificación de los mensajes de texto que se muestran\n" " codificación ansi, unicode, utf8, default to ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force fuerza la conversión de archivos binarios\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 convierte UTF-16 a GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help arroja esta ayuda\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -214,23 +214,23 @@ msgstr "" " -i, --info[=FLAGS] muestra información del archivo\n" " archivo ... archivos a analizar\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserva la fecha en el archivo de salida\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license muestra la licencia del programa\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline añade salto de línea adicional\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom añade la Marca de Orden del Byte, BOM (por defecto en UTF-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -240,7 +240,7 @@ msgstr "" " archivo_de_entrada archivo original en el modo de archivo nuevo\n" " archivo_de_salida archivo de salida en el modo de archivo nuevo\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -248,43 +248,43 @@ msgstr "" " -o, --oldfile escribe al archivo antiguo (por defecto)\n" " archivo ... archivos a convertir en el modo de archivo antiguo\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet modo silencioso, suprime todas las advertencias\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM (por defecto)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora archivos binarios (por defecto)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 mantiene la codificación UTF-16\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose operación detallada\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink sigue los enlaces simbólicos y convierte los destinos\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -292,233 +292,243 @@ msgstr "" " -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos convertidos\n" " (los archivos destino originales no son alterados)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version despliega el número de versión\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Versión DOS de 16 bit (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Versión DOS de 16 bit (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Versión DOS de 32 bit (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Versión DOS de 32 bit (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Versión para MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Versión para Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Versión Windows de 64 bit (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Versión Windows de 32 bit (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Versión Windows de 32 bit (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Versión Windows de 32 bit (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Versión Windows de 64 bit (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Versión Windows de 32 bit (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Versión para OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Versión para OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Versión para %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Con soporte Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Sin soporte Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Con soporte Unicode UTF-16.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Sin soporte Unicode UTF-16.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Con soporte de idioma materno.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "Error al escribir el archivo de salida temporal %s:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Escribiendo BOM %s.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "El archivo de entrada %s tiene BOM %s.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Se asume codificación UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Se asume codificación UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Error al abrir el archivo de salida temporal: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como archivo temporal\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "Error al abrir el archivo de salida temporal: %s\n" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Error al escribir el archivo de salida temporal %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Error al cambiar los permisos del archivo temporal de salida %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemas al resolver el enlace simbólico '%s'\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " el archivo de salida permanece en '%s'\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemas al renombrar '%s' como '%s':" -#: common.c:1538 +#: common.c:1630 #, 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:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando archivo binario %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "La página de códigos %d no está soportada.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16 en la línea %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando archivo UTF-16 %s, la conversión a UTF-16 no está soportada en esta versión de %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, no es un archivo regular.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convirtiendo archivo %s a %s en formato DOS...\n" @@ -529,42 +539,42 @@ msgstr "convirtiendo archivo %s a %s en formato DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemas al convertir el archivo %s a %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignorando enlace simbólico %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "convirtiendo archivo %s a formato Unix...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "convirtiendo archivo %s a formato Mac...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "convirtiendo archivo %s a formato DOS...\n" @@ -574,76 +584,76 @@ msgstr "convirtiendo archivo %s a formato DOS...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convirtiendo archivo %s %s a formato %s Unix...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convirtiendo archivo %s %s a formato %s Mac...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convirtiendo archivo %s %s a formato %s DOS...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problemas convirtiendo el archivo %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "no puedo escribir al archivo de salida: %s" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "'%c' es un valor incorrecto para la opción -i o --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "Página de códigos activa: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "modo de conversión %s especificado es inválido\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "el parámetro '%s' requiere un argumento\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "el modo de conversión %s especificado no es válido\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "no puedo escribir al archivo de salida: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto bajo.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "error: Par sustituto no válido. Falta el sustituto alto.\n" diff --git a/po/fr.po b/po/fr.po index eb0bcbf..25183e2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,13 +1,13 @@ # Message français pour dos2unix. # Copyright (C) 2016 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Frédéric Marchal , 2015. +# Frédéric Marchal , 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.3-beta2\n" +"Project-Id-Version: dos2unix-7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-12 20:04+0100\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-13 13:32+0200\n" "Last-Translator: Frédéric Marchal \n" "Language-Team: French \n" "Language: fr\n" @@ -58,7 +58,7 @@ msgstr "utilise le code page %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Symbole binaire 0x%02X rencontré à la ligne %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -75,7 +75,7 @@ msgstr "" "Tous droits réservés.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -95,7 +95,7 @@ msgstr "" "2. La distribution sous forme binaire doit reproduire le copyright ci-dessus\n" " dans la documentation ou tout autre matériel fournis avec la distribution.\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -121,56 +121,56 @@ msgstr "" "DE QUELQUE MANIÈRE D'UTILISATION DE CE LOGICIEL, MÊME SI LA POSSIBILITÉ\n" "D'UN TEL DOMMAGE A ÉTÉ ANNONCÉE.\n" -#: common.c:607 +#: common.c:611 #, 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:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 utilise le code page 1252 de Windows (Europe de l'ouest)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 utilise le code page 437 du DOS (US) (par défaut)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 utilise le code page 850 du DOS (Europe de l'ouest)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 utilise le code page 860 du DOS (Portugais)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 utilise le code page 863 du DOS (Français Canadien)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 utilise le code page 865 du DOS (Nordique)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 converti les caractères 8 bits vers l'espace 7 bits\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom garde la marque d'ordre des octets\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom garde la marque d'ordre des octets (par défaut)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -178,7 +178,7 @@ msgstr "" " -c, --convmode mode de conversion\n" " modeconv ascii, 7bit, iso, mac, ascii par défaut\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -186,19 +186,19 @@ msgstr "" " -D, --display-enc choisi l'encodage pour afficher les messages textes\n" " encodage ansi, unicode ou utf8 (ansi par défaut)\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force force la conversion de fichiers binaires\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 converti UTF-16 en GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help affiche ce texte d'aide\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -206,23 +206,23 @@ msgstr "" " -i, --info[=FANIONS] affiche les informations du fichier\n" " fichier … fichiers à analyser\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate conserve la date du fichier de sortie\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license affiche la licence du logiciel\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline ajoute des sauts de ligne supplémentaires\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -232,7 +232,7 @@ msgstr "" " fichier_entrée fichier original dans le mode « nouveau fichier »\n" " fichier_sortie fichier de sortie dans le mode « nouveau fichier »\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -240,43 +240,43 @@ msgstr "" " -o, --oldfile écrit dans l'ancien fichier (par défaut)\n" " fichier … fichiers à convertir dans le mode « ancien fichier »\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet mode silencieux, supprime tous les avertissements\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom supprime la marque d'ordre des octets (par défaut)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom supprime la marque d'ordre des octets\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignore les fichiers binaires (par défaut)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 conserve l'encodage UTF-16\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose opération verbeuse\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink suit les liens symboliques et converti les cibles\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -284,233 +284,242 @@ msgstr "" " -R, --replace-symlink remplace les liens symboliques par les fichiers convertis\n" " (les fichiers cibles originaux restent inchangés)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version affiche le numéro de version\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Version DOS 16 bits (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Version DOS 16 bits (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Version DOS 32 bits (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Version DOS 32 bits (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Version MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Version Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Version Windows 64 bit (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Version Windows 32 bits (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Version Windows 32 bits (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Version Windows 32 bits (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Version Windows 64 bits (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Version Windows 32 bits (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Version OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Version OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Version %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Avec support pour l'Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Sans support pour l'Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Avec support pour les noms de fichiers Unicode.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Sans support pour les noms de fichiers Unicode.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Avec support pour la langue native.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Le chemin pour le fichier de sortie temporaire est trop long :" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Écriture de la BOM %s.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Le fichier d'entrée %s a une BOM %s.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Suppose un encodage UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Suppose un encodage UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "utilise %s comme fichier temporaire\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Échec à la fermeture du fichier d'entrée %s :" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Échec d'écriture dans le fichier temporaire de sortie %s :" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s :" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s :" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problème lors de la résolution du lien symbolique « %s »\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " le fichier de sortie reste dans « %s »\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problèmes en renommant « %s » en « %s » :" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " quelle est la cible du lien symbolique « %s »\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignore le fichier binaire %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "le code page %d n'est pas supporté.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu à la ligne %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignore le fichier UTF-16 %s, la conversion UTF-16 n'est pas supportée dans cette version de %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignore %s, pas un fichier régulier.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, 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" @@ -521,42 +530,42 @@ msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n" -#: common.c:1740 +#: common.c:1832 #, 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:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignore le lien symbolique %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "conversion du fichier %s au format Unix…\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "conversion du fichier %s au format Mac…\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "conversion du fichier %s au format DOS…\n" @@ -566,76 +575,76 @@ msgstr "conversion du fichier %s au format DOS…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "conversion du fichier %s %s au format Unix %s…\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "conversion du fichier %s %s au format Mac %s…\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "conversion du fichier %s %s au format DOS %s…\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problèmes lors de la conversion du fichier %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "impossible de lire depuis le fichier d'entrée %s :" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "mauvais fanion « %c » pour l'option -i ou --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "code page actif : %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "mode de conversion %s spécifié invalide\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "l'option « %s » requiert un argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "l'encodage %s spécifié pour l'affichage est invalide\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "la cible du fichier %s n'est pas spécifiée en mode nouveau fichier\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "impossible de lire depuis le fichier d'entrée : %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "impossible d'écrire dans le fichier de sortie : %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet bas est manquant.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erreur: Demi-codet invalide. Le demi-codet haut est manquant.\n" diff --git a/po/hu.po b/po/hu.po index 67eb534..6f13022 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.2.3-beta3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" "PO-Revision-Date: 2015-06-30 13:38+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -60,7 +60,7 @@ msgstr "%d kódlap használata.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Bináris szimbólum (0x%02X) található a(z) %u. sorban\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -77,7 +77,7 @@ msgstr "" "Minden jog fenntartva.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -99,7 +99,7 @@ msgstr "" " dokumentációban, illetve a csomaggal részét képező egyéb anyagokban.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -127,56 +127,56 @@ msgstr "" "OKOZOTT KÁRBAN (BELEÉRTVE A HANYAGSÁGOT ÉS EGYEBET), AKKOR IS, HA AZ\n" "ILYEN KÁR LEHETŐSÉGÉRE FELHÍVTÁK A FIGYELMET.\n" -#: common.c:607 +#: common.c:611 #, 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:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii csak sortörések átalakítása (alapértelmezett)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n" -#: common.c:612 +#: common.c:616 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:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS 860-as kódlap használata (portugál)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS 863-as kódlap használata (francia-kanadai)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS 865-ös kódlap használata (északi)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 8-bites karakterek átalakítása 7-bitesre\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom bájtsorrendjel megtartása (alapértelmezett)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -184,7 +184,7 @@ msgstr "" " -c, --convmode átalakítási mód\n" " convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n" -#: common.c:624 +#: common.c:628 #, fuzzy msgid "" " -D, --display-enc set encoding of displayed text messages\n" @@ -193,19 +193,19 @@ msgstr "" " -c, --convmode átalakítási mód\n" " convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n" -#: common.c:627 +#: common.c:631 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:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 UTF-16 átalakítása GB18030-ra\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help ezen súgószöveg megjelenítése\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -213,23 +213,23 @@ msgstr "" " -i, --info[=JELZŐK] fájlinformációk megjelenítése\n" " fájl ... elemzendő fájlok\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate kimeneti fájl dátumának megtartása\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license szoftverlicenc megjelenítése\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline további új sor hozzáadása\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -239,7 +239,7 @@ msgstr "" " infile eredeti fájl új-fájl módban\n" " outfile kimeneti fájl új-fájl módban\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -247,43 +247,43 @@ msgstr "" " -o, --oldfile kiírás a régi fájlba (alapértelmezett)\n" " file ... átalakítandó fájl régi-fájl módban\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n" -#: common.c:647 +#: common.c:651 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:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom bájtsorrendjel eltávolítása\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe bináris fájlok kihagyása (alapértelmezett)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16 kódolás megtartása\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le feltételezze, hogy a bemeneti formátum UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be feltételezze, hogy a bemeneti formátum UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose részletes működés\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink szimbolikus linkek követése és a célok átalakítása\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -291,237 +291,247 @@ 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:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version verziószám megjelenítése\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "16-bites DOS verzió (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "16-bites DOS verzió (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "32-bites DOS verzió (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "32-bites DOS verzió (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS verzió.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin verzió.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "64-bites Windows verzió (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "32-bites Windows verzió (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "32-bites Windows verzió (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "32-bites Windows verzió (MinGW)\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "64-bites Windows verzió (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "32-bites Windows verzió (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 verzió (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2 verzió (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s verzió.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatással.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 támogatás nélkül.\n" -#: common.c:717 +#: common.c:721 #, fuzzy msgid "With Unicode file name support.\n" msgstr "Unicode UTF-16 támogatással.\n" -#: common.c:719 +#: common.c:723 #, fuzzy msgid "Without Unicode file name support.\n" msgstr "Unicode UTF-16 támogatás nélkül.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Natív nyelvi támogatással.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "Nem sikerült írni a(z) %s átmeneti kimeneti fájlba: %s\n" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "%s BOM írása.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, fuzzy, c-format msgid "Input file %s has %s BOM.\n" msgstr "A(z) %s bemeneti fájl %s BOM-mal rendelkezik.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE kódolás feltételezése.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE kódolás feltételezése.\n" -#: common.c:1336 +#: common.c:1455 #, 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:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "%s használata átmeneti fájlként\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n" + +#: common.c:1512 #, fuzzy, c-format msgid "Failed to write to temporary output file %s:" msgstr "Nem sikerült írni a(z) %s átmeneti kimeneti fájlba: %s\n" -#: common.c:1443 +#: common.c:1535 #, fuzzy, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait: %s\n" -#: common.c:1460 +#: common.c:1552 #, fuzzy, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját: %s\n" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "hiba a(z) „%s” szimbolikus link feloldásakor\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " kimeneti fájl maradt ebben: „%s”\n" -#: common.c:1534 +#: common.c:1626 #, fuzzy, c-format msgid "problems renaming '%s' to '%s':" msgstr "hiba a(z) „%s” átnevezésekor erre: „%s”: %s\n" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " mi a(z) „%s” szimbolikus link célja\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "A(z) %s bináris fájl kihagyása\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "a(z) %d kódlap nem támogatott.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, 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:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, 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" @@ -532,42 +542,42 @@ msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Unix formátumban…\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n" -#: common.c:1740 +#: common.c:1832 #, 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:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "A(z) %s szimbolikus link kihagyása.\n" -#: common.c:1799 +#: common.c:1891 #, 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:1802 +#: common.c:1894 #, 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:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" @@ -577,76 +587,76 @@ msgstr "a(z) %s fájl átalakítása DOS formátumra…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Unix formátumra…\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Mac formátumra…\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású DOS formátumra…\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "hiba a(z) %s fájl átalakításakor\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, fuzzy, c-format msgid "can not read from input file %s:" msgstr "nem sikerült olvasni a(z) %s bemeneti fájlból: %s\n" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "hibás „%c” jelző a -i vagy --info kapcsolókhoz\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktív kódlap: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "érvénytelen %s átalakítási mód lett megadva\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "a(z) „%s” kapcsolóhoz argumentum szükséges\n" -#: common.c:2372 +#: common.c:2467 #, fuzzy, c-format msgid "invalid %s display encoding specified\n" msgstr "érvénytelen %s átalakítási mód lett megadva\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "a(z) %s fájl célja nincs megadva az új-fájl módban\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "nem sikerült olvasni a bemeneti fájlból: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "nem sikerült írni a kimeneti fájlba: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó alacsony helyettesítő.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó magas helyettesítő.\n" diff --git a/po/ja.po b/po/ja.po index c78edd0..9c79b08 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,23 +1,25 @@ # Japanese gettext message file for dos2unix -# Copyright (C) 2014 Erwin Waterlander (msgids) +# Copyright (C) 2016 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. # Yasuaki Taniguchi , 2014. +# Takeshi Hamasaki , 2016. # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.1-beta3\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2014-11-07 11:35+0000\n" -"Last-Translator: YASUAKI TANIGUCHI \n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-15 00:11+0900\n" +"Last-Translator: Takeshi Hamasaki \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.7.1\n" #: dos2unix.c:79 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (Version 3.1)\n" @@ -26,7 +28,7 @@ msgid "" "All rights reserved.\n" "\n" msgstr "" -"Copyright (C) 2009-2015 Erwin Waterlander\n" +"Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (Version 3.1)\n" "Copyright (C) 1998 Bernd Johannes Wuebben (Version 3.0)\n" "Copyright (C) 1994-1995 Benjamin Lin\n" @@ -58,25 +60,25 @@ msgstr "コードページ %d を使用します。\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "バイナリ文字 0x%02X が %u 行目で見つかりました\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "エラー: 環境変数 DOS2UNIX_LOCALEDIR の値が長すぎます。\n" #: unix2dos.c:69 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "All rights reserved.\n" "\n" msgstr "" -"Copyright (C) 2009-2015 Erwin Waterlander\n" +"Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "All rights reserved.\n" "\n" # ライセンス条項なので翻訳しません -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -99,7 +101,7 @@ msgstr "" "\n" # ライセンス条項なので翻訳しません -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -125,56 +127,56 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "使用法: %s [options] [file ...] [-n infile outfile ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 改行のみ変換する (既定)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso DOS と ISO-8859-1 文字セット間で変換する\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows コードページ 1252 (西欧) を使用する\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS コードページ 437 (US) を使用する (既定)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS コードページ 850 (西欧) を使用する\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS コードページ 860 (ポルトガル語) を使用する\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS コードページ 863 (カナダのフランス語) を使用する\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS コードページ 865 (北欧) を使用する\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 8 ビット文字を 7 ビットに変換する\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom バイト順マークを保つ\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom バイト順マークを残す (既定)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -182,28 +184,27 @@ msgstr "" " -c, --convmode 変換モード\n" " convmode ascii, 7bit, iso, mac, 既定は ascii\n" -#: common.c:624 -#, fuzzy +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" -" -c, --convmode 変換モード\n" -" convmode ascii, 7bit, iso, mac, 既定は ascii\n" +" -D, --display-enc 表示されるメッセージのエンコーディングを設定する\n" +" encoding ansi, unicode, utf8, デフォルトは ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force バイナリファイルを強制的に変換する\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" -msgstr "" +msgstr " -gb, --gb18030 UTF-16 を GB18030 に変換する\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help このヘルプメッセージを表示する\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -211,23 +212,23 @@ msgstr "" " -i, --info[=FLAGS] ファイル情報を表示する\n" " file ... 分析するファイル\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate ファイルの日付を保持する\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license ソフトウェアライセンスを表示する\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 改行を追加する\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom バイト順マークを加える (UTF-8 の既定)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -237,7 +238,7 @@ msgstr "" " infile このモードでの入力ファイル\n" " outfile このモードでの出力ファイル\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -245,43 +246,43 @@ msgstr "" " -o, --oldfile 元のファイルに書き込む (既定)\n" " file ... このモードでの変換するファイル\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet 抑止モード、全ての警告を抑止する\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom バイト順マークを削除する (既定)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom バイト順マークを削除する\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe バイナリファイルをスキップする (既定)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16 エンコーディングを保つ\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 入力の形式を UTF-16LE と見なす\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 入力の形式を UTF-16BE と見なす\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose 冗長表示をする\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink シンボリックリンクを辿り、対象を変換する\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -289,235 +290,242 @@ msgstr "" " -R, --replace-symlink シンボリックリンクを変換後の対象ファイルに置換する\n" " (元の対象ファイルは変更されずそのまま残る)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink シンボリックリンクを辿らず、対象をそのままにする (既定)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version バージョン番号を表示する\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 ビットバージョン (WATCOMC)。\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 ビットバージョン (TURBOC)。\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 ビットバージョン (WATCOMC)。\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 ビットバージョン (DJGPP)。\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS バージョン。\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin バージョン。\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 ビットバージョン (MinGW-w64)。\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 ビットバージョン (WATCOMC)。\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 ビットバージョン (MinGW-w64)。\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 ビットバージョン (MinGW)。\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 ビットバージョン (MSVC %d)。\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 ビットバージョン (MSVC %d)。\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 バージョン (WATCOMC)。\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2 バージョン (EMX)。\n" -#: common.c:705 -#, fuzzy, c-format +#: common.c:709 +#, c-format msgid "%s version.\n" -msgstr "MSYS バージョン。\n" +msgstr "%s バージョン。\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 サポート付き。\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Unicode UTF-16 サポート無し。\n" -#: common.c:717 -#, fuzzy +#: common.c:721 msgid "With Unicode file name support.\n" -msgstr "Unicode UTF-16 サポート付き。\n" +msgstr "Unicode ファイル名 サポート付き。\n" -#: common.c:719 -#, fuzzy +#: common.c:723 msgid "Without Unicode file name support.\n" -msgstr "Unicode UTF-16 サポート無し。\n" +msgstr "Unicode ファイル名 サポート無し。\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "ネイティブ言語サポート。\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "一時出力ファイルのパスが長過ぎます:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" -msgstr "" +msgstr "%s BOM を書き込んでいます。\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" -msgstr "" +msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" -msgstr "" +msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" -msgstr "" +msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" -msgstr "" +msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" -msgstr "" +msgstr "入力ファイル %s には %s BOM が存在します。\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE エンコーディングと見なしています。\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE エンコーディングと見なしています。\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "一時出力ファイルを開くのに失敗しました: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "%s を一時ファイルとして使用しています\n" -#: common.c:1412 -#, fuzzy, c-format +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "入力ファイル %s を閉じるのに失敗しました:" + +#: common.c:1512 +#, c-format msgid "Failed to write to temporary output file %s:" -msgstr "一時出力ファイル %s を開くのに失敗しました: %s\n" +msgstr "一時出力ファイル %s への書き込みに失敗しました:" -#: common.c:1443 -#, fuzzy, c-format +#: common.c:1535 +#, c-format msgid "Failed to change the permissions of temporary output file %s:" -msgstr "一時出力ファイル %s のパーミッション変更に失敗しました: %s\n" +msgstr "一時出力ファイル %s のパーミッション変更に失敗しました:" -#: common.c:1460 -#, fuzzy, c-format +#: common.c:1552 +#, c-format msgid "Failed to change the owner and group of temporary output file %s:" -msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました: %s\n" +msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "シンボリックリンク '%s' の解決中に問題が発生しました\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " 出力ファイルは '%s' に残っています\n" -#: common.c:1534 -#, fuzzy, c-format +#: common.c:1626 +#, c-format msgid "problems renaming '%s' to '%s':" -msgstr " '%s' から '%s' への名前変更で問題が発生しました: %s\n" +msgstr " '%s' から '%s' への名前変更で問題が発生しました:" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" -msgstr "" +msgstr " これはシンボリックリンク '%s' のターゲットです\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "バイナリファイル %s をスキップしています\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "コードページ %d はサポートされていません\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 -#, fuzzy, c-format +#: common.c:1703 common.c:1795 common.c:1881 +#, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" -msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n" +msgstr "UTF-16 ファイル %s をスキップしています。%u 行目の UTF-16 変換でエラーが発生しました。\n" -#: common.c:1615 common.c:1707 common.c:1793 -#, fuzzy, c-format +#: common.c:1707 common.c:1799 common.c:1885 +#, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" -msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n" +msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換はこのバージョンの %s ではサポートされていません。\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s をスキップしています。通常ファイルではありません。\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "%s をスキップしています。出力ファイル %s はシンボリックリンクです。\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "シンボリックリンク %s をスキップしています。対象が通常ファイルではありません。\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "%s をスキップしています。シンボリックリンク %s を辿った先が通常ファイルではありません。\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "%s から %s へ Unix 形式でファイル変換しています。\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "%s から %s へ Mac 形式でファイル変換しています。\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "%s から %s へ DOS 形式で変換しています。\n" @@ -528,42 +536,42 @@ msgstr "%s から %s へ DOS 形式で変換しています。\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 -#, fuzzy, c-format +#: common.c:1821 +#, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" -msgstr "%s から %s へ Unix 形式でファイル変換しています。\n" +msgstr "%s ファイルの %s から %s ファイルの %s へ Unix 形式でファイル変換しています...\n" -#: common.c:1732 -#, fuzzy, c-format +#: common.c:1824 +#, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" -msgstr "%s から %s へ Mac 形式でファイル変換しています。\n" +msgstr "%s ファイルの %s から %s ファイルの %s へ Mac 形式でファイル変換しています...\n" -#: common.c:1734 -#, fuzzy, c-format +#: common.c:1826 +#, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" -msgstr "%s から %s へ DOS 形式で変換しています。\n" +msgstr "%s ファイルの %s から %s ファイルの %s へ DOS 形式で変換しています...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "シンボリックリンク %s をスキップしています。\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "ファイル %s を Unix 形式へ変換しています。\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "ファイル %s を Mac 形式へ変換しています。\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "ファイル %s を DOS 形式へ変換しています。\n" @@ -573,79 +581,78 @@ msgstr "ファイル %s を DOS 形式へ変換しています。\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 -#, fuzzy, c-format +#: common.c:1906 +#, c-format msgid "converting %s file %s to %s Unix format...\n" -msgstr "ファイル %s を Unix 形式へ変換しています。\n" +msgstr "%s ファイル %s を %s の Unix 形式へ変換しています...\n" -#: common.c:1817 -#, fuzzy, c-format +#: common.c:1909 +#, c-format msgid "converting %s file %s to %s Mac format...\n" -msgstr "ファイル %s を Mac 形式へ変換しています。\n" +msgstr "%s ファイル %s を %s の Mac 形式へ変換しています。\n" -#: common.c:1819 -#, fuzzy, c-format +#: common.c:1911 +#, c-format msgid "converting %s file %s to %s DOS format...\n" -msgstr "ファイル %s を DOS 形式へ変換しています。\n" +msgstr "%s ファイル %s を %s の DOS 形式へ変換しています。\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "ファイル %s 変換中に問題が発生しました。\n" -#: common.c:1949 common.c:2001 -#, fuzzy, c-format +#: common.c:2039 common.c:2089 +#, c-format msgid "can not read from input file %s:" -msgstr "出力ファイルに書き込めません: %s\n" +msgstr "入力ファイル %s から読み込めません:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "オプション -i または --info に対する間違ったフラグ '%c' です。\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "有効なコードページ: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "無効な %s 変換モードが指定されました\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "オプション '%s' には引数が必要です。\n" -#: common.c:2372 -#, fuzzy, c-format +#: common.c:2467 +#, c-format msgid "invalid %s display encoding specified\n" -msgstr "無効な %s 変換モードが指定されました\n" +msgstr "無効な %s 表示エンコーディングが指定されました\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "対象ファイル %s が新規ファイルモードで指定されていません\n" -#: common.c:2485 -#, fuzzy, c-format +#: common.c:2578 +#, c-format msgid "can not read from input file: %s\n" -msgstr "出力ファイルに書き込めません: %s\n" +msgstr "入力ファイルから読み込めません: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "出力ファイルに書き込めません: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" -msgstr "" +msgstr "エラー: 無効なサロゲートペアです。下位サロゲートがありません。\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" -msgstr "" +msgstr "エラー: 無効なサロゲートペアです。上位サロゲートがありません。\n" -#, fuzzy -#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8 or GB18030.\n" +#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n" #~ msgstr "UTF-16 ファイル %s をスキップしています。現在のロケールの文字エンコーディングは UTF-8 ではありません。\n" diff --git a/po/nb.po b/po/nb.po index aab7131..13788f0 100644 --- a/po/nb.po +++ b/po/nb.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.3-beta2\n" +"Project-Id-Version: dos2unix-7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-28 10:26+0100\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-22 13:26+0100\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmaal \n" "Language: Norwegian Bokmål\n" @@ -60,7 +60,7 @@ msgstr "bruker kodeside %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Fant binærsymbol 0x%02X på linje %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "feil: Verdien av miljøvariabelen DOS2UNIX_LOCALEDIR er for lang.\n" @@ -77,7 +77,7 @@ msgstr "" "Alle rettigheter tilhører rettighetshaveren.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -98,7 +98,7 @@ msgstr "" " distribusjonen.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -124,56 +124,56 @@ msgstr "" "PROGRAMVAREN, SELV NÅR VEDKOMMENDE ER INFORMERT OM AT SLIK SKADE KAN \n" "OPPSTÅ.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Bruk: %s [valg] [fil …] [-n inndatafil utdatafil …]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii bare konverter linjeskift (standard)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 bruk Windows-kodeside 1252 (Vesteuropeisk)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 bruk DOS-kodeside 437 (US) (standard)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 bruk DOS-kodeside 850 (vesteuropeisk)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 bruk DOS-kodeside 860 (portugisisk)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 bruk DOS-kodeside 863 (fransk-kanadisk)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 bruk DOS-kodeside 865 (nordisk)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konverter 8-bit-tegn til 7-bit\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behold «Byte Order»-merke\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behold «Byte Order»-merke (standard)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -181,7 +181,7 @@ msgstr "" " -c, --convmode konverteringsmodus\n" " convmode ascii, 7bit, iso, mac (standardmodus er ascii)\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -189,19 +189,19 @@ msgstr "" " -D, --display-enc endre koding av tekstmeldinger\n" " encoding ansi, unicode, utf8 (ansi er standard)\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force tving konvertering av binærfiler\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help vis denne hjelpeteksten\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -209,23 +209,23 @@ msgstr "" " -i, --info[=FLAGG] vis informasjon om fil\n" " file … filer som skal undersøkes\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behold utdata-filens dato\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license vis programvarelisens\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline legg til en ekstra ny linje\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -235,7 +235,7 @@ msgstr "" " infile opprinnelig fil i ny fil-modus\n" " outfile utdata-fil i ny fil-modus\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -243,43 +243,43 @@ msgstr "" " -o, --oldfile skriv til gammel fil (standard)\n" " file … filer som skal konverteres i gammel fil-modus\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet stillemodus, uten advarsler\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke (standard)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom fjern «Byte Order»-merke\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe hopp over binærfiler (standard)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behold UTF-16-koding\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose detaljert utskrift\n" -#: common.c:658 +#: common.c:662 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:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -287,233 +287,242 @@ msgstr "" " -R, --replace-symlink erstatt symbolske lenker med konverterte filer\n" " (opprinnelig målfil forblir uendret)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version vis versjonsnummer\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bit-versjon (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bit-versjon (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bit-versjon (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bit-versjon (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-versjon.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-versjon.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bit-versjon (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bit-versjon (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bit-versjon (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bit-versjon (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bit-versjon (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bit-versjon (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versjon (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versjon (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s-versjon.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Med støtte for Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Uten støtte for Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Med støtte for Unicode-filnavn.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Uten støtte for Unicode-filnavn.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Med innebygd språkstøtte.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Sti til midlertidig utdatafil er for lang:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver «Byte Order»-merke %s.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Inndatafil %s har %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Forventer UTF-16LE-koding.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Forventer UTF-16BE-koding.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Klarte ikke å åpne midlertidig utdata-fil: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "bruker %s som midlertidig fil\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Klarte ikke å lukke inndatafil %s." + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Klarte ikke å skrive til midlertidig utdata-fil %s." -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Klarte ikke å endre rettigheter til midlertidig utdata-fil %s." -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Klarte ikke å endre eier og gruppetilhørighet for midlertidig utdata-fil %s." -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "det oppstod problemer med å følge den symbolske lenka «%s»\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " utdata-fil blir liggende i «%s»\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "det oppstod problemer med å gi «%s» det nye navnet «%s»." -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " som den symbolske lenka «%s» peker på\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Hopper over binærfil %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "kodesiden %d støttes ikke.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hopper over UTF-16-fil %s. Størrelsen på wchar_t er %d byte.\n" -#: common.c:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hopper over UTF-16-fil %s. Det oppstod en UTF-16-konverteringsfeil på linje %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hopper over fila %s. Konvertering av UTF-16 støttes ikke av denne versjonen av %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hopper over %s, som ikke er en vanlig fil.\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hopper over %s. Utdata-fil %s er en symbolsk lenke.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hopper over symbolsk lenke %s. Målet er ikke en vanlig fil.\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hopper over %s. Målet for symbolsk lenke %s er ikke en vanlig fil.\n" -#: common.c:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterer fila %s til %s Mac-format …\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterer fila %s til %s i DOS-format …\n" @@ -524,42 +533,42 @@ msgstr "konverterer fila %s til %s i DOS-format …\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n" -#: common.c:1740 +#: common.c:1832 #, 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:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Hopper over symbolsk lenke %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konverterer fila %s til Unix-format …\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konverterer fila %s til Mac-format …\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konverterer fila %s til DOS-format …\n" @@ -569,76 +578,76 @@ msgstr "konverterer fila %s til DOS-format …\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterer %s-fila %s til %s-Unix-format …\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterer %s-fila %s til %s-Mac-format …\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterer %s-fila %s til %s-DOS-format …\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "det oppstod problemer under konvertering av fila %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "klarte ikke å lese fra inndata-fil %s." -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "«%c» er et ugyldig flagg for -i (--info)\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktiv kodeside: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "du har valgt en ugyldig %s-konverteringsmodus\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "valget «%s» krever at du bruker et argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "du har valgt en ugyldig %s-koding\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "mål for fila %s er ikke valgt i ny fil-modus\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "klarte ikke å lese fra inndata-fil: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "klarte ikke å skrive til utdata-fil: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "feil: ugyldig surrogatpar. Nedre surrogat mangler.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "feil: ugyldig surrogatpar. Øvre surrogat mangler.\n" diff --git a/po/nl.po b/po/nl.po index 8c456e5..54fab1a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,16 +1,14 @@ # Dutch translations for dos2unix, a DOS/Mac to Unix text-file format converter. # This file is distributed under the same license as the dos2unix package. # -# "For him jam is not jam unless it is a case of jam tomorrow." -# +# Benno Schulenberg , 2014, 2015, 2016. # Erwin Waterlander , 2009-2014. -# Benno Schulenberg , 2014, 2015. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.1-beta5\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2015-09-24 09:48+0200\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-20 09:58+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -21,7 +19,7 @@ msgstr "" "X-Generator: Lokalize 1.0\n" #: dos2unix.c:79 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (Version 3.1)\n" @@ -30,7 +28,7 @@ msgid "" "All rights reserved.\n" "\n" msgstr "" -"Copyright (C) 2009-2015 Erwin Waterlander\n" +"Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (versie 3.1)\n" "Copyright (C) 1998 Bernd Johannes Wuebben (versie 3.0)\n" "Copyright (C) 1994-1995 Benjamin Lin\n" @@ -62,24 +60,24 @@ msgstr "codetabel %d wordt gebruikt.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Binair teken 0x%02X gevonden op regel %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n" #: unix2dos.c:69 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "All rights reserved.\n" "\n" msgstr "" -"Copyright (C) 2009-2015 Erwin Waterlander\n" +"Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "Alle rechten voorbehouden.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -99,7 +97,7 @@ msgstr "" " in de documentatie en/of andere materialen die bij de uitgave horen.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -114,56 +112,56 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii alleen regeleindes converteren (standaard)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -171,7 +169,7 @@ msgstr "" " -c, --convmode te gebruiken conversiemodus\n" " MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -179,19 +177,19 @@ msgstr "" " -D, --display-enc te gebruiken codering voor getoonde berichten\n" " CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force conversie van binaire bestanden afdwingen\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help deze hulptekst tonen\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -199,23 +197,23 @@ msgstr "" " -i, --info[=VLAGGEN] bestandsinformatie weergeven\n" " BESTAND... te analyseren bestand(en)\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license softwarelicentie tonen\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline extra regeleinde toevoegen\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -225,7 +223,7 @@ msgstr "" " INVOERBESTAND het originele bestand in nieuwbestand-modus\n" " UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -233,43 +231,43 @@ msgstr "" " -o, --oldfile het oude bestand overschrijven (standaard)\n" " BESTAND... te converteren bestand(en) in oudbestand-modus\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet alle waarschuwingen onderdrukken\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe binaire bestanden overslaan (standaard)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 UTF-16-codering behouden\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose gedetailleerde uitvoer produceren\n" -#: common.c:658 +#: common.c:662 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:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -277,233 +275,242 @@ msgstr "" " -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n" " (de originele doelbestanden blijven ongewijzigd)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version programmaversie tonen\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bits versie (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bits versie (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bits versie (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bits versie (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-versie.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-versie.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bits versie (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bits versie (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bits versie (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bits versie (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bits versie (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bits versie (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-versie (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-versie (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s-versie.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Met ondersteuning voor Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Zonder ondersteuning voor Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Met ondersteuning voor Unicode-bestandsnamen.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Zonder ondersteuning voor Unicode-bestandsnamen.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Met ondersteuning voor taalregio's.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Pad voor tijdelijk uitvoerbestand is te lang:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Schrijven van %s-BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Invoerbestand %s heeft een %s-BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "UTF-16LE-codering wordt aangenomen.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "UTF-16BE-codering wordt aangenomen.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "%s wordt als tijdelijk bestand gebruikt\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Sluiten van invoerbestand %s is mislukt:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemen met het herleiden van symbolische koppeling '%s'\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " uitvoerbestand blijft in '%s'\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemen met hernoemen van '%s' naar '%s':" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " welke het doel is van symbolische koppeling '%s'\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Binair bestand %s wordt overgeslagen\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "Codetabel %d wordt niet ondersteund.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; er is een UTF-16-conversiefout opgetreden op regel %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "UTF-16-bestand %s wordt overgeslagen; UTF-16-conversie wordt niet ondersteund in deze versie van %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, 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" @@ -514,42 +521,42 @@ msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opmaak...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemen met conversie van bestand %s naar bestand %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Symbolische koppeling %s wordt overgeslagen.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "converteren van bestand %s naar Unix-opmaak...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "converteren van bestand %s naar Mac-opmaak...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "converteren van bestand %s naar DOS-opmaak...\n" @@ -559,76 +566,76 @@ msgstr "converteren van bestand %s naar DOS-opmaak...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Unix-opmaak (%3$s)...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "converteren van bestand %2$s (%1$s) naar Mac-opmaak (%3$s)...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "converteren van bestand %2$s (%1$s) naar DOS-opmaak (%3$s)...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problemen met conversie van bestand %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "kan niet lezen uit invoerbestand %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "onjuiste vlag '%c' voor optie '-i' of '--info'\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "actieve codetabel: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ongeldige conversiemodus %s opgegeven\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "optie '%s' vereist een argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ongeldige weergavecodering %s opgegeven\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "doel van bestand %s is niet opgegeven in 'nieuwbestand-modus'\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "kan niet lezen uit invoerbestand: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "kan niet schrijven naar uitvoerbestand: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het lage deel ontbreekt\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n" @@ -636,4 +643,4 @@ msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n" #~ msgstr "heeft een %s-BOM.\n" #~ 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" +#~ msgstr "UTF-16-bestand %s wordt overgeslagen; de tekencodering van de huidige taalregio is niet UTF-8.\n" diff --git a/po/pl.po b/po/pl.po index 5d03519..2e24889 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-12 19:39+0100\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-13 15:20+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -57,7 +57,7 @@ msgstr "użycie strony kodowej %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Napotkano symbol binarny 0x%02X w linii %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -74,7 +74,7 @@ msgstr "" "Wszelkie prawa zastrzeżone.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -96,7 +96,7 @@ msgstr "" " dołączonych do dystrybucji.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -122,56 +122,56 @@ msgstr "" "W JAKIKOLWIEK SPOSÓB W WYNIKU UŻYCIA TEGO OPROGRAMOWANIA, NAWET JEŚLI\n" "OSTRZEŻONO O MOŻLIWOŚCI TAKICH SZKÓD.\n" -#: common.c:607 +#: common.c:611 #, 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:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konwersja tylko końców linii (domyślne)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 użycie strony kodowej DOS 437 (US; domyślna)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 użycie strony kodowej DOS 850 (zachodnioeuropejskiej)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 użycie strony kodowej DOS 860 (portugalskiej)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 użycie strony kodowej DOS 865 (nordyckiej)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark)\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark) (domyślne)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -179,7 +179,7 @@ msgstr "" " -c, --convmode tryb konwersji\n" " tryb konwersji ascii, 7bit, iso, mac; domyślnie ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -187,19 +187,19 @@ msgstr "" " -D, --display-enc ustawienie kodowania wyświetlanych komunikatów\n" " kodowanie ansi, unicode, utf8; domyślnie ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force wymuszenie konwersji plików binarnych\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konwersja UTF-16 do GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help wyświetlenie tego opisu\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -207,23 +207,23 @@ msgstr "" " -i, --info[=FLAGI] wyświetlenie informacji o pliku\n" " plik ... pliki do analizy\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate zachowanie daty pliku wyjściowego\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license wyświetlenie licencji oprogramowania\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline dodanie dodatkowego znaku nowej linii\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -233,7 +233,7 @@ msgstr "" " plik_wej plik oryginalny w trybie nowego pliku\n" " plik_wyj plik wyjściowy w trybie nowego pliku\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -241,43 +241,43 @@ msgstr "" " -o, --oldfile zapis do starego pliku (domyślne)\n" " plik ... pliki do konwersji w trybie starego pliku\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet tryb cichy, pominięcie wszystkich ostrzeżeń\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark) (domyślne)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark)\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe pomijanie plików binarnych (domyślne)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 zachowanie kodowania UTF-16\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose działanie ze szczegółowym opisem\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink podążanie za dowiązaniami symbolicznymi i konwersja celów\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -285,233 +285,242 @@ msgstr "" " -R, --replace-symlink zastępowanie dowiązań symbolicznych plikami wynikowymi\n" " (oryginalne pliki docelowe pozostają bez zmian)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version wyświetlenie numeru wersji\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Wersja 16-bitowa DOS (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Wersja 16-bitowa DOS (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa DOS (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Wersja 32-bitowa DOS (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Wersja MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Wersja Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Wersja 64-bitowa Windows (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Wersja 32-bitowa Windows (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Wersja 32-bitowa Windows (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Wersja 32-bitowa Windows (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Wersja 64-bitowa Windows (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Wersja 32-bitowa Windows (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Wersja OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Wersja OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Wersja %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Z obsługą Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Bez obsługi Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Z obsługą nazw plików w Unicode.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Bez obsługi nazw plików w Unicode.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Z obsługą języków narodowych.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Ścieżka do tymczasowego pliku wyjściowego jest zbyt długa:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Zapis znacznika BOM %s.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Plik wejściowy %s zawiera znacznik BOM %s.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Przyjęto kodowanie UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Przyjęto kodowanie UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, 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:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "użycie %s jako pliku tymczasowego\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Nie udało się zamknąć pliku wejściowego %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Nie udało się zapisać do tymczasowego pliku wyjściowego %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Nie udało się zmienić uprawnień tymczasowego pliku wyjściowego %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Nie udało się zmienić właściciela i grupy tymczasowego pliku wyjściowego %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "problemy z rozwiązaniem dowiązania symbolicznego '%s'\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " plik wyjściowy pozostaje w '%s'\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "problemy ze zmianą nazwy '%s' na '%s':" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " (czyli cel dowiązania symbolicznego '%s')\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Pominięto plik binarny %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "strona kodowa %d nie jest obsługiwana.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Pominięto plik UTF-16 %s, wystąpił błąd konwersji UTF-16 w linii %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Pominięto plik UTF-16 %s, konwersja UTF-16 nie jest obsługiwana w tej wersji programu %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Pominięto %s, nie jest zwykłym plikiem.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, 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:1716 +#: common.c:1808 #, 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:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n" @@ -522,42 +531,42 @@ msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "problemy z konwersją pliku %s do pliku %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Pominięto dowiązanie symboliczne %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konwersja pliku %s do formatu uniksowego...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konwersja pliku %s do formatu Mac...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konwersja pliku %s do formatu DOS...\n" @@ -567,75 +576,75 @@ msgstr "konwersja pliku %s do formatu DOS...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konwersja pliku %s %s do formatu uniksowego %s...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konwersja pliku %s %s do formatu Mac %s...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konwersja pliku %s %s do formatu DOS %s...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "problemy z konwersją pliku %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "nie można czytać z pliku wejściowego %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "błędna flaga '%c' dla opcji -i lub --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktywna strona kodowa: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "podano błędny tryb konwersji %s\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "opcja '%s' wymaga argumentu\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "podano błędne kodowanie wyświetlania %s\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "nie podano celu pliku %s w trybie nowego pliku\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "nie można czytać z pliku wejściowego: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "nie można zapisać do pliku wyjściowego: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak młodszego zamiennika.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "błąd: Błędna para zamienna. Brak starszego zamiennika.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7774bfa..bde4011 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,21 +4,20 @@ # This file is distributed under the same license as the dos2unix package. # Enrico Nicoletto , 2014. # Rafael Fontenelle , 2014, 2015, 2016. -# msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-12 06:37-0300\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-15 17:44-0200\n" "Last-Translator: Rafael Fontenelle \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.5\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 0.7.1\n" #: dos2unix.c:79 #, c-format @@ -62,7 +61,7 @@ msgstr "usando a página de código %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Símbolo binário 0x%02X localizado na linha %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -79,7 +78,7 @@ msgstr "" "Todos os direitos reservados.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -96,12 +95,12 @@ msgstr "" "que se seguem:\n" "1. As redistribuições de código-fonte devem reter os avisos de direitos\n" " autorais acima, a lista de condições e a renúncia a seguir.\n" -"2. . As redistribuições na forma binária deve reproduzir o aviso de\n" -" direitos autorais acima na documentação e/ou outros materiais\n" +"2. As redistribuições na forma binária devem reproduzir o aviso de\n" +" direitos autorais acima na documentação e/ou outros materiais\n" " fornecidos com a distribuição.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -127,56 +126,56 @@ msgstr "" "OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, MESMO\n" "SE RESSALVADO DA POSSIBILIDADE DE TAL DANO.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n" -#: common.c:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 usa a página de código 1252 do Windows (Europa ocidental)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 usa a página de código 437 do DOS (EUA) (padrão)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 usa a página de código 850 do DOS (Europa ocidental)\n" -#: common.c:613 +#: common.c:617 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:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 usa a página de código 863 do DOS (Francês do Canadá)\n" -#: common.c:615 +#: common.c:619 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:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 converte-se caracteres de 8 bit para espaço de 7 bit\n" -#: common.c:618 +#: common.c:622 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:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.) (padrão)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -184,51 +183,51 @@ msgstr "" " -c, --convmode modo de conversão\n" " convmode ascii, 7bit, iso, mac, padrão para ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" msgstr "" " -D, --display-enc define codificação das mensagens de texto exibidas\n" -" codificação ansi, unicode, utf8, default to ansi\n" +" codificação ansi, unicode, utf8, sendo padrão o ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force força a conversão de arquivos binários\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 converte-se de UTF-16 para GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help exibe este texto de ajuda\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" msgstr "" " -i, --info[=OPÇÕES] exibe informação do arquivo\n" -" file ... arquivos pra analisar\n" +" file ... arquivos para analisar\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate mantém a data do arquivo de saída\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license exibe a licença do software\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline acrescenta nova linha adicional\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -238,7 +237,7 @@ msgstr "" " infile arquivo original no modo de novo arquivo\n" " outfile arquivo de saída no modo de novo arquivo\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -246,43 +245,43 @@ msgstr "" " -o, --oldfile grava no arquivo antigo (padrão)\n" " file ... arquivos a converter no modo de arquivo antigo\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet modo silencioso, esconde todos os avisos\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.) (default)\n" -#: common.c:649 +#: common.c:653 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:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe ignora os arquivos binários (padrão)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 mantém codificação UTF-16\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose operação detalhada\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink segue os links simbólicos e converte os destinos\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -290,233 +289,242 @@ msgstr "" " -R, --replace-symlink substitui os links simbólicos por arquivos convertidos\n" " (os arquivos originais de destino permanecem inalterados)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version exibe o número da versão\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS versão de 16 bit (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS versão de 16 bit (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS versão de 32 bit (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS versão de 32 bit (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Versão do MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Versão do Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows versão de 64 bit (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows versão de 32 bit (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows versão de 32 bit (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows versão de 32 bit (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows versão de 64 bit (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows versão de 32 bit (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Versão OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Versão OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Versão %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Com suporte a Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Sem suporte a Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Com suporte a nomes de arquivos em Unicode UTF-16.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Sem suporte a nomes de arquivos em Unicode UTF-16.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Com suporte ao idioma nativo.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "O caminho do arquivo de saída temporário é muito grande:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Escrevendo %s BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" -msgstr "Arquivo de entrada %s possui %s BOM\n" +msgstr "Arquivo de entrada %s possui %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Presume codificação UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Presumo codificação UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, 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" +msgstr "Falha ao abrir o arquivo de saída temporário: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "usando %s como arquivo de temporário\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Falha ao fechar o arquivo de entrada %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" -msgstr "Ocorreu falha ao gravar no arquivo de saída temporário %s:" +msgstr "Falha ao gravar no arquivo de saída temporário %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" -msgstr "Ocorreu falha ao alterar as permissões do arquivo de saída temporário %s:" +msgstr "Falha ao alterar as permissões do arquivo de saída temporário %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" -msgstr "Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:" +msgstr "Falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " o arquivo de saída permanece em '%s'\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "ocorreram problemas ao renomear '%s' para '%s':" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " que é o destino do link simbólico '%s'\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Ignorando o arquivo binário %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, 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:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16 na linha %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Ignorando o arquivo UTF-16 %s, não há suporte a conversão para UTF-16 nesta versão do %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Ignorando %s, não é um arquivo comum.\n" -#: common.c:1684 +#: common.c:1776 #, 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:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Unix...\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato Mac...\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n" @@ -527,42 +535,42 @@ msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n" -#: common.c:1740 +#: common.c:1832 #, 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:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Ignorando o link simbólico %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "convertendo o arquivo %s para formato Unix...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "convertendo o arquivo %s para formato Mac...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "convertendo o arquivo %s para formato DOS...\n" @@ -572,78 +580,78 @@ msgstr "convertendo o arquivo %s para formato DOS...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "convertendo o arquivo %s %s para formato do Unix %s...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "convertendo o arquivo %s %s para formato do Mac %s...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "convertendo o arquivo %s %s para formato do DOS %s...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "ocorreram problemas ao converter o arquivo %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "não foi possível gravar no arquivo de entrada %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "opção incorreta \"%c\" para opção -i ou --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "página de código ativa: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "o modo de conversão %s especificado é inválido\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "a opção '%s' requer um argumento\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "a codificação de exibição %s especificada é inválida\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "o destino do arquivo %s não foi especificado no modo de novo arquivo\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "não foi possível ler do arquivo de saída: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "não foi possível gravar no arquivo de saída: %s\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto baixo.\n" # "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "erro: par de substitutos inválido. Faltando substituto alto.\n" diff --git a/po/ru.po b/po/ru.po index 5e060cb..3431287 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,10 +6,10 @@ # Yuri Kozlov , 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.3-beta2\n" +"Project-Id-Version: dos2unix-7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-12 18:55+0300\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-14 07:46+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -61,7 +61,7 @@ msgstr "используется кодировка %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "В строке %2$u обнаружен двоичный символ 0x%1$02X\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "ошибка: Значение переменной окружения DOS2UNIX_LOCALEDIR слишком длинное.\n" @@ -78,7 +78,7 @@ msgstr "" "Все права защищены.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -100,7 +100,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -126,56 +126,56 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Использование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii преобразовать только конец строки (по умолчанию)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso преобразовать DOS в ISO-8859-1\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 использовать кодировку Windows 1252 (Западно-Европейский)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 использовать кодировку DOS 437 (US) (по умолчанию)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 использовать кодировку DOS 850 (Западно-Европейский)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 использовать кодировку DOS 860 (Португальский)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 использовать кодировку DOS 863 (Франко-Канадский)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 использовать кодировку DOS 865 (Скандинавский)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 преобразовать 8-битные символы в 7-битные\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)(по умолчанию)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -183,7 +183,7 @@ msgstr "" " -c, --convmode режим преобразования\n" " convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -191,19 +191,19 @@ msgstr "" " -D, --display-enc задать кодировку отображаемых текстовых сообщений\n" " encoding ansi, unicode, utf8, по умолчанию ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force управление преобразованием двоичных файлов\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 преобразовать UTF-16 в GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help показать справку\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -211,23 +211,23 @@ msgstr "" " -i, --info[=ФЛАГИ] показать информацию о файле\n" " файл … файлы для анализа\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate сохранить дату выходного файла\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license отобразить лицензию программного обеспечения\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline добавить дополнительный разделитель строк\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom добавить метку порядка байтов (по умолчанию в UTF-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -237,7 +237,7 @@ msgstr "" " infile исходный файл в режиме нового файла\n" " outfile выходной файл в режиме нового файла\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -245,43 +245,43 @@ msgstr "" " -o, --oldfile записать в старый файл (по умолчанию)\n" " file … файлы для преобразования в режиме старого файла\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet не показывать предупреждения\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom удалить метку порядка байтов (BOM) (по умолчанию)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom удалить метку порядка байтов (BOM)\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропустить двоичные файлы (по умолчанию)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 оставить кодировку UTF-16\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le предположить, что входной формат UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be предположить, что входной формат UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose подробный режим\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink следовать символическим ссылкам и преобразовать цели\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -289,233 +289,242 @@ msgstr "" " -R, --replace-symlink заменить символические ссылки преобразованными файлами\n" " (оригинальные целевые файлы останутся без изменений)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink оставить символические ссылки и цели без изменений (по умолчанию)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version отобразить номер версии\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Версия для DOS, 16-битная (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Версия для DOS, 16-битная (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Версия для DOS, 32-битная (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Версия для DOS, 32-битная (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Версия с MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Версия с Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Версия для Windows, 64-битная (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Версия для Windows, 32-битная (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Версия для Windows, 32-битная (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Версия для Windows, 32-битная (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Версия для Windows, 64-битная (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Версия для Windows, 32-битная (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Версия для OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Версия для OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Версия для %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "С поддержкой Юникода UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Без поддержки Юникода UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "С поддержкой имён файлов в Юникоде.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Без поддержки имён файлов в Юникоде.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "С поддержкой родного языка.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Слишком длинный путь для временного выходного файла:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Записывается %s BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Входной файл %s содержит %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Предполагается кодировка UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Предполагается кодировка UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не удалось открыть временный выходной файл: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "использование %s в качестве временного файла\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Не удалось закрыть входной файл %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Не удалось записать во временный выходной файл %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не удалось изменить права доступа ко временному выходному файлу %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не удалось изменить владельца и группу временного выходного файла %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "конфликт при разрешении символической ссылки «%s»\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " выходной файл остаётся в «%s»\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблемы при переименовании «%s» в «%s»:" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " который является целью символической ссылки «%s»\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропуск двоичного файла %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "кодовая страница %d не поддерживается.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропуск файла %s с UTF-16, возникла ошибка преобразования UTF-16 в строке %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропуск файла %s с UTF-16, преобразование UTF-16 не поддерживается в этой версии %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропуск %s, не является обычным файлом.\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропуск символической ссылки %s, цель не является обычным файлом.\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропуск %s, цель символической ссылки %s не является обычным файлом.\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "преобразование файла %s в файл %s в формат Unix…\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "преобразование файла %s в файл %s в формат Mac…\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "преобразование файла %s в файл %s в формат DOS…\n" @@ -526,42 +535,42 @@ msgstr "преобразование файла %s в файл %s в форма #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат Unix…\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "проблемы при преобразовании файла %s в файл %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Пропуск символической ссылки %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "преобразование файла %s в формат Unix…\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "преобразование файла %s в формат Mac…\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "преобразование файла %s в формат DOS…\n" @@ -571,76 +580,76 @@ msgstr "преобразование файла %s в формат DOS…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "преобразование %s из файла %s в %s формат Unix…\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "преобразование %s из файла %s в %s формат Mac…\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "преобразование %s из файла %s в %s формат DOS…\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "проблемы при преобразовании файла %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "не удалось прочитать из входного файла %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "некорректный флаг «%c» для параметра -i или --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "активная кодовая страница: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "задан неправильный %s режим преобразования\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "для параметра «%s» требуется аргумент\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "задана неправильная кодировка отображения (%s)\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "цель файла %s не задана в режиме нового файла\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "не удалось прочитать из входного файла: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "не удалось записать в выходной файл: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует младший суррогат.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "ошибка: некорректная суррогатная пара. Отсутствует старший суррогат.\n" diff --git a/po/sr.po b/po/sr.po index 347dca5..1b544db 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,13 +1,13 @@ # Serbian translation for dos2unix. # Copyright (C) 2014 Erwin Waterlander (msgids) # This file is distributed under the same license as the dos2unix package. -# Мирослав Николић , 2014—2015. +# Мирослав Николић , 2014—2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix-7.3.1-beta5\n" +"Project-Id-Version: dos2unix-7.3.3-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2015-12-23 18:31+0200\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" +"PO-Revision-Date: 2016-03-05 09:17+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: dos2unix.c:79 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1998 Christian Wurll (Version 3.1)\n" @@ -26,10 +26,10 @@ msgid "" "All rights reserved.\n" "\n" msgstr "" -"Ауторска права (C) 2009-2015 Ервин Вотерландер\n" -"Ауторска права (C) 1998 Кристиан Вирл (издање 3.1)\n" -"Ауторска права (C) 1998 Берн Јохан Вјебен (Version 3.0)\n" -"Ауторска права (C) 1994-1995 Бенџамин Лин\n" +"Ауторска права © 2009-%d Ервин Вотерландер\n" +"Ауторска права © 1998 Кристиан Вирл (издање 3.1)\n" +"Ауторска права © 1998 Берн Јохан Вјебен (Version 3.0)\n" +"Ауторска права © 1994-1995 Бенџамин Лин\n" "Сва права су задржана.\n" "\n" @@ -58,24 +58,24 @@ msgstr "користим кодну страницу %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Бинарни симбол 0x%02X је пронађен у %u. реду\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "грешка: Вредност променљиве окружења „ДОС2UNIX_LOCALEDIR“ је предуга.\n" #: unix2dos.c:69 -#, fuzzy, c-format +#, c-format msgid "" "Copyright (C) 2009-%d Erwin Waterlander\n" "Copyright (C) 1994-1995 Benjamin Lin\n" "All rights reserved.\n" "\n" msgstr "" -"Ауторска права (C) 2009-2015 Ервин Вотерландер\n" -"Ауторска права (C) 1994-1995 Бенџамин Лин\n" +"Ауторска права © 2009-%d Ервин Вотерландер\n" +"Ауторска права © 1994-1995 Бенџамин Лин\n" "Сва права су задржана.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -91,7 +91,7 @@ msgstr "" "1. Расподела изворног кода мора да садржи горње обавештење о ауторском праву, овај списак услова и следећи опозив.\n" "2. Расподела у бинарном облику мора да понови обавештење горе наведеног ауторског права у документацији и/или у другом материјалу који долази уз дистрибуцију.\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -117,56 +117,56 @@ msgstr "" "НЕПАЖЊУ ИЛИ ДРУГО) ДОВОДЕЋИ НА БИЛО КОЈИ НАЧИН ДО ПРЕКИДА УПОТРЕБЕ\n" "ОВОГ СОФТВЕРА, ЧАК И АКО СТЕ ОБАВЕШТЕНИ О МОГУЋНОСТИ ТАКВИХ ШТЕТА.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii претвара само прекиде реда (основно)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso претварање између скупа знакова ДОС-а и ИСО-8859-1\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 користи Виндоуз кодну страницу 1252 (западно-европски)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 користи ДОС кодну страницу 437 (САД) (основно)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 користи ДОС кодну страницу 850 (западно-европски)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 користи ДОС кодну страницу 860 (португалски)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 користи ДОС кодну страницу 863 (канадски француски)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 користи ДОС кодну страницу 865 (норвешки)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 претвара 8-битне знакове у 7-битне размаке\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom задржава назнаку поретка бајта (основно)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -174,7 +174,7 @@ msgstr "" " -c, --convmode режим претварања\n" " режим претварања аскри, 7бита, исо, мек, подразумева аскри\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -182,19 +182,19 @@ msgstr "" " -D, --display-enc подешава кодирање приказаних порука текста\n" " кодирање „ansi“, „unicode“, „utf8“, основно је „ansi“\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force присиљава претварање бинарних датотека\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 претвара УТФ-16 у ГБ18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help приказује овај текст помоћи\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -202,23 +202,23 @@ msgstr "" " -i, --info[=ЗАСТАВЕ] приказује податке о датотеци\n" " file ... датотеке за анализу\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate задржава датум излазне датотеке\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license приказује дозволу софтвера\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline додаје додатни нови ред\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom додаје назнаку поретка бајта (основно УТФ-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -228,7 +228,7 @@ msgstr "" " улазна датотека изворна датотека у режиму нове датотеке\n" " излазна датотека излазна датотека у режиму нове датотеке\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -236,43 +236,43 @@ msgstr "" " -o, --oldfile пише у стару датотеку (основно)\n" " датотека ... датотеке за претварање у режиму старе датотеке\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet тихи режим, потискује сва упозорења\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта (основно)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom уклања назнаку поретка бајта\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe прескаче бинарне датотеке (основно)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 задржава УТФ-16 кодирање\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le подразумева да је улазни запис „UTF-16LE“\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be подразумева да је улазни запис „UTF-16BE“\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose опширне радње\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink прати симболичке везе и претвара мете\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -280,233 +280,243 @@ msgstr "" " -R, --replace-symlink замењује симболичке везе претвореним датотекама\n" " (изворне датотеке мете остају непромењене)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink задржава неизмењеним симболичке везе и мете (основно)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version приказује број издања\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" -msgstr "ДОС 16 бита издање (WATCOMC).\n" +msgstr "ДОС 16-битно издање (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" -msgstr "ДОС 16 бита издање (TURBOC).\n" +msgstr "ДОС 16-битно издање (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" -msgstr "ДОС 32 бита издање (WATCOMC).\n" +msgstr "ДОС 32-битно издање (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" -msgstr "ДОС 32 бита издање (DJGPP).\n" +msgstr "ДОС 32-битно издање (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "МСИС издање.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Цигвин издање.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" -msgstr "Виндоуз 64 бита издање (MinGW-w64).\n" +msgstr "Виндоуз 64-битно издање (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" -msgstr "Виндоуз 32 бита издање (WATCOMC).\n" +msgstr "Виндоуз 32-битно издање (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" -msgstr "Виндоуз 32 бита издање (MinGW-w64).\n" +msgstr "Виндоуз 32-битно издање (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" -msgstr "Виндоуз 32 бита издање (MinGW).\n" +msgstr "Виндоуз 32-битно издање (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" -msgstr "Виндоуз 64 бита издање (MSVC %d).\n" +msgstr "Виндоуз 64-битно издање (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" -msgstr "Виндоуз 32 бита издање (MSVC %d).\n" +msgstr "Виндоуз 32-битно издање (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "ОС/2 издање (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "ОС/2 издање (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s издање.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Са подршком Јуникода УТФ-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Без подршке Јуникода УТФ-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Са подршком назива датотеке Јуникода.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Без подршке назива датотеке Јуникода.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Са подршком матерњег језика.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Записујем %s НПБ-а.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "УТФ-16ЛЕ" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "УТФ-16БЕ" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "ГБ18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "УТФ-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Улазна датотека „%s“ има %s НПБ-а.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Подразумевам УТФ-16ЛЕ кодирање.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Подразумевам УТФ-16БЕ кодирање.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "користим „%s“ као привремену датотеку\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми решавања симболичке везе „%s“\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " излазна датотека остаје у „%s“\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми преименовања „%s“ у „%s“:" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " који је мета симболичке везе „%s“\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Прескачем бинарну датотеку „%s“\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "Кодна страница „%d“ није подржана.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања у %u. реду.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Прескачем УТФ-16 датотеку „%s“, УТФ-16 претварање није подржано у овом издању „%s“.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Прескачем „%s“, није обична датотека.\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Прескачем „%s“, излазна датотека „%s“ је симболичка веза.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Прескачем симболичку везу „%s“, мета није обична датотека.\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Прескачем „%s“, мета симболичке везе „%s“ није обична датотека.\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Јуникса...\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Мека...\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису ДОС-а...\n" @@ -517,42 +527,42 @@ msgstr "претварам датотеку „%s“ у датотеку „%s #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Јуникса...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Прескачем симболичку везу „%s“.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "претварам датотеку „%s“ у запису Јуникса...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "претварам датотеку „%s“ у запису Мека...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "претварам датотеку „%s“ у запису ДОС-а...\n" @@ -562,76 +572,76 @@ msgstr "претварам датотеку „%s“ у запису ДОС-а.. #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Јуникса...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Мека...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "претварам %s датотеку „%s“ у %s запис Дос-а...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "проблеми претварања датотеке „%s“\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "не могу да читам из улазне датотеке „%s“:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "погрешна заставица „%c“ за опцију „-i“ или „--info“\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "радна кодна страница: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "наведен је неисправан „%s“ режим претварања\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "опција „%s“ захтева аргумент\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "наведено је неисправно кодирање „%s“ приказа\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "не могу да читам из улазне датотеке: „%s“\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "не могу да пишем у излазну датотеку: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје нижи надометак.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "грешка: Неисправан пар надометка. Недостаје виши надометак.\n" diff --git a/po/sv.po b/po/sv.po index 8951b8e..d6c5f41 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-28 10:27+0100\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-14 08:40+0200\n" "Last-Translator: Sebastian Rasmussen \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.6\n" +"X-Generator: Poedit 1.8.7.1\n" #: dos2unix.c:79 #, c-format @@ -59,7 +59,7 @@ msgstr "använder teckentabell %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Binärsymbol 0x%02X hittades på rad %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "fel: Värdet på miljövariabeln DOS2UNIX_LOCALEDIR är för långt.\n" @@ -76,7 +76,7 @@ msgstr "" "Alla rättigheter reserverade.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -97,7 +97,7 @@ msgstr "" " med distributionen.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -125,56 +125,56 @@ msgstr "" "ANVÄNDNING AV DENNA MJUKVARA, ÄVEN OM UNDERRÄTTAD OM MÖJLIGHETEN FÖR\n" "SÅDAN SKADA.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Användning: %s [flaggor] [fil …] [-n infil utfil …]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii konvertera bara radbrytningar (standard)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso konvertering mellan DOS och ISO-8859-1 teckenuppsättningar\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 använd Windows teckentabell 1252 (Västeuropeisk)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 använd DOS teckentabell 437 (USA) (standard)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 använd DOS teckentabell 850 (Västeuropeisk)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 använd DOS teckentabell 860 (portugisisk)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 använd DOS teckentabell 863 (fransk-kanadensisk)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 använd DOS-teckentabell 865 (nordisk)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 konvertera 8-bitars tecken till 7-bitars blanksteg\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark)\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark) (standard)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -182,7 +182,7 @@ msgstr "" " -c, --convmode konverteringsläge\n" " konverteringsläge ascii, 7bit, iso, mac, standard är ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -190,19 +190,19 @@ msgstr "" " -D, --display-enc ställ in kodning för visade textmeddelanden\n" " kodning ansi, unicode, utf8, standard är ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force tvinga konvertering av binära filer\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 konvertera UTF-16 till GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help visar denna hjälptext\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -210,23 +210,23 @@ msgstr "" " -i, --info[=FLAGGOR] visa filinformation\n" " fil … filer att analysera\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate behåll datum för utmatningsfilen\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license visa mjukvarulicensen\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline lägg till ytterligare nyrad\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom lägg till byteordningsmarkering (Byte Order Mark) (standard för UTF-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -236,7 +236,7 @@ msgstr "" " infil originalfil i nyfilsläge\n" " utfil utmatningsfil i nyfilsläge\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -244,43 +244,43 @@ msgstr "" " -o, --oldfile skriv till den gamla filen (standard)\n" " fil … filer att konvertera i äldrefilsläge\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet tyst läge, dölj alla varningar\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark) (standard)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark)\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe hoppa över binära filer (standard)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 behåll UTF-16 teckenkodning\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le förmoda att inmatningsformatet är UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be förmoda att inmatningsformatet är UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose utförlig drift\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink följ symboliska länkar och konvertera målen\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -288,233 +288,242 @@ msgstr "" " -R, --replace-symlink ersätt symboliska länkar med konverterade filer\n" " (de ursprungliga målfilerna förblir oförändrade)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink behåll symboliska länkar och mål oförändrade (standard)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version visa versionsnummer\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16-bitarsversion (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16-bitarsversion (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32-bitarsversion (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32-bitarsversion (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS-version.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin-version.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64-bitarsversion (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32-bitarsversion (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32-bitarsversion (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32-bitarsversion (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64-bitarsversion (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32-bitarsversion (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2-version (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2-version (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "%s version.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Med stöd för Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Utan stöd för Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Med stöd för Unicode-filnamn.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Utan stöd för Unicode-filnamn.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Med modersmålsstöd.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Sökväg för temporär utmatningsfil är för lång:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Skriver %s BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Infil %s har %s BOM.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Förmodar att UTF-16LE teckenkodning används.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Förmodar att UTF-16BE teckenkodning används.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Misslyckades att öppna temporär utmatningsfil: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "använder %s som temporär fil\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Misslyckades att stänga inmatningsfil %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Misslyckades att skriva till temporär utmatningsfil %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Misslyckades att ändra rättigheterna för temporär utmatningsfil %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Misslyckades att ändra ägare och grupp för temporär utmatningsfil %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "fel uppstod vid upplösning av symbolisk länk ”%s”\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " utfil förblir i ”%s”\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "fel när '%s' bytte namn till '%s':" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " vilken är målet för den symboliska länken ”%s”\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Hoppar över binärfil %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "saknar stöd för teckentabell %d.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, c-format msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n" msgstr "Hoppar över UTF-16-fil %s, storleken på wchar_t är %d byte.\n" -#: common.c:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Hoppar över UTF-16-fil %s, ett UTF-16-konverteringsfel inträffade på rad %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Hoppar över UTF-16 fil %s, UTF-16-konvertering saknar stöd i denna version av %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Hoppar över %s, är ingen vanlig fil.\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Hoppar över %s, utfil %s är en symbolisk länk.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Hoppar över symbolisk länk %s, målet är inte en vanlig fil.\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Hoppar över %s, målet för den symboliska länken %s är inte en vanlig fil.\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "konverterar fil %s till fil %s i Unix-format…\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "konverterar fil %s till fil %s i Mac-format…\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "konverterar fil %s till fil %s i DOS-format…\n" @@ -525,42 +534,42 @@ msgstr "konverterar fil %s till fil %s i DOS-format…\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "fel vid konvertering från fil %s till fil %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Hoppar över symbolisk länk %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "konverterar fil %s till Unix-format…\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "konverterar fil %s till Mac-format…\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "konverterar fil %s till DOS-format…\n" @@ -570,75 +579,75 @@ msgstr "konverterar fil %s till DOS-format…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "konverterar %s-fil %s till %s Unix-format…\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "konverterar %s-fil %s till %s Mac-format…\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "konverterar %s-fil %s till %s DOS-format…\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "fel vid konvertering av fil %s\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "kan inte läsa från inmatningsfil %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "felaktig flagga '%c' för argumentet -i eller --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "aktiv teckentabell: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "ogiltigt konverteringsläge %s angivet\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "flaggan ”%s” kräver ett argument\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "ogiltig %s-kodning angiven\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "målet för fil %s specificerades inte i nyfilsläge\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "kan inte läsa från inmatningsfil: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "kan inte skriva till utfil: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den lägre delen av surrogatparet saknas.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "fel: Ogiltigt surrogatpar. Den högre delen av surrogatparet saknas.\n" diff --git a/po/uk.po b/po/uk.po index e0d8b22..5fcb571 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,10 +6,10 @@ # Yuri Chornoivan , 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-12 12:17+0200\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-13 17:31+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -33,7 +33,7 @@ msgstr "" "© Christian Wurll, 1998 (версія 3.1)\n" "© Bernd Johannes Wuebben, 1998 (версія 3.0)\n" "© Benjamin Lin, 1994-1995\n" -"Усі права застережено.\n" +"Усі права захищено.\n" "\n" #: dos2unix.c:212 dos2unix.c:249 unix2dos.c:149 unix2dos.c:209 @@ -61,7 +61,7 @@ msgstr "використовуємо кодову сторінку %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Знайдено двійковий символ 0x%02X у рядку %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "помилка: значення змінної середовища DOS2UNIX_LOCALEDIR є надто довгим.\n" @@ -78,7 +78,7 @@ msgstr "" "Усі права застережено.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -107,7 +107,7 @@ msgstr "" " від відповідальності у документації і/або інших супровідних матеріалах.)\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -133,56 +133,56 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Користування: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii перетворити лише символи розриву рядків (типово)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso виконати перетворення з кодування DOS до кодування ISO-8859-1\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 використати кодову таблицю 1252 Windows (західноєвропейські мови)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 використовувати кодову сторінку DOS 437 (США) (типово)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 використовувати кодову сторінку DOS 850 (західноєвропейські мови)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 використовувати сторінку DOS 860 (португальська)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 використовувати сторінку DOS 863 (канадська французька)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 використовувати сторінку DOS 865 (скандинавські мови)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 перетворювати 8-бітові символи на 7-бітові\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom зберегти позначку порядку байтів (BOM)\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -b, --keep-bom зберегти позначку порядку байтів (типово)\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -190,7 +190,7 @@ msgstr "" " -c, --convmode режим перетворення\n" " режим ascii, 7bit, iso, mac, типовим є ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -198,19 +198,19 @@ msgstr "" " -D, --display-enc встановити кодування показаних текстових повідомлень,\n" " кодування ansi, unicode, utf8, типовим є ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force примусове перетворення бінарних файлів\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 перетворити UTF-16 на GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help показати це довідкове повідомлення\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -218,23 +218,23 @@ msgstr "" " -i, --info[=ПРАПОРЦІ] показати дані щодо файла\n" " файл ... файли, які слід проаналізувати\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate зберігати дату створення файла для результату\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license показати ліцензійну угоду щодо програмного забезпечення\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline вставити додатковий символ розриву рядка\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -b, --add-bom додати позначку порядку байтів (типово UTF-8)\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -244,7 +244,7 @@ msgstr "" " вхідний_файл початковий файл у режимі створення файлів\n" " результат файл результату у режимі створення файлів\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -252,43 +252,43 @@ msgstr "" " -o, --oldfile записати до старого файла (типово)\n" " файл ... файли, які слід перетворити у режимі без створення файлів\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet режим без повідомлень, не показувати попередження\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom вилучити позначку порядку байтів (типово)\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom вилучити позначку порядку байтів (BOM)\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe пропускати двійкові файли (типово)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 зберегти кодування UTF-16\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le припускати, що вхідним форматом є UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be припускати, що вхідним форматом є UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose режим докладних повідомлень\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink переходити за символічними посиланням і перетворювати файли, на які вони вказують\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -296,233 +296,242 @@ msgstr "" " -R, --replace-symlink замінити символічні посилання перетвореними файлами\n" " (початкові файли, на які вони вказують, змінено не буде)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink не змінювати символічні посилання та файли, на які вони посилаються (типово)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version показати дані щодо номера версії\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS, 16-бітова версія (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS, 16-бітова версія (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS, 32-бітова версія (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS, 32-бітова версія (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Версія MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Версія Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows, 64-бітова версія (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows, 32-бітова версія (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows, 32-бітова версія (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows, 32-бітова версія (MinGW)\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows, 64-бітова версія (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows, 32-бітова версія (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Версія для OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Версія для OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Версія %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "З підтримкою Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Без підтримки Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "З підтримкою назв файлів у Unicode.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Без підтримки Unicode у назвах файлів.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "З підтримкою природної мови.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Шлях до тимчасового файла виведення є надто довгим:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Записуємо позначку порядку байтів %s.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "У вхідному файлі %s позначкою порядку байтів є %s.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Припускаємо кодування UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Припускаємо кодування UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Не вдалося відкрити файл для виведення тимчасових даних: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "використовуємо %s як тимчасовий файл\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Не вдалося закрити файл вхідних даних %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Не вдалося записати дані до тимчасового файла виведення %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Не вдалося змінити права доступу до тимчасового файла виведення даних %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Не вдалося змінити власника і групу тимчасового файла виведення даних %s:" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "проблеми з обробкою символічного посилання «%s»\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " файл результатів залишився у «%s»\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "проблеми з перейменуванням «%s» на «%s»:" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " на який посилається символічне посилання «%s»\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Пропускаємо двійковий файл %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "підтримки кодової сторінки %d не передбачено.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, сталася помилка під час перетворення даних UTF-16 у рядку %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Пропускаємо файл у кодуванні UTF-16, %s, перетворення UTF-16 для цієї версії %s не передбачено.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "Пропускаємо %s, не є звичайним файлом.\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Пропускаємо %s, файл результату, %s, є символічним посиланням.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "Пропускаємо символічне посилання %s, призначення не є звичайним файлом.\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "Пропускаємо %s, об’єкт, на який посилається символічне посилання %s, не є звичайним файлом.\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n" @@ -533,42 +542,42 @@ msgstr "перетворюємо файл %s на файл %s у форматі #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Unix...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "під час перетворення файла %s на файл %s виникли проблеми\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Пропускаємо символічне посилання %s.\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "перетворюємо файл %s до формату Unix...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "перетворюємо файл %s до формату Mac...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "перетворюємо файл %s до формату DOS...\n" @@ -578,76 +587,76 @@ msgstr "перетворюємо файл %s до формату DOS...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Unix...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s Mac...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "перетворюємо файл у кодуванні %s %s до формату %s DOS...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "під час перетворення файла %s виникли проблеми\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "не вдалося прочитати дані із файла вхідних даних %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "помилковий прапорець «%c» для параметра -i або --info\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "активна кодова сторінка: %d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "вказано некоректний режим перетворення %s\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "до параметра «%s» слід вказувати аргумент\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "вказано некоректне кодування для показу %s\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "не вказано призначення для файла %s у режимі створення файлів\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "не вдалося прочитати дані із файла вхідних даних: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "не вдалося виконати запис до файла результатів: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено нижній компонент.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "помилка: некоректна пара заміщення. Пропущено верхній компонент.\n" diff --git a/po/vi.po b/po/vi.po index 6afe0bc..63ae019 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dos2unix 7.3.3-beta2\n" +"Project-Id-Version: dos2unix 7.3.4-beta4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" -"PO-Revision-Date: 2016-01-13 09:01+0700\n" +"POT-Creation-Date: 2016-05-12 22:50+0200\n" +"PO-Revision-Date: 2016-05-14 08:17+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -61,7 +61,7 @@ msgstr "dùng trang mã %d.\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "Ký hiệu nhị phân 0x%02X được tìm thấy tại dòng %u\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 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" @@ -78,7 +78,7 @@ msgstr "" "Giữ toàn bộ bản quyền.\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -99,7 +99,7 @@ msgstr "" " bản phân phối.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -114,56 +114,56 @@ msgid "" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" msgstr "" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "Cách dùng: %s [các-tùy-chọn] [tập-tin …] [-n tập-tin-vào tập-tin-ra …]\n" -#: common.c:608 +#: common.c:612 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:609 +#: common.c:613 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:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 dùng trang mã Windows 1252 (Tây Âu)\n" -#: common.c:611 +#: common.c:615 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:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 dùng trang mã DOS 850 (Tây Âu)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 dùng trang mã DOS 860 (Bồ Đào Nha)\n" -#: common.c:614 +#: common.c:618 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:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 dùng trang mã DOS 865 (Bắc Âu)\n" -#: common.c:616 +#: common.c:620 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:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark”\n" -#: common.c:620 +#: common.c:624 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:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -171,7 +171,7 @@ msgstr "" " -c, --convmode chế độ chuyển đổi\n" " chế độ chuyển đổi: ascii, 7bit, iso, mac, mặc định là ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -179,19 +179,19 @@ msgstr "" " -D, --display-enc đặt bảng mã để hiển thị các thông báo\n" " bảng mã: ansi, unicode, utf8, mặc định là ansi\n" -#: common.c:627 +#: common.c:631 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:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 đổi từ UTF-16 sang GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help hiển thị trợ giúp này\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -199,23 +199,23 @@ msgstr "" " -i, --info[=CỜ] hiển thị thông tin tập tin\n" " tập-tin … các tập tin cần phân tích\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate giữ nguyên ngày tháng tập tin đầu ra\n" -#: common.c:637 +#: common.c:641 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:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline bổ xung thêm dòng mới\n" -#: common.c:639 +#: common.c:643 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:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -225,7 +225,7 @@ msgstr "" " tập-tin-vào tập tin gốc trong chế độ tập-tin-mới\n" " tập-tin-ra tập tin đầu ra trong chế độ tập-tin-mới\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -233,43 +233,43 @@ msgstr "" " -o, --oldfile ghi vào tập tin cũ (mặc định)\n" " tập-tin … các tập tin cần chuyển đổi trong chế độ tập-tin-cũ\n" -#: common.c:645 +#: common.c:649 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:647 +#: common.c:651 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:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark”\n" -#: common.c:650 +#: common.c:654 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:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 giữ bảng mã UTF-16\n" -#: common.c:653 +#: common.c:657 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:654 +#: common.c:658 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:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose thông báo chi tiết\n" -#: common.c:658 +#: common.c:662 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:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -277,233 +277,242 @@ msgstr "" " -R, --replace-symlink thay thế liên kết mềm bằng tập tin đã chuyển đổi\n" " (các tập tin đích nguyên gốc thì để nguyên không thay đổi)\n" -#: common.c:663 +#: common.c:667 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:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version hiển thị số hiệu phiên bản\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 16 bit (WATCOMC).\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "Phiên bản DOS 16 bit (TURBOC).\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "Phiên bản DOS 32 bit (WATCOMC).\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "Phiên bản DOS 32 bit (DJGPP).\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "Phiên bản MSYS.\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Phiên bản Cygwin.\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 64 bit (MinGW-w64).\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Phiên bản Windows 32 bit (WATCOMC).\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Phiên bản Windows 32 bit (MinGW-w64).\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Phiên bản Windows 32 bit (MinGW).\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 64 bit (MSVC %d).\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Phiên bản Windows 32 bit (MSVC %d).\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "Phiên bản OS/2 (WATCOMC).\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "Phiên bản OS/2 (EMX).\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "Phiên bản %s.\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "Có hỗ trợ Unicode UTF-16.\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "Không hỗ trợ Unicode UTF-16.\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "Có hỗ trợ tên tập tin dạng Unicode.\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "Không hỗ trợ tên tập tin dạng Unicode.\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "Có hỗ trợ bản địa hóa ngôn ngữ.\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +msgid "Path for temporary output file is too long:" +msgstr "Đường dẫn cho tập tin xuất tạm quá dài:" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "Đang ghi %s BOM.\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "Tập tin đầu vào %s có BOM %s.\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "Coi là bảng mã UTF-16LE.\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "Coi là bảng mã UTF-16BE.\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "Gặp lỗi khi mở tập tin đầu ra tạm thời: %s\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "đang dùng %s làm tập tin tạm\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, c-format +msgid "Failed to close input file %s:" +msgstr "Gặp lỗi khi đóng đầu vào %s:" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "Gặp lỗi khi ghi vào tập tin đầu ra tạm thời %s:" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "Gặp lỗi khi thay đổi quyền hạn của tập tin đầu ra tạm %s:" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "Gặp lỗi khi đổi chủ sở hữu và nhóm của tập tin đầu ra tạm %s:" -#: common.c:1507 +#: common.c:1599 #, 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:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " tập tin đầu ra còn trong “%s”\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "gặp lỗi khi đổi tên “%s” thành “%s”:" -#: common.c:1538 +#: common.c:1630 #, 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:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "Bỏ qua tập tin nhị phân %s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "không hỗ trợ trang mã %d.\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "Bỏ qua tập tin UTF-16 %s, đã xảy ra lỗi chuyển đổi UTF-16 trên dòng %u.\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "Bỏ qua tập tin UTF-16 %s, chuyển đổi UTF-16 không được hỗ trợ ở phiên bản này của %s.\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, 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:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "Bỏ qua %s, tập tin đầu ra %s là một liên kết mềm.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, 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:1690 +#: common.c:1782 #, 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:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s thành tập tin “%s” theo định dạng Unix…\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng Mac…\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng DOS…\n" @@ -514,42 +523,42 @@ msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Unix %s…\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "Bỏ qua liên kết mềm %s.\n" -#: common.c:1799 +#: common.c:1891 #, 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:1802 +#: common.c:1894 #, 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:1804 +#: common.c:1896 #, 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" @@ -559,76 +568,76 @@ msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Unix %s…\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Mac %s…\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng DOS %s…\n" -#: common.c:1825 +#: common.c:1917 #, 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:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "không thể đọc từ tập tin đầu vào %s:" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "cờ “%c” cho tùy chọn -i hay --info bị sai\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "trang mã đang hoạt động: %d\n" -#: common.c:2342 +#: common.c:2437 #, 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:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, 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:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "đã đưa ra bảng mã hiển thị không hợp lệ %s\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "đích của tập tin %s không được chỉ định trong chế độ tập-tin-mới\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "không thể đọc từ tập tin đầu vào: %s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "không thể ghi vào tập tin đầu ra: %s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế dưới.\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế trên.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6cd1626..6d5a40a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dos2unix 7.3.3-beta2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-02-10 19:46+0100\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" "PO-Revision-Date: 2016-01-12 19:12+0800\n" "Last-Translator: Tianze Wang \n" "Language-Team: Chinese (simplified) \n" @@ -59,7 +59,7 @@ msgstr "使用编码页 %d 。\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "在第 %2$u 行找到二进制符号 0x%1$02X\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "错误：环境变量 DOS2UNIX_LOCALEDIR 的值太长。\n" @@ -76,7 +76,7 @@ msgstr "" "保留所有权利。\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -98,7 +98,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -124,56 +124,56 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "用法：%s [选项] [文件 ...] [-n 输入文件 输出文件 ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 只转换换行符（默认）\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso 在 DOS 和 ISO-8859-1 字符集之间转换\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 使用Windows 1252 编码页（西欧）\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 使用DOS 437 编码页（US）（默认）\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 使用DOS 850 编码页（西欧）\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 使用DOS 860 编码页（葡萄牙）\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 使用DOS 863 编码页（加拿大法語）\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 使用DOS 865 编码页（北欧）\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 转换8 位字符到7 位空间\n" -#: common.c:618 +#: common.c:622 msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -b, --keep-bom 保留UTF-8 BOM头\n" -#: common.c:620 +#: common.c:624 msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr "-b, --keep-bom 保留UTF-8 BOM头（默认）\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -181,7 +181,7 @@ msgstr "" " -c, --convmode 转换模式\n" " convmode ascii、7bit、iso或mac，默认为ascii\n" -#: common.c:624 +#: common.c:628 msgid "" " -D, --display-enc set encoding of displayed text messages\n" " encoding ansi, unicode, utf8, default to ansi\n" @@ -189,19 +189,19 @@ msgstr "" " -D, --display-enc 设置消息文本的编码\n" " encoding ansi、unicode或utf8，默认为ansi\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force 强制转换二进制文件\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr " -gb, --gb18030 转换UTF-16为GB18030\n" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help 显示本说明文字\n" -#: common.c:634 +#: common.c:638 msgid "" " -i, --info[=FLAGS] display file information\n" " file ... files to analyze\n" @@ -209,23 +209,23 @@ msgstr "" " -i, --info[=FLAGS] 显示文件信息\n" " 文件 ... 需要分析的文件\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate 保留输出文件时间\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license 显示软件协议\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 加入额外的换行符\n" -#: common.c:639 +#: common.c:643 msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom 添加UTF-8 BOM头（默认为UTF-8）\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -235,7 +235,7 @@ msgstr "" " infile 新文件模式中的原始文件\n" " outfile 新文件模式中的输出文件\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -243,43 +243,43 @@ msgstr "" " -o, --oldfile 写入原文件（默认）\n" " file ... 旧文件模式中要转换的文件\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet 安静模式，不显示所有警告\n" -#: common.c:647 +#: common.c:651 msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -r, --remove-bom 移除UTF-8 BOM头（默认）\n" -#: common.c:649 +#: common.c:653 msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -r, --remove-bom 移除UTF-8 BOM头\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe 跳过二进制文件(默认)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr " -u, --keep-utf16 保留UTF-16编码\n" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 假定输入文件格式为UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 假定输入文件格式为UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr " -v, --verbose 显示更多信息\n" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink 根据符号链接转换其目标文件\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -287,233 +287,243 @@ msgstr "" " -R, --replace-symlink 取代符号链接为转换后的文件\n" " (原链接目标文件保持不变)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink 保持符号链接及其目标不变（默认）\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version 显示版本号\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "16位DOS版本 (WATCOMC)。\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "16位DOS版本(TURBOC)。\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "32位DOS版本(WATCOMC)。\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "32位DOS版本(DJGPP)。\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS版本。\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin版本。\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "64位Windows版本(MinGW-w64)。\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "32位Windows版本(WATCOMC)。\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "32位Windows版本(MinGW-w64)。\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "32位Windows版本(MinGW)。\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "64位Windows版本(MSVC %d)。\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "32位Windows版本(MSVC %d)。\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 版本(WATCOMC)。\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2 版本(EMX)。\n" -#: common.c:705 +#: common.c:709 #, c-format msgid "%s version.\n" msgstr "版本 %s。\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "有Unicode UTF-16 支持。\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "无Unicode UTF-16 支持。\n" -#: common.c:717 +#: common.c:721 msgid "With Unicode file name support.\n" msgstr "有Unicode文件名支持。\n" -#: common.c:719 +#: common.c:723 msgid "Without Unicode file name support.\n" msgstr "无Unicode文件名支持。\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "含本地语言支持。\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "写入临时输出文件失败%s：" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "写入 %s BOM。\n" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "UTF-16LE" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "UTF-16BE" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "GB18030" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "UTF-8" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "输入文件 %s 有 %s BOM。\n" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "假定为UTF-16LE编码。\n" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "假定为UTF-16BE编码。\n" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "打开临时输出文件 %s 失败\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作为临时文件\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "打开临时输出文件 %s 失败\n" + +#: common.c:1512 #, c-format msgid "Failed to write to temporary output file %s:" msgstr "写入临时输出文件失败%s：" -#: common.c:1443 +#: common.c:1535 #, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "改变临时输出文件 %s 的权限失败：" -#: common.c:1460 +#: common.c:1552 #, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "改变临时输出文件 %s 的所有者和群组失败：" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "解析符号链接“%s”遇到问题\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " 输出文件“%s”未改变\n" -#: common.c:1534 +#: common.c:1626 #, c-format msgid "problems renaming '%s' to '%s':" msgstr "重新命名“%s”到“%s”错误：" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者为符号链接'%s' 的目标\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "跳过二进制文件%s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "不支持编码页 %d。\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "跳过 UTF-16 文件 %s，UTF-16 转换发生错误于第 %u 行。\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "跳过 UTF-16 文件 %s，本版本 %s 不支持UTF-16。\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "跳过 %s，不是一个普通文件。\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "跳过 %s，输出文件 %s 是一个符号链接。.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "跳过符号链接 %s，目标不是一个普通文件。\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "跳过 %s，符号链接 %s 目标不是一个普通文件。\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在转换文件 %s 为Unix格式到 %s...\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在转换文件 %s 为Mac格式到 %s...\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在转换文件 %s 为DOS格式到 %s...\n" @@ -524,42 +534,42 @@ msgstr "正在转换文件 %s 为DOS格式到 %s...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n" -#: common.c:1732 +#: common.c:1824 #, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n" -#: common.c:1734 +#: common.c:1826 #, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "转换文件 %s 到 %s 错误\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "跳过符号链接 %s。\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "正在转换文件 %s 为Unix格式...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "正在转换文件 %s 为Mac格式...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "正在转换文件 %s 为DOS格式...\n" @@ -569,76 +579,76 @@ msgstr "正在转换文件 %s 为DOS格式...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在转换 %s 文件 %s 为Unix格式的 %s 文件...\n" -#: common.c:1817 +#: common.c:1909 #, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在转换 %s 文件 %s 为Mac格式的 %s 文件...\n" -#: common.c:1819 +#: common.c:1911 #, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在转换 %s 文件 %s 为DOS格式的 %s 文件...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "转换文件 %s 出错\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, c-format msgid "can not read from input file %s:" msgstr "无法读取输入文件 %s：" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "-i/--info选项的标志“%c”错误\n" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "作用中编码页：%d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的转换模式 %s 不合法\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "选项“%s”需要一个参数\n" -#: common.c:2372 +#: common.c:2467 #, c-format msgid "invalid %s display encoding specified\n" msgstr "指定了无效的显示编码 %s\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新文件模式中未指明文件 %s 的目的位置\n" -#: common.c:2485 +#: common.c:2578 #, c-format msgid "can not read from input file: %s\n" msgstr "无法读取输入文件：%s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "无法写入输出文件：%s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "错误：无效的代理对。缺少低位字符。\n" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "错误：无效的代理对。缺少高位字符。\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 4969030..f1fad20 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: 2016-02-10 19:46+0100\n" +"POT-Creation-Date: 2016-05-12 22:42+0200\n" "PO-Revision-Date: 2014-03-14 00:43+0800\n" "Last-Translator: mail6543210 \n" "Language-Team: Chinese (traditional) \n" @@ -59,7 +59,7 @@ msgstr "使用 %d 編碼頁。\n" msgid "Binary symbol 0x%02X found at line %u\n" msgstr "找到二進位符號0x%02X 在第%u 行\n" -#: dos2unix.c:525 unix2dos.c:498 +#: dos2unix.c:529 unix2dos.c:502 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n" msgstr "錯誤：環境變數DOS2UNIX_LOCALEDIR 的值太長。\n" @@ -76,7 +76,7 @@ msgstr "" "保留所有權利。\n" "\n" -#: common.c:572 +#: common.c:576 msgid "" "Redistribution and use in source and binary forms, with or without\n" "modification, are permitted provided that the following conditions\n" @@ -98,7 +98,7 @@ msgstr "" " the distribution.\n" "\n" -#: common.c:582 +#: common.c:586 msgid "" "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n" "EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n" @@ -124,58 +124,58 @@ msgstr "" "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n" "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" -#: common.c:607 +#: common.c:611 #, c-format msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n" msgstr "用法: %s [選項] [file ...] [-n infile outfile ...]\n" -#: common.c:608 +#: common.c:612 msgid " -ascii convert only line breaks (default)\n" msgstr " -ascii 只轉換換行字元(預設)\n" -#: common.c:609 +#: common.c:613 msgid " -iso conversion between DOS and ISO-8859-1 character set\n" msgstr " -iso 在DOS 和ISO-8859-1 字元集間轉換\n" -#: common.c:610 +#: common.c:614 msgid " -1252 use Windows code page 1252 (Western European)\n" msgstr " -1252 使用Windows 1252 編碼頁(西歐)\n" -#: common.c:611 +#: common.c:615 msgid " -437 use DOS code page 437 (US) (default)\n" msgstr " -437 使用DOS 437 編碼頁(US) (預設)\n" -#: common.c:612 +#: common.c:616 msgid " -850 use DOS code page 850 (Western European)\n" msgstr " -850 使用DOS 850 編碼頁(西歐)\n" -#: common.c:613 +#: common.c:617 msgid " -860 use DOS code page 860 (Portuguese)\n" msgstr " -860 使用DOS 860 編碼頁(葡萄牙)\n" -#: common.c:614 +#: common.c:618 msgid " -863 use DOS code page 863 (French Canadian)\n" msgstr " -863 使用DOS 863 編碼頁(加拿大法語)\n" -#: common.c:615 +#: common.c:619 msgid " -865 use DOS code page 865 (Nordic)\n" msgstr " -865 使用DOS 865 編碼頁(北歐)\n" -#: common.c:616 +#: common.c:620 msgid " -7 convert 8 bit characters to 7 bit space\n" msgstr " -7 轉換8 位元字元到7 位元空間\n" -#: common.c:618 +#: common.c:622 #, fuzzy msgid " -b, --keep-bom keep Byte Order Mark\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:620 +#: common.c:624 #, fuzzy msgid " -b, --keep-bom keep Byte Order Mark (default)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:621 +#: common.c:625 msgid "" " -c, --convmode conversion mode\n" " convmode ascii, 7bit, iso, mac, default to ascii\n" @@ -183,7 +183,7 @@ msgstr "" " -c, --convmode 轉換模式\n" " convmode ascii, 7bit, iso, mac, 預設為ascii\n" -#: common.c:624 +#: common.c:628 #, fuzzy msgid "" " -D, --display-enc set encoding of displayed text messages\n" @@ -192,19 +192,19 @@ msgstr "" " -c, --convmode 轉換模式\n" " convmode ascii, 7bit, iso, mac, 預設為ascii\n" -#: common.c:627 +#: common.c:631 msgid " -f, --force force conversion of binary files\n" msgstr " -f, --force 強制轉換二進位檔案\n" -#: common.c:630 +#: common.c:634 msgid " -gb, --gb18030 convert UTF-16 to GB18030\n" msgstr "" -#: common.c:633 +#: common.c:637 msgid " -h, --help display this help text\n" msgstr " -h, --help 顯示本說明文字\n" -#: common.c:634 +#: common.c:638 #, fuzzy msgid "" " -i, --info[=FLAGS] display file information\n" @@ -213,24 +213,24 @@ msgstr "" " -o, --oldfile 寫入原檔案(預設)\n" " file ... 原檔模式中要轉換的檔案\n" -#: common.c:636 +#: common.c:640 msgid " -k, --keepdate keep output file date\n" msgstr " -k, --keepdate 保留輸出檔時間\n" -#: common.c:637 +#: common.c:641 msgid " -L, --license display software license\n" msgstr " -L, --license 顯示軟體授權\n" -#: common.c:638 +#: common.c:642 msgid " -l, --newline add additional newline\n" msgstr " -l, --newline 加入額外的換行\n" -#: common.c:639 +#: common.c:643 #, fuzzy msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:640 +#: common.c:644 msgid "" " -n, --newfile write to new file\n" " infile original file in new-file mode\n" @@ -240,7 +240,7 @@ msgstr "" " infile 新檔模式中的原始檔案\n" " outfile 新檔模式中的輸出檔案\n" -#: common.c:643 +#: common.c:647 msgid "" " -o, --oldfile write to old file (default)\n" " file ... files to convert in old-file mode\n" @@ -248,45 +248,45 @@ msgstr "" " -o, --oldfile 寫入原檔案(預設)\n" " file ... 原檔模式中要轉換的檔案\n" -#: common.c:645 +#: common.c:649 msgid " -q, --quiet quiet mode, suppress all warnings\n" msgstr " -q, --quiet 安靜模式，抑制所有警告\n" -#: common.c:647 +#: common.c:651 #, fuzzy msgid " -r, --remove-bom remove Byte Order Mark (default)\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:649 +#: common.c:653 #, fuzzy msgid " -r, --remove-bom remove Byte Order Mark\n" msgstr " -m, --add-bom 加入UTF-8 BOM\n" -#: common.c:650 +#: common.c:654 msgid " -s, --safe skip binary files (default)\n" msgstr " -s, --safe 略過二進位檔案(預設)\n" -#: common.c:652 +#: common.c:656 msgid " -u, --keep-utf16 keep UTF-16 encoding\n" msgstr "" -#: common.c:653 +#: common.c:657 msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n" msgstr " -ul, --assume-utf16le 假設輸入檔格式為UTF-16LE\n" -#: common.c:654 +#: common.c:658 msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n" msgstr " -ub, --assume-utf16be 假設輸入檔格式為UTF-16BE\n" -#: common.c:656 +#: common.c:660 msgid " -v, --verbose verbose operation\n" msgstr "" -#: common.c:658 +#: common.c:662 msgid " -F, --follow-symlink follow symbolic links and convert the targets\n" msgstr " -F, --follow-symlink 依循符號連結轉換其目標檔案\n" -#: common.c:661 +#: common.c:665 msgid "" " -R, --replace-symlink replace symbolic links with converted files\n" " (original target files remain unchanged)\n" @@ -294,235 +294,245 @@ msgstr "" " -R, --replace-symlink 取代符號連結為轉換後的檔案\n" " (原連結目標檔案保持不變)\n" -#: common.c:663 +#: common.c:667 msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n" msgstr " -S, --skip-symlink 保持符號連結及其目標不變(預設)\n" -#: common.c:665 +#: common.c:669 msgid " -V, --version display version number\n" msgstr " -V, --version 顯示版本號碼\n" -#: common.c:677 +#: common.c:681 msgid "DOS 16 bit version (WATCOMC).\n" msgstr "DOS 16 位元版本(WATCOMC)。\n" -#: common.c:679 +#: common.c:683 msgid "DOS 16 bit version (TURBOC).\n" msgstr "DOS 16 位元版本(TURBOC)。\n" -#: common.c:681 +#: common.c:685 msgid "DOS 32 bit version (WATCOMC).\n" msgstr "DOS 32 位元版本(WATCOMC)。\n" -#: common.c:683 +#: common.c:687 msgid "DOS 32 bit version (DJGPP).\n" msgstr "DOS 32 位元版本(DJGPP)。\n" -#: common.c:685 +#: common.c:689 msgid "MSYS version.\n" msgstr "MSYS 版本。\n" -#: common.c:687 +#: common.c:691 msgid "Cygwin version.\n" msgstr "Cygwin 版本。\n" -#: common.c:689 +#: common.c:693 msgid "Windows 64 bit version (MinGW-w64).\n" msgstr "Windows 64 位元版本(MinGW-w64)。\n" -#: common.c:691 +#: common.c:695 msgid "Windows 32 bit version (WATCOMC).\n" msgstr "Windows 32 位元版本(WATCOMC)。\n" -#: common.c:693 +#: common.c:697 msgid "Windows 32 bit version (MinGW-w64).\n" msgstr "Windows 32 位元版本(MinGW-w64)。\n" -#: common.c:695 +#: common.c:699 msgid "Windows 32 bit version (MinGW).\n" msgstr "Windows 32 位元版本(MinGW)。\n" -#: common.c:697 +#: common.c:701 #, c-format msgid "Windows 64 bit version (MSVC %d).\n" msgstr "Windows 64 位元版本(MSVC %d)。\n" -#: common.c:699 +#: common.c:703 #, c-format msgid "Windows 32 bit version (MSVC %d).\n" msgstr "Windows 32 位元版本(MSVC %d)。\n" -#: common.c:701 +#: common.c:705 msgid "OS/2 version (WATCOMC).\n" msgstr "OS/2 版本(WATCOMC)。\n" -#: common.c:703 +#: common.c:707 msgid "OS/2 version (EMX).\n" msgstr "OS/2 版本(EMX)。\n" -#: common.c:705 +#: common.c:709 #, fuzzy, c-format msgid "%s version.\n" msgstr "MSYS 版本。\n" -#: common.c:711 +#: common.c:715 msgid "With Unicode UTF-16 support.\n" msgstr "有Unicode UTF-16 支援。\n" -#: common.c:713 +#: common.c:717 msgid "Without Unicode UTF-16 support.\n" msgstr "無Unicode UTF-16 支援。\n" -#: common.c:717 +#: common.c:721 #, fuzzy msgid "With Unicode file name support.\n" msgstr "有Unicode UTF-16 支援。\n" -#: common.c:719 +#: common.c:723 #, fuzzy msgid "Without Unicode file name support.\n" msgstr "無Unicode UTF-16 支援。\n" -#: common.c:723 +#: common.c:727 msgid "With native language support.\n" msgstr "含本地語言支援。\n" -#: common.c:1028 common.c:1035 common.c:1042 common.c:1049 common.c:1061 -#: common.c:1068 +#: common.c:861 +#, fuzzy +msgid "Path for temporary output file is too long:" +msgstr "暫存檔寫入失敗%s：%s\n" + +#: common.c:1142 common.c:1149 common.c:1156 common.c:1163 common.c:1175 +#: common.c:1182 #, c-format msgid "Writing %s BOM.\n" msgstr "" -#: common.c:1028 common.c:1084 common.c:1626 common.c:1647 +#: common.c:1142 common.c:1195 common.c:1718 common.c:1739 msgid "UTF-16LE" msgstr "" -#: common.c:1035 common.c:1087 common.c:1628 common.c:1649 +#: common.c:1149 common.c:1198 common.c:1720 common.c:1741 msgid "UTF-16BE" msgstr "" -#: common.c:1042 common.c:1061 common.c:1093 common.c:1639 +#: common.c:1156 common.c:1175 common.c:1204 common.c:1731 msgid "GB18030" msgstr "" -#: common.c:1049 common.c:1068 common.c:1090 common.c:1641 +#: common.c:1163 common.c:1182 common.c:1201 common.c:1733 msgid "UTF-8" msgstr "" -#: common.c:1113 +#: common.c:1227 #, c-format msgid "Input file %s has %s BOM.\n" msgstr "" -#: common.c:1149 common.c:1192 +#: common.c:1263 common.c:1306 msgid "Assuming UTF-16LE encoding.\n" msgstr "" -#: common.c:1153 common.c:1196 +#: common.c:1267 common.c:1310 msgid "Assuming UTF-16BE encoding.\n" msgstr "" -#: common.c:1336 +#: common.c:1455 #, c-format msgid "Failed to open temporary output file: %s\n" msgstr "暫存檔 %s 開啟失敗\n" -#: common.c:1343 +#: common.c:1467 #, c-format msgid "using %s as temporary file\n" msgstr "使用 %s 作為暫存檔\n" -#: common.c:1412 +#: common.c:1499 common.c:2158 +#, fuzzy, c-format +msgid "Failed to close input file %s:" +msgstr "暫存檔 %s 開啟失敗\n" + +#: common.c:1512 #, fuzzy, c-format msgid "Failed to write to temporary output file %s:" msgstr "暫存檔寫入失敗%s：%s\n" -#: common.c:1443 +#: common.c:1535 #, fuzzy, c-format msgid "Failed to change the permissions of temporary output file %s:" msgstr "輸出暫存檔 %s 權限變更失敗：%s\n" -#: common.c:1460 +#: common.c:1552 #, fuzzy, c-format msgid "Failed to change the owner and group of temporary output file %s:" msgstr "輸出暫存檔 %s 擁有者及群組變更失敗：%s\n" -#: common.c:1507 +#: common.c:1599 #, c-format msgid "problems resolving symbolic link '%s'\n" msgstr "解析符號連結'%s' 發生問題\n" -#: common.c:1508 common.c:1540 +#: common.c:1600 common.c:1632 #, c-format msgid " output file remains in '%s'\n" msgstr " 輸出檔案'%s' 未改變\n" -#: common.c:1534 +#: common.c:1626 #, fuzzy, c-format msgid "problems renaming '%s' to '%s':" msgstr "重新命名「%s」到「%s」錯誤：%s\n" -#: common.c:1538 +#: common.c:1630 #, c-format msgid " which is the target of symbolic link '%s'\n" msgstr " 後者為符號連結'%s' 的目標\n" -#: common.c:1601 common.c:1693 common.c:1779 +#: common.c:1693 common.c:1785 common.c:1871 #, c-format msgid "Skipping binary file %s\n" msgstr "略過二進位檔案%s\n" -#: common.c:1604 common.c:1696 common.c:1782 +#: common.c:1696 common.c:1788 common.c:1874 #, c-format msgid "code page %d is not supported.\n" msgstr "未支援%d 編碼頁。\n" -#: common.c:1608 common.c:1700 common.c:1786 common.c:1846 +#: common.c:1700 common.c:1792 common.c:1878 common.c:1938 #, 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:1611 common.c:1703 common.c:1789 +#: common.c:1703 common.c:1795 common.c:1881 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n" msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n" -#: common.c:1615 common.c:1707 common.c:1793 +#: common.c:1707 common.c:1799 common.c:1885 #, fuzzy, c-format msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n" msgstr "略過 UTF-16 檔案 %s，UTF-16 轉換發生錯誤。\n" -#: common.c:1681 common.c:1770 common.c:1835 +#: common.c:1773 common.c:1862 common.c:1927 #, c-format msgid "Skipping %s, not a regular file.\n" msgstr "略過 %s，不是一個普通檔案。\n" -#: common.c:1684 +#: common.c:1776 #, c-format msgid "Skipping %s, output file %s is a symbolic link.\n" msgstr "略過 %s，輸出檔 %s 是一個符號連結。.\n" -#: common.c:1687 common.c:1776 common.c:1840 +#: common.c:1779 common.c:1868 common.c:1932 #, c-format msgid "Skipping symbolic link %s, target is not a regular file.\n" msgstr "略過符號連結 %s，目標不是一個普通檔案。\n" -#: common.c:1690 +#: common.c:1782 #, c-format msgid "Skipping %s, target of symbolic link %s is not a regular file.\n" msgstr "略過 %s，符號連結 %s 目標不是一個普通檔案。\n" -#: common.c:1713 +#: common.c:1805 #, c-format msgid "converting file %s to file %s in Unix format...\n" msgstr "正在轉換 %s 為Unix 格式到 %s...\n" -#: common.c:1716 +#: common.c:1808 #, c-format msgid "converting file %s to file %s in Mac format...\n" msgstr "正在轉換 %s 為Mac 格式到 %s...\n" -#: common.c:1718 +#: common.c:1810 #, c-format msgid "converting file %s to file %s in DOS format...\n" msgstr "正在轉換 %s 為DOS 格式到 %s...\n" @@ -533,42 +543,42 @@ msgstr "正在轉換 %s 為DOS 格式到 %s...\n" #. 3rd %s is encoding of output file. #. 4th %s is name of output file. #. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format... -#: common.c:1729 +#: common.c:1821 #, fuzzy, c-format msgid "converting %s file %s to %s file %s in Unix format...\n" msgstr "正在轉換 %s 為Unix 格式到 %s...\n" -#: common.c:1732 +#: common.c:1824 #, fuzzy, c-format msgid "converting %s file %s to %s file %s in Mac format...\n" msgstr "正在轉換 %s 為Mac 格式到 %s...\n" -#: common.c:1734 +#: common.c:1826 #, fuzzy, c-format msgid "converting %s file %s to %s file %s in DOS format...\n" msgstr "正在轉換 %s 為DOS 格式到 %s...\n" -#: common.c:1740 +#: common.c:1832 #, c-format msgid "problems converting file %s to file %s\n" msgstr "轉換檔案 %s 到 %s 錯誤\n" -#: common.c:1773 +#: common.c:1865 #, c-format msgid "Skipping symbolic link %s.\n" msgstr "略過符號連結 %s。\n" -#: common.c:1799 +#: common.c:1891 #, c-format msgid "converting file %s to Unix format...\n" msgstr "正在轉換 %s 為Unix 格式...\n" -#: common.c:1802 +#: common.c:1894 #, c-format msgid "converting file %s to Mac format...\n" msgstr "正在轉換 %s 為Mac 格式...\n" -#: common.c:1804 +#: common.c:1896 #, c-format msgid "converting file %s to DOS format...\n" msgstr "正在轉換 %s 為DOS 格式...\n" @@ -578,76 +588,76 @@ msgstr "正在轉換 %s 為DOS 格式...\n" #. 2nd %s is name of input file. #. 3rd %s is encoding of output (input file is overwritten). #. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format... -#: common.c:1814 +#: common.c:1906 #, fuzzy, c-format msgid "converting %s file %s to %s Unix format...\n" msgstr "正在轉換 %s 為Unix 格式...\n" -#: common.c:1817 +#: common.c:1909 #, fuzzy, c-format msgid "converting %s file %s to %s Mac format...\n" msgstr "正在轉換 %s 為Mac 格式...\n" -#: common.c:1819 +#: common.c:1911 #, fuzzy, c-format msgid "converting %s file %s to %s DOS format...\n" msgstr "正在轉換 %s 為DOS 格式...\n" -#: common.c:1825 +#: common.c:1917 #, c-format msgid "problems converting file %s\n" msgstr "轉換檔案 %s 錯誤\n" -#: common.c:1949 common.c:2001 +#: common.c:2039 common.c:2089 #, fuzzy, c-format msgid "can not read from input file %s:" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2162 +#: common.c:2257 #, c-format msgid "wrong flag '%c' for option -i or --info\n" msgstr "" -#: common.c:2287 common.c:2330 +#: common.c:2382 common.c:2425 #, c-format msgid "active code page: %d\n" msgstr "作用中編碼頁：%d\n" -#: common.c:2342 +#: common.c:2437 #, c-format msgid "invalid %s conversion mode specified\n" msgstr "指定的轉換模式 %s 不合法\n" -#: common.c:2350 common.c:2380 +#: common.c:2445 common.c:2475 #, c-format msgid "option '%s' requires an argument\n" msgstr "選項'%s' 需要一個引數\n" -#: common.c:2372 +#: common.c:2467 #, fuzzy, c-format msgid "invalid %s display encoding specified\n" msgstr "指定的轉換模式 %s 不合法\n" -#: common.c:2392 common.c:2405 common.c:2471 +#: common.c:2487 common.c:2500 common.c:2566 #, c-format msgid "target of file %s not specified in new-file mode\n" msgstr "新檔模式中未指明檔案 %s 的目的位置\n" -#: common.c:2485 +#: common.c:2578 #, fuzzy, c-format msgid "can not read from input file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2497 common.c:2511 +#: common.c:2588 common.c:2600 #, c-format msgid "can not write to output file: %s\n" msgstr "無法寫入輸出檔：%s\n" -#: common.c:2588 +#: common.c:2675 msgid "error: Invalid surrogate pair. Missing low surrogate.\n" msgstr "" -#: common.c:2603 +#: common.c:2691 msgid "error: Invalid surrogate pair. Missing high surrogate.\n" msgstr "" diff --git a/test/wcstombs_test.c b/test/wcstombs_test.c index e727058..58db4d2 100644 --- a/test/wcstombs_test.c +++ b/test/wcstombs_test.c @@ -9,7 +9,6 @@ int main() { wchar_t wstr[2]; char str[5]; - char *errstr; size_t i; setlocale(LC_ALL, ""); @@ -28,7 +27,7 @@ int main() { fprintf(stdout,"PASS\n"); return 0; } else { - errstr = strerror(errno); + char *errstr = strerror(errno); fprintf(stdout,"%s\n",errstr); fprintf(stdout,"FAIL\n"); return 1; diff --git a/unix2dos.c b/unix2dos.c index 4ece0b6..3d54fb8 100644 --- a/unix2dos.c +++ b/unix2dos.c @@ -482,6 +482,10 @@ int main (int argc, char *argv[]) # endif int argc_new; char **argv_new; +#ifdef D2U_UNIFILE + wchar_t **wargv; + char ***argv_glob; +#endif progname[8] = '\0'; strcpy(progname,"unix2dos"); @@ -542,8 +546,6 @@ int main (int argc, char *argv[]) #ifdef D2U_UNIFILE /* Get arguments in wide Unicode format in the Windows Command Prompt */ - wchar_t **wargv; - char ***argv_glob; /* This does not support wildcard expansion (globbing) */ wargv = CommandLineToArgvW(GetCommandLineW(), &argc); @@ -552,6 +554,7 @@ int main (int argc, char *argv[]) if (argv_glob == NULL) { D2U_UTF8_FPRINTF(stderr, "%s:", progname); D2U_ANSI_FPRINTF(stderr, " %s\n", strerror(errno)); + free(pFlag); return errno; } /* Glob the arguments and convert them to UTF-8 */ diff --git a/vc.mak b/vc.mak index 8f0a6cc..7606550 100644 --- a/vc.mak +++ b/vc.mak @@ -9,7 +9,7 @@ CC = cl.exe /nologo LINK = link.exe /nologo SRCDIR = . -DEFINES = /DVER_REVISION=\"$(DOS2UNIX_VERSION)\" /DVER_DATE=\"$(DOS2UNIX_DATE)\" +DEFINES = /DVER_REVISION=\"$(DOS2UNIX_VERSION)\" /DVER_DATE=\"$(DOS2UNIX_DATE)\" /DVER_AUTHOR=\""$(DOS2UNIX_AUTHOR)"\" CFLAGS = $(DEFINES) !ifdef DEBUG @@ -48,6 +48,9 @@ CFLAGS = $(CFLAGS) -DD2U_UNICODE !if "$(UNIFILE)" == "1" CFLAGS = $(CFLAGS) -DD2U_UNIFILE !endif +!if "$(DEBUGMSG)" == "1" +CFLAGS = $(CFLAGS) -DDEBUG +!endif dos2unix.obj : $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h $(CC) -c $(CFLAGS) $(SRCDIR)\dos2unix.c diff --git a/version.mk b/version.mk index 79da3ac..3622938 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ -DOS2UNIX_VERSION = 7.3.3 -DOS2UNIX_VERSION_SHORT = 733 -DOS2UNIX_DATE = 2016-02-13 +DOS2UNIX_VERSION = 7.3.4 +DOS2UNIX_VERSION_SHORT = 734 +DOS2UNIX_DATE = 2016-05-24 DOS2UNIX_AUTHOR = 'Erwin Waterlander' diff --git a/wcc.mif b/wcc.mif index 651355f..a94f0af 100644 --- a/wcc.mif +++ b/wcc.mif @@ -2,6 +2,14 @@ CFLAGS += -DD2U_UNICODE !endif +!ifeq UNIFILE 1 +CFLAGS += -DD2U_UNIFILE -D_O_U16TEXT=0x20000 +!endif + +!ifeq DEBUGMSG 1 +CFLAGS += -DDEBUG +!endif + dos2unix.obj : $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h $(CC) $(CFLAGS) $(SRCDIR)\dos2unix.c diff --git a/wccdos16.mak b/wccdos16.mak index 2fa1f28..e4e331d 100644 --- a/wccdos16.mak +++ b/wccdos16.mak @@ -2,7 +2,7 @@ CC = wcc SRCDIR = . -DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" +DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" -DVER_AUTHOR="$(DOS2UNIX_AUTHOR)" CFLAGS = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -bt=dos -ml WATCOMSRC = $(%WATCOM)\src\startup PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe diff --git a/wccdos32.mak b/wccdos32.mak index 5deaa07..785c9fc 100644 --- a/wccdos32.mak +++ b/wccdos32.mak @@ -2,7 +2,7 @@ CC = wcc386 SRCDIR = . -DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" +DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" -DVER_AUTHOR="$(DOS2UNIX_AUTHOR)" CFLAGS = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -5r -bt=dos -mf WATCOMSRC = $(%WATCOM)\src\startup PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe diff --git a/wccos2.mak b/wccos2.mak index 901398a..399bde4 100644 --- a/wccos2.mak +++ b/wccos2.mak @@ -2,7 +2,7 @@ CC = wcc386 SRCDIR = . -DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" +DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" -DVER_AUTHOR="$(DOS2UNIX_AUTHOR)" CFLAGS = $(DEFINES) -i=$(SRCDIR) -i$(%WATCOM)\h\os2 -w4 -e25 -zq -od -d2 -6r -bt=os2 -mf WATCOMSRC = $(%WATCOM)\src\startup PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe diff --git a/wccwin32.mak b/wccwin32.mak index 9dcc423..f641a91 100644 --- a/wccwin32.mak +++ b/wccwin32.mak @@ -2,7 +2,7 @@ CC = wcc386 SRCDIR = . -DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" +DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" -DVER_AUTHOR="$(DOS2UNIX_AUTHOR)" CFLAGS = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -5r -bt=nt -mf WATCOMSRC = $(%WATCOM)\src\startup PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe @@ -11,6 +11,7 @@ PACKAGE = dos2unix DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT) VERSIONSUFFIX = -win32 UCS = 1 +UNIFILE = 1 prefix = c:\usr\local -- 2.7.4