Imported Upstream version 6.0.3

Change-Id: I3666c933d91427487472b47a76e63581c69bd3e7
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

24 files changed, 840 insertions, 462 deletions

diff --git a/COPYING.txt b/COPYING.txt
index bdb650f..044fb47 100644
--- a/COPYING.txt
+++ b/COPYING.txt
@@ -2,7 +2,7 @@ The dos2unix package is distributed under FreeBSD style license.
 See also http://www.freebsd.org/copyright/freebsd-license.html
 --------
 
-Copyright (C) 2009-2012  Erwin Waterlander
+Copyright (C) 2009-2013  Erwin Waterlander
 Copyright (C) 1998 Christian Wurll
 Copyright (C) 1998 Bernd Johannes Wuebben
 Copyright (C) 1994-1995 Benjamin Lin.
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 91b7da0..9702cd1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,40 @@
+2013-01-25 Erwin Waterlander <waterlan@xs4all.nl>
+	* Version 6.0.3
+
+2013-01-18 Erwin Waterlander <waterlan@xs4all.nl>
+	* dos2unix.c/unix2dos.c: Print system error when writing to
+	  temporary output file fails.
+
+2013-01-16 Erwin Waterlander <waterlan@xs4all.nl>
+	* dos2unix.c/unix2dos.c: Print system error when closing of
+	  temporary output file fails. E.g. "No space left on device".
+
+2012-12-25 Erwin Waterlander <waterlan@xs4all.nl>
+	* querycp.c/h: Added public domain phrase for Debian
+	  license check.
+
+2012-12-12 Erwin Waterlander <waterlan@xs4all.nl>
+	* test: New directory with some test files.
+
+2012-09-20 Erwin Waterlander <waterlan@xs4all.nl>
+	* man/man1/Makefile: Removed dependency on 'sed' program.
+
+2012-09-19 Erwin Waterlander <waterlan@xs4all.nl>
+	* vc.mak: Visual C++ version supports wildcard expansion.
+	  Added targets 'install', 'uninstall', 'doc', 'dist',
+	  'txt', 'html', and 'mostlyclean'.
+	* INSTALL.txt: Update for Visual C++.
+
+2012-09-16 Erwin Waterlander <waterlan@xs4all.nl>
+	* *.c/*.h: Dos2unix compiles with Microsoft Visual C++.
+	* vc.mak: New makefile for Microsoft Visual C++.
+	* INSTALL.txt: Update for Visual C++.
+
+2012-09-15 Erwin Waterlander <waterlan@xs4all.nl>
+	* Makefile: Better check for DJGPP. DJGPP 2.04 uname returns "FreeDOS"
+	  on Freedos, 2.03 uname returns always "MS-DOS". Thanks to Rugxulo.
+	* man/man1/dos2unix.pod: Fixed a typo. Thanks to Jari Aalto.
+
 2012-09-06 Erwin Waterlander <waterlan@xs4all.nl>
 	* Version 6.0.2
 
diff --git a/INSTALL.txt b/INSTALL.txt
index ae9d46e..e265f55 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -8,7 +8,6 @@ PREREQUISITES
             * sh           : POSIX type shell
             * GNU coreutils: Core utilities package (chmod, install, mkdir,
                              mv, rm, uname)
-            * sed          : Stream editor
             * perl         : Practical Extraction and Report Language (perlpod)
 
         Optional (depending on build targets):
@@ -24,6 +23,15 @@ PREREQUISITES
         Required
             * Open Watcom  : http://www.openwatcom.org/
             * perl         : Practical Extraction and Report Language (perlpod)
+                             http://strawberryperl.com/
+
+
+    Using Microsoft Visual C++:
+        Required
+            * Visual C++   : You can get a free express version via this web page:
+                             http://www.microsoft.com/visualstudio/eng/downloads#d-2010-express
+            * perl         : Practical Extraction and Report Language (perlpod)
+                             http://strawberryperl.com/
 
 
 
@@ -162,6 +170,12 @@ WINDOWS PORT
         wmake -f wccwin32.mak
         wmake -f wccwin32.mak install
 
+    Or use Microsoft Visual C++ and type:
+
+        nmake /f vc.mak clean
+        nmake /f vc.mak
+        nmake /f vc.mak install
+
 
     The win32 binaries built with MinGW32 are packed with a patched version of
     MinGW's libintl-8.dll that has builtin support for relocation. See also
diff --git a/Makefile b/Makefile
index 74a3e11..25400de 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ endif
 endif
 
 ifndef D2U_OS
-ifeq ($(shell uname),MS-DOS)
+ifneq ($(DJGPP),)
 	D2U_OS = msdos
 	prefix=c:/dos32
 	EXE = .exe
diff --git a/NEWS.txt b/NEWS.txt
index e59f310..62ac7d5 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,8 @@
+2013-01-25: Version 6.0.3
+
+  * Source code compiles with Microsoft Visual C.
+  * Print system error when writing output fails.
+
 2012-09-06: Version 6.0.2
 
   * The locale encoding detection has been fixed when NLS was disabled.
diff --git a/README.txt b/README.txt
index 3e24b23..16bdd16 100644
--- a/README.txt
+++ b/README.txt
@@ -46,7 +46,7 @@ HISTORY
 
 AUTHORS
 
-        Erwin Waterlander       version 3.2-6.0.2  2009-2012
+        Erwin Waterlander       version 3.2-6.0.3  2009-2013
         Christian Wurll         version 3.1        1998
         Bernd Johannes Wuebben  version 3.0        1998
         Benjamin Lin            version 1.1-2.3    1994-1995
diff --git a/common.c b/common.c
index 08f4098..72803a5 100644
--- a/common.c
+++ b/common.c
@@ -26,7 +26,7 @@
 
 #include "common.h"
 #if defined(D2U_UNICODE)
-#if defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
 #include <windows.h>
 #endif
 #endif
@@ -98,8 +98,10 @@ int regfile(char *path, int allowSymlinks, CFlag *ipFlag, char *progname)
 #endif
       if (S_ISREG(buf.st_mode))
          fprintf(stderr, " (regular file)");
+#ifdef S_ISBLK
       if (S_ISBLK(buf.st_mode))
          fprintf(stderr, " (block device)");
+#endif
       if (S_ISDIR(buf.st_mode))
          fprintf(stderr, " (directory)");
       if (S_ISCHR(buf.st_mode))
@@ -253,8 +255,12 @@ void PrintVersion(char *progname)
   fprintf(stderr, "%s", _("Windows 64 bit version (MinGW-w64).\n"));
 #elif defined(__WATCOMC__) && defined(__NT__)
   fprintf(stderr, "%s", _("Windows 32 bit version (WATCOMC).\n"));
-#elif defined(__WIN32__) && defined(__MINGW32__)
+#elif defined(_WIN32) && defined(__MINGW32__)
   fprintf(stderr, "%s", _("Windows 32 bit version (MinGW).\n"));
+#elif defined(_WIN64) && defined(_MSC_VER)
+  fprintf(stderr,_("Windows 64 bit version (MSVC %d).\n"),_MSC_VER);
+#elif defined(_WIN32) && defined(_MSC_VER)
+  fprintf(stderr,_("Windows 32 bit version (MSVC %d).\n"),_MSC_VER);
 #elif defined (__OS2__) && defined(__WATCOMC__) /* OS/2 Warp */
   fprintf(stderr, "%s", _("OS/2 version (WATCOMC).\n"));
 #elif defined (__OS2__) && defined(__EMX__) /* OS/2 Warp */
@@ -298,7 +304,7 @@ FILE* OpenOutFile(int fd)
   return (fdopen(fd, W_CNTRL));
 }
 
-#if defined(__TURBOC__) || defined(__MSYS__)
+#if defined(__TURBOC__) || defined(__MSYS__) || defined(_MSC_VER)
 char *dirname(char *path)
 {
   char *ptr;
@@ -589,7 +595,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag)
    {
       /* fprintf(stderr, "UTF-16 trail %x\n",wc); */
       trail = (wchar_t)wc; /* trail (low) surrogate */
-#if defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
       /* On Windows (including Cygwin) wchar_t is 16 bit */
       /* We cannot decode an UTF-16 surrogate pair, because it will
          not fit in a 16 bit wchar_t. */
@@ -629,7 +635,7 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag)
       wstr[1] = L'\0';
    }
 
-#if defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
    /* On Windows we convert UTF-16 always to UTF-8 */
    len = (size_t)(WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbs, sizeof(mbs), NULL, NULL) -1);
 #else
diff --git a/common.h b/common.h
index 2c60671..cf7c885 100644
--- a/common.h
+++ b/common.h
@@ -55,11 +55,11 @@
 #if defined(__DJGPP__) || defined(__TURBOC__) /* DJGPP */
 #  include <dir.h>
 #else
-#  ifndef __MSYS__
+#  if !defined(__MSYS__) && !defined(_MSC_VER)
 #    include <libgen.h>
 #  endif
 #endif
-#ifndef __TURBOC__
+#if !defined(__TURBOC__) && !defined(_MSC_VER)
 #include <unistd.h>
 #endif
 #include <stdio.h>
@@ -71,7 +71,11 @@
 #  define strcmpi(s1, s2) strcasecmp(s1, s2)
 #endif
 #endif
-#include <utime.h>
+#ifdef _MSC_VER
+#  include <sys/utime.h>
+#else
+#  include <utime.h>
+#endif
 #include <limits.h>
 #ifdef __TURBOC__
 #define __FLAT__
@@ -83,7 +87,7 @@
 #endif
 
 #if (defined(__WATCOMC__) && defined(__NT__))  /* Watcom */
-#  define __WIN32__ 1
+#  define _WIN32 1
 #endif
 
 #if defined(__WATCOMC__) && defined(__I86__) /* Watcom C, 16 bit Intel */
@@ -94,19 +98,19 @@
 #define __MSDOS__ 1
 #endif
 
-#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__))
 /* setlocale() is also needed for nl_langinfo() */
 #include <locale.h>
 #endif
 
-#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__)
+#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__) || defined(_MSC_VER)
 /* Some compilers have no mkstemp().
  * Use mktemp() instead.
  * BORLANDC, DJGPP, MINGW32 */
 #define NO_MKSTEMP 1
 #endif
 
-#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(_MSC_VER)
 /* Some compilers have no chown(). */
 #define NO_CHOWN 1
 #endif
@@ -116,25 +120,34 @@
 #undef S_ISLNK
 #endif
 
-#if defined(__MSDOS__) || defined(__WIN32__) || defined(__OS2__)
+/* Microsoft Visual C++ */
+#ifdef _MSC_VER
+#define S_ISCHR( m )    (((m) & _S_IFMT) == _S_IFCHR)
+#define S_ISDIR( m )    (((m) & _S_IFMT) == _S_IFDIR)
+#define S_ISFIFO( m )   (((m) & _S_IFMT) == _S_IFIFO)
+#define S_ISREG( m )    (((m) & _S_IFMT) == _S_IFREG)
+#define NO_CHMOD 1  /* no chmod() available */
+#endif
+
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__)
 /* Systems without soft links use 'stat' instead of 'lstat'. */
 #define STAT stat
 #else
 #define STAT lstat
 #endif
 
-#if defined(__MSDOS__) || defined(__WIN32__) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__)
 /* On some systems rename() will always fail if target file already exists. */
 #define NEED_REMOVE 1
 #endif
 
-#if defined(__MSDOS__) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__OS2__) /* DJGPP, MINGW32 and OS/2 */
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) /* DJGPP, MINGW32 and OS/2 */
 /* required for setmode() and O_BINARY */
 #include <fcntl.h>
 #include <io.h>
 #endif
 
-#if defined(__MSDOS__) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__)
   #define R_CNTRL   "rb"
   #define W_CNTRL   "wb"
 #else
diff --git a/dos2unix.c b/dos2unix.c
index 01f217c..a0d582b 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -7,7 +7,7 @@
  *  See also http://www.freebsd.org/copyright/freebsd-license.html
  *  --------
  *
- *  Copyright (C) 2009-2012 Erwin Waterlander
+ *  Copyright (C) 2009-2013 Erwin Waterlander
  *  Copyright (C) 1998 Christian Wurll
  *  Copyright (C) 1998 Bernd Johannes Wuebben
  *  Copyright (C) 1994-1995 Benjamin Lin.
@@ -66,7 +66,7 @@
 #include "dos2unix.h"
 #include "querycp.h"
 #ifdef D2U_UNICODE
-#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__)  /* Unix, Cygwin */
 # include <langinfo.h>
 #endif
 #endif
@@ -74,7 +74,7 @@
 void PrintLicense(void)
 {
   fprintf(stderr, "%s", _("\
-Copyright (C) 2009-2012 Erwin Waterlander\n\
+Copyright (C) 2009-2013 Erwin Waterlander\n\
 Copyright (C) 1998      Christian Wurll (Version 3.1)\n\
 Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n\
 Copyright (C) 1994-1995 Benjamin Lin\n\
@@ -135,6 +135,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     wint_t TempChar;
     wint_t TempNextChar;
     int line_nr = 1;
+    char *errstr;
 
     ipFlag->status = 0;
 
@@ -173,8 +174,9 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               {
                 if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
               }
               break;
@@ -211,8 +213,9 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 {
                   if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                   {
+                    errstr = strerror(errno);
                     fprintf(stderr, "%s: ", progname);
-                    fprintf(stderr, "%s", _("can not write to output file\n"));
+                    fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                   }
                 }
                 break;
@@ -235,8 +238,9 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 {
                   if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                   {
+                    errstr = strerror(errno);
                     fprintf(stderr, "%s: ", progname);
-                    fprintf(stderr, "%s", _("can not write to output file\n"));
+                    fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                   }
                 }
                 break;
@@ -271,6 +275,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int TempNextChar;
     int *ConvTable;
     int line_nr = 1;
+    char *errstr;
 
     ipFlag->status = 0;
 
@@ -343,8 +348,9 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               RetVal = -1;
               if (!ipFlag->Quiet)
               {
+                errstr = strerror(errno);
                 fprintf(stderr, "%s: ", progname);
-                fprintf(stderr, "%s", _("can not write to output file\n"));
+                fprintf(stderr, _("can not write to output file: %s\n"), errstr);
               }
               break;
             }
@@ -378,8 +384,9 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 RetVal = -1;
                 if (!ipFlag->Quiet)
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
                 break;
               }
@@ -399,8 +406,9 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 RetVal = -1;
                 if (!ipFlag->Quiet)
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
                 break;
               }
@@ -548,7 +556,7 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
   InF = read_bom(InF, &ipFlag->bomtype);
 
 #ifdef D2U_UNICODE
-#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__)  /* Unix, Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
@@ -561,7 +569,7 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
   }
 #endif
-#if !defined(__WIN32__) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
+#if !defined(_WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (sizeof(wchar_t) < 4)
@@ -607,8 +615,20 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     RetVal = -1;
 
   /* can close output file? */
-  if ((TempF) && (fclose(TempF) == EOF))
-    RetVal = -1;
+  if (TempF)
+  {
+    if (fclose(TempF) == EOF)
+    {
+       if (!ipFlag->Quiet)
+       {
+         ipFlag->error = errno;
+         errstr = strerror(errno);
+         fprintf(stderr, "%s: ", progname);
+         fprintf(stderr, _("Failed to write to temporary output file %s: %s\n"), TempPath, errstr);
+       }
+      RetVal = -1;
+    }
+  }
 
 #ifdef NO_MKSTEMP
   if(fd!=NULL)
@@ -769,18 +789,18 @@ int ConvertDosToUnixStdio(CFlag *ipFlag, char *progname)
     ipFlag->KeepDate = 0;
     ipFlag->Force = 1;
 
-#if defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 
     /* stdin and stdout are by default text streams. We need
      * to set them to binary mode. Otherwise an LF will
      * automatically be converted to CR-LF on DOS/Windows.
      * Erwin */
 
-    /* 'setmode' was deprecated by MicroSoft
-     * since Visual C++ 2005. Use '_setmode' instead. */
+    /* POSIX 'setmode' was deprecated by MicroSoft since
+     * Visual C++ 2005. Use ISO C++ conformant '_setmode' instead. */
 
-    _setmode(fileno(stdout), O_BINARY);
-    _setmode(fileno(stdin), O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+    _setmode(_fileno(stdin), _O_BINARY);
 #elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__)
     setmode(fileno(stdout), O_BINARY);
     setmode(fileno(stdin), O_BINARY);
@@ -842,7 +862,7 @@ int main (int argc, char *argv[])
    }
 #endif
 
-#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__))
 /* setlocale() is also needed for nl_langinfo() */
    setlocale (LC_ALL, "");
 #endif
diff --git a/man/man1/Makefile b/man/man1/Makefile
index 4f81af8..560c785 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -99,7 +99,7 @@ all: $(MAN_OBJECTS)
 		--name="$(PACKAGE)" \
 		--section="$(MANSECT)" \
 		$< \
-	| sed 's,[Pp]erl v[0-9.]\+,$(PACKAGE),' \
+	| perl -p -e 's/[Pp]erl v[0-9.]+/$(PACKAGE)/;' \
 	  > $@ && \
 	rm -f pod*.tmp
 # fix for bug http://rt.perl.org/rt3//Public/Bug/Display.html?id=79410
diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod
index b06676f..52e7856 100644
--- a/man/man1/dos2unix.pod
+++ b/man/man1/dos2unix.pod
@@ -189,7 +189,7 @@ defaults to run in this mode. Wildcard names may be used.
 
 In old file (in-place) mode the converted file gets the same owner, group, and
 read/write permissions as the original file. Also when the file is converted by
-an other user who has write permissions on the file (e.g. user root).  The
+another user who has write permissions on the file (e.g. user root).  The
 conversion will be aborted when it is not possible to preserve the original
 values.  Change of owner could mean that the original owner is not able to read
 the file any more. Change of group could be a security risk, the file could be
diff --git a/po/de.po b/po/de.po
index 32715b5..8e0c1a7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 21:28+0200\n"
+"POT-Creation-Date: 2013-01-18 11:09+0100\n"
 "PO-Revision-Date: 2010-01-24 09:00+0100\n"
 "Last-Translator: Philipp Thomas <psmt@opensuse.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,146 +21,152 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
-"Copyright © 2009-2012 Erwin Waterlander\n"
+"Copyright © 2009-2013 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"
 "Alle Rechte vorbehalten.\n"
 "\n"
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr "Ein binäres Symbol wurde in Zeile %d gefunden\n"
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
-msgstr "In die Ausgabedatei kann nicht geschrieben werden\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n"
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "Programmfehler, der Konvertierungsmodus %d ist unzulässig\n"
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr "Codepage %d wird verwendet.\n"
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n"
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "%s wird als temporäre Datei verwendet\n"
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden: %s\n"
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte: %s\n"
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s "
 "scheiterte: %s\n"
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«\n"
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          Die Ausgabedatei verbleibt in »%s«\n"
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten: %s\n"
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          welche das Ziel der symbolischen Verknüpfung »%s« ist\n"
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 "Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n"
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr "aktive Codepage: %d\n"
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "Der angegebene Konvertierungsmodus %s ist unzulässig\n"
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "Die Option »%s« benötigt ein Argument\n"
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n"
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n"
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n"
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 "Symbolische Verknüpfung %s wird übersprungen da das Ziel keine reguläre "
 "Datei ist.\n"
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine "
 "reguläre Datei.\n"
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "binäre Datei %s wird übersprungen\n"
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "Codepage %d wird nicht unterstützt.\n"
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -169,75 +175,75 @@ msgstr ""
 "UTF-16 Datei %s wird übersprungen, da die derzeitige Zeichenkodierung nicht "
 "UTF-8 ist.\n"
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n"
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "UTF-16 Datei %s wird übersprungen, da beim Umwandeln ein Fehler auftrat.\n"
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt ...\n"
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "Beim Konvertieren von Datei %s zu Datei %s sind Probleme aufgetreten\n"
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Symbolische Verknüpfung %s wird übersprungen.\n"
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "Datei %s wird ins Unix-Format umgewandelt ...\n"
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n"
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
-"Copyright © 2009-2012 Erwin Waterlander\n"
+"Copyright © 2009-2013 Erwin Waterlander\n"
 "Copyright © 1994,1995 Benjamin Lin\n"
 "Alle Rechte vorbehalten.\n"
 "\n"
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "Datei %s wird in Datei %s im Mac-Format konvertiert ...\n"
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "Datei %s wird in Datei %s im DOS-Format konvertiert ...\n"
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "Datei %s wird ins Mac-Format konvertiert ...\n"
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "Datei %s wird ins DOS-Format konvertiert ...\n"
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -285,7 +291,7 @@ msgstr ""
 "FAHRLÄSSIGKEIT), DIE AUS DER VERWENDUNG DIESER SOFTWARE ERWÄCHST,\n"
 "SELBST WENN AUF DIE MÖGLICHKIET SOLCHER SCHÄDEN HINGEWIESEN WURDE.\n"
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -346,7 +352,7 @@ msgstr ""
 "                       ist im stdio Modus immer aktiv\n"
 " -s, --safe            überspringt binäre Dateien (Vorgabe)\n"
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -362,65 +368,73 @@ msgstr ""
 " -S, --skip-symlink    symbolische Verknüpfungen und deren Ziele bleiben\n"
 "                       unangetastet (Vorgabe)\n"
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         gibt die Versionsnummer aus\n"
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "DOS 16 bit Version (WATCOMC).\n"
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "DOS 16 bit Version (TURBOC).\n"
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "DOS 32 bit Version (WATCOMC).\n"
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "DOS 32 bit Version (DJGPP).\n"
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr "MSYS Version.\n"
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr "Cygwin Version.\n"
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Windows 64 bit Version (MinGW-w64).\n"
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Windows 32 bit Version (WATCOMC).\n"
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows 32 bit Version (MinGW).\n"
 
-#: common.c:259
-#, fuzzy
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows 64 bit Version (MSVC %d).\n"
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows 32 bit Version (MSVC %d).\n"
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
-msgstr "DOS 32 bit Version (WATCOMC).\n"
+msgstr "OS/2 Version (WATCOMC).\n"
 
-#: common.c:261
-#, fuzzy
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
-msgstr "OS/2 Version.\n"
+msgstr "OS/2 Version (EMX).\n"
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Mit Unterstützung für Unicode UTF-16.\n"
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Ohne Unterstützung für Unicode UTF-16.\n"
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr "Mit Unterstützung von Landessprachen.\n"
diff --git a/po/dos2unix.pot b/po/dos2unix.pot
index e30e008..1e8cd03 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: 2012-09-06 20:56+0200\n"
+"POT-Creation-Date: 2013-01-23 20:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -27,194 +27,200 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr ""
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
 msgstr ""
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr ""
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr ""
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr ""
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr ""
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr ""
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr ""
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr ""
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr ""
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr ""
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr ""
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr ""
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr ""
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr ""
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr ""
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
 "UTF-8.\n"
 msgstr ""
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr ""
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr ""
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr ""
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr ""
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr ""
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr ""
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr ""
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr ""
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr ""
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr ""
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -238,7 +244,7 @@ msgid ""
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 msgstr ""
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -270,7 +276,7 @@ msgid ""
 " -s, --safe            skip binary files (default)\n"
 msgstr ""
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -279,63 +285,73 @@ msgid ""
 " -S, --skip-symlink    keep symbolic links and targets unchanged (default)\n"
 msgstr ""
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr ""
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr ""
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr ""
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr ""
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr ""
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr ""
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr ""
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr ""
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr ""
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr ""
 
-#: common.c:259
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr ""
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr ""
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
 msgstr ""
 
-#: common.c:261
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
 msgstr ""
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr ""
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr ""
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr ""
diff --git a/po/eo-x.po b/po/eo-x.po
index 9832a89..d5190dc 100644
--- a/po/eo-x.po
+++ b/po/eo-x.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 21:28+0200\n"
+"POT-Creation-Date: 2013-01-18 11:09+0100\n"
 "PO-Revision-Date: 2010-03-07 19:50+0100\n"
 "Last-Translator: Rugxulo <rugxulo@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -27,127 +27,133 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr "Netekstan signon trovigxis cxe linio %d\n"
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
-msgstr "ne povas registri dosieren\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "ne povas registri dosieren: %s\n"
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programa eraro, negxustan sxangxmodon %d\n"
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr "uzante kodpagxon %d.\n"
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "uzante %s kiel provizora dosiero\n"
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Ne sukcesis registri provizoran eligitan dosieron %s: %s\n"
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis sxangxi la permesajxojn de la provizora eldona dosiero %s: %s\n"
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis sxangxi la proprietulon kaj grupon de la provizora eldona "
 "dosiero %s: %s\n"
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "erarojn legante dosieran cxeneron '%s'\n"
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          kreatan dosieron restas en '%s'\n"
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          kiu estas la atingon de dosiera cxenero '%s'\n"
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "eraro: DOS2UNIX_LOCALEDIR tro longigxis.\n"
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr "nuntempa kodpagxo: %d\n"
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "neuzebla %s sxangxmodo menciita\n"
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "elekto '%s' bezonas elekto-vorton\n"
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Pasante %s, dosiero ne taugxa.\n"
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Evitante %s, atingan dosieron %s jam estas dosiera cxenero.\n"
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Evitante dosieran cxeneron %s, atingon ne estas normala dosiero.\n"
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr "Evitante %s, atingon de dosiera cxenero %s ne estas normala dosiero.\n"
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Pasante ne-tekstan dosieron %s\n"
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "kodpagxo %d ne estas konvertebla.\n"
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -156,70 +162,70 @@ msgstr ""
 "Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodigxo ne "
 "egalas UTF-8.\n"
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukigxo okazis.\n"
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "sxangxante dosieron %s al dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemojn trovitajn dum sxangxi dosiero %s al dosiero %s\n"
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Evitante dosieran cxeneron %s.\n"
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "sxangxante dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemojn dum sxangxi dosiero %s\n"
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "sxangxante dosiero %s al dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "sxangxante dosiero %s al dosiero %s DOS-en ...\n"
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "sxangxante dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "sxangxante dosiero %s DOS-en ...\n"
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -243,7 +249,7 @@ msgid ""
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 msgstr ""
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -302,7 +308,7 @@ msgstr ""
 "                       cxiam ensxaltata dum stdio modo\n"
 " -s, --safe            evitu netekstajn dosierojn (jam sxaltita)\n"
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -317,65 +323,73 @@ msgstr ""
 " -S, --skip-symlink    retenu dosierajn cxenerojn kaj atingojn nesxangxataj "
 "(jam sxaltita)\n"
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         diri eldono-numeron\n"
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "DOS-16 eldono (WATCOMC).\n"
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "DOS-16 eldono (TURBOC).\n"
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "DOS-32 eldono (WATCOMC).\n"
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "DOS-32 eldono (DJGPP).\n"
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr "MSYS eldono.\n"
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr "Cygwin eldono.\n"
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Windows-64 eldono (MinGW-w64).\n"
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Windows-32 eldono (WATCOMC).\n"
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows-32 eldono (MinGW).\n"
 
-#: common.c:259
-#, fuzzy
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows-64 eldono (MSVC %d).\n"
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows-32 eldono (MSVC %d).\n"
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
-msgstr "DOS-32 eldono (WATCOMC).\n"
+msgstr "OS/2 eldono (WATCOMC).\n"
 
-#: common.c:261
-#, fuzzy
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
-msgstr "OS/2 eldono.\n"
+msgstr "OS/2 eldono (EMX).\n"
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Kun subteno de Unikodo da UTF-16.\n"
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sen subteno de Unikodo da UTF-16.\n"
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/eo.po b/po/eo.po
index 47fdaf4..729878c 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 21:28+0200\n"
+"POT-Creation-Date: 2013-01-18 11:09+0100\n"
 "PO-Revision-Date: 2010-03-07 19:50+0100\n"
 "Last-Translator: Ruĝulo <ruĝulo@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -27,127 +27,133 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr "Netekstan signon troviĝis ĉe linio %d\n"
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
-msgstr "ne povas registri dosieren\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "ne povas registri dosieren: %s\n"
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programa eraro, neĝustan ŝanĝmodon %d\n"
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr "uzante kodpaĝon %d.\n"
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "uzante %s kiel provizora dosiero\n"
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Ne sukcesis registri provizoran eligitan dosieron %s: %s\n"
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis ŝanĝi la permesaĵojn de la provizora eldona dosiero %s: %s\n"
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis ŝanĝi la proprietulon kaj grupon de la provizora eldona dosiero "
 "%s: %s\n"
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "erarojn legante dosieran ĉeneron '%s'\n"
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          kreatan dosieron restas en '%s'\n"
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          kiu estas la atingon de dosiera ĉenero '%s'\n"
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "eraro: DOS2UNIX_LOCALEDIR tro longiĝis.\n"
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr "nuntempa kodpaĝo: %d\n"
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "neuzebla %s ŝanĝmodo menciita\n"
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "elekto '%s' bezonas elekto-vorton\n"
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Pasante %s, dosiero ne tauĝa.\n"
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Evitante %s, atingan dosieron %s jam estas dosiera ĉenero.\n"
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Evitante dosieran ĉeneron %s, atingon ne estas normala dosiero.\n"
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr "Evitante %s, atingon de dosiera ĉenero %s ne estas normala dosiero.\n"
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Pasante ne-tekstan dosieron %s\n"
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "kodpaĝo %d ne estas konvertebla.\n"
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -156,70 +162,70 @@ msgstr ""
 "Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodiĝo ne "
 "egalas UTF-8.\n"
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukiĝo okazis.\n"
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "ŝanĝante dosieron %s al dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemojn trovitajn dum ŝanĝi dosiero %s al dosiero %s\n"
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Evitante dosieran ĉeneron %s.\n"
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "ŝanĝante dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemojn dum ŝanĝi dosiero %s\n"
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "ŝanĝante dosiero %s al dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "ŝanĝante dosiero %s al dosiero %s DOS-en ...\n"
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "ŝanĝante dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "ŝanĝante dosiero %s DOS-en ...\n"
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -243,7 +249,7 @@ msgid ""
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 msgstr ""
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -302,7 +308,7 @@ msgstr ""
 "                       ĉiam enŝaltata dum stdio modo\n"
 " -s, --safe            evitu netekstajn dosierojn (jam ŝaltita)\n"
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -317,65 +323,73 @@ msgstr ""
 " -S, --skip-symlink    retenu dosierajn ĉenerojn kaj atingojn neŝanĝataj "
 "(jam ŝaltita)\n"
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         diri eldono-numeron\n"
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "DOS-16 eldono (WATCOMC).\n"
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "DOS-16 eldono (TURBOC).\n"
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "DOS-32 eldono (WATCOMC).\n"
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "DOS-32 eldono (DJGPP).\n"
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr "MSYS eldono.\n"
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr "Cygwin eldono.\n"
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Windows-64 eldono (MinGW-w64).\n"
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Windows-32 eldono (WATCOMC).\n"
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows-32 eldono (MinGW).\n"
 
-#: common.c:259
-#, fuzzy
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows-64 eldono (MSVC %d).\n"
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows-32 eldono (MSVC %d).\n"
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
-msgstr "DOS-32 eldono (WATCOMC).\n"
+msgstr "OS/2 eldono (WATCOMC).\n"
 
-#: common.c:261
-#, fuzzy
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
-msgstr "OS/2 eldono.\n"
+msgstr "OS/2 eldono (EMX).\n"
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Kun subteno de Unikodo da UTF-16.\n"
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sen subteno de Unikodo da UTF-16.\n"
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/es.po b/po/es.po
index 7e684a8..ac79f6e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 21:28+0200\n"
+"POT-Creation-Date: 2013-01-18 11:09+0100\n"
 "PO-Revision-Date: 2011-06-20 09:13+0200\n"
 "Last-Translator:  <jfreyreg@gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -28,201 +28,207 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr "S�mbolo binario encontrado en la l�nea %d\n"
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
-msgstr "no puedo escribir al archivo de salida\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "no puedo escribir al archivo de salida: %s\n"
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "error, modo de conversi�n %d inv�lido\n"
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr "usando p�gina de c�digos %d.\n"
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Fall� al abrir el archivo de salida temporal: %s\n"
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "usando %s como archivo temporal\n"
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Fall� al escribir el archivo de salida temporal %s: %s\n"
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr "Error al cambiar los permisos del archivo temporal de salida %s: %s\n"
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Error al cambiar el propietario y grupo del archivo temporal de salida %s: "
 "%s\n"
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "problemas al resolver el enlace simb�lico '%s'\n"
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          el archivo de salida permanece en '%s'\n"
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemas al renombrar '%s' como '%s': %s\n"
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          cual es el destino del enlace simb�lico '%s'\n"
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 "error: El valor de la variable de entorno DOS2UNIX_LOCALEDIR es demasiado "
 "largo.\n"
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr "P�gina de c�digos activa: %d\n"
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "modo de conversi�n %s especificado es inv�lido\n"
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "el par�metro '%s' requiere un argumento\n"
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr ""
 "el destino del archivo %s no se especific� en el modo de archivo nuevo\n"
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Ignorando %s, no es un archivo regular.\n"
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Ignorando %s, el archivo de salida %s es un enlace simb�lico.\n"
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Ignorando enlace simb�lico %s, el destino no es un archivo regular.\n"
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "Ignorando %s, el destino del enlace simb�lico %s no es un archivo regular.\n"
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Ignorando archivo binario %s\n"
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "La p�gina de c�digos %d no est� soportada.\n"
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
 "UTF-8.\n"
 msgstr "Ignorando archivo UTF-16 %s, la codificaci�n actual no es UTF-8.\n"
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Ignorando archivo UTF-16 %s, el tama�o de wchar_t es %d bytes.\n"
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "Ignorando archivo UTF-16 %s, ocurri� un error de conversi�n a UTF-16.\n"
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "convirtiendo archivo %s a %s in formato Unix ...\n"
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemas al convertir el archivo %s a %s\n"
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Ignorando enlace simb�lico %s.\n"
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "convirtiendo archivo %s a formato Unix ...\n"
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemas convirtiendo el archivo %s\n"
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "convirtiendo archivo %s a %s in formato Mac ...\n"
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "convirtiendo archivo %s a %s en formato DOS ...\n"
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "convirtiendo archivo %s a formato Mac ...\n"
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "convirtiendo archivo %s a formato DOS ...\n"
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -246,7 +252,7 @@ msgid ""
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 msgstr ""
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -310,7 +316,7 @@ msgstr ""
 "                       siempre en modo stdio\n"
 " -s, --safe            ignora archivos binarios (por defecto)\n"
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -326,65 +332,73 @@ msgstr ""
 " -S, --skip-symlink    no altera los enlaces simb�licos ni sus destinos (por "
 "defecto)\n"
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         despliega el n�mero de versi�n\n"
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "Versi�n DOS de 16 bit (WATCOMC).\n"
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "Versi�n DOS de 16 bit (TURBOC).\n"
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "Versi�n DOS de 32 bit (WATCOMC).\n"
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "Versi�n DOS de 32 bit (DJGPP).\n"
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr "Versi�n para MSYS.\n"
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr "Versi�n para Cygwin.\n"
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Versi�n Windows de 64 bit (MinGW-w64).\n"
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Versi�n Windows de 32 bit (WATCOMC).\n"
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Versi�n Windows de 32 bit (MinGW).\n"
 
-#: common.c:259
-#, fuzzy
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Versi�n Windows de 64 bit (MSVC %d).\n"
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Versi�n Windows de 32 bit (MSVC %d).\n"
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
-msgstr "Versi�n DOS de 32 bit (WATCOMC).\n"
+msgstr "Versi�n para OS/2 (WATCOMC).\n"
 
-#: common.c:261
-#, fuzzy
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
-msgstr "Versi�n para OS/2.\n"
+msgstr "Versi�n para OS/2 (EMX).\n"
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Con soporte Unicode UTF-16.\n"
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sin soporte Unicode UTF-16.\n"
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr "Con soporte de idioma materno.\n"
diff --git a/po/nl.po b/po/nl.po
index dcf5be2..1168e32 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-27 21:28+0200\n"
+"POT-Creation-Date: 2013-01-18 11:09+0100\n"
 "PO-Revision-Date: 2009-12-08 21:59+0100\n"
 "Last-Translator: Erwin Waterlander <waterlan@xs4all.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 
 #: dos2unix.c:76
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1998      Christian Wurll (Version 3.1)\n"
 "Copyright (C) 1998      Bernd Johannes Wuebben (Version 3.0)\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
@@ -27,133 +27,139 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
-#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#: dos2unix.c:164 dos2unix.c:202 dos2unix.c:340 dos2unix.c:375 unix2dos.c:132
+#: unix2dos.c:185 unix2dos.c:332 unix2dos.c:382
 #, c-format
 msgid "Binary symbol found at line %d\n"
 msgstr "Binair teken gevonden op regel %d\n"
 
-#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
-#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
-#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
-msgid "can not write to output file\n"
-msgstr "kan niet schrijven naar uitvoerbestand\n"
+#: dos2unix.c:179 dos2unix.c:218 dos2unix.c:243 dos2unix.c:353 dos2unix.c:389
+#: dos2unix.c:411 unix2dos.c:162 unix2dos.c:199 unix2dos.c:220 unix2dos.c:238
+#: unix2dos.c:360 unix2dos.c:394 unix2dos.c:412 unix2dos.c:427
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "kan niet schrijven naar uitvoerbestand: %s\n"
 
-#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
+#: dos2unix.c:259 dos2unix.c:426 unix2dos.c:253 unix2dos.c:441
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programma fout, ongeldige conversie modus %d\n"
 
-#: dos2unix.c:310 unix2dos.c:303
+#: dos2unix.c:315 unix2dos.c:309
 #, c-format
 msgid "using code page %d.\n"
 msgstr "codetabel %d wordt gebruikt.\n"
 
-#: dos2unix.c:506 unix2dos.c:519
+#: dos2unix.c:514 unix2dos.c:529
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Niet gelukt om tijdelijk uitvoerbestand te openen: %s\n"
 
-#: dos2unix.c:513 unix2dos.c:526
+#: dos2unix.c:521 unix2dos.c:536
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "%s wordt als tijdelijk bestand gebruikt\n"
 
-#: dos2unix.c:642 unix2dos.c:655
+#: dos2unix.c:627 unix2dos.c:642
+#, c-format
+msgid "Failed to write to temporary output file %s: %s\n"
+msgstr "Niet gelukt om tijdelijk uitvoerbestand %s te schrijven: %s\n"
+
+#: dos2unix.c:662 unix2dos.c:677
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Niet gelukt om de permissies van tijdelijk uitvoerbestand %s te wijzigen: "
 "%s\n"
 
-#: dos2unix.c:661 unix2dos.c:674
+#: dos2unix.c:681 unix2dos.c:696
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Niet gelukt om de eigenaar en groep van tijdelijk uitvoerbestand %s te "
 "wijzigen: %s\n"
 
-#: dos2unix.c:714 unix2dos.c:727
+#: dos2unix.c:734 unix2dos.c:749
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "problemen met het herleiden van symbolische koppeling '%s'\n"
 
-#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
+#: dos2unix.c:735 dos2unix.c:769 unix2dos.c:750 unix2dos.c:784
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          uitvoerbestand blijft in '%s'\n"
 
-#: dos2unix.c:744 unix2dos.c:757
+#: dos2unix.c:764 unix2dos.c:779
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemen met hernoemen van '%s' naar '%s': %s\n"
 
-#: dos2unix.c:747 unix2dos.c:760
+#: dos2unix.c:767 unix2dos.c:782
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          welke het doel is van symbolische koppeling '%s'\n"
 
-#: dos2unix.c:839 unix2dos.c:852
+#: dos2unix.c:859 unix2dos.c:874
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n"
 
-#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
+#: dos2unix.c:962 dos2unix.c:993 unix2dos.c:977 unix2dos.c:1008
 #, c-format
 msgid "active code page: %d\n"
 msgstr "actieve code tabel: %d\n"
 
-#: dos2unix.c:983 unix2dos.c:996
+#: dos2unix.c:1003 unix2dos.c:1018
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "ongeldige %s conversie modus gespecificeerd\n"
 
-#: dos2unix.c:993 unix2dos.c:1006
+#: dos2unix.c:1013 unix2dos.c:1028
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "optie '%s' heeft een argument nodig\n"
 
-#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
-#: unix2dos.c:1033 unix2dos.c:1233
+#: dos2unix.c:1026 dos2unix.c:1040 dos2unix.c:1234 unix2dos.c:1041
+#: unix2dos.c:1055 unix2dos.c:1255
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "doel van bestand %s is niet gespecificeerd in 'nieuw bestand modus'\n"
 
-#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
+#: dos2unix.c:1070 dos2unix.c:1154 unix2dos.c:1085 unix2dos.c:1172
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n"
 
-#: dos2unix.c:1057 unix2dos.c:1070
+#: dos2unix.c:1077 unix2dos.c:1092
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 "%s wordt overgeslagen, uitvoerbestand %s is een symbolische koppeling.\n"
 
-#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
+#: dos2unix.c:1084 dos2unix.c:1168 unix2dos.c:1099 unix2dos.c:1186
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier "
 "bestand is.\n"
 
-#: dos2unix.c:1071 unix2dos.c:1084
+#: dos2unix.c:1091 unix2dos.c:1106
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen "
 "regulier bestand is.\n"
 
-#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
+#: dos2unix.c:1098 dos2unix.c:1175 unix2dos.c:1113 unix2dos.c:1193
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Binair bestand %s wordt overgeslagen\n"
 
-#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
+#: dos2unix.c:1105 dos2unix.c:1182 unix2dos.c:1120 unix2dos.c:1200
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "codetabel %d wordt niet ondersteund.\n"
 
-#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
+#: dos2unix.c:1112 dos2unix.c:1189 unix2dos.c:1127 unix2dos.c:1207
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -162,73 +168,73 @@ msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, de huidige lokale karakter codering is "
 "niet UTF-8.\n"
 
-#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
+#: dos2unix.c:1119 dos2unix.c:1196 unix2dos.c:1134 unix2dos.c:1214
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, de grootte van wchar_t is %d bytes.\n"
 
-#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
+#: dos2unix.c:1126 dos2unix.c:1203 unix2dos.c:1141 unix2dos.c:1221
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, een UTF-16 conversie fout is "
 "opgetreden.\n"
 
-#: dos2unix.c:1112
+#: dos2unix.c:1132
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "converteren bestand %s naar bestand %s in Unix formaat ...\n"
 
-#: dos2unix.c:1119 unix2dos.c:1135
+#: dos2unix.c:1139 unix2dos.c:1157
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemen met conversie van bestand %s naar bestand %s\n"
 
-#: dos2unix.c:1141 unix2dos.c:1157
+#: dos2unix.c:1161 unix2dos.c:1179
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Symbolische koppeling %s wordt overgeslagen.\n"
 
-#: dos2unix.c:1189
+#: dos2unix.c:1209
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "converteren bestand %s naar Unix formaat ...\n"
 
-#: dos2unix.c:1196 unix2dos.c:1215
+#: dos2unix.c:1216 unix2dos.c:1237
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemen met conversie van bestand %s\n"
 
 #: unix2dos.c:66
 msgid ""
-"Copyright (C) 2009-2012 Erwin Waterlander\n"
+"Copyright (C) 2009-2013 Erwin Waterlander\n"
 "Copyright (C) 1994-1995 Benjamin Lin\n"
 "All rights reserved.\n"
 "\n"
 msgstr ""
 
-#: unix2dos.c:1126
+#: unix2dos.c:1148
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "converteren bestand %s naar bestand %s in Mac formaat ...\n"
 
-#: unix2dos.c:1128
+#: unix2dos.c:1150
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "converteren bestand %s naar bestand %s in DOS formaat ...\n"
 
-#: unix2dos.c:1206
+#: unix2dos.c:1228
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "converteren bestand %s naar Mac formaat ...\n"
 
-#: unix2dos.c:1208
+#: unix2dos.c:1230
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "converteren bestand %s naar DOS formaat ...\n"
 
-#: common.c:167
+#: common.c:169
 msgid ""
 "Redistribution and use in source and binary forms, with or without\n"
 "modification, are permitted provided that the following conditions\n"
@@ -252,7 +258,7 @@ msgid ""
 "IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 msgstr ""
 
-#: common.c:193
+#: common.c:195
 #, c-format
 msgid ""
 "%s %s (%s)\n"
@@ -311,7 +317,7 @@ msgstr ""
 "                       altijd aan in stdio modus\n"
 " -s, --safe            sla binaire bestanden over (standaard)\n"
 
-#: common.c:223
+#: common.c:225
 #, c-format
 msgid ""
 " -F, --follow-symlink  follow symbolic links and convert the targets\n"
@@ -326,65 +332,73 @@ msgstr ""
 " -S, --skip-symlink    laat symbolische koppelingen en doelen ongewijzigd "
 "(standaard)\n"
 
-#: common.c:229
+#: common.c:231
 #, c-format
 msgid " -V, --version         display version number\n"
 msgstr " -V, --version         toon versie nummer\n"
 
-#: common.c:241
+#: common.c:243
 msgid "DOS 16 bit version (WATCOMC).\n"
 msgstr "DOS 16 bit versie (WATCOMC).\n"
 
-#: common.c:243
+#: common.c:245
 msgid "DOS 16 bit version (TURBOC).\n"
 msgstr "DOS 16 bit versie (TURBOC).\n"
 
-#: common.c:245
+#: common.c:247
 msgid "DOS 32 bit version (WATCOMC).\n"
 msgstr "DOS 32 bit versie (WATCOMC).\n"
 
-#: common.c:247
+#: common.c:249
 msgid "DOS 32 bit version (DJGPP).\n"
 msgstr "DOS 32 bit versie (DJGPP).\n"
 
-#: common.c:249
+#: common.c:251
 msgid "MSYS version.\n"
 msgstr "MSYS versie.\n"
 
-#: common.c:251
+#: common.c:253
 msgid "Cygwin version.\n"
 msgstr "Cygwin versie.\n"
 
-#: common.c:253
+#: common.c:255
 msgid "Windows 64 bit version (MinGW-w64).\n"
 msgstr "Windows 64 bit versie (MinGW-w64).\n"
 
-#: common.c:255
+#: common.c:257
 msgid "Windows 32 bit version (WATCOMC).\n"
 msgstr "Windows 32 bit versie (WATCOMC).\n"
 
-#: common.c:257
+#: common.c:259
 msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows 32 bit versie (MinGW).\n"
 
-#: common.c:259
-#, fuzzy
+#: common.c:261
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows 64 bit versie (MSVC %d).\n"
+
+#: common.c:263
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows 32 bit versie (MSVC %d).\n"
+
+#: common.c:265
 msgid "OS/2 version (WATCOMC).\n"
-msgstr "DOS 32 bit versie (WATCOMC).\n"
+msgstr "OS/2 versie (WATCOMC).\n"
 
-#: common.c:261
-#, fuzzy
+#: common.c:267
 msgid "OS/2 version (EMX).\n"
-msgstr "OS/2 versie.\n"
+msgstr "OS/2 versie (EMX).\n"
 
-#: common.c:264
+#: common.c:270
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Met Unicode UTF-16 ondersteuning.\n"
 
-#: common.c:266
+#: common.c:272
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Zonder Unicode UTF-16 ondersteuning.\n"
 
-#: common.c:269
+#: common.c:275
 msgid "With native language support.\n"
 msgstr "Met moedertaal ondersteuning.\n"
diff --git a/querycp.c b/querycp.c
index 53b6eb3..52fb42b 100644
--- a/querycp.c
+++ b/querycp.c
@@ -1,7 +1,7 @@
-/* The code in this file is Public Domain */
+/* querycp.c is in the public domain */
 
 #if (defined(__WATCOMC__) && defined(__NT__))
-#  define __WIN32__ 1
+#  define _WIN32 1
 #endif
 
 #ifdef __DJGPP__
@@ -145,7 +145,7 @@ unsigned short query_con_codepage(void) {
 }
 
 
-#elif defined (__WIN32__) && !defined(__CYGWIN__) /* Windows, not Cygwin */
+#elif defined (_WIN32) && !defined(__CYGWIN__) /* Windows, not Cygwin */
 
 /* Erwin Waterlander */
 
diff --git a/querycp.h b/querycp.h
index 7264d2b..4a4f7da 100644
--- a/querycp.h
+++ b/querycp.h
@@ -1,3 +1,3 @@
-/* The code in this file code is Public Domain */
+/* querycp.h is in the public domain */
 
 unsigned short query_con_codepage(void);
diff --git a/test/utf16_be.txt b/test/utf16_be.txt
new file mode 100755
index 0000000..1be5db9
--- /dev/null
+++ b/test/utf16_be.txt
diff --git a/test/utf16_le.txt b/test/utf16_le.txt
new file mode 100755
index 0000000..db9f535
--- /dev/null
+++ b/test/utf16_le.txt
diff --git a/unix2dos.c b/unix2dos.c
index 16da1d4..d0cdf80 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -8,7 +8,7 @@
  *  See also http://www.freebsd.org/copyright/freebsd-license.html
  *  --------
  *
- *  Copyright (C) 2009-2012 Erwin Waterlander
+ *  Copyright (C) 2009-2013 Erwin Waterlander
  *  Copyright (C) 1994-1995 Benjamin Lin.
  *  All rights reserved.
  *
@@ -56,7 +56,7 @@
 #include "unix2dos.h"
 #include "querycp.h"
 #ifdef D2U_UNICODE
-#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__)  /* Unix, Cygwin */
 # include <langinfo.h>
 #endif
 #endif
@@ -64,7 +64,7 @@
 void PrintLicense(void)
 {
   fprintf(stderr, "%s", _("\
-Copyright (C) 2009-2012 Erwin Waterlander\n\
+Copyright (C) 2009-2013 Erwin Waterlander\n\
 Copyright (C) 1994-1995 Benjamin Lin\n\
 All rights reserved.\n\n"));
   PrintBSDLicense();
@@ -105,6 +105,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     wint_t TempChar;
     wint_t PreviousChar = 0;
     int line_nr = 1;
+    char *errstr;
 
     ipFlag->status = 0;
 
@@ -156,8 +157,9 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               {
                 if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
               }
               break;
@@ -192,8 +194,9 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 {
                   if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                   {
+                    errstr = strerror(errno);
                     fprintf(stderr, "%s: ", progname);
-                    fprintf(stderr, "%s", _("can not write to output file\n"));
+                    fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                   }
                 }
                 break;
@@ -212,8 +215,9 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                   {
                     if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                     {
+                      errstr = strerror(errno);
                       fprintf(stderr, "%s: ", progname);
-                      fprintf(stderr, "%s", _("can not write to output file\n"));
+                      fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                     }
                   }
                   break;
@@ -229,8 +233,9 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 {
                   if (!(ipFlag->status & UNICODE_CONVERSION_ERROR))
                   {
+                    errstr = strerror(errno);
                     fprintf(stderr, "%s: ", progname);
-                    fprintf(stderr, "%s", _("can not write to output file\n"));
+                    fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                   }
                 }
                 break;
@@ -264,6 +269,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int PreviousChar = 0;
     int *ConvTable;
     int line_nr = 1;
+    char *errstr;
 
     ipFlag->status = 0;
 
@@ -349,8 +355,9 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               RetVal = -1;
               if (!ipFlag->Quiet)
               {
+                errstr = strerror(errno);
                 fprintf(stderr, "%s: ", progname);
-                fprintf(stderr, "%s", _("can not write to output file\n"));
+                fprintf(stderr, _("can not write to output file: %s\n"), errstr);
               }
               break;
           } else {
@@ -382,8 +389,9 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 RetVal = -1;
                 if (!ipFlag->Quiet)
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
                 break;
               }
@@ -399,8 +407,9 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                   RetVal = -1;
                   if (!ipFlag->Quiet)
                   {
+                    errstr = strerror(errno);
                     fprintf(stderr, "%s: ", progname);
-                    fprintf(stderr, "%s", _("can not write to output file\n"));
+                    fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                   }
                   break;
                 }
@@ -413,8 +422,9 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 RetVal = -1;
                 if (!ipFlag->Quiet)
                 {
+                  errstr = strerror(errno);
                   fprintf(stderr, "%s: ", progname);
-                  fprintf(stderr, "%s", _("can not write to output file\n"));
+                  fprintf(stderr, _("can not write to output file: %s\n"), errstr);
                 }
                 break;
               }
@@ -561,7 +571,7 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
   InF = read_bom(InF, &ipFlag->bomtype);
 
 #ifdef D2U_UNICODE
-#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__)  /* Unix, Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
@@ -574,7 +584,7 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
   }
 #endif
-#if !defined(__WIN32__) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
+#if !defined(_WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (sizeof(wchar_t) < 4)
@@ -620,8 +630,20 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     RetVal = -1;
 
   /* can close output file? */
-  if ((TempF) && (fclose(TempF) == EOF))
-    RetVal = -1;
+  if (TempF)
+  {
+    if (fclose(TempF) == EOF)
+    {
+       if (!ipFlag->Quiet)
+       {
+         ipFlag->error = errno;
+         errstr = strerror(errno);
+         fprintf(stderr, "%s: ", progname);
+         fprintf(stderr, _("Failed to write to temporary output file %s: %s\n"), TempPath, errstr);
+       }
+      RetVal = -1;
+    }
+  }
 
 #ifdef NO_MKSTEMP
   if(fd!=NULL)
@@ -782,18 +804,18 @@ int ConvertUnixToDosStdio(CFlag *ipFlag, char *progname)
     ipFlag->KeepDate = 0;
     ipFlag->Force = 1;
 
-#if defined(__WIN32__) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 
     /* stdin and stdout are by default text streams. We need
      * to set them to binary mode. Otherwise an LF will
      * automatically be converted to CR-LF on DOS/Windows.
      * Erwin */
 
-    /* 'setmode' was deprecated by MicroSoft
-     * since Visual C++ 2005. Use '_setmode' instead. */
+    /* POSIX 'setmode' was deprecated by MicroSoft since
+     * Visual C++ 2005. Use ISO C++ conformant '_setmode' instead. */
 
-    _setmode(fileno(stdout), O_BINARY);
-    _setmode(fileno(stdin), O_BINARY);
+    _setmode(_fileno(stdout), _O_BINARY);
+    _setmode(_fileno(stdin), _O_BINARY);
 #elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__)
     setmode(fileno(stdout), O_BINARY);
     setmode(fileno(stdin), O_BINARY);
@@ -855,7 +877,7 @@ int main (int argc, char *argv[])
    }
 #endif
 
-#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__))
 /* setlocale() is also needed for nl_langinfo() */
    setlocale (LC_ALL, "");
 #endif
diff --git a/vc.mak b/vc.mak
new file mode 100644
index 0000000..38cfb5d
--- /dev/null
+++ b/vc.mak
@@ -0,0 +1,175 @@
+# Makefile for Microsoft Visual C++

+#

+

+!include version.mk

+

+CC = cl.exe /nologo

+LINK = link.exe /nologo

+SRCDIR = .

+

+DEFINES = /DVER_REVISION=\"$(DOS2UNIX_VERSION)\" /DVER_DATE=\"$(DOS2UNIX_DATE)\"

+CFLAGS = $(DEFINES)

+

+!ifdef DEBUG

+LDFLAGS = -debug

+!else

+LDFLAGS =

+!endif

+

+PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe

+HTMLEXT = htm

+PACKAGE = dos2unix

+DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT)

+VERSIONSUFFIX = -win32

+UCS = 1

+

+prefix = c:\usr\local

+

+all: $(PROGRAMS) $(DOCFILES)

+

+

+dos2unix.exe: dos2unix.obj querycp.obj common.obj

+	$(LINK) $(LDFLAGS) dos2unix.obj querycp.obj common.obj setargv.obj mpr.lib

+

+unix2dos.exe: unix2dos.obj querycp.obj common.obj

+	$(LINK) $(LDFLAGS) unix2dos.obj querycp.obj common.obj setargv.obj mpr.lib

+

+

+!if "$(UCS)" == "1"

+CFLAGS = $(CFLAGS) -DD2U_UNICODE

+!endif

+

+dos2unix.obj :  $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h

+	$(CC) -c $(CFLAGS) $(SRCDIR)\dos2unix.c

+

+unix2dos.obj :  $(SRCDIR)\unix2dos.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h

+	$(CC) -c $(CFLAGS) $(SRCDIR)\unix2dos.c

+

+querycp.obj :  $(SRCDIR)\querycp.c $(SRCDIR)\querycp.h

+	$(CC) -c $(CFLAGS) $(SRCDIR)\querycp.c

+

+common.obj :  $(SRCDIR)\common.c $(SRCDIR)\common.h

+	$(CC) -c $(CFLAGS) $(SRCDIR)\common.c

+

+mac2unix.exe : dos2unix.exe

+	copy /v dos2unix.exe mac2unix.exe

+

+unix2mac.exe : unix2dos.exe

+	copy /v unix2dos.exe unix2mac.exe

+

+exec_prefix = $(prefix)

+bindir      = $(exec_prefix)\bin

+datarootdir = $(prefix)\share

+datadir     = $(datarootdir)

+!ifndef docsubdir

+docsubdir   = $(PACKAGE)-$(DOS2UNIX_VERSION)

+!endif

+docdir      = $(datarootdir)\doc\$(docsubdir)

+INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)

+

+

+$(prefix):

+	if not exist $@ mkdir $@

+

+$(bindir): $(prefix)

+	if not exist $@ mkdir $@

+

+$(datarootdir): $(prefix)

+	if not exist $@ mkdir $@

+

+$(datarootdir)\doc: $(datarootdir)

+	if not exist $@ mkdir $@

+

+$(docdir): $(datarootdir)\doc

+	if not exist $@ mkdir $@

+

+install: $(PROGRAMS) $(DOCFILES) $(bindir) $(docdir)

+	copy dos2unix.exe $(bindir)

+	copy mac2unix.exe $(bindir)

+	copy unix2dos.exe $(bindir)

+	copy unix2mac.exe $(bindir)

+	copy README.txt $(docdir)

+	copy NEWS.txt $(docdir)

+	copy ChangeLog.txt $(docdir)

+	copy COPYING.txt $(docdir)

+	copy TODO.txt $(docdir)

+	copy BUGS.txt $(docdir)

+	copy man\man1\$(PACKAGE).txt $(docdir)

+	copy man\man1\$(PACKAGE).$(HTMLEXT) $(docdir)

+

+man\es\man1\dos2unix.txt : man\es\man1\dos2unix.pod

+	pod2text $** > $(@R).tx1

+	iconv -f ISO-8859-1 -t UTF-8 $(@R).tx1 > $@

+

+man\nl\man1\dos2unix.txt : man\nl\man1\dos2unix.pod

+	pod2text $** > $(@R).tx1

+	iconv -f ISO-8859-1 -t UTF-8 $(@R).tx1 > $@

+

+man\man1\dos2unix.txt : man\man1\dos2unix.pod

+	pod2text $** > $@

+

+man\es\man1\dos2unix.$(HTMLEXT) : man\es\man1\dos2unix.pod

+	iconv -f ISO-8859-1 -t UTF-8 $** > $(@R).ut8

+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa" $(@R).ut8 > $@

+

+man\nl\man1\dos2unix.$(HTMLEXT) : man\nl\man1\dos2unix.pod

+	iconv -f ISO-8859-1 -t UTF-8 $** > $(@R).ut8

+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter" $(@R).ut8 > $@

+

+man\man1\dos2unix.$(HTMLEXT) : man\man1\dos2unix.pod

+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $** > $@

+

+TXTFILES = man\man1\$(PACKAGE).txt man\es\man1\$(PACKAGE).txt man\nl\man1\$(PACKAGE).txt

+HTMLFILES = man\man1\$(PACKAGE).$(HTMLEXT) man\es\man1\$(PACKAGE).$(HTMLEXT) man\nl\man1\$(PACKAGE).$(HTMLEXT)

+

+txt : $(TXTFILES)

+

+html : $(HTMLFILES)

+

+doc : $(DOCFILES)

+

+uninstall:

+	-del $(bindir)\dos2unix.exe

+	-del $(bindir)\mac2unix.exe

+	-del $(bindir)\unix2dos.exe

+	-del $(bindir)\unix2mac.exe

+	-rmdir /s /q $(docdir)

+

+!ifndef VERSIONSUFFIX

+VERSIONSUFFIX	= -bin

+!endif

+

+!ifndef ZIPFILE

+ZIPFILE = $(PACKAGE)$(DOS2UNIX_VERSION)$(VERSIONSUFFIX).zip

+!endif

+ZIPOBJ = bin\dos2unix.exe bin\mac2unix.exe bin\unix2dos.exe bin\unix2mac.exe share\doc\$(docsubdir) $(ZIPOBJ_EXTRA)

+

+DISTCMD = dist.bat

+

+dist :

+	@echo cd /d $(prefix) > $(DISTCMD)

+	@echo unix2dos -k share\doc\$(docsubdir)\*.txt >> $(DISTCMD)

+	@echo unix2dos -k share\doc\$(docsubdir)\*.$(HTMLEXT) >> $(DISTCMD)

+	@echo zip -r $(ZIPFILE) $(ZIPOBJ) >> $(DISTCMD)

+	@echo cd /d $(MAKEDIR) >> $(DISTCMD)

+	@echo move $(prefix)\$(ZIPFILE) .. >> $(DISTCMD)

+	.\$(DISTCMD)

+

+

+mostlyclean :

+	-del *.obj

+	-del *.exe

+	-del *.tmp

+

+clean : mostlyclean

+	-del $(DOCFILES)

+	-del man\es\man1\*.txt

+	-del man\nl\man1\*.txt

+	-del man\es\man1\*.tx1

+	-del man\nl\man1\*.tx1

+	-del man\es\man1\*.$(HTMLEXT)

+	-del man\nl\man1\*.$(HTMLEXT)

+	-del man\es\man1\*.ut8

+	-del man\nl\man1\*.ut8

+	-del $(DISTCMD)

+

diff --git a/version.mk b/version.mk
index 2fa12fb..36981c6 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-DOS2UNIX_VERSION = 6.0.2
-DOS2UNIX_VERSION_SHORT = 602
-DOS2UNIX_DATE = 2012-09-06
+DOS2UNIX_VERSION = 6.0.3
+DOS2UNIX_VERSION_SHORT = 603
+DOS2UNIX_DATE = 2013-01-25
 DOS2UNIX_AUTHOR = 'Erwin Waterlander'