summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:29:49 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2016-10-20 13:29:52 +0900
commit844262890797f165a0497afdcc1ad8f5caec971d (patch)
tree225cb3197568540b5a37cd4bdd008173a44df316
parent0077b68f7eb84ff84bc271256e4ac0e178e531f9 (diff)
downloaddos2unix-844262890797f165a0497afdcc1ad8f5caec971d.tar.gz
dos2unix-844262890797f165a0497afdcc1ad8f5caec971d.tar.bz2
dos2unix-844262890797f165a0497afdcc1ad8f5caec971d.zip
Imported Upstream version 7.3.2upstream/7.3.2
Change-Id: I7711f5859ca401595fdfcabc046539e76566eb07 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r--ChangeLog.txt31
-rw-r--r--Makefile13
-rw-r--r--NEWS.txt7
-rw-r--r--README.txt10
-rw-r--r--common.c27
-rw-r--r--djgpp.mak5
-rw-r--r--man/de/man1/dos2unix.14
-rw-r--r--man/de/man1/dos2unix.htm2
-rw-r--r--man/es/man1/dos2unix.14
-rw-r--r--man/es/man1/dos2unix.htm2
-rw-r--r--man/fr/man1/dos2unix.14
-rw-r--r--man/fr/man1/dos2unix.htm2
-rw-r--r--man/man1/dos2unix-man.pot2
-rw-r--r--man/man1/dos2unix.14
-rw-r--r--man/man1/dos2unix.htm2
-rw-r--r--man/nl/man1/dos2unix.14
-rw-r--r--man/nl/man1/dos2unix.htm2
-rw-r--r--man/pl/man1/dos2unix.14
-rw-r--r--man/pl/man1/dos2unix.htm2
-rw-r--r--man/pt_BR/man1/dos2unix.1150
-rw-r--r--man/pt_BR/man1/dos2unix.htm46
-rw-r--r--man/pt_BR/man1/dos2unix.po96
-rw-r--r--man/pt_BR/man1/dos2unix.pod126
-rw-r--r--man/pt_BR/man1/dos2unix.txt144
-rw-r--r--man/sv/man1/dos2unix.1842
-rw-r--r--man/sv/man1/dos2unix.htm717
-rw-r--r--man/sv/man1/dos2unix.po1581
-rw-r--r--man/sv/man1/dos2unix.pod790
-rw-r--r--man/sv/man1/dos2unix.txt686
-rw-r--r--man/uk/man1/dos2unix.14
-rw-r--r--man/uk/man1/dos2unix.htm2
-rw-r--r--man/zh_CN/man1/dos2unix.14
-rw-r--r--man/zh_CN/man1/dos2unix.htm2
-rw-r--r--po/da.po236
-rw-r--r--po/de.po224
-rw-r--r--po/dos2unix.pot224
-rw-r--r--po/eo.po224
-rw-r--r--po/es.po224
-rw-r--r--po/fr.po224
-rw-r--r--po/hu.po224
-rw-r--r--po/ja.po224
-rw-r--r--po/nb.po224
-rw-r--r--po/nl.po224
-rw-r--r--po/pl.po224
-rw-r--r--po/pt_BR.po295
-rw-r--r--po/ru.po224
-rw-r--r--po/sr.po224
-rw-r--r--po/sv.po677
-rw-r--r--po/uk.po224
-rw-r--r--po/vi.po224
-rw-r--r--po/zh_CN.po224
-rw-r--r--po/zh_TW.po224
-rwxr-xr-xtest/Makefile11
-rw-r--r--test/info.txt2
-rw-r--r--test/info_ucs.txt10
-rwxr-xr-xtest/iso.t12
-rwxr-xr-xtest/misc.t33
-rwxr-xr-xtest/utf16.t35
-rw-r--r--version.mk6
59 files changed, 7795 insertions, 2427 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index c15770b..4414530 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,31 @@
+2015-11-20 Erwin Waterlander <waterlan@xs4all.nl>
+ * Version 7.3.2
+ * Makefile: Automatically detect if we are on MSYS 1 or 2.
+ Unicode support is disabled for MSYS 1.
+
+2015-11-09 Sebastian Rasmussen <sebras@gmail.com>
+ * po/sv.po: New Swedish translation of the messages.
+ * man/sv/man1/dos2unix.po: New Swedish translation of the manual.
+
+2015-11-08 Erwin Waterlander <waterlan@xs4all.nl>
+ * Makefile, djgpp.mak, test/Makefile: Make it possible to run test
+ suite in DJGPP environment. $SHELL must point to sh or bash.
+
+2015-11-07 Erwin Waterlander <waterlan@xs4all.nl>
+ * test: Be able to run tests when UTF-16 support is not enabled (UCS=).
+
+2015-11-05 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Fix option -iso. The -iso option was misinterpreted
+ as a corrupted -i option. Thanks to report of Ulf-Dietrich Braumann.
+ * test/iso.t: Added two tests for option -iso.
+
+2015-10-09 Rafael Fontenelle <rffontenelle@gmail.com>
+ * po/pt_BR.po: Updated Brazilian Portuguese translation.
+ * man/pt_BR.po/man1/dos2unix.po: Updated Brazilian Portuguese translation.
+
+2015-10-01 Erwin Waterlander <waterlan@xs4all.nl>
+ * common.c: Fix compilation for MSYS 1.
+
2015-09-30 Erwin Waterlander <waterlan@xs4all.nl>
* Version 7.3.1
@@ -147,6 +175,9 @@
* common.c: Fixed false warning while reading BOM from zero byte file.
Was introduced on 2015-06-24.
+2014-06-27 Joe Hansen <joedalton2@yahoo.dk>
+ * po/da.po: Updated Danish translation.
+
2015-06-24 Erwin Waterlander <waterlan@xs4all.nl>
* common.c: Bug fix. Check for file I/O errors with every file access.
diff --git a/Makefile b/Makefile
index 69d37a1..651e6d5 100644
--- a/Makefile
+++ b/Makefile
@@ -179,6 +179,10 @@ ifeq (msys,$(D2U_OS))
CC=gcc
EXE = .exe
VERSIONSUFFIX = -msys
+# MSYS 1 does not support locales and no Unicode.
+ifeq ($(shell ./test/chk_loc.sh en_US.utf8),no)
+UCS =
+endif
ifdef ENABLE_NLS
LIBS_EXTRA = -lintl -liconv
endif
@@ -446,8 +450,15 @@ man/uk/man1/$(PACKAGE).$(HTMLEXT) : man/uk/man1/$(PACKAGE).pod
man/zh_CN/man1/$(PACKAGE).$(HTMLEXT) : man/zh_CN/man1/$(PACKAGE).pod
PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/Mac - Unix文件格式转换器" $< > $@
+man/sv/man1/$(PACKAGE).$(HTMLEXT) : man/sv/man1/$(PACKAGE).pod
+ PERL_UNICODE=SDA pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - textfilsformatskonverterare från DOS/Mac till Unix och vice versa" $< > $@
+
test: all
- cd test; $(MAKE) test
+ifneq ($(DJGPP),)
+ cd test; $(MAKE) test UCS= SHELL=$(shell which sh)
+else
+ cd test; $(MAKE) test UCS=$(UCS)
+endif
check: test
diff --git a/NEWS.txt b/NEWS.txt
index 81057d9..91ab125 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,10 @@
+2015-11-20: Version 7.3.2
+
+ * New: Swedish translation of messages and manual.
+ * Updated: Danish and Brazilian Portuguese translations.
+ * Fix: The -iso option was misinterpreted as a corrupted -i option.
+ * Fix: Compilation for MSYS 1.
+
2015-09-30: Version 7.3.1
* New: Simplified Chinese translation of messages and manual.
diff --git a/README.txt b/README.txt
index 41d2109..6b3a8f8 100644
--- a/README.txt
+++ b/README.txt
@@ -57,7 +57,7 @@ HISTORY
AUTHORS
- Erwin Waterlander version 3.2-7.3.1 2009-2015
+ Erwin Waterlander version 3.2-7.3.2 2009-2015
Christian Wurll version 3.1 1998
Bernd Johannes Wuebben version 3.0 1998
Benjamin Lin version 1.1-2.3 1994-1995
@@ -73,10 +73,11 @@ TRANSLATORS
Brazilian Portuguese Enrico Nicoletto Version 6.0.5
Brazilian Portuguese Rafael Ferreira Version 6.0.6 - 7.2
+ Brazilian Portuguese Rafael Fontenelle Version 7.3.2
Chinese (simplified) zwpwjwtz Version 7.3.1
Chinese (traditional) mail6543210 Version 6.0.5
Danish Thomas Pryds Version 6.0.5 - 6.0.6
- Danish Joe Hansen Version 7.2.3 - 7.3
+ Danish Joe Hansen Version 7.2.3 - 7.3.2
Dutch Erwin Waterlander Version 4.0 - 6.0.4
Dutch Benno Schulenberg Version 6.0.5 - 7.3.1
Esperanto Rugxulo Version 5.1 - 6.0.4
@@ -95,6 +96,7 @@ TRANSLATORS
Serbian Мирослав Николић Version 6.0.5 - 7.2.2
Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4
Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.3.1
+ Swedish Sebastian Rasmussen Version 7.3.2
Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.1
Vietnamese Trần Ngọc Quân Version 6.0.5 - 7.3.1
@@ -102,6 +104,7 @@ TRANSLATORS
See http://translationproject.org/domain/dos2unix-man.html
Brazilian Portuguese Rafael Ferreira Version 6.0.5 - 7.2
+ Brazilian Portuguese Rafael Fontenelle Version 7.3.2
Chinese (simplified) zwpwjwtz Version 7.3.1
Dutch Erwin Waterlander Version 5.1.1 - 6.0.4
Dutch Benno Schulenberg Version 6.0.5 - 7.3.1
@@ -110,6 +113,7 @@ TRANSLATORS
Polish Jakub Bogusz Version 6.0.5 - 7.3.1
Spanish Julio A. Freyre-Gonzalez Version 5.3.1 - 6.0.4
Spanish Enrique Lazcorreta Puigmartí Version 6.0.6 - 7.2.1
+ Swedish Sebastian Rasmussen Version 7.3.2
Ukrainian Yuri Chornoivan Version 6.0.5 - 7.3.1
@@ -152,6 +156,8 @@ ACKNOWLEDGEMENTS
errors while reading the input.
Baruch Siach Fix compilation error "'wchar_t' undeclared"
when Unicode support is disabled.
+ Ulf-Dietrich Braumann Reported that the -iso option was misinterpreted
+ as a corrupted -i option.
FINDUTILS
diff --git a/common.c b/common.c
index 249baca..21c83ca 100644
--- a/common.c
+++ b/common.c
@@ -29,15 +29,12 @@
#include "querycp.h"
#include <stdarg.h>
-#ifdef D2U_UNIFILE
-#include <windows.h>
-#elif defined(D2U_UNICODE)
-#if defined(_WIN32) || defined(__CYGWIN__)
+
+#if defined(D2U_UNIFILE) || (defined(D2U_UNICODE) && defined(_WIN32))
#include <windows.h>
#endif
-#endif
-#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */
+#if defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */
# include <langinfo.h>
#endif
@@ -1649,6 +1646,7 @@ void print_format(const CFlag *pFlag, char *informat, char *outformat, size_t li
strncpy(informat,_("UTF-16BE"),lin);
informat[lin-1]='\0';
+#ifdef D2U_UNICODE
if ((pFlag->bomtype == FILE_UTF16LE)||(pFlag->bomtype == FILE_UTF16BE)) {
#if !defined(__MSDOS__) && !defined(_WIN32) && !defined(__OS2__) /* Unix, Cygwin */
strncpy(outformat,nl_langinfo(CODESET),lout);
@@ -1670,6 +1668,7 @@ void print_format(const CFlag *pFlag, char *informat, char *outformat, size_t li
}
outformat[lout-1]='\0';
}
+#endif
}
void print_messages_newfile(const CFlag *pFlag, const char *infile, const char *outfile, const char *progname, const int RetVal)
@@ -2247,13 +2246,7 @@ int parse_options(int argc, char *argv[],
pFlag->verbose = 2;
else if ((strcmp(argv[ArgIdx],"-l") == 0) || (strcmp(argv[ArgIdx],"--newline") == 0))
pFlag->NewLine = 1;
- else if (strcmp(argv[ArgIdx],"--info") == 0)
- pFlag->file_info |= INFO_DEFAULT;
- else if (strncmp(argv[ArgIdx],"--info=", (size_t)7) == 0) {
- get_info_options(argv[ArgIdx]+7, pFlag, progname);
- } else if (strncmp(argv[ArgIdx],"-i", (size_t)2) == 0) {
- get_info_options(argv[ArgIdx]+2, pFlag, progname);
- } else if ((strcmp(argv[ArgIdx],"-m") == 0) || (strcmp(argv[ArgIdx],"--add-bom") == 0))
+ else if ((strcmp(argv[ArgIdx],"-m") == 0) || (strcmp(argv[ArgIdx],"--add-bom") == 0))
pFlag->add_bom = 1;
else if ((strcmp(argv[ArgIdx],"-r") == 0) || (strcmp(argv[ArgIdx],"--remove-bom") == 0)) {
pFlag->keep_bom = 0;
@@ -2309,7 +2302,13 @@ int parse_options(int argc, char *argv[],
else if ((strcmp(argv[ArgIdx],"-ub") == 0) || (strcmp(argv[ArgIdx],"--assume-utf16be") == 0))
pFlag->ConvMode = CONVMODE_UTF16BE;
#endif
- else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0)) {
+ else if (strcmp(argv[ArgIdx],"--info") == 0)
+ pFlag->file_info |= INFO_DEFAULT;
+ else if (strncmp(argv[ArgIdx],"--info=", (size_t)7) == 0) {
+ get_info_options(argv[ArgIdx]+7, pFlag, progname);
+ } else if (strncmp(argv[ArgIdx],"-i", (size_t)2) == 0) {
+ get_info_options(argv[ArgIdx]+2, pFlag, progname);
+ } else if ((strcmp(argv[ArgIdx],"-c") == 0) || (strcmp(argv[ArgIdx],"--convmode") == 0)) {
if (++ArgIdx < argc) {
if (strcmpi(argv[ArgIdx],"ascii") == 0) { /* Benjamin Lin's legacy options */
pFlag->ConvMode = CONVMODE_ASCII;
diff --git a/djgpp.mak b/djgpp.mak
index 15be2d5..a77e4e8 100644
--- a/djgpp.mak
+++ b/djgpp.mak
@@ -21,6 +21,11 @@ docsubdir = dos2unix
all:
$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS=
+test: all
+ cd test; $(MAKE) test UCS= SHELL=$(shell which sh)
+
+check: test
+
install:
$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LIBS_EXTRA="$(LIBS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) UCS=
diff --git a/man/de/man1/dos2unix.1 b/man/de/man1/dos2unix.1
index f1e592a..3955b65 100644
--- a/man/de/man1/dos2unix.1
+++ b/man/de/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/de/man1/dos2unix.htm b/man/de/man1/dos2unix.htm
index 0443065..50313a8 100644
--- a/man/de/man1/dos2unix.htm
+++ b/man/de/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title>
+<title>dos2unix 7.3.2 - Formatumwandlung für Textdateien von DOS/Mac nach Unix und umgekehrt</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/es/man1/dos2unix.1 b/man/es/man1/dos2unix.1
index db8a020..1272850 100644
--- a/man/es/man1/dos2unix.1
+++ b/man/es/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/es/man1/dos2unix.htm b/man/es/man1/dos2unix.htm
index 5998f4b..163ce50 100644
--- a/man/es/man1/dos2unix.htm
+++ b/man/es/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title>
+<title>dos2unix 7.3.2 - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/fr/man1/dos2unix.1 b/man/fr/man1/dos2unix.1
index e2a43db..5e32603 100644
--- a/man/fr/man1/dos2unix.1
+++ b/man/fr/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/fr/man1/dos2unix.htm b/man/fr/man1/dos2unix.htm
index 1f5d6dc..bd1eb01 100644
--- a/man/fr/man1/dos2unix.htm
+++ b/man/fr/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title>
+<title>dos2unix 7.3.2 - Convertit les fichiers textes du format DOS/Mac vers Unix et inversement</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/man1/dos2unix-man.pot b/man/man1/dos2unix-man.pot
index f516903..76653ca 100644
--- a/man/man1/dos2unix-man.pot
+++ b/man/man1/dos2unix-man.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-30 22:21+0200\n"
+"POT-Creation-Date: 2015-11-20 20:01+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"
diff --git a/man/man1/dos2unix.1 b/man/man1/dos2unix.1
index 14178c3..ec28d79 100644
--- a/man/man1/dos2unix.1
+++ b/man/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-23" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-09-23" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/man1/dos2unix.htm b/man/man1/dos2unix.htm
index 1abc2ba..14df349 100644
--- a/man/man1/dos2unix.htm
+++ b/man/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - DOS/MAC to UNIX and vice versa text file format converter</title>
+<title>dos2unix 7.3.2 - DOS/MAC to UNIX and vice versa text file format converter</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/nl/man1/dos2unix.1 b/man/nl/man1/dos2unix.1
index 8690a2f..2622b80 100644
--- a/man/nl/man1/dos2unix.1
+++ b/man/nl/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/nl/man1/dos2unix.htm b/man/nl/man1/dos2unix.htm
index 73f94c2..fb6c152 100644
--- a/man/nl/man1/dos2unix.htm
+++ b/man/nl/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title>
+<title>dos2unix 7.3.2 - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/pl/man1/dos2unix.1 b/man/pl/man1/dos2unix.1
index 8126551..e2b0dc5 100644
--- a/man/pl/man1/dos2unix.1
+++ b/man/pl/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/pl/man1/dos2unix.htm b/man/pl/man1/dos2unix.htm
index 3bf8577..b005f3f 100644
--- a/man/pl/man1/dos2unix.htm
+++ b/man/pl/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title>
+<title>dos2unix 7.3.2 - konwerter formatu plików tekstowych między systemami DOS/Mac a Uniksem</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/pt_BR/man1/dos2unix.1 b/man/pt_BR/man1/dos2unix.1
index 3fe73a2..ebc97a4 100644
--- a/man/pt_BR/man1/dos2unix.1
+++ b/man/pt_BR/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -175,65 +175,68 @@ converter para quebras de linha do \s-1DOS.\s0 Veja também a opção \f(CW\*(C`
.IX Item "-c, --convmode MODOCONV"
Define o modo de conversão, sendo \s-1MODOCONV\s0 um dentre: \fIascii\fR, \fI7bit\fR,
\&\fIiso\fR, \fImac\fR com ascii sendo o padrão.
-.IP "\fB\-D, \-\-display\-enc \s-1ENCODING\s0\fR" 4
-.IX Item "-D, --display-enc ENCODING"
-Set encoding of displayed text. Where \s-1ENCODING\s0 is one of: \fIansi\fR,
-\&\fIunicode\fR, \fIutf8\fR with ansi being the default.
-.Sp
-This option is only available in dos2unix for Windows with Unicode file name
-support. This option has no effect on the actual file names read and
-written, only on how they are displayed.
-.Sp
-There are several methods for displaying text in a Windows console based on
-the encoding of the text. They all have their own advantages and
-disadvantages.
+.IP "\fB\-D, \-\-display\-enc CODIFICAÇÃO\fR" 4
+.IX Item "-D, --display-enc CODIFICAÇÃO"
+Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: \fIansi\fR,
+\&\fIunicode\fR, \fIutf8\fR com ascii sendo o padrão.
+.Sp
+Essa opção está disponível apenas no dos2unix para Windows com suporte a
+nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de
+arquivos lidos e escritos, apenas em como eles são exibidos.
+.Sp
+Há vários métodos para exibir texto em um console Windows baseado na
+codificação do texto. Todos eles possuem suas próprias vantagens e
+desvantagens.
.RS 4
.IP "\fBansi\fR" 4
.IX Item "ansi"
-Dos2unix's default method is to use \s-1ANSI\s0 encoded text. The advantage is that
-it is backwards compatible. It works with raster and TrueType fonts. In some
-regions you may need to change the active \s-1DOS OEM\s0 code page to the Windows
-system \s-1ANSI\s0 code page using the \f(CW\*(C`chcp\*(C'\fR command, because dos2unix uses the
-Windows system code page.
-.Sp
-The disadvantage of ansi is that international file names with characters
-not inside the system default code page are not displayed properly. You will
-see a question mark, or a wrong symbol instead. When you don't work with
-foreign file names this method is \s-1OK.\s0
+O método padrão do dos2unix é usar o texto codificado em \s-1ANSI. A\s0 sua
+vantagem é a compatibilidade reversa. Ele funciona com fontes raster e
+TrueType. Em algumas regiões você pode precisar alterar a página de código
+\&\s-1OEM\s0 do \s-1DOS\s0 para \s-1ANSI\s0 do sistema Windows usando o comando \f(CW\*(C`chcp\*(C'\fR, porque
+dos2unix usa a página de código do sistema Windows.
+.Sp
+A desvantagem do ansi é que nomes de arquivos internacionais com caracteres
+fora a página de código padrão do sistema não são exibidos
+apropriadamente. Você verá um sinal de interrogação, ou um símbolo
+incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse
+método funciona bem.
.IP "\fBunicode\fR" 4
.IX Item "unicode"
-The advantage of unicode (the Windows name for \s-1UTF\-16\s0) encoding is that text
-is usually properly displayed. There is no need to change the active code
-page. You may need to set the console's font to a TrueType font to have
-international characters displayed properly. When a character is not
-included in the TrueType font you usually see a small square, sometimes with
-a question mark in it.
-.Sp
-When you use the ConEmu console all text is displayed properly, because
-ConEmu automatically selects a good font.
-.Sp
-The disadvantage of unicode is that it is not compatible with \s-1ASCII.\s0 The
-output is not easy to handle when you redirect it to another program or a
-file. Redirection to a file does not give a correct \s-1UTF\-16\s0 file.
+A vantagem da codificação do unicode (o nome Windows para \s-1UTF\-16\s0) é que o
+texto é normalmente exibido apropriadamente. Não há necessidade para alterar
+a página de código ativa. Você pode precisar definir a fonte do console para
+uma fonte TrueType para que caracteres internacionais sejam exibidos
+apropriadamente. Quando um caractere não está incluído na fonte TrueType,
+geralmente você vê um pequeno quadrado, algumas vezes com um sinal de
+interrogação nele.
+.Sp
+Quando você usa o console ConEmu todo texto é exibido apropriadamente,
+porque o ConEmu seleciona automaticamente um fonte boa.
+.Sp
+A desvantagem do unicode é que ele não é compatível com \s-1ASCII. A\s0 saída não é
+fácil de lidar quando você o redireciona para um outro programa ou um
+arquivo. Redirecionamento para um arquivo não fornece um arquivo \s-1UTF\-16\s0
+correto.
.IP "\fButf8\fR" 4
.IX Item "utf8"
-The advantage of utf8 is that it is compatible with \s-1ASCII\s0 and when you
-redirect it to a file you get a proper \s-1UTF\-8\s0 file. You need to set the
-console's font to a TrueType font. With a TrueType font the text is
-displayed similar as with the \f(CW\*(C`unicode\*(C'\fR encoding.
-.Sp
-The disadvantage is that when you use the default raster font all non-ASCII
-characters are displayed wrong. Not only unicode file names, but also
-translated messages become unreadable. On Windows configured for an
-East-Asian region you may see a lot of flickering of the console when the
-messages are displayed.
-.Sp
-In a ConEmu console the utf8 encoding method works well.
+A vantagem do utf8 é que ele é compatível com \s-1ASCII\s0 e quando você o
+redireciona para um arquivo, você obtém um arquivo \s-1UTF\-8\s0 apropriado. Você
+precisa definir a fonte do console para uma fonte TrueType. Com uma fonte
+TrueType, o texto é exibido similiar a uma codificação \f(CW\*(C`unicode\*(C'\fR.
+.Sp
+A desvantagem é que quando você usa a fonte raster padrão, caracteres
+não\-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode,
+mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para
+uma região leste da Ásia, você pode ver muitas falhas no console quando as
+mensagens são exibidas.
+.Sp
+Em um console ConEmu, o método de codificação utf8 funciona bem.
.RE
.RS 4
.Sp
-The default encoding can be changed with environment variable
-\&\s-1DOS2UNIX_DISPLAY_ENC\s0 by setting it to \f(CW\*(C`unicode\*(C'\fR or \f(CW\*(C`utf8\*(C'\fR.
+A codificação padrão pode ser alterada com a variável de ambiente
+\&\s-1DOS2UNIX_DISPLAY_ENC\s0 definindo-a para \f(CW\*(C`unicode\*(C'\fR ou \f(CW\*(C`utf8\*(C'\fR.
.RE
.IP "\fB\-f, \-\-force\fR" 4
.IX Item "-f, --force"
@@ -328,14 +331,14 @@ Lista os arquivos que possuem quebras de linha do Unix:
\& unix2dos \-ic *.txt
.Ve
.Sp
-Convert only files that have \s-1DOS\s0 line breaks and leave the other files
-untouched:
+Converte apenas arquivos que possuem quebras de linha do \s-1DOS\s0 e não altera
+outros arquivos:
.Sp
.Vb 1
\& dos2unix \-ic *.txt | xargs dos2unix
.Ve
.Sp
-Find text files that have \s-1DOS\s0 line breaks:
+Localiza arquivos de texto que possuam quebras de linha do \s-1DOS:\s0
.Sp
.Vb 1
\& find \-name \*(Aq*.txt\*(Aq | xargs dos2unix \-ic
@@ -366,8 +369,8 @@ Escreve uma marca de ordem de byte (\s-1BOM\s0) no arquivo de saída. Por padrã
Quando o arquivo de entrada é \s-1UTF\-16,\s0 e a opção \f(CW\*(C`\-u\*(C'\fR é usada, um \s-1BOM UTF\-16\s0
será escrito.
.Sp
-Never use this option when the output encoding is other than \s-1UTF\-8, UTF\-16,\s0
-or \s-1GB18030.\s0 See also section \s-1UNICODE.\s0
+Nunca use essa opção quando a codificação de saída é outra além de \s-1UTF\-8,
+UTF\-16\s0 ou \s-1GB18030.\s0 Veja também a seção \s-1UNICODE.\s0
.IP "\fB\-n, \-\-newfile \s-1ARQENT\s0 ARQSAÍDA ...\fR" 4
.IX Item "-n, --newfile ARQENT ARQSAÍDA ..."
Modo de novo arquivo. Converte o arquivo \s-1ARQENT\s0 e escreve a saída para o
@@ -611,18 +614,19 @@ Unix2dos escreve por padrão um \s-1BOM\s0 no arquivo de saída quando o arquivo
entrada tem \s-1BOM.\s0 Use a opção \f(CW\*(C`\-m\*(C'\fR para remover \s-1BOM.\s0
.PP
Dos2unix e unix2dos sempre escrevem \s-1BOM\s0 quando a opção \f(CW\*(C`\-m\*(C'\fR é usada.
-.SS "Unicode file names on Windows"
-.IX Subsection "Unicode file names on Windows"
-Dos2unix has optional support for reading and writing Unicode file names in
-the Windows Command Prompt. That means that dos2unix can open files that
-have characters in the name that are not part of the default system \s-1ANSI\s0
-code page. To see if dos2unix for Windows was built with Unicode file name
-support type \f(CW\*(C`dos2unix \-V\*(C'\fR.
-.PP
-There are some issues with displaying Unicode file names in a Windows
-console. See option \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. The file names may be
-displayed wrongly in the console, but the files will be written with the
-correct name.
+.SS "Nomes de arquivos Unicode no Windows"
+.IX Subsection "Nomes de arquivos Unicode no Windows"
+Dos2unix possui um suporte opcional para leitura e escrita de nomes de
+arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix
+pode abrir arquivos que possuam caracteres no nome que não são parte da
+página de código \s-1ANSI\s0 padrão do sistema. Para ver ser dosunix para Windows
+foi compilado com suporte a nomes de arquivos Unicode, digite \f(CW\*(C`dos2unix
+\&\-V\*(C'\fR.
+.PP
+Há alguns problemas com a exibição de nomes de arquivos Unicode em um
+console Windows. Veja a opção \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. Para nomes de
+arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com
+o nome correto.
.SS "Exemplos de Unicode"
.IX Subsection "Exemplos de Unicode"
Conversão de \s-1UTF\-16\s0 do Windows (com \s-1BOM\s0) para \s-1UTF\-8\s0 do Unix:
@@ -659,10 +663,10 @@ formato de transformação de unicode. Assim como \s-1UTF\-8, GB18030\s0 é comp
com \s-1ASCII. GB18030\s0 também é compatível com a página de código 936 do
Windows, também conhecida como \s-1GBK.\s0
.PP
-On Unix/Linux \s-1UTF\-16\s0 files are converted to \s-1GB18030\s0 when the locale encoding
-is set to \s-1GB18030.\s0 Note that this will only work if the locale is supported
-by the system. Use command \f(CW\*(C`locale \-a\*(C'\fR to get the list of supported
-locales.
+No Unix/Linux, arquivos \s-1UTF\-16\s0 são convertidos para \s-1GB18030\s0 quando a
+codificação da localização é definida para \s-1GB18030.\s0 Note que isso vai
+funcionar apenas se o sistemas oferecer suporte à localização. Use o comando
+\&\f(CW\*(C`locale \-a\*(C'\fR para obter a lista de localizações às quais há suporte.
.PP
No Windows, você precisa usar a opção \f(CW\*(C`\-gb\*(C'\fR para converter arquivos \s-1UTF\-16\s0
para \s-1GB18030.\s0
@@ -758,7 +762,7 @@ diretório atual, digite:
\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
.Ve
.PP
-In a Windows Command Prompt the following command can be used:
+Em um Prompt de Comando do Windows o seguinte comando pode ser usado:
.PP
.Vb 1
\& for /R %G in (*.txt) do dos2unix "%G"
diff --git a/man/pt_BR/man1/dos2unix.htm b/man/pt_BR/man1/dos2unix.htm
index f82b783..57b6e81 100644
--- a/man/pt_BR/man1/dos2unix.htm
+++ b/man/pt_BR/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title>
+<title>dos2unix 7.3.2 - Conversor de formato de arquivo texto de DOS/Mac para Unix e vice-versa</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
@@ -23,7 +23,7 @@
<li><a href="#Codificaes">Codifica&ccedil;&otilde;es</a></li>
<li><a href="#Converso">Convers&atilde;o</a></li>
<li><a href="#Marca-de-ordem-de-byte">Marca de ordem de byte</a></li>
- <li><a href="#Unicode-file-names-on-Windows">Unicode file names on Windows</a></li>
+ <li><a href="#Nomes-de-arquivos-Unicode-no-Windows">Nomes de arquivos Unicode no Windows</a></li>
<li><a href="#Exemplos-de-Unicode">Exemplos de Unicode</a></li>
</ul>
</li>
@@ -144,48 +144,48 @@
<p>Define o modo de convers&atilde;o, sendo MODOCONV um dentre: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> com ascii sendo o padr&atilde;o.</p>
</dd>
-<dt id="D---display-enc-ENCODING"><b>-D, --display-enc ENCODING</b></dt>
+<dt id="D---display-enc-CODIFICAO"><b>-D, --display-enc CODIFICA&Ccedil;&Atilde;O</b></dt>
<dd>
-<p>Set encoding of displayed text. Where ENCODING is one of: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> with ansi being the default.</p>
+<p>Define a codifica&ccedil;&atilde;o do texto exibido, sendo CODIFICA&Ccedil;&Atilde;O um dentre: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> com ascii sendo o padr&atilde;o.</p>
-<p>This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed.</p>
+<p>Essa op&ccedil;&atilde;o est&aacute; dispon&iacute;vel apenas no dos2unix para Windows com suporte a nome de arquivo em Unicode. Essa op&ccedil;&atilde;o n&atilde;o possui efeito nos nomes de arquivos lidos e escritos, apenas em como eles s&atilde;o exibidos.</p>
-<p>There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages.</p>
+<p>H&aacute; v&aacute;rios m&eacute;todos para exibir texto em um console Windows baseado na codifica&ccedil;&atilde;o do texto. Todos eles possuem suas pr&oacute;prias vantagens e desvantagens.</p>
<dl>
<dt id="ansi"><b>ansi</b></dt>
<dd>
-<p>Dos2unix&#39;s default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the <code>chcp</code> command, because dos2unix uses the Windows system code page.</p>
+<p>O m&eacute;todo padr&atilde;o do dos2unix &eacute; usar o texto codificado em ANSI. A sua vantagem &eacute; a compatibilidade reversa. Ele funciona com fontes raster e TrueType. Em algumas regi&otilde;es voc&ecirc; pode precisar alterar a p&aacute;gina de c&oacute;digo OEM do DOS para ANSI do sistema Windows usando o comando <code>chcp</code>, porque dos2unix usa a p&aacute;gina de c&oacute;digo do sistema Windows.</p>
-<p>The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don&#39;t work with foreign file names this method is OK.</p>
+<p>A desvantagem do ansi &eacute; que nomes de arquivos internacionais com caracteres fora a p&aacute;gina de c&oacute;digo padr&atilde;o do sistema n&atilde;o s&atilde;o exibidos apropriadamente. Voc&ecirc; ver&aacute; um sinal de interroga&ccedil;&atilde;o, ou um s&iacute;mbolo incorreto. Quando voc&ecirc; n&atilde;o utiliza nomes de arquivos extrangeiros, esse m&eacute;todo funciona bem.</p>
</dd>
<dt id="unicode"><b>unicode</b></dt>
<dd>
-<p>The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console&#39;s font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it.</p>
+<p>A vantagem da codifica&ccedil;&atilde;o do unicode (o nome Windows para UTF-16) &eacute; que o texto &eacute; normalmente exibido apropriadamente. N&atilde;o h&aacute; necessidade para alterar a p&aacute;gina de c&oacute;digo ativa. Voc&ecirc; pode precisar definir a fonte do console para uma fonte TrueType para que caracteres internacionais sejam exibidos apropriadamente. Quando um caractere n&atilde;o est&aacute; inclu&iacute;do na fonte TrueType, geralmente voc&ecirc; v&ecirc; um pequeno quadrado, algumas vezes com um sinal de interroga&ccedil;&atilde;o nele.</p>
-<p>When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font.</p>
+<p>Quando voc&ecirc; usa o console ConEmu todo texto &eacute; exibido apropriadamente, porque o ConEmu seleciona automaticamente um fonte boa.</p>
-<p>The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file.</p>
+<p>A desvantagem do unicode &eacute; que ele n&atilde;o &eacute; compat&iacute;vel com ASCII. A sa&iacute;da n&atilde;o &eacute; f&aacute;cil de lidar quando voc&ecirc; o redireciona para um outro programa ou um arquivo. Redirecionamento para um arquivo n&atilde;o fornece um arquivo UTF-16 correto.</p>
</dd>
<dt id="utf8"><b>utf8</b></dt>
<dd>
-<p>The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console&#39;s font to a TrueType font. With a TrueType font the text is displayed similar as with the <code>unicode</code> encoding.</p>
+<p>A vantagem do utf8 &eacute; que ele &eacute; compat&iacute;vel com ASCII e quando voc&ecirc; o redireciona para um arquivo, voc&ecirc; obt&eacute;m um arquivo UTF-8 apropriado. Voc&ecirc; precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto &eacute; exibido similiar a uma codifica&ccedil;&atilde;o <code>unicode</code>.</p>
-<p>The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed.</p>
+<p>A desvantagem &eacute; que quando voc&ecirc; usa a fonte raster padr&atilde;o, caracteres n&atilde;o-ASCII s&atilde;o exibidos incorretamente. N&atilde;o apenas nomes de arquivos unicode, mas tamb&eacute;m mensagens traduzidas ficam ileg&iacute;veis. No Windows configurado para uma regi&atilde;o leste da &Aacute;sia, voc&ecirc; pode ver muitas falhas no console quando as mensagens s&atilde;o exibidas.</p>
-<p>In a ConEmu console the utf8 encoding method works well.</p>
+<p>Em um console ConEmu, o m&eacute;todo de codifica&ccedil;&atilde;o utf8 funciona bem.</p>
</dd>
</dl>
-<p>The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to <code>unicode</code> or <code>utf8</code>.</p>
+<p>A codifica&ccedil;&atilde;o padr&atilde;o pode ser alterada com a vari&aacute;vel de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para <code>unicode</code> ou <code>utf8</code>.</p>
</dd>
<dt id="f---force"><b>-f, --force</b></dt>
@@ -290,11 +290,11 @@
<pre><code> unix2dos -ic *.txt</code></pre>
-<p>Convert only files that have DOS line breaks and leave the other files untouched:</p>
+<p>Converte apenas arquivos que possuem quebras de linha do DOS e n&atilde;o altera outros arquivos:</p>
<pre><code> dos2unix -ic *.txt | xargs dos2unix</code></pre>
-<p>Find text files that have DOS line breaks:</p>
+<p>Localiza arquivos de texto que possuam quebras de linha do DOS:</p>
<pre><code> find -name &#39;*.txt&#39; | xargs dos2unix -ic</code></pre>
@@ -328,7 +328,7 @@
<p>Quando o arquivo de entrada &eacute; UTF-16, e a op&ccedil;&atilde;o <code>-u</code> &eacute; usada, um BOM UTF-16 ser&aacute; escrito.</p>
-<p>Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE.</p>
+<p>Nunca use essa op&ccedil;&atilde;o quando a codifica&ccedil;&atilde;o de sa&iacute;da &eacute; outra al&eacute;m de UTF-8, UTF-16 ou GB18030. Veja tamb&eacute;m a se&ccedil;&atilde;o UNICODE.</p>
</dd>
<dt id="n---newfile-ARQENT-ARQSADA"><b>-n, --newfile ARQENT ARQSA&Iacute;DA ...</b></dt>
@@ -539,11 +539,11 @@
<p>Dos2unix e unix2dos sempre escrevem BOM quando a op&ccedil;&atilde;o <code>-m</code> &eacute; usada.</p>
-<h2 id="Unicode-file-names-on-Windows">Unicode file names on Windows</h2>
+<h2 id="Nomes-de-arquivos-Unicode-no-Windows">Nomes de arquivos Unicode no Windows</h2>
-<p>Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type <code>dos2unix -V</code>.</p>
+<p>Dos2unix possui um suporte opcional para leitura e escrita de nomes de arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix pode abrir arquivos que possuam caracteres no nome que n&atilde;o s&atilde;o parte da p&aacute;gina de c&oacute;digo ANSI padr&atilde;o do sistema. Para ver ser dosunix para Windows foi compilado com suporte a nomes de arquivos Unicode, digite <code>dos2unix -V</code>.</p>
-<p>There are some issues with displaying Unicode file names in a Windows console. See option <code>-D</code>, <code>--display-enc</code>. The file names may be displayed wrongly in the console, but the files will be written with the correct name.</p>
+<p>H&aacute; alguns problemas com a exibi&ccedil;&atilde;o de nomes de arquivos Unicode em um console Windows. Veja a op&ccedil;&atilde;o <code>-D</code>, <code>--display-enc</code>. Para nomes de arquivos pode ser exibido incorretamente, mas os arquivos ser&atilde;o escritos com o nome correto.</p>
<h2 id="Exemplos-de-Unicode">Exemplos de Unicode</h2>
@@ -569,7 +569,7 @@
<p>GB18030 &eacute; completamente compat&iacute;vel com Unicode e pode ser considerado um formato de transforma&ccedil;&atilde;o de unicode. Assim como UTF-8, GB18030 &eacute; compat&iacute;vel com ASCII. GB18030 tamb&eacute;m &eacute; compat&iacute;vel com a p&aacute;gina de c&oacute;digo 936 do Windows, tamb&eacute;m conhecida como GBK.</p>
-<p>On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command <code>locale -a</code> to get the list of supported locales.</p>
+<p>No Unix/Linux, arquivos UTF-16 s&atilde;o convertidos para GB18030 quando a codifica&ccedil;&atilde;o da localiza&ccedil;&atilde;o &eacute; definida para GB18030. Note que isso vai funcionar apenas se o sistemas oferecer suporte &agrave; localiza&ccedil;&atilde;o. Use o comando <code>locale -a</code> para obter a lista de localiza&ccedil;&otilde;es &agrave;s quais h&aacute; suporte.</p>
<p>No Windows, voc&ecirc; precisa usar a op&ccedil;&atilde;o <code>-gb</code> para converter arquivos UTF-16 para GB18030.</p>
@@ -635,7 +635,7 @@
<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
-<p>In a Windows Command Prompt the following command can be used:</p>
+<p>Em um Prompt de Comando do Windows o seguinte comando pode ser usado:</p>
<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
diff --git a/man/pt_BR/man1/dos2unix.po b/man/pt_BR/man1/dos2unix.po
index 64e4b42..7613699 100644
--- a/man/pt_BR/man1/dos2unix.po
+++ b/man/pt_BR/man1/dos2unix.po
@@ -2,21 +2,21 @@
# Copyright (c) 2015 Erwin Waterlander (msgids)
# Copyright (C) 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix-man 7.2-beta4\n"
+"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 19:55+0200\n"
-"PO-Revision-Date: 2015-01-03 17:19-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2015-09-23 20:09+0200\n"
+"PO-Revision-Date: 2015-10-09 04:40-0300\n"
+"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: =head1
@@ -239,84 +239,82 @@ msgstr "Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>
#. type: =item
#: dos2unix.pod:155
msgid "B<-D, --display-enc ENCODING>"
-msgstr ""
+msgstr "B<-D, --display-enc CODIFICAÇÃO>"
#. type: textblock
#: dos2unix.pod:157
-#, fuzzy
-#| msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
-msgstr "Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>, I<iso>, I<mac> com ascii sendo o padrão."
+msgstr "Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>, I<unicode>, I<utf8> com ascii sendo o padrão."
#. type: textblock
#: dos2unix.pod:161
msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
-msgstr ""
+msgstr "Essa opção está disponível apenas no dos2unix para Windows com suporte a nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de arquivos lidos e escritos, apenas em como eles são exibidos."
#. type: textblock
#: dos2unix.pod:165
msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
-msgstr ""
+msgstr "Há vários métodos para exibir texto em um console Windows baseado na codificação do texto. Todos eles possuem suas próprias vantagens e desvantagens."
#. type: =item
#: dos2unix.pod:171
msgid "B<ansi>"
-msgstr ""
+msgstr "B<ansi>"
#. type: textblock
#: dos2unix.pod:173
msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
-msgstr ""
+msgstr "O método padrão do dos2unix é usar o texto codificado em ANSI. A sua vantagem é a compatibilidade reversa. Ele funciona com fontes raster e TrueType. Em algumas regiões você pode precisar alterar a página de código OEM do DOS para ANSI do sistema Windows usando o comando C<chcp>, porque dos2unix usa a página de código do sistema Windows."
#. type: textblock
#: dos2unix.pod:179
msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
-msgstr ""
+msgstr "A desvantagem do ansi é que nomes de arquivos internacionais com caracteres fora a página de código padrão do sistema não são exibidos apropriadamente. Você verá um sinal de interrogação, ou um símbolo incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse método funciona bem."
#. type: =item
#: dos2unix.pod:184
msgid "B<unicode>"
-msgstr ""
+msgstr "B<unicode>"
#. type: textblock
#: dos2unix.pod:186
msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
-msgstr ""
+msgstr "A vantagem da codificação do unicode (o nome Windows para UTF-16) é que o texto é normalmente exibido apropriadamente. Não há necessidade para alterar a página de código ativa. Você pode precisar definir a fonte do console para uma fonte TrueType para que caracteres internacionais sejam exibidos apropriadamente. Quando um caractere não está incluído na fonte TrueType, geralmente você vê um pequeno quadrado, algumas vezes com um sinal de interrogação nele."
#. type: textblock
#: dos2unix.pod:192
msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
-msgstr ""
+msgstr "Quando você usa o console ConEmu todo texto é exibido apropriadamente, porque o ConEmu seleciona automaticamente um fonte boa."
#. type: textblock
#: dos2unix.pod:195
msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
-msgstr ""
+msgstr "A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é fácil de lidar quando você o redireciona para um outro programa ou um arquivo. Redirecionamento para um arquivo não fornece um arquivo UTF-16 correto."
#. type: =item
#: dos2unix.pod:199
msgid "B<utf8>"
-msgstr ""
+msgstr "B<utf8>"
#. type: textblock
#: dos2unix.pod:201
msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
-msgstr ""
+msgstr "A vantagem do utf8 é que ele é compatível com ASCII e quando você o redireciona para um arquivo, você obtém um arquivo UTF-8 apropriado. Você precisa definir a fonte do console para uma fonte TrueType. Com uma fonte TrueType, o texto é exibido similiar a uma codificação C<unicode>."
#. type: textblock
#: dos2unix.pod:206
msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
-msgstr ""
+msgstr "A desvantagem é que quando você usa a fonte raster padrão, caracteres não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode, mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para uma região leste da Ásia, você pode ver muitas falhas no console quando as mensagens são exibidas."
#. type: textblock
#: dos2unix.pod:212
msgid "In a ConEmu console the utf8 encoding method works well."
-msgstr ""
+msgstr "Em um console ConEmu, o método de codificação utf8 funciona bem."
#. type: textblock
#: dos2unix.pod:216
msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
-msgstr ""
+msgstr "A codificação padrão pode ser alterada com a variável de ambiente DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode> ou C<utf8>."
#. type: =item
#: dos2unix.pod:219
@@ -545,39 +543,31 @@ msgstr ""
#. type: textblock
#: dos2unix.pod:308
msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
-msgstr ""
+msgstr "Converte apenas arquivos que possuem quebras de linha do DOS e não altera outros arquivos:"
#. type: verbatim
#: dos2unix.pod:310
-#, fuzzy, no-wrap
-#| msgid ""
-#| " find . -name *.txt |xargs dos2unix\n"
-#| "\n"
+#, no-wrap
msgid ""
" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" dos2unix -ic *.txt | xargs dos2unix\n"
"\n"
#. type: textblock
#: dos2unix.pod:312
-#, fuzzy
-#| msgid "List the files that have DOS line breaks:"
msgid "Find text files that have DOS line breaks:"
-msgstr "Lista os arquivos que possuem quebras de linha do DOS:"
+msgstr "Localiza arquivos de texto que possuam quebras de linha do DOS:"
#. type: verbatim
#: dos2unix.pod:314
-#, fuzzy, no-wrap
-#| msgid ""
-#| " find . -name *.txt |xargs dos2unix\n"
-#| "\n"
+#, no-wrap
msgid ""
" find -name '*.txt' | xargs dos2unix -ic\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" find -name '*.txt' | xargs dos2unix -ic\n"
"\n"
#. type: =item
@@ -637,10 +627,8 @@ msgstr "Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BO
#. type: textblock
#: dos2unix.pod:343
-#, fuzzy
-#| msgid "Never use this option when the output encoding is other than UTF-8 or UTF-16. See also section UNICODE."
msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
-msgstr "Nunca use essa opção quando a codificação de saída é outra além de UTF-8 ou UTF-16. Veja também a seção UNICODE."
+msgstr "Nunca use essa opção quando a codificação de saída é outra além de UTF-8, UTF-16 ou GB18030. Veja também a seção UNICODE."
#. type: =item
#: dos2unix.pod:347
@@ -1110,17 +1098,17 @@ msgstr "Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada.
#. type: =head2
#: dos2unix.pod:588
msgid "Unicode file names on Windows"
-msgstr ""
+msgstr "Nomes de arquivos Unicode no Windows"
#. type: textblock
#: dos2unix.pod:590
msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
-msgstr ""
+msgstr "Dos2unix possui um suporte opcional para leitura e escrita de nomes de arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix pode abrir arquivos que possuam caracteres no nome que não são parte da página de código ANSI padrão do sistema. Para ver ser dosunix para Windows foi compilado com suporte a nomes de arquivos Unicode, digite C<dos2unix -V>."
#. type: textblock
#: dos2unix.pod:596
msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
-msgstr ""
+msgstr "Há alguns problemas com a exibição de nomes de arquivos Unicode em um console Windows. Veja a opção C<-D>, C<--display-enc>. Para nomes de arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com o nome correto."
#. type: =head2
#: dos2unix.pod:600
@@ -1204,10 +1192,8 @@ msgstr "GB18030 é completamente compatível com Unicode e pode ser considerado
#. type: textblock
#: dos2unix.pod:628
-#, fuzzy
-#| msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the location is set to China. E.g. in an English British locale setting C<en_GB.GB18030> conversion of UTF-16 to GB18030 will not work, but in a Chinese C<zh_CN.GB18030> locale setting it will work."
msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
-msgstr "No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a codificação da localização é definida para GB18030. Note que isso vai funcionar apenas se a localização estiver definida para China. Por exemplo, em uma configuração de localização inglesa (Britânia) a conversão C<en_GB.GB18030> de UTF-16 para GB18030 não vai funcionar, mas em uma configuração de localização C<zh_CN.GB18030> chinesa vai funcionar."
+msgstr "No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a codificação da localização é definida para GB18030. Note que isso vai funcionar apenas se o sistemas oferecer suporte à localização. Use o comando C<locale -a> para obter a lista de localizações às quais há suporte."
#. type: textblock
#: dos2unix.pod:632
@@ -1417,33 +1403,27 @@ msgstr "Use dos2unix em combinação com os comandos find(1) e xargs(1) para con
#. type: verbatim
#: dos2unix.pod:698
-#, fuzzy, no-wrap
-#| msgid ""
-#| " find . -name *.txt |xargs dos2unix\n"
-#| "\n"
+#, no-wrap
msgid ""
" find . -name '*.txt' |xargs dos2unix\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" find . -name '*.txt' |xargs dos2unix\n"
"\n"
#. type: textblock
#: dos2unix.pod:700
msgid "In a Windows Command Prompt the following command can be used:"
-msgstr ""
+msgstr "Em um Prompt de Comando do Windows o seguinte comando pode ser usado:"
#. type: verbatim
#: dos2unix.pod:702
-#, fuzzy, no-wrap
-#| msgid ""
-#| " find . -name *.txt |xargs dos2unix\n"
-#| "\n"
+#, no-wrap
msgid ""
" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
msgstr ""
-" find . -name *.txt |xargs dos2unix\n"
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
"\n"
#. type: =head1
diff --git a/man/pt_BR/man1/dos2unix.pod b/man/pt_BR/man1/dos2unix.pod
index b4f85bc..aafd72f 100644
--- a/man/pt_BR/man1/dos2unix.pod
+++ b/man/pt_BR/man1/dos2unix.pod
@@ -125,18 +125,18 @@ converter para quebras de linha do DOS. Veja também a opção C<-r>.
Define o modo de conversão, sendo MODOCONV um dentre: I<ascii>, I<7bit>,
I<iso>, I<mac> com ascii sendo o padrão.
-=item B<-D, --display-enc ENCODING>
+=item B<-D, --display-enc CODIFICAÇÃO>
-Set encoding of displayed text. Where ENCODING is one of: I<ansi>,
-I<unicode>, I<utf8> with ansi being the default.
+Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre: I<ansi>,
+I<unicode>, I<utf8> com ascii sendo o padrão.
-This option is only available in dos2unix for Windows with Unicode file name
-support. This option has no effect on the actual file names read and
-written, only on how they are displayed.
+Essa opção está disponível apenas no dos2unix para Windows com suporte a
+nome de arquivo em Unicode. Essa opção não possui efeito nos nomes de
+arquivos lidos e escritos, apenas em como eles são exibidos.
-There are several methods for displaying text in a Windows console based on
-the encoding of the text. They all have their own advantages and
-disadvantages.
+Há vários métodos para exibir texto em um console Windows baseado na
+codificação do texto. Todos eles possuem suas próprias vantagens e
+desvantagens.
@@ -144,52 +144,55 @@ disadvantages.
=item B<ansi>
-Dos2unix's default method is to use ANSI encoded text. The advantage is that
-it is backwards compatible. It works with raster and TrueType fonts. In some
-regions you may need to change the active DOS OEM code page to the Windows
-system ANSI code page using the C<chcp> command, because dos2unix uses the
-Windows system code page.
+O método padrão do dos2unix é usar o texto codificado em ANSI. A sua
+vantagem é a compatibilidade reversa. Ele funciona com fontes raster e
+TrueType. Em algumas regiões você pode precisar alterar a página de código
+OEM do DOS para ANSI do sistema Windows usando o comando C<chcp>, porque
+dos2unix usa a página de código do sistema Windows.
-The disadvantage of ansi is that international file names with characters
-not inside the system default code page are not displayed properly. You will
-see a question mark, or a wrong symbol instead. When you don't work with
-foreign file names this method is OK.
+A desvantagem do ansi é que nomes de arquivos internacionais com caracteres
+fora a página de código padrão do sistema não são exibidos
+apropriadamente. Você verá um sinal de interrogação, ou um símbolo
+incorreto. Quando você não utiliza nomes de arquivos extrangeiros, esse
+método funciona bem.
=item B<unicode>
-The advantage of unicode (the Windows name for UTF-16) encoding is that text
-is usually properly displayed. There is no need to change the active code
-page. You may need to set the console's font to a TrueType font to have
-international characters displayed properly. When a character is not
-included in the TrueType font you usually see a small square, sometimes with
-a question mark in it.
+A vantagem da codificação do unicode (o nome Windows para UTF-16) é que o
+texto é normalmente exibido apropriadamente. Não há necessidade para alterar
+a página de código ativa. Você pode precisar definir a fonte do console para
+uma fonte TrueType para que caracteres internacionais sejam exibidos
+apropriadamente. Quando um caractere não está incluído na fonte TrueType,
+geralmente você vê um pequeno quadrado, algumas vezes com um sinal de
+interrogação nele.
-When you use the ConEmu console all text is displayed properly, because
-ConEmu automatically selects a good font.
+Quando você usa o console ConEmu todo texto é exibido apropriadamente,
+porque o ConEmu seleciona automaticamente um fonte boa.
-The disadvantage of unicode is that it is not compatible with ASCII. The
-output is not easy to handle when you redirect it to another program or a
-file. Redirection to a file does not give a correct UTF-16 file.
+A desvantagem do unicode é que ele não é compatível com ASCII. A saída não é
+fácil de lidar quando você o redireciona para um outro programa ou um
+arquivo. Redirecionamento para um arquivo não fornece um arquivo UTF-16
+correto.
=item B<utf8>
-The advantage of utf8 is that it is compatible with ASCII and when you
-redirect it to a file you get a proper UTF-8 file. You need to set the
-console's font to a TrueType font. With a TrueType font the text is
-displayed similar as with the C<unicode> encoding.
+A vantagem do utf8 é que ele é compatível com ASCII e quando você o
+redireciona para um arquivo, você obtém um arquivo UTF-8 apropriado. Você
+precisa definir a fonte do console para uma fonte TrueType. Com uma fonte
+TrueType, o texto é exibido similiar a uma codificação C<unicode>.
-The disadvantage is that when you use the default raster font all non-ASCII
-characters are displayed wrong. Not only unicode file names, but also
-translated messages become unreadable. On Windows configured for an
-East-Asian region you may see a lot of flickering of the console when the
-messages are displayed.
+A desvantagem é que quando você usa a fonte raster padrão, caracteres
+não-ASCII são exibidos incorretamente. Não apenas nomes de arquivos unicode,
+mas também mensagens traduzidas ficam ilegíveis. No Windows configurado para
+uma região leste da Ásia, você pode ver muitas falhas no console quando as
+mensagens são exibidas.
-In a ConEmu console the utf8 encoding method works well.
+Em um console ConEmu, o método de codificação utf8 funciona bem.
=back
-The default encoding can be changed with environment variable
-DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>.
+A codificação padrão pode ser alterada com a variável de ambiente
+DOS2UNIX_DISPLAY_ENC definindo-a para C<unicode> ou C<utf8>.
=item B<-f, --force>
@@ -282,12 +285,12 @@ Lista os arquivos que possuem quebras de linha do Unix:
unix2dos -ic *.txt
-Convert only files that have DOS line breaks and leave the other files
-untouched:
+Converte apenas arquivos que possuem quebras de linha do DOS e não altera
+outros arquivos:
dos2unix -ic *.txt | xargs dos2unix
-Find text files that have DOS line breaks:
+Localiza arquivos de texto que possuam quebras de linha do DOS:
find -name '*.txt' | xargs dos2unix -ic
@@ -319,8 +322,8 @@ BOM UTF-8 é escrito.
Quando o arquivo de entrada é UTF-16, e a opção C<-u> é usada, um BOM UTF-16
será escrito.
-Never use this option when the output encoding is other than UTF-8, UTF-16,
-or GB18030. See also section UNICODE.
+Nunca use essa opção quando a codificação de saída é outra além de UTF-8,
+UTF-16 ou GB18030. Veja também a seção UNICODE.
@@ -577,18 +580,19 @@ entrada tem BOM. Use a opção C<-m> para remover BOM.
Dos2unix e unix2dos sempre escrevem BOM quando a opção C<-m> é usada.
-=head2 Unicode file names on Windows
+=head2 Nomes de arquivos Unicode no Windows
-Dos2unix has optional support for reading and writing Unicode file names in
-the Windows Command Prompt. That means that dos2unix can open files that
-have characters in the name that are not part of the default system ANSI
-code page. To see if dos2unix for Windows was built with Unicode file name
-support type C<dos2unix -V>.
+Dos2unix possui um suporte opcional para leitura e escrita de nomes de
+arquivos Unicode no Prompt de Comando Windows. Isso significa que dos2unix
+pode abrir arquivos que possuam caracteres no nome que não são parte da
+página de código ANSI padrão do sistema. Para ver ser dosunix para Windows
+foi compilado com suporte a nomes de arquivos Unicode, digite C<dos2unix
+-V>.
-There are some issues with displaying Unicode file names in a Windows
-console. See option C<-D>, C<--display-enc>. The file names may be
-displayed wrongly in the console, but the files will be written with the
-correct name.
+Há alguns problemas com a exibição de nomes de arquivos Unicode em um
+console Windows. Veja a opção C<-D>, C<--display-enc>. Para nomes de
+arquivos pode ser exibido incorretamente, mas os arquivos serão escritos com
+o nome correto.
=head2 Exemplos de Unicode
@@ -619,10 +623,10 @@ formato de transformação de unicode. Assim como UTF-8, GB18030 é compatível
com ASCII. GB18030 também é compatível com a página de código 936 do
Windows, também conhecida como GBK.
-On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding
-is set to GB18030. Note that this will only work if the locale is supported
-by the system. Use command C<locale -a> to get the list of supported
-locales.
+No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a
+codificação da localização é definida para GB18030. Note que isso vai
+funcionar apenas se o sistemas oferecer suporte à localização. Use o comando
+C<locale -a> para obter a lista de localizações às quais há suporte.
No Windows, você precisa usar a opção C<-gb> para converter arquivos UTF-16
para GB18030.
@@ -696,7 +700,7 @@ diretório atual, digite:
find . -name '*.txt' |xargs dos2unix
-In a Windows Command Prompt the following command can be used:
+Em um Prompt de Comando do Windows o seguinte comando pode ser usado:
for /R %G in (*.txt) do dos2unix "%G"
diff --git a/man/pt_BR/man1/dos2unix.txt b/man/pt_BR/man1/dos2unix.txt
index d863d3f..d312b97 100644
--- a/man/pt_BR/man1/dos2unix.txt
+++ b/man/pt_BR/man1/dos2unix.txt
@@ -92,66 +92,70 @@ OPÇÕES
Define o modo de conversão, sendo MODOCONV um dentre: *ascii*,
*7bit*, *iso*, *mac* com ascii sendo o padrão.
- -D, --display-enc ENCODING
- Set encoding of displayed text. Where ENCODING is one of: *ansi*,
- *unicode*, *utf8* with ansi being the default.
+ -D, --display-enc CODIFICAÇÃO
+ Define a codificação do texto exibido, sendo CODIFICAÇÃO um dentre:
+ *ansi*, *unicode*, *utf8* com ascii sendo o padrão.
- This option is only available in dos2unix for Windows with Unicode
- file name support. This option has no effect on the actual file
- names read and written, only on how they are displayed.
+ Essa opção está disponível apenas no dos2unix para Windows com
+ suporte a nome de arquivo em Unicode. Essa opção não possui efeito
+ nos nomes de arquivos lidos e escritos, apenas em como eles são
+ exibidos.
- There are several methods for displaying text in a Windows console
- based on the encoding of the text. They all have their own
- advantages and disadvantages.
+ Há vários métodos para exibir texto em um console Windows baseado na
+ codificação do texto. Todos eles possuem suas próprias vantagens e
+ desvantagens.
ansi
- Dos2unix's default method is to use ANSI encoded text. The
- advantage is that it is backwards compatible. It works with
- raster and TrueType fonts. In some regions you may need to
- change the active DOS OEM code page to the Windows system ANSI
- code page using the "chcp" command, because dos2unix uses the
- Windows system code page.
-
- The disadvantage of ansi is that international file names with
- characters not inside the system default code page are not
- displayed properly. You will see a question mark, or a wrong
- symbol instead. When you don't work with foreign file names this
- method is OK.
+ O método padrão do dos2unix é usar o texto codificado em ANSI. A
+ sua vantagem é a compatibilidade reversa. Ele funciona com
+ fontes raster e TrueType. Em algumas regiões você pode precisar
+ alterar a página de código OEM do DOS para ANSI do sistema
+ Windows usando o comando "chcp", porque dos2unix usa a página de
+ código do sistema Windows.
+
+ A desvantagem do ansi é que nomes de arquivos internacionais com
+ caracteres fora a página de código padrão do sistema não são
+ exibidos apropriadamente. Você verá um sinal de interrogação, ou
+ um símbolo incorreto. Quando você não utiliza nomes de arquivos
+ extrangeiros, esse método funciona bem.
unicode
- The advantage of unicode (the Windows name for UTF-16) encoding
- is that text is usually properly displayed. There is no need to
- change the active code page. You may need to set the console's
- font to a TrueType font to have international characters
- displayed properly. When a character is not included in the
- TrueType font you usually see a small square, sometimes with a
- question mark in it.
-
- When you use the ConEmu console all text is displayed properly,
- because ConEmu automatically selects a good font.
-
- The disadvantage of unicode is that it is not compatible with
- ASCII. The output is not easy to handle when you redirect it to
- another program or a file. Redirection to a file does not give a
- correct UTF-16 file.
+ A vantagem da codificação do unicode (o nome Windows para
+ UTF-16) é que o texto é normalmente exibido apropriadamente. Não
+ há necessidade para alterar a página de código ativa. Você pode
+ precisar definir a fonte do console para uma fonte TrueType para
+ que caracteres internacionais sejam exibidos apropriadamente.
+ Quando um caractere não está incluído na fonte TrueType,
+ geralmente você vê um pequeno quadrado, algumas vezes com um
+ sinal de interrogação nele.
+
+ Quando você usa o console ConEmu todo texto é exibido
+ apropriadamente, porque o ConEmu seleciona automaticamente um
+ fonte boa.
+
+ A desvantagem do unicode é que ele não é compatível com ASCII. A
+ saída não é fácil de lidar quando você o redireciona para um
+ outro programa ou um arquivo. Redirecionamento para um arquivo
+ não fornece um arquivo UTF-16 correto.
utf8
- The advantage of utf8 is that it is compatible with ASCII and
- when you redirect it to a file you get a proper UTF-8 file. You
- need to set the console's font to a TrueType font. With a
- TrueType font the text is displayed similar as with the
- "unicode" encoding.
+ A vantagem do utf8 é que ele é compatível com ASCII e quando
+ você o redireciona para um arquivo, você obtém um arquivo UTF-8
+ apropriado. Você precisa definir a fonte do console para uma
+ fonte TrueType. Com uma fonte TrueType, o texto é exibido
+ similiar a uma codificação "unicode".
- The disadvantage is that when you use the default raster font
- all non-ASCII characters are displayed wrong. Not only unicode
- file names, but also translated messages become unreadable. On
- Windows configured for an East-Asian region you may see a lot of
- flickering of the console when the messages are displayed.
+ A desvantagem é que quando você usa a fonte raster padrão,
+ caracteres não-ASCII são exibidos incorretamente. Não apenas
+ nomes de arquivos unicode, mas também mensagens traduzidas ficam
+ ilegíveis. No Windows configurado para uma região leste da Ásia,
+ você pode ver muitas falhas no console quando as mensagens são
+ exibidas.
- In a ConEmu console the utf8 encoding method works well.
+ Em um console ConEmu, o método de codificação utf8 funciona bem.
- The default encoding can be changed with environment variable
- DOS2UNIX_DISPLAY_ENC by setting it to "unicode" or "utf8".
+ A codificação padrão pode ser alterada com a variável de ambiente
+ DOS2UNIX_DISPLAY_ENC definindo-a para "unicode" ou "utf8".
-f, --force
Força a conversão de arquivos binários.
@@ -225,12 +229,12 @@ OPÇÕES
unix2dos -ic *.txt
- Convert only files that have DOS line breaks and leave the other
- files untouched:
+ Converte apenas arquivos que possuem quebras de linha do DOS e não
+ altera outros arquivos:
dos2unix -ic *.txt | xargs dos2unix
- Find text files that have DOS line breaks:
+ Localiza arquivos de texto que possuam quebras de linha do DOS:
find -name '*.txt' | xargs dos2unix -ic
@@ -259,8 +263,8 @@ OPÇÕES
Quando o arquivo de entrada é UTF-16, e a opção "-u" é usada, um BOM
UTF-16 será escrito.
- Never use this option when the output encoding is other than UTF-8,
- UTF-16, or GB18030. See also section UNICODE.
+ Nunca use essa opção quando a codificação de saída é outra além de
+ UTF-8, UTF-16 ou GB18030. Veja também a seção UNICODE.
-n, --newfile ARQENT ARQSAÍDA ...
Modo de novo arquivo. Converte o arquivo ARQENT e escreve a saída
@@ -493,17 +497,18 @@ UNICODE
Dos2unix e unix2dos sempre escrevem BOM quando a opção "-m" é usada.
- Unicode file names on Windows
- Dos2unix has optional support for reading and writing Unicode file names
- in the Windows Command Prompt. That means that dos2unix can open files
- that have characters in the name that are not part of the default system
- ANSI code page. To see if dos2unix for Windows was built with Unicode
- file name support type "dos2unix -V".
+ Nomes de arquivos Unicode no Windows
+ Dos2unix possui um suporte opcional para leitura e escrita de nomes de
+ arquivos Unicode no Prompt de Comando Windows. Isso significa que
+ dos2unix pode abrir arquivos que possuam caracteres no nome que não são
+ parte da página de código ANSI padrão do sistema. Para ver ser dosunix
+ para Windows foi compilado com suporte a nomes de arquivos Unicode,
+ digite "dos2unix -V".
- There are some issues with displaying Unicode file names in a Windows
- console. See option "-D", "--display-enc". The file names may be
- displayed wrongly in the console, but the files will be written with the
- correct name.
+ Há alguns problemas com a exibição de nomes de arquivos Unicode em um
+ console Windows. Veja a opção "-D", "--display-enc". Para nomes de
+ arquivos pode ser exibido incorretamente, mas os arquivos serão escritos
+ com o nome correto.
Exemplos de Unicode
Conversão de UTF-16 do Windows (com BOM) para UTF-8 do Unix:
@@ -532,10 +537,11 @@ GB18030
compatível com ASCII. GB18030 também é compatível com a página de código
936 do Windows, também conhecida como GBK.
- On Unix/Linux UTF-16 files are converted to GB18030 when the locale
- encoding is set to GB18030. Note that this will only work if the locale
- is supported by the system. Use command "locale -a" to get the list of
- supported locales.
+ No Unix/Linux, arquivos UTF-16 são convertidos para GB18030 quando a
+ codificação da localização é definida para GB18030. Note que isso vai
+ funcionar apenas se o sistemas oferecer suporte à localização. Use o
+ comando "locale -a" para obter a lista de localizações às quais há
+ suporte.
No Windows, você precisa usar a opção "-gb" para converter arquivos
UTF-16 para GB18030.
@@ -607,7 +613,7 @@ Conversão recursiva
find . -name '*.txt' |xargs dos2unix
- In a Windows Command Prompt the following command can be used:
+ Em um Prompt de Comando do Windows o seguinte comando pode ser usado:
for /R %G in (*.txt) do dos2unix "%G"
diff --git a/man/sv/man1/dos2unix.1 b/man/sv/man1/dos2unix.1
new file mode 100644
index 0000000..7693389
--- /dev/null
+++ b/man/sv/man1/dos2unix.1
@@ -0,0 +1,842 @@
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings. \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote. \*(C+ will
+.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+. ds -- \(*W-
+. ds PI pi
+. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
+. ds L" ""
+. ds R" ""
+. ds C` ""
+. ds C' ""
+'br\}
+.el\{\
+. ds -- \|\(em\|
+. ds PI \(*p
+. ds L" ``
+. ds R" ''
+. ds C`
+. ds C'
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD. Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+. if \nF \{
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
+..
+. if !\nF==2 \{
+. nr % 0
+. nr F 2
+. \}
+. \}
+.\}
+.rr rF
+.\" ========================================================================
+.\"
+.IX Title "dos2unix 1"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
+.\" For nroff, turn off justification. Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAMN"
+.IX Header "NAMN"
+dos2unix \- textfilsformatskonverterare från DOS/Mac till Unix och vice versa
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+.Vb 2
+\& dos2unix [flaggor] [FIL …] [\-n INFIL UTFIL …]
+\& unix2dos [flaggor] [FIL …] [\-n INFIL UTFIL …]
+.Ve
+.SH "BESKRIVNING"
+.IX Header "BESKRIVNING"
+Paketet Dos2unix inkluderar verktygen \f(CW\*(C`dos2unix\*(C'\fR och \f(CW\*(C`unix2dos\*(C'\fR som
+konverterar oformaterade textfiler i \s-1DOS\-\s0 eller Mac-format till Unix format
+och vice versa.
+.PP
+Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är en
+kombination av två tecken: vagnretur (Carriage Return, \s-1CR\s0) åtföljt av
+radmatning (Line Feed, \s-1LF\s0). Textfiler i Unix har en radbrytning som är ett
+enda tecken: radmatning (Line Feed, \s-1LF\s0). Textfiler för Mac, innan Mac \s-1OS X,\s0
+hade en radbrytning som var en enda vagnretur (Carriage Return, \s-1CR\s0). Numera
+använder Mac \s-1OS\s0 radbrytning i Unix-stil (\s-1LF\s0).
+.PP
+Förutom radbrytningar så kan Dos2unix också konvertera filers kodning. Några
+DOS-teckentabeller kan konverteras till Unix Latin\-1. Och filer som använder
+Windows Unicode (\s-1UTF\-16\s0) kan konverteras till Unix Unicode (\s-1UTF\-8\s0).
+.PP
+Binära filer hoppas över automatiskt, om inte konvertering tvingas.
+.PP
+Kataloger och FIFOs och andra filer som inte är vanliga filer hoppas över
+automatiskt.
+.PP
+Symboliska länkar och deras mål förblir oförändrade som standard. Symboliska
+länkar kan valfritt bli ersatta eller så kan utmatningen skrivas till målet
+för den symboliska länken. På Windows saknas stöd för att skriva till målet
+för en symbolisk länk.
+.PP
+Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig
+skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör
+som standard konverteringen på plats (gammalfilsläge), medan
+originalversionen från SunOS/Solaris bara hade stöd för parad konvertering
+(nyfilsläge). Se vidare flaggorna \f(CW\*(C`\-o\*(C'\fR och \f(CW\*(C`\-n\*(C'\fR.
+.SH "FLAGGOR"
+.IX Header "FLAGGOR"
+.IP "\fB\-\-\fR" 4
+.IX Item "--"
+Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du
+vill konvertera filer vars namn börjar med bindestreck. För att till exempel
+konvertera en fil med namnet “\-foo“ kan du använda detta kommando:
+.Sp
+.Vb 1
+\& dos2unix \-\- \-foo
+.Ve
+.Sp
+Eller i nyfilsläge:
+.Sp
+.Vb 1
+\& dos2unix \-n \-\- \-foo out.txt
+.Ve
+.IP "\fB\-ascii\fR" 4
+.IX Item "-ascii"
+Konvertera enbart radbrytningar. Detta är standardkonverteringsläget.
+.IP "\fB\-iso\fR" 4
+.IX Item "-iso"
+Konvertering mellan \s-1DOS\-\s0 och ISO\-8859\-1\-teckentabeller. Se vidare stycket
+KONVERTERINGSLÄGEN.
+.IP "\fB\-1252\fR" 4
+.IX Item "-1252"
+Använd Windows-teckentabell 1252 (Västeuropeisk).
+.IP "\fB\-437\fR" 4
+.IX Item "-437"
+Använd DOS-teckentabell 437 (\s-1USA\s0). Detta är standardteckentabellen som
+används för ISO-konvertering.
+.IP "\fB\-850\fR" 4
+.IX Item "-850"
+Använd DOS-teckentabell 850 (Västeuropeisk).
+.IP "\fB\-860\fR" 4
+.IX Item "-860"
+Använd DOS-teckentabell 860 (Portugisisk).
+.IP "\fB\-863\fR" 4
+.IX Item "-863"
+Använd DOS-teckentabell 863 (Fransk-kanadensisk).
+.IP "\fB\-865\fR" 4
+.IX Item "-865"
+Använd DOS-teckentabell 865 (Nordisk).
+.IP "\fB\-7\fR" 4
+.IX Item "-7"
+Konvertera 8\-bitars tecken till 7\-bitars blanksteg.
+.IP "\fB\-b, \-\-keep\-bom\fR" 4
+.IX Item "-b, --keep-bom"
+Behåll byteordningsmarkering (Byte Order Mark, \s-1BOM\s0). Om infilen har en \s-1BOM,\s0
+skriv en \s-1BOM\s0 i utfilen. Detta är standardbeteendet vid konvertering av
+DOS-radbrytningar. Se vidare flaggan \f(CW\*(C`\-r\*(C'\fR.
+.IP "\fB\-c, \-\-convmode KONVERTERINGLÄGE\fR" 4
+.IX Item "-c, --convmode KONVERTERINGLÄGE"
+Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: \fIascii\fR,
+\&\fI7bit\fR, \fIiso\fR, \fImac\fR där ascii är standard.
+.IP "\fB\-D, \-\-display\-enc \s-1KODNING\s0\fR" 4
+.IX Item "-D, --display-enc KODNING"
+Ställ in kodning för visad text. Där \s-1KODNING\s0 är en av: \fIansi\fR, \fIunicode\fR,
+\&\fIutf8\fR där ansi är standardvalet.
+.Sp
+Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för
+Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses
+och skrivs, bara på hur de visas.
+.Sp
+Det finns flera metoder för att visa text i en Windows-konsol baserad på
+vilken kodning texten har. De har alla för\- och nackdelar.
+.RS 4
+.IP "\fBansi\fR" 4
+.IX Item "ansi"
+Dos2unix standardmetod är att använda ANSI-kodad text. Fördelen är att den
+är bakåtkompatibel. Det fungerar med raster\- och TrueType-teckensnitt. I
+vissa regioner kan du behöva ändra den aktiva \s-1DOS\s0 OEM-teckentabellen till
+Windows-systemets ANSI-teckentabell genom att använda kommandot \f(CW\*(C`chcp\*(C'\fR,
+eftersom dos2unix använder Windows-systemets teckentabell.
+.Sp
+Nackdelen med ansi är att internationella filnamn med tecken som inte finns
+i systemets standardteckentabell inte visas korrekt. Du kommer att se
+frågetecken, eller en felaktig symbol istället. När du inte arbetar med
+utländska filnamn är denna metoden \s-1OK.\s0
+.IP "\fBunicode\fR" 4
+.IX Item "unicode"
+Fördelen med unicode-kodning (Windows-namnet för \s-1UTF\-16\s0) är att text
+vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva
+teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett
+TrueType-teckensnitt för att få internationella tecken att visas
+korrekt. När ett tecken inte finns inkluderat i TrueType-teckensnittet
+kommer du vanligtvis att se en liten ruta, ibland med ett frågetecken inuti.
+.Sp
+När du använder ConEmu-konsolen kommer all text att visas korrekt eftersom
+ConEmu automatiskt väljer ett bra teckensnitt.
+.Sp
+Nackdelen med unicode är att den inte är kompatibel med \s-1ASCII.\s0 Utmatningen
+är inte lätt att hantera när du omdirigerar den till ett annat program eller
+en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF\-16\-fil.
+.IP "\fButf8\fR" 4
+.IX Item "utf8"
+Fördelen med utf8 är att den är kompatibel med \s-1ASCII\s0 och när du omdirigerar
+den till en fil kommer du att få en korrekt UTF\-8\-fil. Du måste ställa in
+konsolens teckensnitt till ett TrueType-teckensnitt. Med ett
+TrueType-teckensnitt kommer text att visas på liknande sätt som med
+\&\f(CW\*(C`unicode\*(C'\fR\-kodningen.
+.Sp
+Nackdelen är att när du använder standardrasterteckensnittet kommer alla
+icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan också
+översatta meddelanden kommer att bli oläsbara. Under Windows som
+konfigurerats för Östasien kan man komma att se många blinkningar i konsolen
+när meddelanden visas.
+.Sp
+I ConEmu-konsolen fungerar utf8\-kodningsmetoden väl.
+.RE
+.RS 4
+.Sp
+Standardkodningen kan ändras via miljövariabeln \s-1DOS2UNIX_DISPLAY_ENC\s0 genom
+att sätta den till \f(CW\*(C`unicode\*(C'\fR eller \f(CW\*(C`utf8\*(C'\fR.
+.RE
+.IP "\fB\-f, \-\-force\fR" 4
+.IX Item "-f, --force"
+Tvinga konvertering av binära filer.
+.IP "\fB\-gb, \-\-gb18030\fR" 4
+.IX Item "-gb, --gb18030"
+Under Windows konverteras UTF\-16\-filer som standard till \s-1UTF\-8,\s0 oavsett
+vilken lokalinställning som är gjord. Använd denna flagga för att konvertera
+UTF\-16\-filer till \s-1GB18030.\s0 Denna flagga finns bara tillgänglig i Windows. Se
+vidare i avsnittet \s-1GB18030.\s0
+.IP "\fB\-h, \-\-help\fR" 4
+.IX Item "-h, --help"
+Visa hjälptext och avsluta.
+.IP "\fB\-i[\s-1FLAGGOR\s0], \-\-info[=FLAGGOR] \s-1FIL ...\s0\fR" 4
+.IX Item "-i[FLAGGOR], --info[=FLAGGOR] FIL ..."
+Visa filinformation. Ingen konvertering görs.
+.Sp
+Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar,
+antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen,
+text eller binär, filnamn.
+.Sp
+Exempelutmatning:
+.Sp
+.Vb 8
+\& 6 0 0 no_bom text dos.txt
+\& 0 6 0 no_bom text unix.txt
+\& 0 0 6 no_bom text mac.txt
+\& 6 6 6 no_bom text mixed.txt
+\& 50 0 0 UTF\-16LE text utf16le.txt
+\& 0 50 0 no_bom text utf8unix.txt
+\& 50 0 0 UTF\-8 text utf8dos.txt
+\& 2 418 219 no_bom binär dos2unix.exe
+.Ve
+.Sp
+Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler
+flaggor kan läggas till.
+.RS 4
+.IP "\fBd\fR" 4
+.IX Item "d"
+Skriv ut antal DOS-radbrytningar.
+.IP "\fBu\fR" 4
+.IX Item "u"
+Skriv ut antal Unix-radbrytningar.
+.IP "\fBm\fR" 4
+.IX Item "m"
+Skriv ut antal Mac-radbrytningar.
+.IP "\fBb\fR" 4
+.IX Item "b"
+Skriv ut byteordningsmarkeringen.
+.IP "\fBt\fR" 4
+.IX Item "t"
+Skriv ut om filen är text eller binär.
+.IP "\fBc\fR" 4
+.IX Item "c"
+Skriv bara ut filerna som skulle ha konverterats.
+.Sp
+Med \f(CW\*(C`c\*(C'\fR\-flaggan kommer dos2unix att skriva ut filerna som innehåller
+DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har
+Unix-radbrytningar.
+.RE
+.RS 4
+.Sp
+Exempel:
+.Sp
+Visa information för alla *.txt\-filer:
+.Sp
+.Vb 1
+\& dos2unix \-i *.txt
+.Ve
+.Sp
+Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:
+.Sp
+.Vb 1
+\& dos2unix \-idu *.txt
+.Ve
+.Sp
+Visa bara byteordningsmarkeringen:
+.Sp
+.Vb 1
+\& dos2unix \-\-info=b *.txt
+.Ve
+.Sp
+Lista filerna som har DOS-radbrytningar:
+.Sp
+.Vb 1
+\& dos2unix \-ic *.txt
+.Ve
+.Sp
+Lista filerna som har Unix-radbrytningar:
+.Sp
+.Vb 1
+\& unix2dos \-ic *.txt
+.Ve
+.Sp
+Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer
+orörda:
+.Sp
+.Vb 1
+\& dos2unix \-ic *.txt | xargs dos2unix
+.Ve
+.Sp
+Hitta textfiler som har DOS-radbrytningar:
+.Sp
+.Vb 1
+\& find \-name \*(Aq*.txt\*(Aq | xargs dos2unix \-ic
+.Ve
+.RE
+.IP "\fB\-k, \-\-keepdate\fR" 4
+.IX Item "-k, --keepdate"
+Behåll infilens datumstämpel för utfilen.
+.IP "\fB\-L, \-\-license\fR" 4
+.IX Item "-L, --license"
+Visa programmets licens.
+.IP "\fB\-l, \-\-newline\fR" 4
+.IX Item "-l, --newline"
+Lägg till ytterligare nyrad.
+.Sp
+\&\fBdos2unix\fR: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I
+Mac\-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar.
+.Sp
+\&\fBunix2dos\fR: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I
+Mac\-läge ändras Unix-radbrytningar till två Mac-radbrytningar.
+.IP "\fB\-m, \-\-add\-bom\fR" 4
+.IX Item "-m, --add-bom"
+Skriv en byteordningsmarkering (Byte Order Mark, \s-1BOM\s0) i utfilen. Som
+standard skrivs en \s-1UTF\-8 BOM.\s0
+.Sp
+När infilen är \s-1UTF\-16,\s0 och flaggan \f(CW\*(C`\-u\*(C'\fR används, kommer en \s-1UTF\-16 BOM\s0 att
+skrivas.
+.Sp
+Använd aldrig denna flagga när kodningen för utmatning är något annat än
+\&\s-1UTF\-8, UTF\-16\s0 eller \s-1GB18030.\s0 Se vidare i avsnittet \s-1UNICODE.\s0
+.IP "\fB\-n, \-\-newfile \s-1INFIL UTFIL\s0 …\fR" 4
+.IX Item "-n, --newfile INFIL UTFIL …"
+Nyfilsläge. Konvertera filen \s-1INFIL\s0 och skriv utfilen \s-1UTFIL.\s0 Filnamnen måste
+ange i par och jokertecken i namnen ska \fIinte\fR användas annars \fIkommer\fR du
+att förlora filer.
+.Sp
+Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att
+bli ägaren till den konverterade filen. Läs\-/skrivbehörigheter för den nya
+filen kommer att vara samma behörigheter som för originalfilen minus
+\&\fIumask\fR\|(1) för användaren som kör konverteringen.
+.IP "\fB\-o, \-\-oldfile \s-1FIL\s0 …\fR" 4
+.IX Item "-o, --oldfile FIL …"
+Gammalfilsläge. Konvertera filen \s-1FIL\s0 och skriv över den med
+utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn
+får användas.
+.Sp
+I gammalfilsläge (på\-plats läge) kommer den konverterade filen att få samma
+ägare, grupp samt läs\-/skrivbehörigheter som originalfilen. Även då filen
+konverteras av en annan användare som har skrivbehörighet för filen
+(t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är
+möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att
+originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara
+en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte
+är avsedd för. Stöd för bevarande av ägare, grupp och
+läs\-/skrivbehörigheter finns bara i Unix.
+.IP "\fB\-q, \-\-quiet\fR" 4
+.IX Item "-q, --quiet"
+Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är
+noll. Utom när felaktiga kommandoradsflaggor används.
+.IP "\fB\-r, \-\-remove\-bom\fR" 4
+.IX Item "-r, --remove-bom"
+Ta bort byteordningsmarkering (Byte Order Mark, \s-1BOM\s0). Skriv inte en \s-1BOM\s0 i
+utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar.
+Se vidare flaggan \f(CW\*(C`\-b\*(C'\fR.
+.IP "\fB\-s, \-\-safe\fR" 4
+.IX Item "-s, --safe"
+Hoppa över binära filer (standard).
+.IP "\fB\-u, \-\-keep\-utf16\fR" 4
+.IX Item "-u, --keep-utf16"
+Behåll infilens original UTF\-16\-kodning. Utfilen kommer att skrivas med
+samma UTF\-16\-kodning som infilen, omvänd eller rak byteordning (little eller
+big endian). Detta förhindrar transformation till \s-1UTF\-8.\s0 En \s-1UTF\-16 BOM\s0
+kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med
+\&\f(CW\*(C`\-ascii\*(C'\fR\-flaggan.
+.IP "\fB\-ul, \-\-assume\-utf16le\fR" 4
+.IX Item "-ul, --assume-utf16le"
+Antag att infilsformatet är \s-1UTF\-16LE.\s0
+.Sp
+När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har
+BOM:en högre prioritet än denna flagga.
+.Sp
+När du har gjort fel antagande (infilen var inte i UTF\-16LE\-format) och
+konverteringens lyckas, kommer du att få en \s-1UTF\-8\s0 utfil med felaktig
+text. Du kan göra denna konvertering ogjord med \fIiconv\fR\|(1) genom att
+konvertera \s-1UTF\-8\s0 utfilen tillbaka till \s-1UTF\-16LE.\s0 Detta kommer att återskapa
+originalfilen.
+.Sp
+Antagandet om \s-1UTF\-16LE\s0 fungerar som ett \fIkonverteringsläge\fR. Genom att
+växla till standard \fIascii\fR\-läget kommer \s-1UTF\-16LE\s0 antagandet att stängas
+av.
+.IP "\fB\-ub, \-\-assume\-utf16be\fR" 4
+.IX Item "-ub, --assume-utf16be"
+Antag att infilsformatet är \s-1UTF\-16BE.\s0
+.Sp
+Denna flagga fungerar på samma sätt som flaggan \f(CW\*(C`\-ul\*(C'\fR.
+.IP "\fB\-v, \-\-verbose\fR" 4
+.IX Item "-v, --verbose"
+Visa utförliga meddelanden. Extra information visas om
+byteordningsmarkeringar och antalet konverterade radbrytningar.
+.IP "\fB\-F, \-\-follow\-symlink\fR" 4
+.IX Item "-F, --follow-symlink"
+Följ symboliska länkar och konvertera målen.
+.IP "\fB\-R, \-\-replace\-symlink\fR" 4
+.IX Item "-R, --replace-symlink"
+Ersätt symboliska länkar med konverterade filer (original målfilerna förblir
+oförändrade).
+.IP "\fB\-S, \-\-skip\-symlink\fR" 4
+.IX Item "-S, --skip-symlink"
+Behåll symboliska länkar och mål oförändrade (standard).
+.IP "\fB\-V, \-\-version\fR" 4
+.IX Item "-V, --version"
+Visa versionsinformation och avsluta.
+.SH "MAC\-LÄGE"
+.IX Header "MAC-LÄGE"
+I normalläge konverteras radbrytningar från \s-1DOS\s0 till Unix och vice
+versa. Mac-radbrytningar konverteras inte.
+.PP
+I Mac\-läge konverteras radbrytningar från Mac till Unix och vice
+versa. DOS-radbrytningar ändras ej.
+.PP
+För att köra i Mac\-läge använd kommandoradsflaggan \f(CW\*(C`\-c mac\*(C'\fR eller använd
+kommandona \f(CW\*(C`mac2unix\*(C'\fR eller \f(CW\*(C`unix2mac\*(C'\fR.
+.SH "KONVERTERINGSLÄGEN"
+.IX Header "KONVERTERINGSLÄGEN"
+.IP "\fBascii\fR" 4
+.IX Item "ascii"
+I läget \f(CW\*(C`ascii\*(C'\fR konverteras enbart radbrytningar. Detta är
+standardkonverteringsläget.
+.Sp
+Även om namnet på detta läge är \s-1ASCII,\s0 vilket är en 7\-bitarsstandard, så är
+det läget egentligen ett 8\-bitarsläge. Använd alltid detta läge vid
+konvertering av Unicode UTF\-8\-filer.
+.IP "\fB7bit\fR" 4
+.IX Item "7bit"
+I detta läge konverteras alla 8\-bitars icke-ASCII tecken (med värden från
+128 till 255) till ett 7\-bitars blanksteg.
+.IP "\fBiso\fR" 4
+.IX Item "iso"
+Tecken konverteras mellan \s-1DOS\s0 teckenuppsättning (teckentabell) och \s-1ISO\s0
+teckenuppsättning \s-1ISO\-8859\-1 \s0(Latin\-1) på Unix. \s-1DOS\s0 tecken utan motsvarande
+\&\s-1ISO\-8859\-1\s0 tecken, för vilka konvertering är omöjligt, kommer att ersättas
+med en punkt. Detsamma gäller för \s-1ISO\-8859\-1\s0 tecken utan motsvarighet i \s-1DOS.\s0
+.Sp
+När enbart flaggan \f(CW\*(C`\-iso\*(C'\fR används kommer dos2unix att försöka avgöra den
+aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda
+standardteckentabellen \s-1CP437,\s0 vilken huvudsakligen används i \s-1USA.\s0 För att
+tvinga en specifik tackentabell använd flaggorna \f(CW\*(C`\-437\*(C'\fR (\s-1USA\s0), \f(CW\*(C`\-850\*(C'\fR
+(Västeuropeisk), \f(CW\*(C`\-860\*(C'\fR (Portugisisk), \f(CW\*(C`\-863\*(C'\fR (Fransk-kanadensisk) eller
+\&\f(CW\*(C`\-865\*(C'\fR (Nordisk). Det finns också stöd för Windows-teckentabell \s-1CP\-1252
+\&\s0(Västeuropeisk) via flaggan \f(CW\*(C`\-1252\*(C'\fR. För andra teckentabeller använd
+dos2unix i kombination med \fIiconv\fR\|(1). iconv kan konvertera mellan en lång
+lista av teckenkodningar.
+.Sp
+Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att
+korrumpera UTF\-8\-kodade filer.
+.Sp
+Några exempel:
+.Sp
+Konvertera från \s-1DOS\s0 standardteckentabell till Unix Latin\-1:
+.Sp
+.Vb 1
+\& dos2unix \-iso \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från \s-1DOS CP850\s0 till Unix Latin\-1:
+.Sp
+.Vb 1
+\& dos2unix \-850 \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från Windows \s-1CP1252\s0 till Unix Latin\-1:
+.Sp
+.Vb 1
+\& dos2unix \-1252 \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från Windows \s-1CP1252\s0 till Unix \s-1UTF\-8 \s0(Unicode):
+.Sp
+.Vb 1
+\& iconv \-f CP1252 \-t UTF\-8 in.txt | dos2unix > ut.txt
+.Ve
+.Sp
+Konvertera från Unix Latin\-1 till DOS-standardteckentabell:
+.Sp
+.Vb 1
+\& unix2dos \-iso \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från Unix Latin\-1 till \s-1DOS CP850:\s0
+.Sp
+.Vb 1
+\& unix2dos \-850 \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från Unix Latin\-1 till Windows \s-1CP1252:\s0
+.Sp
+.Vb 1
+\& unix2dos \-1252 \-n in.txt ut.txt
+.Ve
+.Sp
+Konvertera från Unix \s-1UTF\-8 \s0(Unicode) till Windows \s-1CP1252:\s0
+.Sp
+.Vb 1
+\& unix2dos < in.txt | iconv \-f UTF\-8 \-t CP1252 > ut.txt
+.Ve
+.Sp
+Se även <http://czyborra.com/charsets/codepages.html> och
+<http://czyborra.com/charsets/iso8859.html>.
+.SH "UNICODE"
+.IX Header "UNICODE"
+.SS "Kodningar"
+.IX Subsection "Kodningar"
+Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+vanligtvis med UTF\-8\-kodning. I Windows kan Unicode-textfiler kodas i \s-1UTF\-8,
+UTF\-16\s0 eller \s-1UTF\-16\s0 rak byteordning (big endian), men kodas mestadels i
+UTF\-16\-format.
+.SS "Konvertering"
+.IX Subsection "Konvertering"
+Unicode-textfiler kan ha \s-1DOS,\s0 Unix eller Mac-radbrytningar precis som
+vanliga textfiler.
+.PP
+Alla versioner av dos2unix och unix2dos kan konvertera UTF\-8\-kodade filer,
+eftersom \s-1UTF\-8\s0 designades för bakåtkompatibilitet med \s-1ASCII.\s0
+.PP
+Dos2unix och unix2dos med Uncode\-UTF\-16\-stöd, kan läsa UTF\-16\-kodade
+textfiler i omvänd och rak byteordning (little och big endian). För att se
+om dos2unix byggts med UTF\-16\-stöd skriv \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+Under Unix/Linux kommer UTF\-16\-kodade filer att konverteras till lokalens
+teckenkodning. Använd kommandot \fIlocale\fR\|(1) för att ta reda på vilken lokalens
+teckenkodning är. När konvertering inte är möjlig kommer ett
+konverteringsfel att inträffa och filen kommer att hoppas över.
+.PP
+Under Windows konverteras UTF\-16\-filer som standard till
+\&\s-1UTF\-8.\s0 UTF\-8\-formaterade textfiler har bra stöd både under Windows och
+Unix/Linux.
+.PP
+\&\s-1UTF\-16\-\s0 och UTF\-8\-kodning är fullt kompatibla, ingen text kommer att gå
+förlorad i konverteringen. När ett \s-1UTF\-16\s0 till UTF\-8\-konverteringsfel
+uppstår, till exempel när infilen i UTF\-16\-format innehåller ett fel, kommer
+att filen att hoppas över.
+.PP
+När flaggan \f(CW\*(C`\-u\*(C'\fR används kommer utfilen att skrivas med samma
+UTF\-16\-kodning som infilen. Flaggan \f(CW\*(C`\-u\*(C'\fR förhindrar konvertering till
+\&\s-1UTF\-8.\s0
+.PP
+Dos2unix och unix2dos har ingen flagga för att konvertera UTF\-8\-filer till
+\&\s-1UTF\-16.\s0
+.PP
+\&\s-1ISO\-\s0 och 7\-bitarslägeskonvertering fungerar inte på UTF\-16\-filer.
+.SS "Byteordningsmarkering (Byte Order Mark)"
+.IX Subsection "Byteordningsmarkering (Byte Order Mark)"
+I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order
+Mark, \s-1BOM\s0) eftersom många Windows-program (inklusive Notepad) lägger till
+BOM:ar som standard. Se även
+<http://en.wikipedia.org/wiki/Byte_order_mark>.
+.PP
+I Unix har Unicode-textfiler typiskt ingen \s-1BOM.\s0 Filer antas vara kodade i
+den lokala teckenuppsättningen.
+.PP
+Dos2Unix kan bara detektera om en fil är i UTF\-16\-format om filen har en
+\&\s-1BOM.\s0 När en UTF\-16\-fil inte har en \s-1BOM\s0 så kommer dos2unix att de filen som
+en binärfil.
+.PP
+Använd flaggan \f(CW\*(C`\-ul\*(C'\fR eller \f(CW\*(C`\-ub\*(C'\fR för att konvertera en UTF\-16\-fil utan
+\&\s-1BOM.\s0
+.PP
+Dos2unix skriver som standard ingen \s-1BOM\s0 i utfilen. Med flaggan \f(CW\*(C`\-b\*(C'\fR kommer
+Dos2unix att skriva en \s-1BOM\s0 när infilen har en \s-1BOM.\s0
+.PP
+Unix2dos skriver som standard en \s-1BOM\s0 i utfilen när infilen har en
+\&\s-1BOM.\s0 Använd flaggan \f(CW\*(C`\-r\*(C'\fR för att ta bort BOM:en.
+.PP
+Dos2unix och unix2dos skriver alltid en \s-1BOM\s0 när flaggan \f(CW\*(C`\-m\*(C'\fR används.
+.SS "Unicode-filnamn under Windows"
+.IX Subsection "Unicode-filnamn under Windows"
+Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn i
+Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har
+tecken i sina namn som inte är en del av systemets atandard
+ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för
+Unicode-filnamn skriv \f(CW\*(C`dos2unix \-V\*(C'\fR.
+.PP
+Det finns en del problem med att visa Unicode-filnamn i en
+Windows-konsol. Se vidare flaggan \f(CW\*(C`\-D\*(C'\fR, \f(CW\*(C`\-\-display\-enc\*(C'\fR. Filnamnen kan
+visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta
+namnen.
+.SS "Unicode-exempel"
+.IX Subsection "Unicode-exempel"
+Konvertera från Windows \s-1UTF\-16 \s0(med \s-1BOM\s0) till Unix \s-1UTF\-8:\s0
+.PP
+.Vb 1
+\& dos2unix \-n in.txt ut.txt
+.Ve
+.PP
+Konvertera från Windows \s-1UTF\-16LE \s0(utan \s-1BOM\s0) till Unix \s-1UTF\-8:\s0
+.PP
+.Vb 1
+\& dos2unix \-ul \-n in.txt ut.txt
+.Ve
+.PP
+Konvertera från Unix \s-1UTF\-8\s0 till Windows \s-1UTF\-8\s0 med \s-1BOM:\s0
+.PP
+.Vb 1
+\& unix2dos \-m \-n in.txt ut.txt
+.Ve
+.PP
+Konvertera från Unix \s-1UTF\-8\s0 till Windows \s-1UTF\-16:\s0
+.PP
+.Vb 1
+\& unix2dos < in.txt | iconv \-f UTF\-8 \-t UTF\-16 > ut.txt
+.Ve
+.SH "GB18030"
+.IX Header "GB18030"
+\&\s-1GB18030\s0 är en standard från Kinesiska regeringen. En obligatorisk delmängd
+av standarden \s-1GB18030\s0 krävs officiellt för alla programvaruprodukter som
+säljs i Kina. Se vidare <http://en.wikipedia.org/wiki/GB_18030>.
+.PP
+\&\s-1GB18030\s0 är fullständigt kompatibel med Unicode och kan anses vara ett
+överföringsformat för unicode. Precis som \s-1UTF\-8\s0 är \s-1GB18030\s0 kompatibel med
+\&\s-1ASCII. GB18030\s0 är också kompatibel med Windows-teckentabell 936, också känd
+som \s-1GBK.\s0
+.PP
+Under Unix/Linux kommer UTF\-16\-filer att konverteras till \s-1GB18030\s0 när
+lokalens teckenkodning är inställd på \s-1GB18030.\s0 Notera att detta endast
+kommer att fungera om lokalen har stöd i systemet. Använd kommandot \f(CW\*(C`locale
+\&\-a\*(C'\fR för att få en lista över de lokaler som stöds.
+.PP
+Under Windows måste du använda flaggan \f(CW\*(C`\-gb\*(C'\fR för att konvertera
+UTF\-16\-filer till \s-1GB18030.\s0
+.PP
+GB18030\-kodade filer kan ha en byteordningsmarkering, precis som
+Unicode-filer.
+.SH "EXEMPEL"
+.IX Header "EXEMPEL"
+Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
+.PP
+.Vb 2
+\& dos2unix
+\& dos2unix \-l \-c mac
+.Ve
+.PP
+Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
+.PP
+.Vb 2
+\& dos2unix a.txt b.txt
+\& dos2unix \-o a.txt b.txt
+.Ve
+.PP
+Konvertera och ersätt a.txt i ascii\-konverteringsläge:
+.PP
+.Vb 1
+\& dos2unix a.txt
+.Ve
+.PP
+Konvertera och ersätt a.txt i ascii\-konverteringsläge, konvertera och ersätt
+b.txt i 7bit\-konverteringsläge:
+.PP
+.Vb 3
+\& dos2unix a.txt \-c 7bit b.txt
+\& dos2unix \-c ascii a.txt \-c 7bit b.txt
+\& dos2unix \-ascii a.txt \-7 b.txt
+.Ve
+.PP
+Konvertera a.txt från Mac\- till Unix-format:
+.PP
+.Vb 2
+\& dos2unix \-c mac a.txt
+\& mac2unix a.txt
+.Ve
+.PP
+Konvertera a.txt från Unix\- till Mac-format:
+.PP
+.Vb 2
+\& unix2dos \-c mac a.txt
+\& unix2mac a.txt
+.Ve
+.PP
+Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:
+.PP
+.Vb 2
+\& dos2unix \-k a.txt
+\& dos2unix \-k \-o a.txt
+.Ve
+.PP
+Konvertera a.txt och skriv till e.txt:
+.PP
+.Vb 1
+\& dos2unix \-n a.txt e.txt
+.Ve
+.PP
+Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från
+a.txt:
+.PP
+.Vb 1
+\& dos2unix \-k \-n a.txt e.txt
+.Ve
+.PP
+Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:
+.PP
+.Vb 2
+\& dos2unix a.txt \-n b.txt e.txt
+\& dos2unix \-o a.txt \-n b.txt e.txt
+.Ve
+.PP
+Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt,
+konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:
+.PP
+.Vb 1
+\& dos2unix \-n c.txt e.txt \-o a.txt b.txt \-n d.txt f.txt
+.Ve
+.SH "REKURSIV KONVERTERING"
+.IX Header "REKURSIV KONVERTERING"
+Använd dos2unix i kombination med kommandona \fIfind\fR\|(1) och \fIxargs\fR\|(1) för att
+rekursivt konvertera filer i en katalogstruktur. För att till exempel
+konvertera alla .txt\-filer i katalogträdet under den aktuella katalogen
+skriv:
+.PP
+.Vb 1
+\& find . \-name \*(Aq*.txt\*(Aq |xargs dos2unix
+.Ve
+.PP
+I en Windows-kommandoprompt kan följande kommando användas:
+.PP
+.Vb 1
+\& for /R %G in (*.txt) do dos2unix "%G"
+.Ve
+.SH "LOKALISERING"
+.IX Header "LOKALISERING"
+.IP "\fB\s-1LANG\s0\fR" 4
+.IX Item "LANG"
+Det primära språket väljs med miljövariabeln \s-1LANG.\s0 LANG-variabeln består av
+flera delas. Den första delen är språkkoden i gemener. Den andra delen är
+valfri och utgör landskoden i versaler, föregången av ett understreck. Det
+finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett
+par exempel för skal av POSIX-standard-typ:
+.Sp
+.Vb 7
+\& export LANG=nl Nederländska
+\& export LANG=nl_NL Nederländska, Nederländerna
+\& export LANG=nl_BE Nederländska, Belgien
+\& export LANG=es_ES Spanska, Spanien
+\& export LANG=es_MX Spanska, Mexiko
+\& export LANG=en_US.iso88591 Engelska, USA, Latin\-1\-kodning
+\& export LANG=en_GB.UTF\-8 Engelska, UK, UTF\-8\-kodning
+.Ve
+.Sp
+För en fullständig lista över språk och landskoder se vidare i
+gettext-manualen:
+<http://www.gnu.org/software/gettext/manual/html_node/Usual\-Language\-Codes.html>
+.Sp
+På Unix-system kan du använda kommando \fIlocale\fR\|(1) för att få lokal-specifik
+information.
+.IP "\fB\s-1LANGUAGE\s0\fR" 4
+.IX Item "LANGUAGE"
+Med miljövariabeln \s-1LANGUAGE\s0 kan du ange en prioritetslista över språk,
+separerade med kolon. Dos2unix kommer att ge företräde till \s-1LANGAUGE\s0 över
+\&\s-1LANG.\s0 Exempelvis först nederländska och sedan tyska: \f(CW\*(C`LANGUAGE=nl:de\*(C'\fR. Du
+måste först ha aktiverat lokalisering, genom att sätta \s-1LANG \s0(eller \s-1LC_ALL\s0)
+till ett värde annat än “C“, innan du kan använda en prioritetslista för
+språk via LANGUAGE-variabeln. Se vidare i gettext-manualen:
+<http://www.gnu.org/software/gettext/manual/html_node/The\-LANGUAGE\-variable.html>
+.Sp
+Om du väljer ett språk som inte är tillgänglig kommer du att få engelska
+meddelanden som standard.
+.IP "\fB\s-1DOS2UNIX_LOCALEDIR\s0\fR" 4
+.IX Item "DOS2UNIX_LOCALEDIR"
+Med miljövariabeln \s-1DOS2UNIX_LOCALEDIR\s0 kan \s-1LOCALEDIR\s0 som ställts in vid
+kompilering åsidosättas. \s-1LOCALEDIR\s0 används för att hitta
+språkfiler. Standardvärdet för GNU-program är
+\&\f(CW\*(C`/usr/local/share/locale\*(C'\fR. Flaggan \fB\-\-version\fR kommer att visa vilken
+\&\s-1LOCALEDIR\s0 som används.
+.Sp
+Exempel (POSIX-skal):
+.Sp
+.Vb 1
+\& export DOS2UNIX_LOCALEDIR=$HOME/share/locale
+.Ve
+.SH "RETURVÄRDE"
+.IX Header "RETURVÄRDE"
+Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer
+det senaste systemfelet att returneras. För andra fel kommer 1 att
+returneras.
+.PP
+Returvärdet är alltid noll i tystläge, utom när felaktiga
+kommandoradsflaggor används.
+.SH "STANDARDER"
+.IX Header "STANDARDER"
+<http://en.wikipedia.org/wiki/Text_file>
+.PP
+<http://en.wikipedia.org/wiki/Carriage_return>
+.PP
+<http://en.wikipedia.org/wiki/Newline>
+.PP
+<http://en.wikipedia.org/wiki/Unicode>
+.SH "FÖRFATTARE"
+.IX Header "FÖRFATTARE"
+Benjamin Lin \- <blin@socs.uts.edu.au>, Bernd Johannes Wuebben
+(mac2unix\-läge) \- <wuebben@kde.org>, Christian Wurll (lägg till en extra
+radbrytning) \- <wurll@ira.uka.de>, Erwin Waterlander \- <waterlan@xs4all.nl>
+(upphovsman)
+.PP
+Projektsida: <http://waterlan.home.xs4all.nl/dos2unix.html>
+.PP
+SourceForge-sida: <http://sourceforge.net/projects/dos2unix/>
+.SH "SE ÄVEN"
+.IX Header "SE ÄVEN"
+\&\fIfile\fR\|(1) \fIfind\fR\|(1) \fIiconv\fR\|(1) \fIlocale\fR\|(1) \fIxargs\fR\|(1)
diff --git a/man/sv/man1/dos2unix.htm b/man/sv/man1/dos2unix.htm
new file mode 100644
index 0000000..cddc1e3
--- /dev/null
+++ b/man/sv/man1/dos2unix.htm
@@ -0,0 +1,717 @@
+<?xml version="1.0" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>dos2unix 7.3.2 - textfilsformatskonverterare från DOS/Mac till Unix och vice versa</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:ASSI@cygwin.nonet" />
+</head>
+
+<body>
+
+
+
+<ul id="index">
+ <li><a href="#NAMN">NAMN</a></li>
+ <li><a href="#SYNOPSIS">SYNOPSIS</a></li>
+ <li><a href="#BESKRIVNING">BESKRIVNING</a></li>
+ <li><a href="#FLAGGOR">FLAGGOR</a></li>
+ <li><a href="#MAC-LGE">MAC-L&Auml;GE</a></li>
+ <li><a href="#KONVERTERINGSLGEN">KONVERTERINGSL&Auml;GEN</a></li>
+ <li><a href="#UNICODE">UNICODE</a>
+ <ul>
+ <li><a href="#Kodningar">Kodningar</a></li>
+ <li><a href="#Konvertering">Konvertering</a></li>
+ <li><a href="#Byteordningsmarkering-Byte-Order-Mark">Byteordningsmarkering (Byte Order Mark)</a></li>
+ <li><a href="#Unicode-filnamn-under-Windows">Unicode-filnamn under Windows</a></li>
+ <li><a href="#Unicode-exempel">Unicode-exempel</a></li>
+ </ul>
+ </li>
+ <li><a href="#GB18030">GB18030</a></li>
+ <li><a href="#EXEMPEL">EXEMPEL</a></li>
+ <li><a href="#REKURSIV-KONVERTERING">REKURSIV KONVERTERING</a></li>
+ <li><a href="#LOKALISERING">LOKALISERING</a></li>
+ <li><a href="#RETURVRDE">RETURV&Auml;RDE</a></li>
+ <li><a href="#STANDARDER">STANDARDER</a></li>
+ <li><a href="#FRFATTARE">F&Ouml;RFATTARE</a></li>
+ <li><a href="#SE-VEN">SE &Auml;VEN</a></li>
+</ul>
+
+<h1 id="NAMN">NAMN</h1>
+
+<p>dos2unix - textfilsformatskonverterare fr&aring;n DOS/Mac till Unix och vice versa</p>
+
+<h1 id="SYNOPSIS">SYNOPSIS</h1>
+
+<pre><code> dos2unix [flaggor] [FIL &hellip;] [-n INFIL UTFIL &hellip;]
+ unix2dos [flaggor] [FIL &hellip;] [-n INFIL UTFIL &hellip;]</code></pre>
+
+<h1 id="BESKRIVNING">BESKRIVNING</h1>
+
+<p>Paketet Dos2unix inkluderar verktygen <code>dos2unix</code> och <code>unix2dos</code> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format och vice versa.</p>
+
+<p>Textfiler i DOS/Windows har en radbrytning, ocks&aring; k&auml;nd som nyrad, som &auml;r en kombination av tv&aring; tecken: vagnretur (Carriage Return, CR) &aring;tf&ouml;ljt av radmatning (Line Feed, LF). Textfiler i Unix har en radbrytning som &auml;r ett enda tecken: radmatning (Line Feed, LF). Textfiler f&ouml;r Mac, innan Mac OS X, hade en radbrytning som var en enda vagnretur (Carriage Return, CR). Numera anv&auml;nder Mac OS radbrytning i Unix-stil (LF).</p>
+
+<p>F&ouml;rutom radbrytningar s&aring; kan Dos2unix ocks&aring; konvertera filers kodning. N&aring;gra DOS-teckentabeller kan konverteras till Unix Latin-1. Och filer som anv&auml;nder Windows Unicode (UTF-16) kan konverteras till Unix Unicode (UTF-8).</p>
+
+<p>Bin&auml;ra filer hoppas &ouml;ver automatiskt, om inte konvertering tvingas.</p>
+
+<p>Kataloger och FIFOs och andra filer som inte &auml;r vanliga filer hoppas &ouml;ver automatiskt.</p>
+
+<p>Symboliska l&auml;nkar och deras m&aring;l f&ouml;rblir of&ouml;r&auml;ndrade som standard. Symboliska l&auml;nkar kan valfritt bli ersatta eller s&aring; kan utmatningen skrivas till m&aring;let f&ouml;r den symboliska l&auml;nken. P&aring; Windows saknas st&ouml;d f&ouml;r att skriva till m&aring;let f&ouml;r en symbolisk l&auml;nk.</p>
+
+<p>Dos2unix modellerades efter dos2unix fr&aring;n SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen f&ouml;r SunOS/Solaris. Denna versionen g&ouml;r som standard konverteringen p&aring; plats (gammalfilsl&auml;ge), medan originalversionen fr&aring;n SunOS/Solaris bara hade st&ouml;d f&ouml;r parad konvertering (nyfilsl&auml;ge). Se vidare flaggorna <code>-o</code> och <code>-n</code>.</p>
+
+<h1 id="FLAGGOR">FLAGGOR</h1>
+
+<dl>
+
+<dt id="pod"><b>--</b></dt>
+<dd>
+
+<p>Behandla alla efterf&ouml;ljande flaggor som filnamn. Anv&auml;nd denna flagg om du vill konvertera filer vars namn b&ouml;rjar med bindestreck. F&ouml;r att till exempel konvertera en fil med namnet &ldquo;-foo&ldquo; kan du anv&auml;nda detta kommando:</p>
+
+<pre><code> dos2unix -- -foo</code></pre>
+
+<p>Eller i nyfilsl&auml;ge:</p>
+
+<pre><code> dos2unix -n -- -foo out.txt</code></pre>
+
+</dd>
+<dt id="ascii"><b>-ascii</b></dt>
+<dd>
+
+<p>Konvertera enbart radbrytningar. Detta &auml;r standardkonverteringsl&auml;get.</p>
+
+</dd>
+<dt id="iso"><b>-iso</b></dt>
+<dd>
+
+<p>Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare stycket KONVERTERINGSL&Auml;GEN.</p>
+
+</dd>
+<dt id="pod-1252"><b>-1252</b></dt>
+<dd>
+
+<p>Anv&auml;nd Windows-teckentabell 1252 (V&auml;steuropeisk).</p>
+
+</dd>
+<dt id="pod-437"><b>-437</b></dt>
+<dd>
+
+<p>Anv&auml;nd DOS-teckentabell 437 (USA). Detta &auml;r standardteckentabellen som anv&auml;nds f&ouml;r ISO-konvertering.</p>
+
+</dd>
+<dt id="pod-850"><b>-850</b></dt>
+<dd>
+
+<p>Anv&auml;nd DOS-teckentabell 850 (V&auml;steuropeisk).</p>
+
+</dd>
+<dt id="pod-860"><b>-860</b></dt>
+<dd>
+
+<p>Anv&auml;nd DOS-teckentabell 860 (Portugisisk).</p>
+
+</dd>
+<dt id="pod-863"><b>-863</b></dt>
+<dd>
+
+<p>Anv&auml;nd DOS-teckentabell 863 (Fransk-kanadensisk).</p>
+
+</dd>
+<dt id="pod-865"><b>-865</b></dt>
+<dd>
+
+<p>Anv&auml;nd DOS-teckentabell 865 (Nordisk).</p>
+
+</dd>
+<dt id="pod-7"><b>-7</b></dt>
+<dd>
+
+<p>Konvertera 8-bitars tecken till 7-bitars blanksteg.</p>
+
+</dd>
+<dt id="b---keep-bom"><b>-b, --keep-bom</b></dt>
+<dd>
+
+<p>Beh&aring;ll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM, skriv en BOM i utfilen. Detta &auml;r standardbeteendet vid konvertering av DOS-radbrytningar. Se vidare flaggan <code>-r</code>.</p>
+
+</dd>
+<dt id="c---convmode-KONVERTERINGLGE"><b>-c, --convmode KONVERTERINGL&Auml;GE</b></dt>
+<dd>
+
+<p>St&auml;ller in konverteringsl&auml;ge. D&auml;r KONVERTERINGSL&Auml;GE &auml;r en av: <i>ascii</i>, <i>7bit</i>, <i>iso</i>, <i>mac</i> d&auml;r ascii &auml;r standard.</p>
+
+</dd>
+<dt id="D---display-enc-KODNING"><b>-D, --display-enc KODNING</b></dt>
+<dd>
+
+<p>St&auml;ll in kodning f&ouml;r visad text. D&auml;r KODNING &auml;r en av: <i>ansi</i>, <i>unicode</i>, <i>utf8</i> d&auml;r ansi &auml;r standardvalet.</p>
+
+<p>Denna flagga finns bara tillg&auml;nglig i dos2unix f&ouml;r Windows med st&ouml;d f&ouml;r Unicode-filnamn. Denna flagga har ingen effekt p&aring; sj&auml;lva filnamnen som l&auml;ses och skrivs, bara p&aring; hur de visas.</p>
+
+<p>Det finns flera metoder f&ouml;r att visa text i en Windows-konsol baserad p&aring; vilken kodning texten har. De har alla f&ouml;r- och nackdelar.</p>
+
+<dl>
+
+<dt id="ansi"><b>ansi</b></dt>
+<dd>
+
+<p>Dos2unix standardmetod &auml;r att anv&auml;nda ANSI-kodad text. F&ouml;rdelen &auml;r att den &auml;r bak&aring;tkompatibel. Det fungerar med raster- och TrueType-teckensnitt. I vissa regioner kan du beh&ouml;va &auml;ndra den aktiva DOS OEM-teckentabellen till Windows-systemets ANSI-teckentabell genom att anv&auml;nda kommandot <code>chcp</code>, eftersom dos2unix anv&auml;nder Windows-systemets teckentabell.</p>
+
+<p>Nackdelen med ansi &auml;r att internationella filnamn med tecken som inte finns i systemets standardteckentabell inte visas korrekt. Du kommer att se fr&aring;getecken, eller en felaktig symbol ist&auml;llet. N&auml;r du inte arbetar med utl&auml;ndska filnamn &auml;r denna metoden OK.</p>
+
+</dd>
+<dt id="unicode"><b>unicode</b></dt>
+<dd>
+
+<p>F&ouml;rdelen med unicode-kodning (Windows-namnet f&ouml;r UTF-16) &auml;r att text vanligtvis visas korrekt. Det finns inget behov av att &auml;ndra den aktiva teckentabellen. Du kan beh&ouml;va st&auml;lla in konsolens teckensnitt till ett TrueType-teckensnitt f&ouml;r att f&aring; internationella tecken att visas korrekt. N&auml;r ett tecken inte finns inkluderat i TrueType-teckensnittet kommer du vanligtvis att se en liten ruta, ibland med ett fr&aring;getecken inuti.</p>
+
+<p>N&auml;r du anv&auml;nder ConEmu-konsolen kommer all text att visas korrekt eftersom ConEmu automatiskt v&auml;ljer ett bra teckensnitt.</p>
+
+<p>Nackdelen med unicode &auml;r att den inte &auml;r kompatibel med ASCII. Utmatningen &auml;r inte l&auml;tt att hantera n&auml;r du omdirigerar den till ett annat program eller en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil.</p>
+
+</dd>
+<dt id="utf8"><b>utf8</b></dt>
+<dd>
+
+<p>F&ouml;rdelen med utf8 &auml;r att den &auml;r kompatibel med ASCII och n&auml;r du omdirigerar den till en fil kommer du att f&aring; en korrekt UTF-8-fil. Du m&aring;ste st&auml;lla in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas p&aring; liknande s&auml;tt som med <code>unicode</code>-kodningen.</p>
+
+<p>Nackdelen &auml;r att n&auml;r du anv&auml;nder standardrasterteckensnittet kommer alla icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan ocks&aring; &ouml;versatta meddelanden kommer att bli ol&auml;sbara. Under Windows som konfigurerats f&ouml;r &Ouml;stasien kan man komma att se m&aring;nga blinkningar i konsolen n&auml;r meddelanden visas.</p>
+
+<p>I ConEmu-konsolen fungerar utf8-kodningsmetoden v&auml;l.</p>
+
+</dd>
+</dl>
+
+<p>Standardkodningen kan &auml;ndras via milj&ouml;variabeln DOS2UNIX_DISPLAY_ENC genom att s&auml;tta den till <code>unicode</code> eller <code>utf8</code>.</p>
+
+</dd>
+<dt id="f---force"><b>-f, --force</b></dt>
+<dd>
+
+<p>Tvinga konvertering av bin&auml;ra filer.</p>
+
+</dd>
+<dt id="gb---gb18030"><b>-gb, --gb18030</b></dt>
+<dd>
+
+<p>Under Windows konverteras UTF-16-filer som standard till UTF-8, oavsett vilken lokalinst&auml;llning som &auml;r gjord. Anv&auml;nd denna flagga f&ouml;r att konvertera UTF-16-filer till GB18030. Denna flagga finns bara tillg&auml;nglig i Windows. Se vidare i avsnittet GB18030.</p>
+
+</dd>
+<dt id="h---help"><b>-h, --help</b></dt>
+<dd>
+
+<p>Visa hj&auml;lptext och avsluta.</p>
+
+</dd>
+<dt id="i-FLAGGOR---info-FLAGGOR-FIL"><b>-i[FLAGGOR], --info[=FLAGGOR] FIL ...</b></dt>
+<dd>
+
+<p>Visa filinformation. Ingen konvertering g&ouml;rs.</p>
+
+<p>F&ouml;ljande information skrivs ut, i denna ordningen: antal DOS-radbrytningar, antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen, text eller bin&auml;r, filnamn.</p>
+
+<p>Exempelutmatning:</p>
+
+<pre><code> 6 0 0 no_bom text dos.txt
+ 0 6 0 no_bom text unix.txt
+ 0 0 6 no_bom text mac.txt
+ 6 6 6 no_bom text mixed.txt
+ 50 0 0 UTF-16LE text utf16le.txt
+ 0 50 0 no_bom text utf8unix.txt
+ 50 0 0 UTF-8 text utf8dos.txt
+ 2 418 219 no_bom bin&auml;r dos2unix.exe</code></pre>
+
+<p>Extra flaggor kan anv&auml;ndas valfritt f&ouml;r att &auml;ndra utmatningen. En eller fler flaggor kan l&auml;ggas till.</p>
+
+<dl>
+
+<dt id="d"><b>d</b></dt>
+<dd>
+
+<p>Skriv ut antal DOS-radbrytningar.</p>
+
+</dd>
+<dt id="u"><b>u</b></dt>
+<dd>
+
+<p>Skriv ut antal Unix-radbrytningar.</p>
+
+</dd>
+<dt id="m"><b>m</b></dt>
+<dd>
+
+<p>Skriv ut antal Mac-radbrytningar.</p>
+
+</dd>
+<dt id="b"><b>b</b></dt>
+<dd>
+
+<p>Skriv ut byteordningsmarkeringen.</p>
+
+</dd>
+<dt id="t"><b>t</b></dt>
+<dd>
+
+<p>Skriv ut om filen &auml;r text eller bin&auml;r.</p>
+
+</dd>
+<dt id="c"><b>c</b></dt>
+<dd>
+
+<p>Skriv bara ut filerna som skulle ha konverterats.</p>
+
+<p>Med <code>c</code>-flaggan kommer dos2unix att skriva ut filerna som inneh&aring;ller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar.</p>
+
+</dd>
+</dl>
+
+<p>Exempel:</p>
+
+<p>Visa information f&ouml;r alla *.txt-filer:</p>
+
+<pre><code> dos2unix -i *.txt</code></pre>
+
+<p>Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:</p>
+
+<pre><code> dos2unix -idu *.txt</code></pre>
+
+<p>Visa bara byteordningsmarkeringen:</p>
+
+<pre><code> dos2unix --info=b *.txt</code></pre>
+
+<p>Lista filerna som har DOS-radbrytningar:</p>
+
+<pre><code> dos2unix -ic *.txt</code></pre>
+
+<p>Lista filerna som har Unix-radbrytningar:</p>
+
+<pre><code> unix2dos -ic *.txt</code></pre>
+
+<p>Konvertera endast filer som har DOS-radbrytningar och l&auml;mna &ouml;vriga filer or&ouml;rda:</p>
+
+<pre><code> dos2unix -ic *.txt | xargs dos2unix</code></pre>
+
+<p>Hitta textfiler som har DOS-radbrytningar:</p>
+
+<pre><code> find -name &#39;*.txt&#39; | xargs dos2unix -ic</code></pre>
+
+</dd>
+<dt id="k---keepdate"><b>-k, --keepdate</b></dt>
+<dd>
+
+<p>Beh&aring;ll infilens datumst&auml;mpel f&ouml;r utfilen.</p>
+
+</dd>
+<dt id="L---license"><b>-L, --license</b></dt>
+<dd>
+
+<p>Visa programmets licens.</p>
+
+</dd>
+<dt id="l---newline"><b>-l, --newline</b></dt>
+<dd>
+
+<p>L&auml;gg till ytterligare nyrad.</p>
+
+<p><b>dos2unix</b>: Endast DOS-radbrytningar &auml;ndras till tv&aring; Unix-radbrytningar. I Mac-l&auml;ge &auml;ndras endast Mac-radbrytningar till tv&aring; Unix-radbrytningar.</p>
+
+<p><b>unix2dos</b>: Endast Unix-radbrytningar &auml;ndras till tv&aring; DOS-radbrytningar. I Mac-l&auml;ge &auml;ndras Unix-radbrytningar till tv&aring; Mac-radbrytningar.</p>
+
+</dd>
+<dt id="m---add-bom"><b>-m, --add-bom</b></dt>
+<dd>
+
+<p>Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som standard skrivs en UTF-8 BOM.</p>
+
+<p>N&auml;r infilen &auml;r UTF-16, och flaggan <code>-u</code> anv&auml;nds, kommer en UTF-16 BOM att skrivas.</p>
+
+<p>Anv&auml;nd aldrig denna flagga n&auml;r kodningen f&ouml;r utmatning &auml;r n&aring;got annat &auml;n UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE.</p>
+
+</dd>
+<dt id="n---newfile-INFIL-UTFIL"><b>-n, --newfile INFIL UTFIL &hellip;</b></dt>
+<dd>
+
+<p>Nyfilsl&auml;ge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen m&aring;ste ange i par och jokertecken i namnen ska <i>inte</i> anv&auml;ndas annars <i>kommer</i> du att f&ouml;rlora filer.</p>
+
+<p>Anv&auml;ndaren som p&aring;b&ouml;rjar konverteringen i nyfilsl&auml;ge (paratl&auml;ge) kommer att bli &auml;garen till den konverterade filen. L&auml;s-/skrivbeh&ouml;righeter f&ouml;r den nya filen kommer att vara samma beh&ouml;righeter som f&ouml;r originalfilen minus umask(1) f&ouml;r anv&auml;ndaren som k&ouml;r konverteringen.</p>
+
+</dd>
+<dt id="o---oldfile-FIL"><b>-o, --oldfile FIL &hellip;</b></dt>
+<dd>
+
+<p>Gammalfilsl&auml;ge. Konvertera filen FIL och skriv &ouml;ver den med utmatningen. Programmet k&ouml;r i detta l&auml;ge som standard. Jokertecken i filnamn f&aring;r anv&auml;ndas.</p>
+
+<p>I gammalfilsl&auml;ge (p&aring;-plats l&auml;ge) kommer den konverterade filen att f&aring; samma &auml;gare, grupp samt l&auml;s-/skrivbeh&ouml;righeter som originalfilen. &Auml;ven d&aring; filen konverteras av en annan anv&auml;ndare som har skrivbeh&ouml;righet f&ouml;r filen (t.ex. anv&auml;ndaren root). Konverteringen kommer att avbrytas n&auml;r det inte &auml;r m&ouml;jligt att bevara originalv&auml;rdena. Byte av &auml;gare skulle kunna inneb&auml;ra att original&auml;garen inte l&auml;ngre kan l&auml;sa filen. Byte av grupp skulle kunna vara en s&auml;kerhetsrisk, filen skulle kunna bli l&auml;sbar f&ouml;r anv&auml;ndare som den inte &auml;r avsedd f&ouml;r. St&ouml;d f&ouml;r bevarande av &auml;gare, grupp och l&auml;s-/skrivbeh&ouml;righeter finns bara i Unix.</p>
+
+</dd>
+<dt id="q---quiet"><b>-q, --quiet</b></dt>
+<dd>
+
+<p>Tyst drift. Undertryck alla varningar och meddelanden. Returv&auml;rdet &auml;r noll. Utom n&auml;r felaktiga kommandoradsflaggor anv&auml;nds.</p>
+
+</dd>
+<dt id="r---remove-bom"><b>-r, --remove-bom</b></dt>
+<dd>
+
+<p>Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i utfilen. Detta &auml;r standardbeteende vid konvertering av Unix-radbrytningar. Se vidare flaggan <code>-b</code>.</p>
+
+</dd>
+<dt id="s---safe"><b>-s, --safe</b></dt>
+<dd>
+
+<p>Hoppa &ouml;ver bin&auml;ra filer (standard).</p>
+
+</dd>
+<dt id="u---keep-utf16"><b>-u, --keep-utf16</b></dt>
+<dd>
+
+<p>Beh&aring;ll infilens original UTF-16-kodning. Utfilen kommer att skrivas med samma UTF-16-kodning som infilen, omv&auml;nd eller rak byteordning (little eller big endian). Detta f&ouml;rhindrar transformation till UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med <code>-ascii</code>-flaggan.</p>
+
+</dd>
+<dt id="ul---assume-utf16le"><b>-ul, --assume-utf16le</b></dt>
+<dd>
+
+<p>Antag att infilsformatet &auml;r UTF-16LE.</p>
+
+<p>N&auml;r det finns en byteordningsmarkering (Byte Order Mark) i infilen s&aring; har BOM:en h&ouml;gre prioritet &auml;n denna flagga.</p>
+
+<p>N&auml;r du har gjort fel antagande (infilen var inte i UTF-16LE-format) och konverteringens lyckas, kommer du att f&aring; en UTF-8 utfil med felaktig text. Du kan g&ouml;ra denna konvertering ogjord med iconv(1) genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att &aring;terskapa originalfilen.</p>
+
+<p>Antagandet om UTF-16LE fungerar som ett <i>konverteringsl&auml;ge</i>. Genom att v&auml;xla till standard <i>ascii</i>-l&auml;get kommer UTF-16LE antagandet att st&auml;ngas av.</p>
+
+</dd>
+<dt id="ub---assume-utf16be"><b>-ub, --assume-utf16be</b></dt>
+<dd>
+
+<p>Antag att infilsformatet &auml;r UTF-16BE.</p>
+
+<p>Denna flagga fungerar p&aring; samma s&auml;tt som flaggan <code>-ul</code>.</p>
+
+</dd>
+<dt id="v---verbose"><b>-v, --verbose</b></dt>
+<dd>
+
+<p>Visa utf&ouml;rliga meddelanden. Extra information visas om byteordningsmarkeringar och antalet konverterade radbrytningar.</p>
+
+</dd>
+<dt id="F---follow-symlink"><b>-F, --follow-symlink</b></dt>
+<dd>
+
+<p>F&ouml;lj symboliska l&auml;nkar och konvertera m&aring;len.</p>
+
+</dd>
+<dt id="R---replace-symlink"><b>-R, --replace-symlink</b></dt>
+<dd>
+
+<p>Ers&auml;tt symboliska l&auml;nkar med konverterade filer (original m&aring;lfilerna f&ouml;rblir of&ouml;r&auml;ndrade).</p>
+
+</dd>
+<dt id="S---skip-symlink"><b>-S, --skip-symlink</b></dt>
+<dd>
+
+<p>Beh&aring;ll symboliska l&auml;nkar och m&aring;l of&ouml;r&auml;ndrade (standard).</p>
+
+</dd>
+<dt id="V---version"><b>-V, --version</b></dt>
+<dd>
+
+<p>Visa versionsinformation och avsluta.</p>
+
+</dd>
+</dl>
+
+<h1 id="MAC-LGE">MAC-L&Auml;GE</h1>
+
+<p>I normall&auml;ge konverteras radbrytningar fr&aring;n DOS till Unix och vice versa. Mac-radbrytningar konverteras inte.</p>
+
+<p>I Mac-l&auml;ge konverteras radbrytningar fr&aring;n Mac till Unix och vice versa. DOS-radbrytningar &auml;ndras ej.</p>
+
+<p>F&ouml;r att k&ouml;ra i Mac-l&auml;ge anv&auml;nd kommandoradsflaggan <code>-c mac</code> eller anv&auml;nd kommandona <code>mac2unix</code> eller <code>unix2mac</code>.</p>
+
+<h1 id="KONVERTERINGSLGEN">KONVERTERINGSL&Auml;GEN</h1>
+
+<dl>
+
+<dt id="ascii1"><b>ascii</b></dt>
+<dd>
+
+<p>I l&auml;get <code>ascii</code> konverteras enbart radbrytningar. Detta &auml;r standardkonverteringsl&auml;get.</p>
+
+<p>&Auml;ven om namnet p&aring; detta l&auml;ge &auml;r ASCII, vilket &auml;r en 7-bitarsstandard, s&aring; &auml;r det l&auml;get egentligen ett 8-bitarsl&auml;ge. Anv&auml;nd alltid detta l&auml;ge vid konvertering av Unicode UTF-8-filer.</p>
+
+</dd>
+<dt id="bit"><b>7bit</b></dt>
+<dd>
+
+<p>I detta l&auml;ge konverteras alla 8-bitars icke-ASCII tecken (med v&auml;rden fr&aring;n 128 till 255) till ett 7-bitars blanksteg.</p>
+
+</dd>
+<dt id="iso1"><b>iso</b></dt>
+<dd>
+
+<p>Tecken konverteras mellan DOS teckenupps&auml;ttning (teckentabell) och ISO teckenupps&auml;ttning ISO-8859-1 (Latin-1) p&aring; Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, f&ouml;r vilka konvertering &auml;r om&ouml;jligt, kommer att ers&auml;ttas med en punkt. Detsamma g&auml;ller f&ouml;r ISO-8859-1 tecken utan motsvarighet i DOS.</p>
+
+<p>N&auml;r enbart flaggan <code>-iso</code> anv&auml;nds kommer dos2unix att f&ouml;rs&ouml;ka avg&ouml;ra den aktiva teckentabellen. N&auml;r detta inte &auml;r m&ouml;jligt kommer dos2unix att anv&auml;nda standardteckentabellen CP437, vilken huvudsakligen anv&auml;nds i USA. F&ouml;r att tvinga en specifik tackentabell anv&auml;nd flaggorna <code>-437</code> (USA), <code>-850</code> (V&auml;steuropeisk), <code>-860</code> (Portugisisk), <code>-863</code> (Fransk-kanadensisk) eller <code>-865</code> (Nordisk). Det finns ocks&aring; st&ouml;d f&ouml;r Windows-teckentabell CP-1252 (V&auml;steuropeisk) via flaggan <code>-1252</code>. F&ouml;r andra teckentabeller anv&auml;nd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en l&aring;ng lista av teckenkodningar.</p>
+
+<p>Anv&auml;nd aldrig ISO-konvertering p&aring; Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer.</p>
+
+<p>N&aring;gra exempel:</p>
+
+<p>Konvertera fr&aring;n DOS standardteckentabell till Unix Latin-1:</p>
+
+<pre><code> dos2unix -iso -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n DOS CP850 till Unix Latin-1:</p>
+
+<pre><code> dos2unix -850 -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Windows CP1252 till Unix Latin-1:</p>
+
+<pre><code> dos2unix -1252 -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Windows CP1252 till Unix UTF-8 (Unicode):</p>
+
+<pre><code> iconv -f CP1252 -t UTF-8 in.txt | dos2unix &gt; ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix Latin-1 till DOS-standardteckentabell:</p>
+
+<pre><code> unix2dos -iso -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix Latin-1 till DOS CP850:</p>
+
+<pre><code> unix2dos -850 -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix Latin-1 till Windows CP1252:</p>
+
+<pre><code> unix2dos -1252 -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix UTF-8 (Unicode) till Windows CP1252:</p>
+
+<pre><code> unix2dos &lt; in.txt | iconv -f UTF-8 -t CP1252 &gt; ut.txt</code></pre>
+
+<p>Se &auml;ven <a href="http://czyborra.com/charsets/codepages.html">http://czyborra.com/charsets/codepages.html</a> och <a href="http://czyborra.com/charsets/iso8859.html">http://czyborra.com/charsets/iso8859.html</a>.</p>
+
+</dd>
+</dl>
+
+<h1 id="UNICODE">UNICODE</h1>
+
+<h2 id="Kodningar">Kodningar</h2>
+
+<p>Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format.</p>
+
+<h2 id="Konvertering">Konvertering</h2>
+
+<p>Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler.</p>
+
+<p>Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades f&ouml;r bak&aring;tkompatibilitet med ASCII.</p>
+
+<p>Dos2unix och unix2dos med Uncode-UTF-16-st&ouml;d, kan l&auml;sa UTF-16-kodade textfiler i omv&auml;nd och rak byteordning (little och big endian). F&ouml;r att se om dos2unix byggts med UTF-16-st&ouml;d skriv <code>dos2unix -V</code>.</p>
+
+<p>Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Anv&auml;nd kommandot locale(1) f&ouml;r att ta reda p&aring; vilken lokalens teckenkodning &auml;r. N&auml;r konvertering inte &auml;r m&ouml;jlig kommer ett konverteringsfel att intr&auml;ffa och filen kommer att hoppas &ouml;ver.</p>
+
+<p>Under Windows konverteras UTF-16-filer som standard till UTF-8. UTF-8-formaterade textfiler har bra st&ouml;d b&aring;de under Windows och Unix/Linux.</p>
+
+<p>UTF-16- och UTF-8-kodning &auml;r fullt kompatibla, ingen text kommer att g&aring; f&ouml;rlorad i konverteringen. N&auml;r ett UTF-16 till UTF-8-konverteringsfel uppst&aring;r, till exempel n&auml;r infilen i UTF-16-format inneh&aring;ller ett fel, kommer att filen att hoppas &ouml;ver.</p>
+
+<p>N&auml;r flaggan <code>-u</code> anv&auml;nds kommer utfilen att skrivas med samma UTF-16-kodning som infilen. Flaggan <code>-u</code> f&ouml;rhindrar konvertering till UTF-8.</p>
+
+<p>Dos2unix och unix2dos har ingen flagga f&ouml;r att konvertera UTF-8-filer till UTF-16.</p>
+
+<p>ISO- och 7-bitarsl&auml;geskonvertering fungerar inte p&aring; UTF-16-filer.</p>
+
+<h2 id="Byteordningsmarkering-Byte-Order-Mark">Byteordningsmarkering (Byte Order Mark)</h2>
+
+<p>I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom m&aring;nga Windows-program (inklusive Notepad) l&auml;gger till BOM:ar som standard. Se &auml;ven <a href="http://en.wikipedia.org/wiki/Byte_order_mark">http://en.wikipedia.org/wiki/Byte_order_mark</a>.</p>
+
+<p>I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenupps&auml;ttningen.</p>
+
+<p>Dos2Unix kan bara detektera om en fil &auml;r i UTF-16-format om filen har en BOM. N&auml;r en UTF-16-fil inte har en BOM s&aring; kommer dos2unix att de filen som en bin&auml;rfil.</p>
+
+<p>Anv&auml;nd flaggan <code>-ul</code> eller <code>-ub</code> f&ouml;r att konvertera en UTF-16-fil utan BOM.</p>
+
+<p>Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan <code>-b</code> kommer Dos2unix att skriva en BOM n&auml;r infilen har en BOM.</p>
+
+<p>Unix2dos skriver som standard en BOM i utfilen n&auml;r infilen har en BOM. Anv&auml;nd flaggan <code>-r</code> f&ouml;r att ta bort BOM:en.</p>
+
+<p>Dos2unix och unix2dos skriver alltid en BOM n&auml;r flaggan <code>-m</code> anv&auml;nds.</p>
+
+<h2 id="Unicode-filnamn-under-Windows">Unicode-filnamn under Windows</h2>
+
+<p>Dos2unix har valfritt st&ouml;d f&ouml;r l&auml;sning och skri8vning av Unicode-filnamn i Windows kommandoprompt. Detta inneb&auml;r att dos2unix kan &ouml;ppna filer som har tecken i sina namn som inte &auml;r en del av systemets atandard ANSI-teckentabell. F&ouml;r att se om dos2unix f&ouml;r Windows byggdes med st&ouml;d f&ouml;r Unicode-filnamn skriv <code>dos2unix -V</code>.</p>
+
+<p>Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan <code>-D</code>, <code>--display-enc</code>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen.</p>
+
+<h2 id="Unicode-exempel">Unicode-exempel</h2>
+
+<p>Konvertera fr&aring;n Windows UTF-16 (med BOM) till Unix UTF-8:</p>
+
+<pre><code> dos2unix -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Windows UTF-16LE (utan BOM) till Unix UTF-8:</p>
+
+<pre><code> dos2unix -ul -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix UTF-8 till Windows UTF-8 med BOM:</p>
+
+<pre><code> unix2dos -m -n in.txt ut.txt</code></pre>
+
+<p>Konvertera fr&aring;n Unix UTF-8 till Windows UTF-16:</p>
+
+<pre><code> unix2dos &lt; in.txt | iconv -f UTF-8 -t UTF-16 &gt; ut.txt</code></pre>
+
+<h1 id="GB18030">GB18030</h1>
+
+<p>GB18030 &auml;r en standard fr&aring;n Kinesiska regeringen. En obligatorisk delm&auml;ngd av standarden GB18030 kr&auml;vs officiellt f&ouml;r alla programvaruprodukter som s&auml;ljs i Kina. Se vidare <a href="http://en.wikipedia.org/wiki/GB_18030">http://en.wikipedia.org/wiki/GB_18030</a>.</p>
+
+<p>GB18030 &auml;r fullst&auml;ndigt kompatibel med Unicode och kan anses vara ett &ouml;verf&ouml;ringsformat f&ouml;r unicode. Precis som UTF-8 &auml;r GB18030 kompatibel med ASCII. GB18030 &auml;r ocks&aring; kompatibel med Windows-teckentabell 936, ocks&aring; k&auml;nd som GBK.</p>
+
+<p>Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 n&auml;r lokalens teckenkodning &auml;r inst&auml;lld p&aring; GB18030. Notera att detta endast kommer att fungera om lokalen har st&ouml;d i systemet. Anv&auml;nd kommandot <code>locale -a</code> f&ouml;r att f&aring; en lista &ouml;ver de lokaler som st&ouml;ds.</p>
+
+<p>Under Windows m&aring;ste du anv&auml;nda flaggan <code>-gb</code> f&ouml;r att konvertera UTF-16-filer till GB18030.</p>
+
+<p>GB18030-kodade filer kan ha en byteordningsmarkering, precis som Unicode-filer.</p>
+
+<h1 id="EXEMPEL">EXEMPEL</h1>
+
+<p>L&auml;sa inmatning fr&aring;n &ldquo;stdin&ldquo; och skriv utmatning till &ldquo;stdout&ldquo;:</p>
+
+<pre><code> dos2unix
+ dos2unix -l -c mac</code></pre>
+
+<p>Konvertera och ers&auml;tta a.txt. Konvertera och ers&auml;tt b.txt:</p>
+
+<pre><code> dos2unix a.txt b.txt
+ dos2unix -o a.txt b.txt</code></pre>
+
+<p>Konvertera och ers&auml;tt a.txt i ascii-konverteringsl&auml;ge:</p>
+
+<pre><code> dos2unix a.txt</code></pre>
+
+<p>Konvertera och ers&auml;tt a.txt i ascii-konverteringsl&auml;ge, konvertera och ers&auml;tt b.txt i 7bit-konverteringsl&auml;ge:</p>
+
+<pre><code> dos2unix a.txt -c 7bit b.txt
+ dos2unix -c ascii a.txt -c 7bit b.txt
+ dos2unix -ascii a.txt -7 b.txt</code></pre>
+
+<p>Konvertera a.txt fr&aring;n Mac- till Unix-format:</p>
+
+<pre><code> dos2unix -c mac a.txt
+ mac2unix a.txt</code></pre>
+
+<p>Konvertera a.txt fr&aring;n Unix- till Mac-format:</p>
+
+<pre><code> unix2dos -c mac a.txt
+ unix2mac a.txt</code></pre>
+
+<p>Konvertera och ers&auml;tt a.txt medan originalet tidsst&auml;mpel beh&aring;lls:</p>
+
+<pre><code> dos2unix -k a.txt
+ dos2unix -k -o a.txt</code></pre>
+
+<p>Konvertera a.txt och skriv till e.txt:</p>
+
+<pre><code> dos2unix -n a.txt e.txt</code></pre>
+
+<p>Konvertera a.txt och skriv till e.txt, l&aring;t e.txt beh&aring;lla tidsst&auml;mpeln fr&aring;n a.txt:</p>
+
+<pre><code> dos2unix -k -n a.txt e.txt</code></pre>
+
+<p>Konvertera och ers&auml;tt a.txt, konvertera b.txt och skriv till e.txt:</p>
+
+<pre><code> dos2unix a.txt -n b.txt e.txt
+ dos2unix -o a.txt -n b.txt e.txt</code></pre>
+
+<p>Konvertera c.txt och skriv till e.txt, konvertera och ers&auml;tt a.txt, konvertera och ers&auml;tt b.txt, konvertera d.txt och skriv till f.txt:</p>
+
+<pre><code> dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt</code></pre>
+
+<h1 id="REKURSIV-KONVERTERING">REKURSIV KONVERTERING</h1>
+
+<p>Anv&auml;nd dos2unix i kombination med kommandona find(1) och xargs(1) f&ouml;r att rekursivt konvertera filer i en katalogstruktur. F&ouml;r att till exempel konvertera alla .txt-filer i katalogtr&auml;det under den aktuella katalogen skriv:</p>
+
+<pre><code> find . -name &#39;*.txt&#39; |xargs dos2unix</code></pre>
+
+<p>I en Windows-kommandoprompt kan f&ouml;ljande kommando anv&auml;ndas:</p>
+
+<pre><code> for /R %G in (*.txt) do dos2unix &quot;%G&quot;</code></pre>
+
+<h1 id="LOKALISERING">LOKALISERING</h1>
+
+<dl>
+
+<dt id="LANG"><b>LANG</b></dt>
+<dd>
+
+<p>Det prim&auml;ra spr&aring;ket v&auml;ljs med milj&ouml;variabeln LANG. LANG-variabeln best&aring;r av flera delas. Den f&ouml;rsta delen &auml;r spr&aring;kkoden i gemener. Den andra delen &auml;r valfri och utg&ouml;r landskoden i versaler, f&ouml;reg&aring;ngen av ett understreck. Det finns ocks&aring; en valfri tredje del: teckenkodning, f&ouml;reg&aring;ngen av en punkt. Ett par exempel f&ouml;r skal av POSIX-standard-typ:</p>
+
+<pre><code> export LANG=nl Nederl&auml;ndska
+ export LANG=nl_NL Nederl&auml;ndska, Nederl&auml;nderna
+ export LANG=nl_BE Nederl&auml;ndska, Belgien
+ export LANG=es_ES Spanska, Spanien
+ export LANG=es_MX Spanska, Mexiko
+ export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning
+ export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning</code></pre>
+
+<p>F&ouml;r en fullst&auml;ndig lista &ouml;ver spr&aring;k och landskoder se vidare i gettext-manualen: <a href="http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html">http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html</a></p>
+
+<p>P&aring; Unix-system kan du anv&auml;nda kommando locale(1) f&ouml;r att f&aring; lokal-specifik information.</p>
+
+</dd>
+<dt id="LANGUAGE"><b>LANGUAGE</b></dt>
+<dd>
+
+<p>Med milj&ouml;variabeln LANGUAGE kan du ange en prioritetslista &ouml;ver spr&aring;k, separerade med kolon. Dos2unix kommer att ge f&ouml;retr&auml;de till LANGAUGE &ouml;ver LANG. Exempelvis f&ouml;rst nederl&auml;ndska och sedan tyska: <code>LANGUAGE=nl:de</code>. Du m&aring;ste f&ouml;rst ha aktiverat lokalisering, genom att s&auml;tta LANG (eller LC_ALL) till ett v&auml;rde annat &auml;n &ldquo;C&ldquo;, innan du kan anv&auml;nda en prioritetslista f&ouml;r spr&aring;k via LANGUAGE-variabeln. Se vidare i gettext-manualen: <a href="http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html">http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html</a></p>
+
+<p>Om du v&auml;ljer ett spr&aring;k som inte &auml;r tillg&auml;nglig kommer du att f&aring; engelska meddelanden som standard.</p>
+
+</dd>
+<dt id="DOS2UNIX_LOCALEDIR"><b>DOS2UNIX_LOCALEDIR</b></dt>
+<dd>
+
+<p>Med milj&ouml;variabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som st&auml;llts in vid kompilering &aring;sidos&auml;ttas. LOCALEDIR anv&auml;nds f&ouml;r att hitta spr&aring;kfiler. Standardv&auml;rdet f&ouml;r GNU-program &auml;r <code>/usr/local/share/locale</code>. Flaggan <b>--version</b> kommer att visa vilken LOCALEDIR som anv&auml;nds.</p>
+
+<p>Exempel (POSIX-skal):</p>
+
+<pre><code> export DOS2UNIX_LOCALEDIR=$HOME/share/locale</code></pre>
+
+</dd>
+</dl>
+
+<h1 id="RETURVRDE">RETURV&Auml;RDE</h1>
+
+<p>Om allt g&aring;r bra kommer noll att returneras. N&auml;r ett systemfel uppst&aring;r kommer det senaste systemfelet att returneras. F&ouml;r andra fel kommer 1 att returneras.</p>
+
+<p>Returv&auml;rdet &auml;r alltid noll i tystl&auml;ge, utom n&auml;r felaktiga kommandoradsflaggor anv&auml;nds.</p>
+
+<h1 id="STANDARDER">STANDARDER</h1>
+
+<p><a href="http://en.wikipedia.org/wiki/Text_file">http://en.wikipedia.org/wiki/Text_file</a></p>
+
+<p><a href="http://en.wikipedia.org/wiki/Carriage_return">http://en.wikipedia.org/wiki/Carriage_return</a></p>
+
+<p><a href="http://en.wikipedia.org/wiki/Newline">http://en.wikipedia.org/wiki/Newline</a></p>
+
+<p><a href="http://en.wikipedia.org/wiki/Unicode">http://en.wikipedia.org/wiki/Unicode</a></p>
+
+<h1 id="FRFATTARE">F&Ouml;RFATTARE</h1>
+
+<p>Benjamin Lin - &lt;blin@socs.uts.edu.au&gt;, Bernd Johannes Wuebben (mac2unix-l&auml;ge) - &lt;wuebben@kde.org&gt;, Christian Wurll (l&auml;gg till en extra radbrytning) - &lt;wurll@ira.uka.de&gt;, Erwin Waterlander - &lt;waterlan@xs4all.nl&gt; (upphovsman)</p>
+
+<p>Projektsida: <a href="http://waterlan.home.xs4all.nl/dos2unix.html">http://waterlan.home.xs4all.nl/dos2unix.html</a></p>
+
+<p>SourceForge-sida: <a href="http://sourceforge.net/projects/dos2unix/">http://sourceforge.net/projects/dos2unix/</a></p>
+
+<h1 id="SE-VEN">SE &Auml;VEN</h1>
+
+<p>file(1) find(1) iconv(1) locale(1) xargs(1)</p>
+
+
+</body>
+
+</html>
+
+
diff --git a/man/sv/man1/dos2unix.po b/man/sv/man1/dos2unix.po
new file mode 100644
index 0000000..95173d2
--- /dev/null
+++ b/man/sv/man1/dos2unix.po
@@ -0,0 +1,1581 @@
+# Swedish translation for dos2unix-man.
+# Copyright © 2014-2015 Erwin Waterlander, et al. (msgids)
+# This file is distributed under the same license as the dos2unix package.
+# Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dos2unix-man 7.3.1-beta6\n"
+"POT-Creation-Date: 2015-09-23 20:09+0200\n"
+"PO-Revision-Date: 2015-11-08 15:17+0100\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.6\n"
+
+#. type: =head1
+#: dos2unix.pod:52
+msgid "NAME"
+msgstr "NAMN"
+
+#. type: textblock
+#: dos2unix.pod:54
+msgid "dos2unix - DOS/Mac to Unix and vice versa text file format converter"
+msgstr "dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice versa"
+
+#. type: =head1
+#: dos2unix.pod:56
+msgid "SYNOPSIS"
+msgstr "SYNOPSIS"
+
+#. type: verbatim
+#: dos2unix.pod:58
+#, no-wrap
+msgid ""
+" dos2unix [options] [FILE ...] [-n INFILE OUTFILE ...]\n"
+" unix2dos [options] [FILE ...] [-n INFILE OUTFILE ...]\n"
+"\n"
+msgstr ""
+" dos2unix [flaggor] [FIL …] [-n INFIL UTFIL …]\n"
+" unix2dos [flaggor] [FIL …] [-n INFIL UTFIL …]\n"
+"\n"
+
+#. type: =head1
+#: dos2unix.pod:61
+msgid "DESCRIPTION"
+msgstr "BESKRIVNING"
+
+#. type: textblock
+#: dos2unix.pod:63
+msgid "The Dos2unix package includes utilities C<dos2unix> and C<unix2dos> to convert plain text files in DOS or Mac format to Unix format and vice versa."
+msgstr "Paketet Dos2unix inkluderar verktygen C<dos2unix> och C<unix2dos> som konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format och vice versa."
+
+#. type: textblock
+#: dos2unix.pod:66
+msgid "In DOS/Windows text files a line break, also known as newline, is a combination of two characters: a Carriage Return (CR) followed by a Line Feed (LF). In Unix text files a line break is a single character: the Line Feed (LF). In Mac text files, prior to Mac OS X, a line break was single Carriage Return (CR) character. Nowadays Mac OS uses Unix style (LF) line breaks."
+msgstr "Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är en kombination av två tecken: vagnretur (Carriage Return, CR) åtföljt av radmatning (Line Feed, LF). Textfiler i Unix har en radbrytning som är ett enda tecken: radmatning (Line Feed, LF). Textfiler för Mac, innan Mac OS X, hade en radbrytning som var en enda vagnretur (Carriage Return, CR). Numera använder Mac OS radbrytning i Unix-stil (LF)."
+
+#. type: textblock
+#: dos2unix.pod:72
+msgid "Besides line breaks Dos2unix can also convert the encoding of files. A few DOS code pages can be converted to Unix Latin-1. And Windows Unicode (UTF-16) files can be converted to Unix Unicode (UTF-8) files."
+msgstr "Förutom radbrytningar så kan Dos2unix också konvertera filers kodning. Några DOS-teckentabeller kan konverteras till Unix Latin-1. Och filer som använder Windows Unicode (UTF-16) kan konverteras till Unix Unicode (UTF-8)."
+
+#. type: textblock
+#: dos2unix.pod:76
+msgid "Binary files are automatically skipped, unless conversion is forced."
+msgstr "Binära filer hoppas över automatiskt, om inte konvertering tvingas."
+
+#. type: textblock
+#: dos2unix.pod:78
+msgid "Non-regular files, such as directories and FIFOs, are automatically skipped."
+msgstr "Kataloger och FIFOs och andra filer som inte är vanliga filer hoppas över automatiskt."
+
+#. type: textblock
+#: dos2unix.pod:80
+msgid "Symbolic links and their targets are by default kept untouched. Symbolic links can optionally be replaced, or the output can be written to the symbolic link target. Writing to a symbolic link target is not supported on Windows."
+msgstr "Symboliska länkar och deras mål förblir oförändrade som standard. Symboliska länkar kan valfritt bli ersatta eller så kan utmatningen skrivas till målet för den symboliska länken. På Windows saknas stöd för att skriva till målet för en symbolisk länk."
+
+#. type: textblock
+#: dos2unix.pod:84
+msgid "Dos2unix was modelled after dos2unix under SunOS/Solaris. There is one important difference with the original SunOS/Solaris version. This version does by default in-place conversion (old file mode), while the original SunOS/Solaris version only supports paired conversion (new file mode). See also options C<-o> and C<-n>."
+msgstr "Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör som standard konverteringen på plats (gammalfilsläge), medan originalversionen från SunOS/Solaris bara hade stöd för parad konvertering (nyfilsläge). Se vidare flaggorna C<-o> och C<-n>."
+
+#. type: =head1
+#: dos2unix.pod:90
+msgid "OPTIONS"
+msgstr "FLAGGOR"
+
+#. type: =item
+#: dos2unix.pod:94
+msgid "B<-->"
+msgstr "B<-->"
+
+#. type: textblock
+#: dos2unix.pod:96
+msgid "Treat all following options as file names. Use this option if you want to convert files whose names start with a dash. For instance to convert a file named \"-foo\", you can use this command:"
+msgstr "Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du vill konvertera filer vars namn börjar med bindestreck. För att till exempel konvertera en fil med namnet “-foo“ kan du använda detta kommando:"
+
+#. type: verbatim
+#: dos2unix.pod:100
+#, no-wrap
+msgid ""
+" dos2unix -- -foo\n"
+"\n"
+msgstr ""
+" dos2unix -- -foo\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:102
+msgid "Or in new file mode:"
+msgstr "Eller i nyfilsläge:"
+
+#. type: verbatim
+#: dos2unix.pod:104
+#, no-wrap
+msgid ""
+" dos2unix -n -- -foo out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -n -- -foo out.txt\n"
+"\n"
+
+#. type: =item
+#: dos2unix.pod:106
+msgid "B<-ascii>"
+msgstr "B<-ascii>"
+
+#. type: textblock
+#: dos2unix.pod:108
+msgid "Convert only line breaks. This is the default conversion mode."
+msgstr "Konvertera enbart radbrytningar. Detta är standardkonverteringsläget."
+
+#. type: =item
+#: dos2unix.pod:110
+msgid "B<-iso>"
+msgstr "B<-iso>"
+
+#. type: textblock
+#: dos2unix.pod:112
+msgid "Conversion between DOS and ISO-8859-1 character set. See also section CONVERSION MODES."
+msgstr "Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare stycket KONVERTERINGSLÄGEN."
+
+#. type: =item
+#: dos2unix.pod:115
+msgid "B<-1252>"
+msgstr "B<-1252>"
+
+#. type: textblock
+#: dos2unix.pod:117
+msgid "Use Windows code page 1252 (Western European)."
+msgstr "Använd Windows-teckentabell 1252 (Västeuropeisk)."
+
+#. type: =item
+#: dos2unix.pod:119
+msgid "B<-437>"
+msgstr "B<-437>"
+
+#. type: textblock
+#: dos2unix.pod:121
+msgid "Use DOS code page 437 (US). This is the default code page used for ISO conversion."
+msgstr "Använd DOS-teckentabell 437 (USA). Detta är standardteckentabellen som används för ISO-konvertering."
+
+#. type: =item
+#: dos2unix.pod:123
+msgid "B<-850>"
+msgstr "B<-850>"
+
+#. type: textblock
+#: dos2unix.pod:125
+msgid "Use DOS code page 850 (Western European)."
+msgstr "Använd DOS-teckentabell 850 (Västeuropeisk)."
+
+#. type: =item
+#: dos2unix.pod:127
+msgid "B<-860>"
+msgstr "B<-860>"
+
+#. type: textblock
+#: dos2unix.pod:129
+msgid "Use DOS code page 860 (Portuguese)."
+msgstr "Använd DOS-teckentabell 860 (Portugisisk)."
+
+#. type: =item
+#: dos2unix.pod:131
+msgid "B<-863>"
+msgstr "B<-863>"
+
+#. type: textblock
+#: dos2unix.pod:133
+msgid "Use DOS code page 863 (French Canadian)."
+msgstr "Använd DOS-teckentabell 863 (Fransk-kanadensisk)."
+
+#. type: =item
+#: dos2unix.pod:135
+msgid "B<-865>"
+msgstr "B<-865>"
+
+#. type: textblock
+#: dos2unix.pod:137
+msgid "Use DOS code page 865 (Nordic)."
+msgstr "Använd DOS-teckentabell 865 (Nordisk)."
+
+#. type: =item
+#: dos2unix.pod:139
+msgid "B<-7>"
+msgstr "B<-7>"
+
+#. type: textblock
+#: dos2unix.pod:141
+msgid "Convert 8 bit characters to 7 bit space."
+msgstr "Konvertera 8-bitars tecken till 7-bitars blanksteg."
+
+#. type: =item
+#: dos2unix.pod:143
+msgid "B<-b, --keep-bom>"
+msgstr "B<-b, --keep-bom>"
+
+#. type: textblock
+#: dos2unix.pod:145
+msgid "Keep Byte Order Mark (BOM). When the input file has a BOM, write a BOM in the output file. This is the default behavior when converting to DOS line breaks. See also option C<-r>."
+msgstr "Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM, skriv en BOM i utfilen. Detta är standardbeteendet vid konvertering av DOS-radbrytningar. Se vidare flaggan C<-r>."
+
+#. type: =item
+#: dos2unix.pod:149
+msgid "B<-c, --convmode CONVMODE>"
+msgstr "B<-c, --convmode KONVERTERINGLÄGE>"
+
+#. type: textblock
+#: dos2unix.pod:151
+msgid "Set conversion mode. Where CONVMODE is one of: I<ascii>, I<7bit>, I<iso>, I<mac> with ascii being the default."
+msgstr "Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: I<ascii>, I<7bit>, I<iso>, I<mac> där ascii är standard."
+
+#. type: =item
+#: dos2unix.pod:155
+msgid "B<-D, --display-enc ENCODING>"
+msgstr "B<-D, --display-enc KODNING>"
+
+#. type: textblock
+#: dos2unix.pod:157
+msgid "Set encoding of displayed text. Where ENCODING is one of: I<ansi>, I<unicode>, I<utf8> with ansi being the default."
+msgstr "Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>, I<utf8> där ansi är standardvalet."
+
+#. type: textblock
+#: dos2unix.pod:161
+msgid "This option is only available in dos2unix for Windows with Unicode file name support. This option has no effect on the actual file names read and written, only on how they are displayed."
+msgstr "Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses och skrivs, bara på hur de visas."
+
+#. type: textblock
+#: dos2unix.pod:165
+msgid "There are several methods for displaying text in a Windows console based on the encoding of the text. They all have their own advantages and disadvantages."
+msgstr "Det finns flera metoder för att visa text i en Windows-konsol baserad på vilken kodning texten har. De har alla för- och nackdelar."
+
+#. type: =item
+#: dos2unix.pod:171
+msgid "B<ansi>"
+msgstr "B<ansi>"
+
+#. type: textblock
+#: dos2unix.pod:173
+msgid "Dos2unix's default method is to use ANSI encoded text. The advantage is that it is backwards compatible. It works with raster and TrueType fonts. In some regions you may need to change the active DOS OEM code page to the Windows system ANSI code page using the C<chcp> command, because dos2unix uses the Windows system code page."
+msgstr "Dos2unix standardmetod är att använda ANSI-kodad text. Fördelen är att den är bakåtkompatibel. Det fungerar med raster- och TrueType-teckensnitt. I vissa regioner kan du behöva ändra den aktiva DOS OEM-teckentabellen till Windows-systemets ANSI-teckentabell genom att använda kommandot C<chcp>, eftersom dos2unix använder Windows-systemets teckentabell."
+
+#. type: textblock
+#: dos2unix.pod:179
+msgid "The disadvantage of ansi is that international file names with characters not inside the system default code page are not displayed properly. You will see a question mark, or a wrong symbol instead. When you don't work with foreign file names this method is OK."
+msgstr "Nackdelen med ansi är att internationella filnamn med tecken som inte finns i systemets standardteckentabell inte visas korrekt. Du kommer att se frågetecken, eller en felaktig symbol istället. När du inte arbetar med utländska filnamn är denna metoden OK."
+
+#. type: =item
+#: dos2unix.pod:184
+msgid "B<unicode>"
+msgstr "B<unicode>"
+
+#. type: textblock
+#: dos2unix.pod:186
+msgid "The advantage of unicode (the Windows name for UTF-16) encoding is that text is usually properly displayed. There is no need to change the active code page. You may need to set the console's font to a TrueType font to have international characters displayed properly. When a character is not included in the TrueType font you usually see a small square, sometimes with a question mark in it."
+msgstr "Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att text vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett TrueType-teckensnitt för att få internationella tecken att visas korrekt. När ett tecken inte finns inkluderat i TrueType-teckensnittet kommer du vanligtvis att se en liten ruta, ibland med ett frågetecken inuti."
+
+#. type: textblock
+#: dos2unix.pod:192
+msgid "When you use the ConEmu console all text is displayed properly, because ConEmu automatically selects a good font."
+msgstr "När du använder ConEmu-konsolen kommer all text att visas korrekt eftersom ConEmu automatiskt väljer ett bra teckensnitt."
+
+#. type: textblock
+#: dos2unix.pod:195
+msgid "The disadvantage of unicode is that it is not compatible with ASCII. The output is not easy to handle when you redirect it to another program or a file. Redirection to a file does not give a correct UTF-16 file."
+msgstr "Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen är inte lätt att hantera när du omdirigerar den till ett annat program eller en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil."
+
+#. type: =item
+#: dos2unix.pod:199
+msgid "B<utf8>"
+msgstr "B<utf8>"
+
+#. type: textblock
+#: dos2unix.pod:201
+msgid "The advantage of utf8 is that it is compatible with ASCII and when you redirect it to a file you get a proper UTF-8 file. You need to set the console's font to a TrueType font. With a TrueType font the text is displayed similar as with the C<unicode> encoding."
+msgstr "Fördelen med utf8 är att den är kompatibel med ASCII och när du omdirigerar den till en fil kommer du att få en korrekt UTF-8-fil. Du måste ställa in konsolens teckensnitt till ett TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text att visas på liknande sätt som med C<unicode>-kodningen."
+
+#. type: textblock
+#: dos2unix.pod:206
+msgid "The disadvantage is that when you use the default raster font all non-ASCII characters are displayed wrong. Not only unicode file names, but also translated messages become unreadable. On Windows configured for an East-Asian region you may see a lot of flickering of the console when the messages are displayed."
+msgstr "Nackdelen är att när du använder standardrasterteckensnittet kommer alla icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan också översatta meddelanden kommer att bli oläsbara. Under Windows som konfigurerats för Östasien kan man komma att se många blinkningar i konsolen när meddelanden visas."
+
+#. type: textblock
+#: dos2unix.pod:212
+msgid "In a ConEmu console the utf8 encoding method works well."
+msgstr "I ConEmu-konsolen fungerar utf8-kodningsmetoden väl."
+
+#. type: textblock
+#: dos2unix.pod:216
+msgid "The default encoding can be changed with environment variable DOS2UNIX_DISPLAY_ENC by setting it to C<unicode> or C<utf8>."
+msgstr "Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom att sätta den till C<unicode> eller C<utf8>."
+
+#. type: =item
+#: dos2unix.pod:219
+msgid "B<-f, --force>"
+msgstr "B<-f, --force>"
+
+#. type: textblock
+#: dos2unix.pod:221
+msgid "Force conversion of binary files."
+msgstr "Tvinga konvertering av binära filer."
+
+#. type: =item
+#: dos2unix.pod:223
+msgid "B<-gb, --gb18030>"
+msgstr "B<-gb, --gb18030>"
+
+#. type: textblock
+#: dos2unix.pod:225
+msgid "On Windows UTF-16 files are by default converted to UTF-8, regardless of the locale setting. Use this option to convert UTF-16 files to GB18030. This option is only available on Windows. See also section GB18030."
+msgstr "Under Windows konverteras UTF-16-filer som standard till UTF-8, oavsett vilken lokalinställning som är gjord. Använd denna flagga för att konvertera UTF-16-filer till GB18030. Denna flagga finns bara tillgänglig i Windows. Se vidare i avsnittet GB18030."
+
+#. type: =item
+#: dos2unix.pod:229
+msgid "B<-h, --help>"
+msgstr "B<-h, --help>"
+
+#. type: textblock
+#: dos2unix.pod:231
+msgid "Display help and exit."
+msgstr "Visa hjälptext och avsluta."
+
+#. type: =item
+#: dos2unix.pod:233
+msgid "B<-i[FLAGS], --info[=FLAGS] FILE ...>"
+msgstr "B<-i[FLAGGOR], --info[=FLAGGOR] FIL ...>"
+
+#. type: textblock
+#: dos2unix.pod:235
+msgid "Display file information. No conversion is done."
+msgstr "Visa filinformation. Ingen konvertering görs."
+
+#. type: textblock
+#: dos2unix.pod:237
+msgid "The following information is printed, in this order: number of DOS line breaks, number of Unix line breaks, number of Mac line breaks, byte order mark, text or binary, file name."
+msgstr "Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar, antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen, text eller binär, filnamn."
+
+#. type: textblock
+#: dos2unix.pod:241
+msgid "Example output:"
+msgstr "Exempelutmatning:"
+
+#. type: verbatim
+#: dos2unix.pod:243
+#, no-wrap
+msgid ""
+" 6 0 0 no_bom text dos.txt\n"
+" 0 6 0 no_bom text unix.txt\n"
+" 0 0 6 no_bom text mac.txt\n"
+" 6 6 6 no_bom text mixed.txt\n"
+" 50 0 0 UTF-16LE text utf16le.txt\n"
+" 0 50 0 no_bom text utf8unix.txt\n"
+" 50 0 0 UTF-8 text utf8dos.txt\n"
+" 2 418 219 no_bom binary dos2unix.exe\n"
+"\n"
+msgstr ""
+" 6 0 0 no_bom text dos.txt\n"
+" 0 6 0 no_bom text unix.txt\n"
+" 0 0 6 no_bom text mac.txt\n"
+" 6 6 6 no_bom text mixed.txt\n"
+" 50 0 0 UTF-16LE text utf16le.txt\n"
+" 0 50 0 no_bom text utf8unix.txt\n"
+" 50 0 0 UTF-8 text utf8dos.txt\n"
+" 2 418 219 no_bom binär dos2unix.exe\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:252
+msgid "Optionally extra flags can be set to change the output. One or more flags can be added."
+msgstr "Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler flaggor kan läggas till."
+
+#. type: =item
+#: dos2unix.pod:257
+msgid "B<d>"
+msgstr "B<d>"
+
+#. type: textblock
+#: dos2unix.pod:259
+msgid "Print number of DOS line breaks."
+msgstr "Skriv ut antal DOS-radbrytningar."
+
+#. type: =item
+#: dos2unix.pod:261
+msgid "B<u>"
+msgstr "B<u>"
+
+#. type: textblock
+#: dos2unix.pod:263
+msgid "Print number of Unix line breaks."
+msgstr "Skriv ut antal Unix-radbrytningar."
+
+#. type: =item
+#: dos2unix.pod:265
+msgid "B<m>"
+msgstr "B<m>"
+
+#. type: textblock
+#: dos2unix.pod:267
+msgid "Print number of Mac line breaks."
+msgstr "Skriv ut antal Mac-radbrytningar."
+
+#. type: =item
+#: dos2unix.pod:269
+msgid "B<b>"
+msgstr "B<b>"
+
+#. type: textblock
+#: dos2unix.pod:271
+msgid "Print the byte order mark."
+msgstr "Skriv ut byteordningsmarkeringen."
+
+#. type: =item
+#: dos2unix.pod:273
+msgid "B<t>"
+msgstr "B<t>"
+
+#. type: textblock
+#: dos2unix.pod:275
+msgid "Print if file is text or binary."
+msgstr "Skriv ut om filen är text eller binär."
+
+#. type: =item
+#: dos2unix.pod:277
+msgid "B<c>"
+msgstr "B<c>"
+
+#. type: textblock
+#: dos2unix.pod:279
+msgid "Print only the files that would be converted."
+msgstr "Skriv bara ut filerna som skulle ha konverterats."
+
+#. type: textblock
+#: dos2unix.pod:281
+msgid "With the C<c> flag dos2unix will print only the files that contain DOS line breaks, unix2dos will print only file names that have Unix line breaks."
+msgstr "Med C<c>-flaggan kommer dos2unix att skriva ut filerna som innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har Unix-radbrytningar."
+
+#. type: textblock
+#: dos2unix.pod:286
+msgid "Examples:"
+msgstr "Exempel:"
+
+#. type: textblock
+#: dos2unix.pod:288
+msgid "Show information for all *.txt files:"
+msgstr "Visa information för alla *.txt-filer:"
+
+#. type: verbatim
+#: dos2unix.pod:290
+#, no-wrap
+msgid ""
+" dos2unix -i *.txt\n"
+"\n"
+msgstr ""
+" dos2unix -i *.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:292
+msgid "Show only the number of DOS line breaks and Unix line breaks:"
+msgstr "Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:"
+
+#. type: verbatim
+#: dos2unix.pod:294
+#, no-wrap
+msgid ""
+" dos2unix -idu *.txt\n"
+"\n"
+msgstr ""
+" dos2unix -idu *.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:296
+msgid "Show only the byte order mark:"
+msgstr "Visa bara byteordningsmarkeringen:"
+
+#. type: verbatim
+#: dos2unix.pod:298
+#, no-wrap
+msgid ""
+" dos2unix --info=b *.txt\n"
+"\n"
+msgstr ""
+" dos2unix --info=b *.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:300
+msgid "List the files that have DOS line breaks:"
+msgstr "Lista filerna som har DOS-radbrytningar:"
+
+#. type: verbatim
+#: dos2unix.pod:302
+#, no-wrap
+msgid ""
+" dos2unix -ic *.txt\n"
+"\n"
+msgstr ""
+" dos2unix -ic *.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:304
+msgid "List the files that have Unix line breaks:"
+msgstr "Lista filerna som har Unix-radbrytningar:"
+
+#. type: verbatim
+#: dos2unix.pod:306
+#, no-wrap
+msgid ""
+" unix2dos -ic *.txt\n"
+"\n"
+msgstr ""
+" unix2dos -ic *.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:308
+msgid "Convert only files that have DOS line breaks and leave the other files untouched:"
+msgstr "Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer orörda:"
+
+#. type: verbatim
+#: dos2unix.pod:310
+#, no-wrap
+msgid ""
+" dos2unix -ic *.txt | xargs dos2unix\n"
+"\n"
+msgstr ""
+" dos2unix -ic *.txt | xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:312
+msgid "Find text files that have DOS line breaks:"
+msgstr "Hitta textfiler som har DOS-radbrytningar:"
+
+#. type: verbatim
+#: dos2unix.pod:314
+#, no-wrap
+msgid ""
+" find -name '*.txt' | xargs dos2unix -ic\n"
+"\n"
+msgstr ""
+" find -name '*.txt' | xargs dos2unix -ic\n"
+"\n"
+
+#. type: =item
+#: dos2unix.pod:316
+msgid "B<-k, --keepdate>"
+msgstr "B<-k, --keepdate>"
+
+#. type: textblock
+#: dos2unix.pod:318
+msgid "Keep the date stamp of output file same as input file."
+msgstr "Behåll infilens datumstämpel för utfilen."
+
+#. type: =item
+#: dos2unix.pod:320
+msgid "B<-L, --license>"
+msgstr "B<-L, --license>"
+
+#. type: textblock
+#: dos2unix.pod:322
+msgid "Display program's license."
+msgstr "Visa programmets licens."
+
+#. type: =item
+#: dos2unix.pod:324
+msgid "B<-l, --newline>"
+msgstr "B<-l, --newline>"
+
+#. type: textblock
+#: dos2unix.pod:326
+msgid "Add additional newline."
+msgstr "Lägg till ytterligare nyrad."
+
+#. type: textblock
+#: dos2unix.pod:328
+msgid "B<dos2unix>: Only DOS line breaks are changed to two Unix line breaks. In Mac mode only Mac line breaks are changed to two Unix line breaks."
+msgstr "B<dos2unix>: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I Mac-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar."
+
+#. type: textblock
+#: dos2unix.pod:332
+msgid "B<unix2dos>: Only Unix line breaks are changed to two DOS line breaks. In Mac mode Unix line breaks are changed to two Mac line breaks."
+msgstr "B<unix2dos>: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I Mac-läge ändras Unix-radbrytningar till två Mac-radbrytningar."
+
+#. type: =item
+#: dos2unix.pod:335
+msgid "B<-m, --add-bom>"
+msgstr "B<-m, --add-bom>"
+
+#. type: textblock
+#: dos2unix.pod:337
+msgid "Write a Byte Order Mark (BOM) in the output file. By default an UTF-8 BOM is written."
+msgstr "Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som standard skrivs en UTF-8 BOM."
+
+#. type: textblock
+#: dos2unix.pod:340
+msgid "When the input file is UTF-16, and the option C<-u> is used, an UTF-16 BOM will be written."
+msgstr "När infilen är UTF-16, och flaggan C<-u> används, kommer en UTF-16 BOM att skrivas."
+
+#. type: textblock
+#: dos2unix.pod:343
+msgid "Never use this option when the output encoding is other than UTF-8, UTF-16, or GB18030. See also section UNICODE."
+msgstr "Använd aldrig denna flagga när kodningen för utmatning är något annat än UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE."
+
+#. type: =item
+#: dos2unix.pod:347
+msgid "B<-n, --newfile INFILE OUTFILE ...>"
+msgstr "B<-n, --newfile INFIL UTFIL …>"
+
+#. type: textblock
+#: dos2unix.pod:349
+msgid "New file mode. Convert file INFILE and write output to file OUTFILE. File names must be given in pairs and wildcard names should I<not> be used or you I<will> lose your files."
+msgstr "Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste ange i par och jokertecken i namnen ska I<inte> användas annars I<kommer> du att förlora filer."
+
+#. type: textblock
+#: dos2unix.pod:353
+msgid "The person who starts the conversion in new file (paired) mode will be the owner of the converted file. The read/write permissions of the new file will be the permissions of the original file minus the umask(1) of the person who runs the conversion."
+msgstr "Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya filen kommer att vara samma behörigheter som för originalfilen minus umask(1) för användaren som kör konverteringen."
+
+#. type: =item
+#: dos2unix.pod:358
+msgid "B<-o, --oldfile FILE ...>"
+msgstr "B<-o, --oldfile FIL …>"
+
+#. type: textblock
+#: dos2unix.pod:360
+msgid "Old file mode. Convert file FILE and overwrite output to it. The program defaults to run in this mode. Wildcard names may be used."
+msgstr "Gammalfilsläge. Konvertera filen FIL och skriv över den med utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn får användas."
+
+#. type: textblock
+#: dos2unix.pod:363
+msgid "In old file (in-place) mode the converted file gets the same owner, group, and read/write permissions as the original file. Also when the file is converted by another user who has write permissions on the file (e.g. user root). The conversion will be aborted when it is not possible to preserve the original values. Change of owner could mean that the original owner is not able to read the file any more. Change of group could be a security risk, the file could be made readable for persons for whom it is not intended. Preservation of owner, group, and read/write permissions is only supported on Unix."
+msgstr "I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen konverteras av en annan användare som har skrivbehörighet för filen (t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte är avsedd för. Stöd för bevarande av ägare, grupp och läs-/skrivbehörigheter finns bara i Unix."
+
+#. type: =item
+#: dos2unix.pod:372
+msgid "B<-q, --quiet>"
+msgstr "B<-q, --quiet>"
+
+#. type: textblock
+#: dos2unix.pod:374
+msgid "Quiet mode. Suppress all warnings and messages. The return value is zero. Except when wrong command-line options are used."
+msgstr "Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är noll. Utom när felaktiga kommandoradsflaggor används."
+
+#. type: =item
+#: dos2unix.pod:377
+msgid "B<-r, --remove-bom>"
+msgstr "B<-r, --remove-bom>"
+
+#. type: textblock
+#: dos2unix.pod:379
+msgid "Remove Byte Order Mark (BOM). Do not write a BOM in the output file. This is the default behavior when converting to Unix line breaks. See also option C<-b>."
+msgstr "Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar. Se vidare flaggan C<-b>."
+
+#. type: =item
+#: dos2unix.pod:383
+msgid "B<-s, --safe>"
+msgstr "B<-s, --safe>"
+
+#. type: textblock
+#: dos2unix.pod:385
+msgid "Skip binary files (default)."
+msgstr "Hoppa över binära filer (standard)."
+
+#. type: =item
+#: dos2unix.pod:387
+msgid "B<-u, --keep-utf16>"
+msgstr "B<-u, --keep-utf16>"
+
+#. type: textblock
+#: dos2unix.pod:389
+msgid "Keep the original UTF-16 encoding of the input file. The output file will be written in the same UTF-16 encoding, little or big endian, as the input file. This prevents transformation to UTF-8. An UTF-16 BOM will be written accordingly. This option can be disabled with the C<-ascii> option."
+msgstr "Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med samma UTF-16-kodning som infilen, omvänd eller rak byteordning (little eller big endian). Detta förhindrar transformation till UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med C<-ascii>-flaggan."
+
+#. type: =item
+#: dos2unix.pod:394
+msgid "B<-ul, --assume-utf16le>"
+msgstr "B<-ul, --assume-utf16le>"
+
+#. type: textblock
+#: dos2unix.pod:396
+msgid "Assume that the input file format is UTF-16LE."
+msgstr "Antag att infilsformatet är UTF-16LE."
+
+#. type: textblock
+#: dos2unix.pod:398
+msgid "When there is a Byte Order Mark in the input file the BOM has priority over this option."
+msgstr "När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har BOM:en högre prioritet än denna flagga."
+
+#. type: textblock
+#: dos2unix.pod:401
+msgid "When you made a wrong assumption (the input file was not in UTF-16LE format) and the conversion succeeded, you will get an UTF-8 output file with wrong text. You can undo the wrong conversion with iconv(1) by converting the UTF-8 output file back to UTF-16LE. This will bring back the original file."
+msgstr "När du har gjort fel antagande (infilen var inte i UTF-16LE-format) och konverteringens lyckas, kommer du att få en UTF-8 utfil med felaktig text. Du kan göra denna konvertering ogjord med iconv(1) genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att återskapa originalfilen."
+
+#. type: textblock
+#: dos2unix.pod:406
+msgid "The assumption of UTF-16LE works as a I<conversion mode>. By switching to the default I<ascii> mode the UTF-16LE assumption is turned off."
+msgstr "Antagandet om UTF-16LE fungerar som ett I<konverteringsläge>. Genom att växla till standard I<ascii>-läget kommer UTF-16LE antagandet att stängas av."
+
+#. type: =item
+#: dos2unix.pod:409
+msgid "B<-ub, --assume-utf16be>"
+msgstr "B<-ub, --assume-utf16be>"
+
+#. type: textblock
+#: dos2unix.pod:411
+msgid "Assume that the input file format is UTF-16BE."
+msgstr "Antag att infilsformatet är UTF-16BE."
+
+#. type: textblock
+#: dos2unix.pod:413
+msgid "This option works the same as option C<-ul>."
+msgstr "Denna flagga fungerar på samma sätt som flaggan C<-ul>."
+
+#. type: =item
+#: dos2unix.pod:415
+msgid "B<-v, --verbose>"
+msgstr "B<-v, --verbose>"
+
+#. type: textblock
+#: dos2unix.pod:417
+msgid "Display verbose messages. Extra information is displayed about Byte Order Marks and the amount of converted line breaks."
+msgstr "Visa utförliga meddelanden. Extra information visas om byteordningsmarkeringar och antalet konverterade radbrytningar."
+
+#. type: =item
+#: dos2unix.pod:420
+msgid "B<-F, --follow-symlink>"
+msgstr "B<-F, --follow-symlink>"
+
+#. type: textblock
+#: dos2unix.pod:422
+msgid "Follow symbolic links and convert the targets."
+msgstr "Följ symboliska länkar och konvertera målen."
+
+#. type: =item
+#: dos2unix.pod:424
+msgid "B<-R, --replace-symlink>"
+msgstr "B<-R, --replace-symlink>"
+
+#. type: textblock
+#: dos2unix.pod:426
+msgid "Replace symbolic links with converted files (original target files remain unchanged)."
+msgstr "Ersätt symboliska länkar med konverterade filer (original målfilerna förblir oförändrade)."
+
+#. type: =item
+#: dos2unix.pod:429
+msgid "B<-S, --skip-symlink>"
+msgstr "B<-S, --skip-symlink>"
+
+#. type: textblock
+#: dos2unix.pod:431
+msgid "Keep symbolic links and targets unchanged (default)."
+msgstr "Behåll symboliska länkar och mål oförändrade (standard)."
+
+#. type: =item
+#: dos2unix.pod:433
+msgid "B<-V, --version>"
+msgstr "B<-V, --version>"
+
+#. type: textblock
+#: dos2unix.pod:435
+msgid "Display version information and exit."
+msgstr "Visa versionsinformation och avsluta."
+
+#. type: =head1
+#: dos2unix.pod:439
+msgid "MAC MODE"
+msgstr "MAC-LÄGE"
+
+#. type: textblock
+#: dos2unix.pod:441
+msgid "In normal mode line breaks are converted from DOS to Unix and vice versa. Mac line breaks are not converted."
+msgstr "I normalläge konverteras radbrytningar från DOS till Unix och vice versa. Mac-radbrytningar konverteras inte."
+
+#. type: textblock
+#: dos2unix.pod:444
+msgid "In Mac mode line breaks are converted from Mac to Unix and vice versa. DOS line breaks are not changed."
+msgstr "I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa. DOS-radbrytningar ändras ej."
+
+#. type: textblock
+#: dos2unix.pod:447
+msgid "To run in Mac mode use the command-line option C<-c mac> or use the commands C<mac2unix> or C<unix2mac>."
+msgstr "För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd kommandona C<mac2unix> eller C<unix2mac>."
+
+#. type: =head1
+#: dos2unix.pod:450
+msgid "CONVERSION MODES"
+msgstr "KONVERTERINGSLÄGEN"
+
+#. type: =item
+#: dos2unix.pod:454
+msgid "B<ascii>"
+msgstr "B<ascii>"
+
+#. type: textblock
+#: dos2unix.pod:456
+msgid "In mode C<ascii> only line breaks are converted. This is the default conversion mode."
+msgstr "I läget C<ascii> konverteras enbart radbrytningar. Detta är standardkonverteringsläget."
+
+#. type: textblock
+#: dos2unix.pod:459
+msgid "Although the name of this mode is ASCII, which is a 7 bit standard, the actual mode is 8 bit. Use always this mode when converting Unicode UTF-8 files."
+msgstr "Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid konvertering av Unicode UTF-8-filer."
+
+#. type: =item
+#: dos2unix.pod:463
+msgid "B<7bit>"
+msgstr "B<7bit>"
+
+#. type: textblock
+#: dos2unix.pod:465
+msgid "In this mode all 8 bit non-ASCII characters (with values from 128 to 255) are converted to a 7 bit space."
+msgstr "I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden från 128 till 255) till ett 7-bitars blanksteg."
+
+#. type: =item
+#: dos2unix.pod:468
+msgid "B<iso>"
+msgstr "B<iso>"
+
+#. type: textblock
+#: dos2unix.pod:470
+msgid "Characters are converted between a DOS character set (code page) and ISO character set ISO-8859-1 (Latin-1) on Unix. DOS characters without ISO-8859-1 equivalent, for which conversion is not possible, are converted to a dot. The same counts for ISO-8859-1 characters without DOS counterpart."
+msgstr "Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och ISO teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan motsvarande ISO-8859-1 tecken, för vilka konvertering är omöjligt, kommer att ersättas med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS."
+
+#. type: textblock
+#: dos2unix.pod:475
+msgid "When only option C<-iso> is used dos2unix will try to determine the active code page. When this is not possible dos2unix will use default code page CP437, which is mainly used in the USA. To force a specific code page use options C<-437> (US), C<-850> (Western European), C<-860> (Portuguese), C<-863> (French Canadian), or C<-865> (Nordic). Windows code page CP1252 (Western European) is also supported with option C<-1252>. For other code pages use dos2unix in combination with iconv(1). Iconv can convert between a long list of character encodings."
+msgstr "När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda standardteckentabellen CP437, vilken huvudsakligen används i USA. För att tvinga en specifik tackentabell använd flaggorna C<-437> (USA), C<-850> (Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång lista av teckenkodningar."
+
+#. type: textblock
+#: dos2unix.pod:484
+msgid "Never use ISO conversion on Unicode text files. It will corrupt UTF-8 encoded files."
+msgstr "Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att korrumpera UTF-8-kodade filer."
+
+#. type: textblock
+#: dos2unix.pod:486
+msgid "Some examples:"
+msgstr "Några exempel:"
+
+#. type: textblock
+#: dos2unix.pod:488
+msgid "Convert from DOS default code page to Unix Latin-1:"
+msgstr "Konvertera från DOS standardteckentabell till Unix Latin-1:"
+
+#. type: verbatim
+#: dos2unix.pod:490
+#, no-wrap
+msgid ""
+" dos2unix -iso -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -iso -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:492
+msgid "Convert from DOS CP850 to Unix Latin-1:"
+msgstr "Konvertera från DOS CP850 till Unix Latin-1:"
+
+#. type: verbatim
+#: dos2unix.pod:494
+#, no-wrap
+msgid ""
+" dos2unix -850 -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -850 -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:496
+msgid "Convert from Windows CP1252 to Unix Latin-1:"
+msgstr "Konvertera från Windows CP1252 till Unix Latin-1:"
+
+#. type: verbatim
+#: dos2unix.pod:498
+#, no-wrap
+msgid ""
+" dos2unix -1252 -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -1252 -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:500
+msgid "Convert from Windows CP1252 to Unix UTF-8 (Unicode):"
+msgstr "Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):"
+
+#. type: verbatim
+#: dos2unix.pod:502
+#, no-wrap
+msgid ""
+" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > out.txt\n"
+"\n"
+msgstr ""
+" iconv -f CP1252 -t UTF-8 in.txt | dos2unix > ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:504
+msgid "Convert from Unix Latin-1 to DOS default code page:"
+msgstr "Konvertera från Unix Latin-1 till DOS-standardteckentabell:"
+
+#. type: verbatim
+#: dos2unix.pod:506
+#, no-wrap
+msgid ""
+" unix2dos -iso -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" unix2dos -iso -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:508
+msgid "Convert from Unix Latin-1 to DOS CP850:"
+msgstr "Konvertera från Unix Latin-1 till DOS CP850:"
+
+#. type: verbatim
+#: dos2unix.pod:510
+#, no-wrap
+msgid ""
+" unix2dos -850 -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" unix2dos -850 -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:512
+msgid "Convert from Unix Latin-1 to Windows CP1252:"
+msgstr "Konvertera från Unix Latin-1 till Windows CP1252:"
+
+#. type: verbatim
+#: dos2unix.pod:514
+#, no-wrap
+msgid ""
+" unix2dos -1252 -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" unix2dos -1252 -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:516
+msgid "Convert from Unix UTF-8 (Unicode) to Windows CP1252:"
+msgstr "Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:"
+
+#. type: verbatim
+#: dos2unix.pod:518
+#, no-wrap
+msgid ""
+" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > out.txt\n"
+"\n"
+msgstr ""
+" unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:520
+msgid "See also L<http://czyborra.com/charsets/codepages.html> and L<http://czyborra.com/charsets/iso8859.html>."
+msgstr "Se även L<http://czyborra.com/charsets/codepages.html> och L<http://czyborra.com/charsets/iso8859.html>."
+
+#. type: =head1
+#: dos2unix.pod:525
+msgid "UNICODE"
+msgstr "UNICODE"
+
+#. type: =head2
+#: dos2unix.pod:527
+msgid "Encodings"
+msgstr "Kodningar"
+
+#. type: textblock
+#: dos2unix.pod:529
+msgid "There exist different Unicode encodings. On Unix and Linux Unicode files are typically encoded in UTF-8 encoding. On Windows Unicode text files can be encoded in UTF-8, UTF-16, or UTF-16 big endian, but are mostly encoded in UTF-16 format."
+msgstr "Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i UTF-16-format."
+
+#. type: =head2
+#: dos2unix.pod:534
+msgid "Conversion"
+msgstr "Konvertering"
+
+#. type: textblock
+#: dos2unix.pod:536
+msgid "Unicode text files can have DOS, Unix or Mac line breaks, like regular text files."
+msgstr "Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som vanliga textfiler."
+
+#. type: textblock
+#: dos2unix.pod:539
+msgid "All versions of dos2unix and unix2dos can convert UTF-8 encoded files, because UTF-8 was designed for backward compatibility with ASCII."
+msgstr "Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII."
+
+#. type: textblock
+#: dos2unix.pod:542
+msgid "Dos2unix and unix2dos with Unicode UTF-16 support, can read little and big endian UTF-16 encoded text files. To see if dos2unix was built with UTF-16 support type C<dos2unix -V>."
+msgstr "Dos2unix och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade textfiler i omvänd och rak byteordning (little och big endian). För att se om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>."
+
+#. type: textblock
+#: dos2unix.pod:546
+msgid "On Unix/Linux UTF-16 encoded files are converted to the locale character encoding. Use the locale(1) command to find out what the locale character encoding is. When conversion is not possible a conversion error will occur and the file will be skipped."
+msgstr "Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens teckenkodning. Använd kommandot locale(1) för att ta reda på vilken lokalens teckenkodning är. När konvertering inte är möjlig kommer ett konverteringsfel att inträffa och filen kommer att hoppas över."
+
+#. type: textblock
+#: dos2unix.pod:551
+msgid "On Windows UTF-16 files are by default converted to UTF-8. UTF-8 formatted text files are well supported on both Windows and Unix/Linux."
+msgstr "Under Windows konverteras UTF-16-filer som standard till UTF-8. UTF-8-formaterade textfiler har bra stöd både under Windows och Unix/Linux."
+
+#. type: textblock
+#: dos2unix.pod:554
+msgid "UTF-16 and UTF-8 encoding are fully compatible, there will no text be lost in the conversion. When an UTF-16 to UTF-8 conversion error occurs, for instance when the UTF-16 input file contains an error, the file will be skipped."
+msgstr "UTF-16- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel uppstår, till exempel när infilen i UTF-16-format innehåller ett fel, kommer att filen att hoppas över."
+
+#. type: textblock
+#: dos2unix.pod:558
+msgid "When option C<-u> is used, the output file will be written in the same UTF-16 encoding as the input file. Option C<-u> prevents conversion to UTF-8."
+msgstr "När flaggan C<-u> används kommer utfilen att skrivas med samma UTF-16-kodning som infilen. Flaggan C<-u> förhindrar konvertering till UTF-8."
+
+#. type: textblock
+#: dos2unix.pod:561
+msgid "Dos2unix and unix2dos have no option to convert UTF-8 files to UTF-16."
+msgstr "Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer till UTF-16."
+
+#. type: textblock
+#: dos2unix.pod:563
+msgid "ISO and 7-bit mode conversion do not work on UTF-16 files."
+msgstr "ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer."
+
+#. type: =head2
+#: dos2unix.pod:565
+msgid "Byte Order Mark"
+msgstr "Byteordningsmarkering (Byte Order Mark)"
+
+#. type: textblock
+#: dos2unix.pod:567
+msgid "On Windows Unicode text files typically have a Byte Order Mark (BOM), because many Windows programs (including Notepad) add BOMs by default. See also L<http://en.wikipedia.org/wiki/Byte_order_mark>."
+msgstr "I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till BOM:ar som standard. Se även L<http://en.wikipedia.org/wiki/Byte_order_mark>."
+
+#. type: textblock
+#: dos2unix.pod:571
+msgid "On Unix Unicode files typically don't have a BOM. It is assumed that text files are encoded in the locale character encoding."
+msgstr "I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i den lokala teckenuppsättningen."
+
+#. type: textblock
+#: dos2unix.pod:574
+msgid "Dos2unix can only detect if a file is in UTF-16 format if the file has a BOM. When an UTF-16 file doesn't have a BOM, dos2unix will see the file as a binary file."
+msgstr "Dos2Unix kan bara detektera om en fil är i UTF-16-format om filen har en BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen som en binärfil."
+
+#. type: textblock
+#: dos2unix.pod:578
+msgid "Use option C<-ul> or C<-ub> to convert an UTF-16 file without BOM."
+msgstr "Använd flaggan C<-ul> eller C<-ub> för att konvertera en UTF-16-fil utan BOM."
+
+#. type: textblock
+#: dos2unix.pod:580
+msgid "Dos2unix writes by default no BOM in the output file. With option C<-b> Dos2unix writes a BOM when the input file has a BOM."
+msgstr "Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan C<-b> kommer Dos2unix att skriva en BOM när infilen har en BOM."
+
+#. type: textblock
+#: dos2unix.pod:583
+msgid "Unix2dos writes by default a BOM in the output file when the input file has a BOM. Use option C<-r> to remove the BOM."
+msgstr "Unix2dos skriver som standard en BOM i utfilen när infilen har en BOM. Använd flaggan C<-r> för att ta bort BOM:en."
+
+#. type: textblock
+#: dos2unix.pod:586
+msgid "Dos2unix and unix2dos write always a BOM when option C<-m> is used."
+msgstr "Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används."
+
+#. type: =head2
+#: dos2unix.pod:588
+msgid "Unicode file names on Windows"
+msgstr "Unicode-filnamn under Windows"
+
+#. type: textblock
+#: dos2unix.pod:590
+msgid "Dos2unix has optional support for reading and writing Unicode file names in the Windows Command Prompt. That means that dos2unix can open files that have characters in the name that are not part of the default system ANSI code page. To see if dos2unix for Windows was built with Unicode file name support type C<dos2unix -V>."
+msgstr "Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har tecken i sina namn som inte är en del av systemets atandard ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för Unicode-filnamn skriv C<dos2unix -V>."
+
+#. type: textblock
+#: dos2unix.pod:596
+msgid "There are some issues with displaying Unicode file names in a Windows console. See option C<-D>, C<--display-enc>. The file names may be displayed wrongly in the console, but the files will be written with the correct name."
+msgstr "Det finns en del problem med att visa Unicode-filnamn i en Windows-konsol. Se vidare flaggan C<-D>, C<--display-enc>. Filnamnen kan visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta namnen."
+
+#. type: =head2
+#: dos2unix.pod:600
+msgid "Unicode examples"
+msgstr "Unicode-exempel"
+
+#. type: textblock
+#: dos2unix.pod:602
+msgid "Convert from Windows UTF-16 (with BOM) to Unix UTF-8:"
+msgstr "Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:"
+
+#. type: verbatim
+#: dos2unix.pod:604
+#, no-wrap
+msgid ""
+" dos2unix -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:606
+msgid "Convert from Windows UTF-16LE (without BOM) to Unix UTF-8:"
+msgstr "Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:"
+
+#. type: verbatim
+#: dos2unix.pod:608
+#, no-wrap
+msgid ""
+" dos2unix -ul -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" dos2unix -ul -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:610
+msgid "Convert from Unix UTF-8 to Windows UTF-8 with BOM:"
+msgstr "Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:"
+
+#. type: verbatim
+#: dos2unix.pod:612
+#, no-wrap
+msgid ""
+" unix2dos -m -n in.txt out.txt\n"
+"\n"
+msgstr ""
+" unix2dos -m -n in.txt ut.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:614
+msgid "Convert from Unix UTF-8 to Windows UTF-16:"
+msgstr "Konvertera från Unix UTF-8 till Windows UTF-16:"
+
+#. type: verbatim
+#: dos2unix.pod:616
+#, no-wrap
+msgid ""
+" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > out.txt\n"
+"\n"
+msgstr ""
+" unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > ut.txt\n"
+"\n"
+
+#. type: =head1
+#: dos2unix.pod:618
+msgid "GB18030"
+msgstr "GB18030"
+
+#. type: textblock
+#: dos2unix.pod:620
+msgid "GB18030 is a Chinese government standard. A mandatory subset of the GB18030 standard is officially required for all software products sold in China. See also L<http://en.wikipedia.org/wiki/GB_18030>."
+msgstr "GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd av standarden GB18030 krävs officiellt för alla programvaruprodukter som säljs i Kina. Se vidare L<http://en.wikipedia.org/wiki/GB_18030>."
+
+#. type: textblock
+#: dos2unix.pod:624
+msgid "GB18030 is fully compatible with Unicode, and can be considered an unicode transformation format. Like UTF-8, GB18030 is compatible with ASCII. GB18030 is also compatible with Windows code page 936, also known as GBK."
+msgstr "GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd som GBK."
+
+#. type: textblock
+#: dos2unix.pod:628
+msgid "On Unix/Linux UTF-16 files are converted to GB18030 when the locale encoding is set to GB18030. Note that this will only work if the locale is supported by the system. Use command C<locale -a> to get the list of supported locales."
+msgstr "Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när lokalens teckenkodning är inställd på GB18030. Notera att detta endast kommer att fungera om lokalen har stöd i systemet. Använd kommandot C<locale -a> för att få en lista över de lokaler som stöds."
+
+#. type: textblock
+#: dos2unix.pod:632
+msgid "On Windows you need to use option C<-gb> to convert UTF-16 files to GB18030."
+msgstr "Under Windows måste du använda flaggan C<-gb> för att konvertera UTF-16-filer till GB18030."
+
+#. type: textblock
+#: dos2unix.pod:634
+msgid "GB18030 encoded files can have a Byte Order Mark, like Unicode files."
+msgstr "GB18030-kodade filer kan ha en byteordningsmarkering, precis som Unicode-filer."
+
+#. type: =head1
+#: dos2unix.pod:636
+msgid "EXAMPLES"
+msgstr "EXEMPEL"
+
+#. type: textblock
+#: dos2unix.pod:638
+msgid "Read input from 'stdin' and write output to 'stdout':"
+msgstr "Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:"
+
+#. type: verbatim
+#: dos2unix.pod:640
+#, no-wrap
+msgid ""
+" dos2unix\n"
+" dos2unix -l -c mac\n"
+"\n"
+msgstr ""
+" dos2unix\n"
+" dos2unix -l -c mac\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:643
+msgid "Convert and replace a.txt. Convert and replace b.txt:"
+msgstr "Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:"
+
+#. type: verbatim
+#: dos2unix.pod:645
+#, no-wrap
+msgid ""
+" dos2unix a.txt b.txt\n"
+" dos2unix -o a.txt b.txt\n"
+"\n"
+msgstr ""
+" dos2unix a.txt b.txt\n"
+" dos2unix -o a.txt b.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:648
+msgid "Convert and replace a.txt in ascii conversion mode:"
+msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge:"
+
+#. type: verbatim
+#: dos2unix.pod:650
+#, no-wrap
+msgid ""
+" dos2unix a.txt\n"
+"\n"
+msgstr ""
+" dos2unix a.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:652
+msgid "Convert and replace a.txt in ascii conversion mode, convert and replace b.txt in 7bit conversion mode:"
+msgstr "Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och ersätt b.txt i 7bit-konverteringsläge:"
+
+#. type: verbatim
+#: dos2unix.pod:655
+#, no-wrap
+msgid ""
+" dos2unix a.txt -c 7bit b.txt\n"
+" dos2unix -c ascii a.txt -c 7bit b.txt\n"
+" dos2unix -ascii a.txt -7 b.txt\n"
+"\n"
+msgstr ""
+" dos2unix a.txt -c 7bit b.txt\n"
+" dos2unix -c ascii a.txt -c 7bit b.txt\n"
+" dos2unix -ascii a.txt -7 b.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:659
+msgid "Convert a.txt from Mac to Unix format:"
+msgstr "Konvertera a.txt från Mac- till Unix-format:"
+
+#. type: verbatim
+#: dos2unix.pod:661
+#, no-wrap
+msgid ""
+" dos2unix -c mac a.txt\n"
+" mac2unix a.txt\n"
+"\n"
+msgstr ""
+" dos2unix -c mac a.txt\n"
+" mac2unix a.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:664
+msgid "Convert a.txt from Unix to Mac format:"
+msgstr "Konvertera a.txt från Unix- till Mac-format:"
+
+#. type: verbatim
+#: dos2unix.pod:666
+#, no-wrap
+msgid ""
+" unix2dos -c mac a.txt\n"
+" unix2mac a.txt\n"
+"\n"
+msgstr ""
+" unix2dos -c mac a.txt\n"
+" unix2mac a.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:669
+msgid "Convert and replace a.txt while keeping original date stamp:"
+msgstr "Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:"
+
+#. type: verbatim
+#: dos2unix.pod:671
+#, no-wrap
+msgid ""
+" dos2unix -k a.txt\n"
+" dos2unix -k -o a.txt\n"
+"\n"
+msgstr ""
+" dos2unix -k a.txt\n"
+" dos2unix -k -o a.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:674
+msgid "Convert a.txt and write to e.txt:"
+msgstr "Konvertera a.txt och skriv till e.txt:"
+
+#. type: verbatim
+#: dos2unix.pod:676
+#, no-wrap
+msgid ""
+" dos2unix -n a.txt e.txt\n"
+"\n"
+msgstr ""
+" dos2unix -n a.txt e.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:678
+msgid "Convert a.txt and write to e.txt, keep date stamp of e.txt same as a.txt:"
+msgstr "Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från a.txt:"
+
+#. type: verbatim
+#: dos2unix.pod:680
+#, no-wrap
+msgid ""
+" dos2unix -k -n a.txt e.txt\n"
+"\n"
+msgstr ""
+" dos2unix -k -n a.txt e.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:682
+msgid "Convert and replace a.txt, convert b.txt and write to e.txt:"
+msgstr "Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:"
+
+#. type: verbatim
+#: dos2unix.pod:684
+#, no-wrap
+msgid ""
+" dos2unix a.txt -n b.txt e.txt\n"
+" dos2unix -o a.txt -n b.txt e.txt\n"
+"\n"
+msgstr ""
+" dos2unix a.txt -n b.txt e.txt\n"
+" dos2unix -o a.txt -n b.txt e.txt\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:687
+msgid "Convert c.txt and write to e.txt, convert and replace a.txt, convert and replace b.txt, convert d.txt and write to f.txt:"
+msgstr "Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt, konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:"
+
+#. type: verbatim
+#: dos2unix.pod:690
+#, no-wrap
+msgid ""
+" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
+"\n"
+msgstr ""
+" dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt\n"
+"\n"
+
+#. type: =head1
+#: dos2unix.pod:692
+msgid "RECURSIVE CONVERSION"
+msgstr "REKURSIV KONVERTERING"
+
+#. type: textblock
+#: dos2unix.pod:694
+msgid "Use dos2unix in combination with the find(1) and xargs(1) commands to recursively convert text files in a directory tree structure. For instance to convert all .txt files in the directory tree under the current directory type:"
+msgstr "Använd dos2unix i kombination med kommandona find(1) och xargs(1) för att rekursivt konvertera filer i en katalogstruktur. För att till exempel konvertera alla .txt-filer i katalogträdet under den aktuella katalogen skriv:"
+
+#. type: verbatim
+#: dos2unix.pod:698
+#, no-wrap
+msgid ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+msgstr ""
+" find . -name '*.txt' |xargs dos2unix\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:700
+msgid "In a Windows Command Prompt the following command can be used:"
+msgstr "I en Windows-kommandoprompt kan följande kommando användas:"
+
+#. type: verbatim
+#: dos2unix.pod:702
+#, no-wrap
+msgid ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
+msgstr ""
+" for /R %G in (*.txt) do dos2unix \"%G\"\n"
+"\n"
+
+#. type: =head1
+#: dos2unix.pod:704
+msgid "LOCALIZATION"
+msgstr "LOKALISERING"
+
+#. type: =item
+#: dos2unix.pod:708
+msgid "B<LANG>"
+msgstr "B<LANG>"
+
+#. type: textblock
+#: dos2unix.pod:710
+msgid "The primary language is selected with the environment variable LANG. The LANG variable consists out of several parts. The first part is in small letters the language code. The second is optional and is the country code in capital letters, preceded with an underscore. There is also an optional third part: character encoding, preceded with a dot. A few examples for POSIX standard type shells:"
+msgstr "Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av flera delas. Den första delen är språkkoden i gemener. Den andra delen är valfri och utgör landskoden i versaler, föregången av ett understreck. Det finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett par exempel för skal av POSIX-standard-typ:"
+
+#. type: verbatim
+#: dos2unix.pod:717
+#, no-wrap
+msgid ""
+" export LANG=nl Dutch\n"
+" export LANG=nl_NL Dutch, The Netherlands\n"
+" export LANG=nl_BE Dutch, Belgium\n"
+" export LANG=es_ES Spanish, Spain\n"
+" export LANG=es_MX Spanish, Mexico\n"
+" export LANG=en_US.iso88591 English, USA, Latin-1 encoding\n"
+" export LANG=en_GB.UTF-8 English, UK, UTF-8 encoding\n"
+"\n"
+msgstr ""
+" export LANG=nl Nederländska\n"
+" export LANG=nl_NL Nederländska, Nederländerna\n"
+" export LANG=nl_BE Nederländska, Belgien\n"
+" export LANG=es_ES Spanska, Spanien\n"
+" export LANG=es_MX Spanska, Mexiko\n"
+" export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning\n"
+" export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning\n"
+"\n"
+
+#. type: textblock
+#: dos2unix.pod:725
+msgid "For a complete list of language and country codes see the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
+msgstr "För en fullständig lista över språk och landskoder se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>"
+
+#. type: textblock
+#: dos2unix.pod:728
+msgid "On Unix systems you can use the command locale(1) to get locale specific information."
+msgstr "På Unix-system kan du använda kommando locale(1) för att få lokal-specifik information."
+
+#. type: =item
+#: dos2unix.pod:731
+msgid "B<LANGUAGE>"
+msgstr "B<LANGUAGE>"
+
+#. type: textblock
+#: dos2unix.pod:733
+msgid "With the LANGUAGE environment variable you can specify a priority list of languages, separated by colons. Dos2unix gives preference to LANGUAGE over LANG. For instance, first Dutch and then German: C<LANGUAGE=nl:de>. You have to first enable localization, by setting LANG (or LC_ALL) to a value other than \"C\", before you can use a language priority list through the LANGUAGE variable. See also the gettext manual: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
+msgstr "Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk, separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska: C<LANGUAGE=nl:de>. Du måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se vidare i gettext-manualen: L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>"
+
+#. type: textblock
+#: dos2unix.pod:741
+msgid "If you select a language which is not available you will get the standard English messages."
+msgstr "Om du väljer ett språk som inte är tillgänglig kommer du att få engelska meddelanden som standard."
+
+#. type: =item
+#: dos2unix.pod:745
+msgid "B<DOS2UNIX_LOCALEDIR>"
+msgstr "B<DOS2UNIX_LOCALEDIR>"
+
+#. type: textblock
+#: dos2unix.pod:747
+msgid "With the environment variable DOS2UNIX_LOCALEDIR the LOCALEDIR set during compilation can be overruled. LOCALEDIR is used to find the language files. The GNU default value is C</usr/local/share/locale>. Option B<--version> will display the LOCALEDIR that is used."
+msgstr "Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in vid kompilering åsidosättas. LOCALEDIR används för att hitta språkfiler. Standardvärdet för GNU-program är C</usr/local/share/locale>. Flaggan B<--version> kommer att visa vilken LOCALEDIR som används."
+
+#. type: textblock
+#: dos2unix.pod:752
+msgid "Example (POSIX shell):"
+msgstr "Exempel (POSIX-skal):"
+
+#. type: verbatim
+#: dos2unix.pod:754
+#, no-wrap
+msgid ""
+" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
+"\n"
+msgstr ""
+" export DOS2UNIX_LOCALEDIR=$HOME/share/locale\n"
+"\n"
+
+#. type: =head1
+#: dos2unix.pod:759
+msgid "RETURN VALUE"
+msgstr "RETURVÄRDE"
+
+#. type: textblock
+#: dos2unix.pod:761
+msgid "On success, zero is returned. When a system error occurs the last system error will be returned. For other errors 1 is returned."
+msgstr "Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer det senaste systemfelet att returneras. För andra fel kommer 1 att returneras."
+
+#. type: textblock
+#: dos2unix.pod:764
+msgid "The return value is always zero in quiet mode, except when wrong command-line options are used."
+msgstr "Returvärdet är alltid noll i tystläge, utom när felaktiga kommandoradsflaggor används."
+
+#. type: =head1
+#: dos2unix.pod:767
+msgid "STANDARDS"
+msgstr "STANDARDER"
+
+#. type: textblock
+#: dos2unix.pod:769
+msgid "L<http://en.wikipedia.org/wiki/Text_file>"
+msgstr "L<http://en.wikipedia.org/wiki/Text_file>"
+
+#. type: textblock
+#: dos2unix.pod:771
+msgid "L<http://en.wikipedia.org/wiki/Carriage_return>"
+msgstr "L<http://en.wikipedia.org/wiki/Carriage_return>"
+
+#. type: textblock
+#: dos2unix.pod:773
+msgid "L<http://en.wikipedia.org/wiki/Newline>"
+msgstr "L<http://en.wikipedia.org/wiki/Newline>"
+
+#. type: textblock
+#: dos2unix.pod:775
+msgid "L<http://en.wikipedia.org/wiki/Unicode>"
+msgstr "L<http://en.wikipedia.org/wiki/Unicode>"
+
+#. type: =head1
+#: dos2unix.pod:777
+msgid "AUTHORS"
+msgstr "FÖRFATTARE"
+
+#. type: textblock
+#: dos2unix.pod:779
+msgid "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix mode) - <wuebben@kde.org>, Christian Wurll (add extra newline) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (maintainer)"
+msgstr "Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben (mac2unix-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl> (upphovsman)"
+
+#. type: textblock
+#: dos2unix.pod:784
+msgid "Project page: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
+msgstr "Projektsida: L<http://waterlan.home.xs4all.nl/dos2unix.html>"
+
+#. type: textblock
+#: dos2unix.pod:786
+msgid "SourceForge page: L<http://sourceforge.net/projects/dos2unix/>"
+msgstr "SourceForge-sida: L<http://sourceforge.net/projects/dos2unix/>"
+
+#. type: =head1
+#: dos2unix.pod:788
+msgid "SEE ALSO"
+msgstr "SE ÄVEN"
+
+#. type: textblock
+#: dos2unix.pod:790
+msgid "file(1) find(1) iconv(1) locale(1) xargs(1)"
+msgstr "file(1) find(1) iconv(1) locale(1) xargs(1)"
diff --git a/man/sv/man1/dos2unix.pod b/man/sv/man1/dos2unix.pod
new file mode 100644
index 0000000..e6ed68d
--- /dev/null
+++ b/man/sv/man1/dos2unix.pod
@@ -0,0 +1,790 @@
+
+ *****************************************************
+ * GENERATED FILE, DO NOT EDIT *
+ * THIS IS NO SOURCE FILE, BUT RESULT OF COMPILATION *
+ *****************************************************
+
+This file was generated by po4a(7). Do not store it (in VCS, for example),
+but store the PO file used as source file by po4a-translate.
+
+In fact, consider this as a binary, and the PO file as a regular .c file:
+If the PO get lost, keeping this translation up-to-date will be harder.
+
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAMN
+
+dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice versa
+
+=head1 SYNOPSIS
+
+ dos2unix [flaggor] [FIL …] [-n INFIL UTFIL …]
+ unix2dos [flaggor] [FIL …] [-n INFIL UTFIL …]
+
+=head1 BESKRIVNING
+
+Paketet Dos2unix inkluderar verktygen C<dos2unix> och C<unix2dos> som
+konverterar oformaterade textfiler i DOS- eller Mac-format till Unix format
+och vice versa.
+
+Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är en
+kombination av två tecken: vagnretur (Carriage Return, CR) åtföljt av
+radmatning (Line Feed, LF). Textfiler i Unix har en radbrytning som är ett
+enda tecken: radmatning (Line Feed, LF). Textfiler för Mac, innan Mac OS X,
+hade en radbrytning som var en enda vagnretur (Carriage Return, CR). Numera
+använder Mac OS radbrytning i Unix-stil (LF).
+
+Förutom radbrytningar så kan Dos2unix också konvertera filers kodning. Några
+DOS-teckentabeller kan konverteras till Unix Latin-1. Och filer som använder
+Windows Unicode (UTF-16) kan konverteras till Unix Unicode (UTF-8).
+
+Binära filer hoppas över automatiskt, om inte konvertering tvingas.
+
+Kataloger och FIFOs och andra filer som inte är vanliga filer hoppas över
+automatiskt.
+
+Symboliska länkar och deras mål förblir oförändrade som standard. Symboliska
+länkar kan valfritt bli ersatta eller så kan utmatningen skrivas till målet
+för den symboliska länken. På Windows saknas stöd för att skriva till målet
+för en symbolisk länk.
+
+Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en viktig
+skillnad gentemot originalversionen för SunOS/Solaris. Denna versionen gör
+som standard konverteringen på plats (gammalfilsläge), medan
+originalversionen från SunOS/Solaris bara hade stöd för parad konvertering
+(nyfilsläge). Se vidare flaggorna C<-o> och C<-n>.
+
+=head1 FLAGGOR
+
+=over 4
+
+=item B<-->
+
+Behandla alla efterföljande flaggor som filnamn. Använd denna flagg om du
+vill konvertera filer vars namn börjar med bindestreck. För att till exempel
+konvertera en fil med namnet “-foo“ kan du använda detta kommando:
+
+ dos2unix -- -foo
+
+Eller i nyfilsläge:
+
+ dos2unix -n -- -foo out.txt
+
+=item B<-ascii>
+
+Konvertera enbart radbrytningar. Detta är standardkonverteringsläget.
+
+=item B<-iso>
+
+Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare stycket
+KONVERTERINGSLÄGEN.
+
+=item B<-1252>
+
+Använd Windows-teckentabell 1252 (Västeuropeisk).
+
+=item B<-437>
+
+Använd DOS-teckentabell 437 (USA). Detta är standardteckentabellen som
+används för ISO-konvertering.
+
+=item B<-850>
+
+Använd DOS-teckentabell 850 (Västeuropeisk).
+
+=item B<-860>
+
+Använd DOS-teckentabell 860 (Portugisisk).
+
+=item B<-863>
+
+Använd DOS-teckentabell 863 (Fransk-kanadensisk).
+
+=item B<-865>
+
+Använd DOS-teckentabell 865 (Nordisk).
+
+=item B<-7>
+
+Konvertera 8-bitars tecken till 7-bitars blanksteg.
+
+=item B<-b, --keep-bom>
+
+Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har en BOM,
+skriv en BOM i utfilen. Detta är standardbeteendet vid konvertering av
+DOS-radbrytningar. Se vidare flaggan C<-r>.
+
+=item B<-c, --convmode KONVERTERINGLÄGE>
+
+Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av: I<ascii>,
+I<7bit>, I<iso>, I<mac> där ascii är standard.
+
+=item B<-D, --display-enc KODNING>
+
+Ställ in kodning för visad text. Där KODNING är en av: I<ansi>, I<unicode>,
+I<utf8> där ansi är standardvalet.
+
+Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd för
+Unicode-filnamn. Denna flagga har ingen effekt på själva filnamnen som läses
+och skrivs, bara på hur de visas.
+
+Det finns flera metoder för att visa text i en Windows-konsol baserad på
+vilken kodning texten har. De har alla för- och nackdelar.
+
+
+
+=over 4
+
+=item B<ansi>
+
+Dos2unix standardmetod är att använda ANSI-kodad text. Fördelen är att den
+är bakåtkompatibel. Det fungerar med raster- och TrueType-teckensnitt. I
+vissa regioner kan du behöva ändra den aktiva DOS OEM-teckentabellen till
+Windows-systemets ANSI-teckentabell genom att använda kommandot C<chcp>,
+eftersom dos2unix använder Windows-systemets teckentabell.
+
+Nackdelen med ansi är att internationella filnamn med tecken som inte finns
+i systemets standardteckentabell inte visas korrekt. Du kommer att se
+frågetecken, eller en felaktig symbol istället. När du inte arbetar med
+utländska filnamn är denna metoden OK.
+
+=item B<unicode>
+
+Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att text
+vanligtvis visas korrekt. Det finns inget behov av att ändra den aktiva
+teckentabellen. Du kan behöva ställa in konsolens teckensnitt till ett
+TrueType-teckensnitt för att få internationella tecken att visas
+korrekt. När ett tecken inte finns inkluderat i TrueType-teckensnittet
+kommer du vanligtvis att se en liten ruta, ibland med ett frågetecken inuti.
+
+När du använder ConEmu-konsolen kommer all text att visas korrekt eftersom
+ConEmu automatiskt väljer ett bra teckensnitt.
+
+Nackdelen med unicode är att den inte är kompatibel med ASCII. Utmatningen
+är inte lätt att hantera när du omdirigerar den till ett annat program eller
+en fil. Omdirigering till en fil kommer inte att ge en korrekt UTF-16-fil.
+
+=item B<utf8>
+
+Fördelen med utf8 är att den är kompatibel med ASCII och när du omdirigerar
+den till en fil kommer du att få en korrekt UTF-8-fil. Du måste ställa in
+konsolens teckensnitt till ett TrueType-teckensnitt. Med ett
+TrueType-teckensnitt kommer text att visas på liknande sätt som med
+C<unicode>-kodningen.
+
+Nackdelen är att när du använder standardrasterteckensnittet kommer alla
+icke-ASCII tecken att visas fel. Inte enbart unicode-filnamn, utan också
+översatta meddelanden kommer att bli oläsbara. Under Windows som
+konfigurerats för Östasien kan man komma att se många blinkningar i konsolen
+när meddelanden visas.
+
+I ConEmu-konsolen fungerar utf8-kodningsmetoden väl.
+
+=back
+
+Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC genom
+att sätta den till C<unicode> eller C<utf8>.
+
+=item B<-f, --force>
+
+Tvinga konvertering av binära filer.
+
+=item B<-gb, --gb18030>
+
+Under Windows konverteras UTF-16-filer som standard till UTF-8, oavsett
+vilken lokalinställning som är gjord. Använd denna flagga för att konvertera
+UTF-16-filer till GB18030. Denna flagga finns bara tillgänglig i Windows. Se
+vidare i avsnittet GB18030.
+
+=item B<-h, --help>
+
+Visa hjälptext och avsluta.
+
+=item B<-i[FLAGGOR], --info[=FLAGGOR] FIL ...>
+
+Visa filinformation. Ingen konvertering görs.
+
+Följande information skrivs ut, i denna ordningen: antal DOS-radbrytningar,
+antal Unix-radbrytningar, antal Mac-radbrytningar, byteordningsmarkeringen,
+text eller binär, filnamn.
+
+Exempelutmatning:
+
+ 6 0 0 no_bom text dos.txt
+ 0 6 0 no_bom text unix.txt
+ 0 0 6 no_bom text mac.txt
+ 6 6 6 no_bom text mixed.txt
+ 50 0 0 UTF-16LE text utf16le.txt
+ 0 50 0 no_bom text utf8unix.txt
+ 50 0 0 UTF-8 text utf8dos.txt
+ 2 418 219 no_bom binär dos2unix.exe
+
+Extra flaggor kan användas valfritt för att ändra utmatningen. En eller fler
+flaggor kan läggas till.
+
+=over 4
+
+=item B<d>
+
+Skriv ut antal DOS-radbrytningar.
+
+=item B<u>
+
+Skriv ut antal Unix-radbrytningar.
+
+=item B<m>
+
+Skriv ut antal Mac-radbrytningar.
+
+=item B<b>
+
+Skriv ut byteordningsmarkeringen.
+
+=item B<t>
+
+Skriv ut om filen är text eller binär.
+
+=item B<c>
+
+Skriv bara ut filerna som skulle ha konverterats.
+
+Med C<c>-flaggan kommer dos2unix att skriva ut filerna som innehåller
+DOS-radbrytningar, unix2dos kommer bara att skriva ut filnamn som har
+Unix-radbrytningar.
+
+=back
+
+Exempel:
+
+Visa information för alla *.txt-filer:
+
+ dos2unix -i *.txt
+
+Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:
+
+ dos2unix -idu *.txt
+
+Visa bara byteordningsmarkeringen:
+
+ dos2unix --info=b *.txt
+
+Lista filerna som har DOS-radbrytningar:
+
+ dos2unix -ic *.txt
+
+Lista filerna som har Unix-radbrytningar:
+
+ unix2dos -ic *.txt
+
+Konvertera endast filer som har DOS-radbrytningar och lämna övriga filer
+orörda:
+
+ dos2unix -ic *.txt | xargs dos2unix
+
+Hitta textfiler som har DOS-radbrytningar:
+
+ find -name '*.txt' | xargs dos2unix -ic
+
+=item B<-k, --keepdate>
+
+Behåll infilens datumstämpel för utfilen.
+
+=item B<-L, --license>
+
+Visa programmets licens.
+
+=item B<-l, --newline>
+
+Lägg till ytterligare nyrad.
+
+B<dos2unix>: Endast DOS-radbrytningar ändras till två Unix-radbrytningar. I
+Mac-läge ändras endast Mac-radbrytningar till två Unix-radbrytningar.
+
+B<unix2dos>: Endast Unix-radbrytningar ändras till två DOS-radbrytningar. I
+Mac-läge ändras Unix-radbrytningar till två Mac-radbrytningar.
+
+=item B<-m, --add-bom>
+
+Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som
+standard skrivs en UTF-8 BOM.
+
+När infilen är UTF-16, och flaggan C<-u> används, kommer en UTF-16 BOM att
+skrivas.
+
+Använd aldrig denna flagga när kodningen för utmatning är något annat än
+UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE.
+
+
+
+=item B<-n, --newfile INFIL UTFIL …>
+
+Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL. Filnamnen måste
+ange i par och jokertecken i namnen ska I<inte> användas annars I<kommer> du
+att förlora filer.
+
+Användaren som påbörjar konverteringen i nyfilsläge (paratläge) kommer att
+bli ägaren till den konverterade filen. Läs-/skrivbehörigheter för den nya
+filen kommer att vara samma behörigheter som för originalfilen minus
+umask(1) för användaren som kör konverteringen.
+
+=item B<-o, --oldfile FIL …>
+
+Gammalfilsläge. Konvertera filen FIL och skriv över den med
+utmatningen. Programmet kör i detta läge som standard. Jokertecken i filnamn
+får användas.
+
+I gammalfilsläge (på-plats läge) kommer den konverterade filen att få samma
+ägare, grupp samt läs-/skrivbehörigheter som originalfilen. Även då filen
+konverteras av en annan användare som har skrivbehörighet för filen
+(t.ex. användaren root). Konverteringen kommer att avbrytas när det inte är
+möjligt att bevara originalvärdena. Byte av ägare skulle kunna innebära att
+originalägaren inte längre kan läsa filen. Byte av grupp skulle kunna vara
+en säkerhetsrisk, filen skulle kunna bli läsbar för användare som den inte
+är avsedd för. Stöd för bevarande av ägare, grupp och
+läs-/skrivbehörigheter finns bara i Unix.
+
+=item B<-q, --quiet>
+
+Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet är
+noll. Utom när felaktiga kommandoradsflaggor används.
+
+=item B<-r, --remove-bom>
+
+Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en BOM i
+utfilen. Detta är standardbeteende vid konvertering av Unix-radbrytningar.
+Se vidare flaggan C<-b>.
+
+=item B<-s, --safe>
+
+Hoppa över binära filer (standard).
+
+=item B<-u, --keep-utf16>
+
+Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas med
+samma UTF-16-kodning som infilen, omvänd eller rak byteordning (little eller
+big endian). Detta förhindrar transformation till UTF-8. En UTF-16 BOM
+kommer att skrivas i enlighet med detta. Denna flagga kan inaktiveras med
+C<-ascii>-flaggan.
+
+=item B<-ul, --assume-utf16le>
+
+Antag att infilsformatet är UTF-16LE.
+
+När det finns en byteordningsmarkering (Byte Order Mark) i infilen så har
+BOM:en högre prioritet än denna flagga.
+
+När du har gjort fel antagande (infilen var inte i UTF-16LE-format) och
+konverteringens lyckas, kommer du att få en UTF-8 utfil med felaktig
+text. Du kan göra denna konvertering ogjord med iconv(1) genom att
+konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta kommer att återskapa
+originalfilen.
+
+Antagandet om UTF-16LE fungerar som ett I<konverteringsläge>. Genom att
+växla till standard I<ascii>-läget kommer UTF-16LE antagandet att stängas
+av.
+
+=item B<-ub, --assume-utf16be>
+
+Antag att infilsformatet är UTF-16BE.
+
+Denna flagga fungerar på samma sätt som flaggan C<-ul>.
+
+=item B<-v, --verbose>
+
+Visa utförliga meddelanden. Extra information visas om
+byteordningsmarkeringar och antalet konverterade radbrytningar.
+
+=item B<-F, --follow-symlink>
+
+Följ symboliska länkar och konvertera målen.
+
+=item B<-R, --replace-symlink>
+
+Ersätt symboliska länkar med konverterade filer (original målfilerna förblir
+oförändrade).
+
+=item B<-S, --skip-symlink>
+
+Behåll symboliska länkar och mål oförändrade (standard).
+
+=item B<-V, --version>
+
+Visa versionsinformation och avsluta.
+
+=back
+
+=head1 MAC-LÄGE
+
+I normalläge konverteras radbrytningar från DOS till Unix och vice
+versa. Mac-radbrytningar konverteras inte.
+
+I Mac-läge konverteras radbrytningar från Mac till Unix och vice
+versa. DOS-radbrytningar ändras ej.
+
+För att köra i Mac-läge använd kommandoradsflaggan C<-c mac> eller använd
+kommandona C<mac2unix> eller C<unix2mac>.
+
+=head1 KONVERTERINGSLÄGEN
+
+=over 4
+
+=item B<ascii>
+
+I läget C<ascii> konverteras enbart radbrytningar. Detta är
+standardkonverteringsläget.
+
+Även om namnet på detta läge är ASCII, vilket är en 7-bitarsstandard, så är
+det läget egentligen ett 8-bitarsläge. Använd alltid detta läge vid
+konvertering av Unicode UTF-8-filer.
+
+=item B<7bit>
+
+I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden från
+128 till 255) till ett 7-bitars blanksteg.
+
+=item B<iso>
+
+Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och ISO
+teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan motsvarande
+ISO-8859-1 tecken, för vilka konvertering är omöjligt, kommer att ersättas
+med en punkt. Detsamma gäller för ISO-8859-1 tecken utan motsvarighet i DOS.
+
+När enbart flaggan C<-iso> används kommer dos2unix att försöka avgöra den
+aktiva teckentabellen. När detta inte är möjligt kommer dos2unix att använda
+standardteckentabellen CP437, vilken huvudsakligen används i USA. För att
+tvinga en specifik tackentabell använd flaggorna C<-437> (USA), C<-850>
+(Västeuropeisk), C<-860> (Portugisisk), C<-863> (Fransk-kanadensisk) eller
+C<-865> (Nordisk). Det finns också stöd för Windows-teckentabell CP-1252
+(Västeuropeisk) via flaggan C<-1252>. För andra teckentabeller använd
+dos2unix i kombination med iconv(1). iconv kan konvertera mellan en lång
+lista av teckenkodningar.
+
+Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att
+korrumpera UTF-8-kodade filer.
+
+Några exempel:
+
+Konvertera från DOS standardteckentabell till Unix Latin-1:
+
+ dos2unix -iso -n in.txt ut.txt
+
+Konvertera från DOS CP850 till Unix Latin-1:
+
+ dos2unix -850 -n in.txt ut.txt
+
+Konvertera från Windows CP1252 till Unix Latin-1:
+
+ dos2unix -1252 -n in.txt ut.txt
+
+Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):
+
+ iconv -f CP1252 -t UTF-8 in.txt | dos2unix > ut.txt
+
+Konvertera från Unix Latin-1 till DOS-standardteckentabell:
+
+ unix2dos -iso -n in.txt ut.txt
+
+Konvertera från Unix Latin-1 till DOS CP850:
+
+ unix2dos -850 -n in.txt ut.txt
+
+Konvertera från Unix Latin-1 till Windows CP1252:
+
+ unix2dos -1252 -n in.txt ut.txt
+
+Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:
+
+ unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > ut.txt
+
+Se även L<http://czyborra.com/charsets/codepages.html> och
+L<http://czyborra.com/charsets/iso8859.html>.
+
+=back
+
+=head1 UNICODE
+
+=head2 Kodningar
+
+Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i UTF-8,
+UTF-16 eller UTF-16 rak byteordning (big endian), men kodas mestadels i
+UTF-16-format.
+
+=head2 Konvertering
+
+Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som
+vanliga textfiler.
+
+Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade filer,
+eftersom UTF-8 designades för bakåtkompatibilitet med ASCII.
+
+Dos2unix och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade
+textfiler i omvänd och rak byteordning (little och big endian). För att se
+om dos2unix byggts med UTF-16-stöd skriv C<dos2unix -V>.
+
+Under Unix/Linux kommer UTF-16-kodade filer att konverteras till lokalens
+teckenkodning. Använd kommandot locale(1) för att ta reda på vilken lokalens
+teckenkodning är. När konvertering inte är möjlig kommer ett
+konverteringsfel att inträffa och filen kommer att hoppas över.
+
+Under Windows konverteras UTF-16-filer som standard till
+UTF-8. UTF-8-formaterade textfiler har bra stöd både under Windows och
+Unix/Linux.
+
+UTF-16- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå
+förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel
+uppstår, till exempel när infilen i UTF-16-format innehåller ett fel, kommer
+att filen att hoppas över.
+
+När flaggan C<-u> används kommer utfilen att skrivas med samma
+UTF-16-kodning som infilen. Flaggan C<-u> förhindrar konvertering till
+UTF-8.
+
+Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer till
+UTF-16.
+
+ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer.
+
+=head2 Byteordningsmarkering (Byte Order Mark)
+
+I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte Order
+Mark, BOM) eftersom många Windows-program (inklusive Notepad) lägger till
+BOM:ar som standard. Se även
+L<http://en.wikipedia.org/wiki/Byte_order_mark>.
+
+I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade i
+den lokala teckenuppsättningen.
+
+Dos2Unix kan bara detektera om en fil är i UTF-16-format om filen har en
+BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen som
+en binärfil.
+
+Använd flaggan C<-ul> eller C<-ub> för att konvertera en UTF-16-fil utan
+BOM.
+
+Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan C<-b> kommer
+Dos2unix att skriva en BOM när infilen har en BOM.
+
+Unix2dos skriver som standard en BOM i utfilen när infilen har en
+BOM. Använd flaggan C<-r> för att ta bort BOM:en.
+
+Dos2unix och unix2dos skriver alltid en BOM när flaggan C<-m> används.
+
+=head2 Unicode-filnamn under Windows
+
+Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn i
+Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som har
+tecken i sina namn som inte är en del av systemets atandard
+ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd för
+Unicode-filnamn skriv C<dos2unix -V>.
+
+Det finns en del problem med att visa Unicode-filnamn i en
+Windows-konsol. Se vidare flaggan C<-D>, C<--display-enc>. Filnamnen kan
+visas felaktigt i konsolen, men filerna som skrivs kommer att ha de korrekta
+namnen.
+
+=head2 Unicode-exempel
+
+Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:
+
+ dos2unix -n in.txt ut.txt
+
+Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:
+
+ dos2unix -ul -n in.txt ut.txt
+
+Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:
+
+ unix2dos -m -n in.txt ut.txt
+
+Konvertera från Unix UTF-8 till Windows UTF-16:
+
+ unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > ut.txt
+
+=head1 GB18030
+
+GB18030 är en standard från Kinesiska regeringen. En obligatorisk delmängd
+av standarden GB18030 krävs officiellt för alla programvaruprodukter som
+säljs i Kina. Se vidare L<http://en.wikipedia.org/wiki/GB_18030>.
+
+GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett
+överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel med
+ASCII. GB18030 är också kompatibel med Windows-teckentabell 936, också känd
+som GBK.
+
+Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när
+lokalens teckenkodning är inställd på GB18030. Notera att detta endast
+kommer att fungera om lokalen har stöd i systemet. Använd kommandot C<locale
+-a> för att få en lista över de lokaler som stöds.
+
+Under Windows måste du använda flaggan C<-gb> för att konvertera
+UTF-16-filer till GB18030.
+
+GB18030-kodade filer kan ha en byteordningsmarkering, precis som
+Unicode-filer.
+
+=head1 EXEMPEL
+
+Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
+
+ dos2unix
+ dos2unix -l -c mac
+
+Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
+
+ dos2unix a.txt b.txt
+ dos2unix -o a.txt b.txt
+
+Konvertera och ersätt a.txt i ascii-konverteringsläge:
+
+ dos2unix a.txt
+
+Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och ersätt
+b.txt i 7bit-konverteringsläge:
+
+ dos2unix a.txt -c 7bit b.txt
+ dos2unix -c ascii a.txt -c 7bit b.txt
+ dos2unix -ascii a.txt -7 b.txt
+
+Konvertera a.txt från Mac- till Unix-format:
+
+ dos2unix -c mac a.txt
+ mac2unix a.txt
+
+Konvertera a.txt från Unix- till Mac-format:
+
+ unix2dos -c mac a.txt
+ unix2mac a.txt
+
+Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:
+
+ dos2unix -k a.txt
+ dos2unix -k -o a.txt
+
+Konvertera a.txt och skriv till e.txt:
+
+ dos2unix -n a.txt e.txt
+
+Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln från
+a.txt:
+
+ dos2unix -k -n a.txt e.txt
+
+Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:
+
+ dos2unix a.txt -n b.txt e.txt
+ dos2unix -o a.txt -n b.txt e.txt
+
+Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt,
+konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:
+
+ dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt
+
+=head1 REKURSIV KONVERTERING
+
+Använd dos2unix i kombination med kommandona find(1) och xargs(1) för att
+rekursivt konvertera filer i en katalogstruktur. För att till exempel
+konvertera alla .txt-filer i katalogträdet under den aktuella katalogen
+skriv:
+
+ find . -name '*.txt' |xargs dos2unix
+
+I en Windows-kommandoprompt kan följande kommando användas:
+
+ for /R %G in (*.txt) do dos2unix "%G"
+
+=head1 LOKALISERING
+
+=over 4
+
+=item B<LANG>
+
+Det primära språket väljs med miljövariabeln LANG. LANG-variabeln består av
+flera delas. Den första delen är språkkoden i gemener. Den andra delen är
+valfri och utgör landskoden i versaler, föregången av ett understreck. Det
+finns också en valfri tredje del: teckenkodning, föregången av en punkt. Ett
+par exempel för skal av POSIX-standard-typ:
+
+ export LANG=nl Nederländska
+ export LANG=nl_NL Nederländska, Nederländerna
+ export LANG=nl_BE Nederländska, Belgien
+ export LANG=es_ES Spanska, Spanien
+ export LANG=es_MX Spanska, Mexiko
+ export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning
+ export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning
+
+För en fullständig lista över språk och landskoder se vidare i
+gettext-manualen:
+L<http://www.gnu.org/software/gettext/manual/html_node/Usual-Language-Codes.html>
+
+På Unix-system kan du använda kommando locale(1) för att få lokal-specifik
+information.
+
+=item B<LANGUAGE>
+
+Med miljövariabeln LANGUAGE kan du ange en prioritetslista över språk,
+separerade med kolon. Dos2unix kommer att ge företräde till LANGAUGE över
+LANG. Exempelvis först nederländska och sedan tyska: C<LANGUAGE=nl:de>. Du
+måste först ha aktiverat lokalisering, genom att sätta LANG (eller LC_ALL)
+till ett värde annat än “C“, innan du kan använda en prioritetslista för
+språk via LANGUAGE-variabeln. Se vidare i gettext-manualen:
+L<http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-variable.html>
+
+Om du väljer ett språk som inte är tillgänglig kommer du att få engelska
+meddelanden som standard.
+
+
+
+=item B<DOS2UNIX_LOCALEDIR>
+
+Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in vid
+kompilering åsidosättas. LOCALEDIR används för att hitta
+språkfiler. Standardvärdet för GNU-program är
+C</usr/local/share/locale>. Flaggan B<--version> kommer att visa vilken
+LOCALEDIR som används.
+
+Exempel (POSIX-skal):
+
+ export DOS2UNIX_LOCALEDIR=$HOME/share/locale
+
+=back
+
+
+
+=head1 RETURVÄRDE
+
+Om allt går bra kommer noll att returneras. När ett systemfel uppstår kommer
+det senaste systemfelet att returneras. För andra fel kommer 1 att
+returneras.
+
+Returvärdet är alltid noll i tystläge, utom när felaktiga
+kommandoradsflaggor används.
+
+=head1 STANDARDER
+
+L<http://en.wikipedia.org/wiki/Text_file>
+
+L<http://en.wikipedia.org/wiki/Carriage_return>
+
+L<http://en.wikipedia.org/wiki/Newline>
+
+L<http://en.wikipedia.org/wiki/Unicode>
+
+=head1 FÖRFATTARE
+
+Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben
+(mac2unix-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra
+radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander - <waterlan@xs4all.nl>
+(upphovsman)
+
+Projektsida: L<http://waterlan.home.xs4all.nl/dos2unix.html>
+
+SourceForge-sida: L<http://sourceforge.net/projects/dos2unix/>
+
+=head1 SE ÄVEN
+
+file(1) find(1) iconv(1) locale(1) xargs(1)
+
diff --git a/man/sv/man1/dos2unix.txt b/man/sv/man1/dos2unix.txt
new file mode 100644
index 0000000..dc189ca
--- /dev/null
+++ b/man/sv/man1/dos2unix.txt
@@ -0,0 +1,686 @@
+NAMN
+ dos2unix - textfilsformatskonverterare från DOS/Mac till Unix och vice
+ versa
+
+SYNOPSIS
+ dos2unix [flaggor] [FIL …] [-n INFIL UTFIL …]
+ unix2dos [flaggor] [FIL …] [-n INFIL UTFIL …]
+
+BESKRIVNING
+ Paketet Dos2unix inkluderar verktygen "dos2unix" och "unix2dos" som
+ konverterar oformaterade textfiler i DOS- eller Mac-format till Unix
+ format och vice versa.
+
+ Textfiler i DOS/Windows har en radbrytning, också känd som nyrad, som är
+ en kombination av två tecken: vagnretur (Carriage Return, CR) åtföljt av
+ radmatning (Line Feed, LF). Textfiler i Unix har en radbrytning som är
+ ett enda tecken: radmatning (Line Feed, LF). Textfiler för Mac, innan
+ Mac OS X, hade en radbrytning som var en enda vagnretur (Carriage
+ Return, CR). Numera använder Mac OS radbrytning i Unix-stil (LF).
+
+ Förutom radbrytningar så kan Dos2unix också konvertera filers kodning.
+ Några DOS-teckentabeller kan konverteras till Unix Latin-1. Och filer
+ som använder Windows Unicode (UTF-16) kan konverteras till Unix Unicode
+ (UTF-8).
+
+ Binära filer hoppas över automatiskt, om inte konvertering tvingas.
+
+ Kataloger och FIFOs och andra filer som inte är vanliga filer hoppas
+ över automatiskt.
+
+ Symboliska länkar och deras mål förblir oförändrade som standard.
+ Symboliska länkar kan valfritt bli ersatta eller så kan utmatningen
+ skrivas till målet för den symboliska länken. På Windows saknas stöd för
+ att skriva till målet för en symbolisk länk.
+
+ Dos2unix modellerades efter dos2unix från SunOS/Solaris. Det finns en
+ viktig skillnad gentemot originalversionen för SunOS/Solaris. Denna
+ versionen gör som standard konverteringen på plats (gammalfilsläge),
+ medan originalversionen från SunOS/Solaris bara hade stöd för parad
+ konvertering (nyfilsläge). Se vidare flaggorna "-o" och "-n".
+
+FLAGGOR
+ -- Behandla alla efterföljande flaggor som filnamn. Använd denna flagg
+ om du vill konvertera filer vars namn börjar med bindestreck. För
+ att till exempel konvertera en fil med namnet “-foo“ kan du använda
+ detta kommando:
+
+ dos2unix -- -foo
+
+ Eller i nyfilsläge:
+
+ dos2unix -n -- -foo out.txt
+
+ -ascii
+ Konvertera enbart radbrytningar. Detta är
+ standardkonverteringsläget.
+
+ -iso
+ Konvertering mellan DOS- och ISO-8859-1-teckentabeller. Se vidare
+ stycket KONVERTERINGSLÄGEN.
+
+ -1252
+ Använd Windows-teckentabell 1252 (Västeuropeisk).
+
+ -437
+ Använd DOS-teckentabell 437 (USA). Detta är standardteckentabellen
+ som används för ISO-konvertering.
+
+ -850
+ Använd DOS-teckentabell 850 (Västeuropeisk).
+
+ -860
+ Använd DOS-teckentabell 860 (Portugisisk).
+
+ -863
+ Använd DOS-teckentabell 863 (Fransk-kanadensisk).
+
+ -865
+ Använd DOS-teckentabell 865 (Nordisk).
+
+ -7 Konvertera 8-bitars tecken till 7-bitars blanksteg.
+
+ -b, --keep-bom
+ Behåll byteordningsmarkering (Byte Order Mark, BOM). Om infilen har
+ en BOM, skriv en BOM i utfilen. Detta är standardbeteendet vid
+ konvertering av DOS-radbrytningar. Se vidare flaggan "-r".
+
+ -c, --convmode KONVERTERINGLÄGE
+ Ställer in konverteringsläge. Där KONVERTERINGSLÄGE är en av:
+ *ascii*, *7bit*, *iso*, *mac* där ascii är standard.
+
+ -D, --display-enc KODNING
+ Ställ in kodning för visad text. Där KODNING är en av: *ansi*,
+ *unicode*, *utf8* där ansi är standardvalet.
+
+ Denna flagga finns bara tillgänglig i dos2unix för Windows med stöd
+ för Unicode-filnamn. Denna flagga har ingen effekt på själva
+ filnamnen som läses och skrivs, bara på hur de visas.
+
+ Det finns flera metoder för att visa text i en Windows-konsol
+ baserad på vilken kodning texten har. De har alla för- och
+ nackdelar.
+
+ ansi
+ Dos2unix standardmetod är att använda ANSI-kodad text. Fördelen
+ är att den är bakåtkompatibel. Det fungerar med raster- och
+ TrueType-teckensnitt. I vissa regioner kan du behöva ändra den
+ aktiva DOS OEM-teckentabellen till Windows-systemets
+ ANSI-teckentabell genom att använda kommandot "chcp", eftersom
+ dos2unix använder Windows-systemets teckentabell.
+
+ Nackdelen med ansi är att internationella filnamn med tecken som
+ inte finns i systemets standardteckentabell inte visas korrekt.
+ Du kommer att se frågetecken, eller en felaktig symbol istället.
+ När du inte arbetar med utländska filnamn är denna metoden OK.
+
+ unicode
+ Fördelen med unicode-kodning (Windows-namnet för UTF-16) är att
+ text vanligtvis visas korrekt. Det finns inget behov av att
+ ändra den aktiva teckentabellen. Du kan behöva ställa in
+ konsolens teckensnitt till ett TrueType-teckensnitt för att få
+ internationella tecken att visas korrekt. När ett tecken inte
+ finns inkluderat i TrueType-teckensnittet kommer du vanligtvis
+ att se en liten ruta, ibland med ett frågetecken inuti.
+
+ När du använder ConEmu-konsolen kommer all text att visas
+ korrekt eftersom ConEmu automatiskt väljer ett bra teckensnitt.
+
+ Nackdelen med unicode är att den inte är kompatibel med ASCII.
+ Utmatningen är inte lätt att hantera när du omdirigerar den till
+ ett annat program eller en fil. Omdirigering till en fil kommer
+ inte att ge en korrekt UTF-16-fil.
+
+ utf8
+ Fördelen med utf8 är att den är kompatibel med ASCII och när du
+ omdirigerar den till en fil kommer du att få en korrekt
+ UTF-8-fil. Du måste ställa in konsolens teckensnitt till ett
+ TrueType-teckensnitt. Med ett TrueType-teckensnitt kommer text
+ att visas på liknande sätt som med "unicode"-kodningen.
+
+ Nackdelen är att när du använder standardrasterteckensnittet
+ kommer alla icke-ASCII tecken att visas fel. Inte enbart
+ unicode-filnamn, utan också översatta meddelanden kommer att bli
+ oläsbara. Under Windows som konfigurerats för Östasien kan man
+ komma att se många blinkningar i konsolen när meddelanden visas.
+
+ I ConEmu-konsolen fungerar utf8-kodningsmetoden väl.
+
+ Standardkodningen kan ändras via miljövariabeln DOS2UNIX_DISPLAY_ENC
+ genom att sätta den till "unicode" eller "utf8".
+
+ -f, --force
+ Tvinga konvertering av binära filer.
+
+ -gb, --gb18030
+ Under Windows konverteras UTF-16-filer som standard till UTF-8,
+ oavsett vilken lokalinställning som är gjord. Använd denna flagga
+ för att konvertera UTF-16-filer till GB18030. Denna flagga finns
+ bara tillgänglig i Windows. Se vidare i avsnittet GB18030.
+
+ -h, --help
+ Visa hjälptext och avsluta.
+
+ -i[FLAGGOR], --info[=FLAGGOR] FIL ...
+ Visa filinformation. Ingen konvertering görs.
+
+ Följande information skrivs ut, i denna ordningen: antal
+ DOS-radbrytningar, antal Unix-radbrytningar, antal
+ Mac-radbrytningar, byteordningsmarkeringen, text eller binär,
+ filnamn.
+
+ Exempelutmatning:
+
+ 6 0 0 no_bom text dos.txt
+ 0 6 0 no_bom text unix.txt
+ 0 0 6 no_bom text mac.txt
+ 6 6 6 no_bom text mixed.txt
+ 50 0 0 UTF-16LE text utf16le.txt
+ 0 50 0 no_bom text utf8unix.txt
+ 50 0 0 UTF-8 text utf8dos.txt
+ 2 418 219 no_bom binär dos2unix.exe
+
+ Extra flaggor kan användas valfritt för att ändra utmatningen. En
+ eller fler flaggor kan läggas till.
+
+ d Skriv ut antal DOS-radbrytningar.
+
+ u Skriv ut antal Unix-radbrytningar.
+
+ m Skriv ut antal Mac-radbrytningar.
+
+ b Skriv ut byteordningsmarkeringen.
+
+ t Skriv ut om filen är text eller binär.
+
+ c Skriv bara ut filerna som skulle ha konverterats.
+
+ Med "c"-flaggan kommer dos2unix att skriva ut filerna som
+ innehåller DOS-radbrytningar, unix2dos kommer bara att skriva ut
+ filnamn som har Unix-radbrytningar.
+
+ Exempel:
+
+ Visa information för alla *.txt-filer:
+
+ dos2unix -i *.txt
+
+ Visa bara antalet DOS-radbrytningar och Unix-radbrytningar:
+
+ dos2unix -idu *.txt
+
+ Visa bara byteordningsmarkeringen:
+
+ dos2unix --info=b *.txt
+
+ Lista filerna som har DOS-radbrytningar:
+
+ dos2unix -ic *.txt
+
+ Lista filerna som har Unix-radbrytningar:
+
+ unix2dos -ic *.txt
+
+ Konvertera endast filer som har DOS-radbrytningar och lämna övriga
+ filer orörda:
+
+ dos2unix -ic *.txt | xargs dos2unix
+
+ Hitta textfiler som har DOS-radbrytningar:
+
+ find -name '*.txt' | xargs dos2unix -ic
+
+ -k, --keepdate
+ Behåll infilens datumstämpel för utfilen.
+
+ -L, --license
+ Visa programmets licens.
+
+ -l, --newline
+ Lägg till ytterligare nyrad.
+
+ dos2unix: Endast DOS-radbrytningar ändras till två
+ Unix-radbrytningar. I Mac-läge ändras endast Mac-radbrytningar till
+ två Unix-radbrytningar.
+
+ unix2dos: Endast Unix-radbrytningar ändras till två
+ DOS-radbrytningar. I Mac-läge ändras Unix-radbrytningar till två
+ Mac-radbrytningar.
+
+ -m, --add-bom
+ Skriv en byteordningsmarkering (Byte Order Mark, BOM) i utfilen. Som
+ standard skrivs en UTF-8 BOM.
+
+ När infilen är UTF-16, och flaggan "-u" används, kommer en UTF-16
+ BOM att skrivas.
+
+ Använd aldrig denna flagga när kodningen för utmatning är något
+ annat än UTF-8, UTF-16 eller GB18030. Se vidare i avsnittet UNICODE.
+
+ -n, --newfile INFIL UTFIL …
+ Nyfilsläge. Konvertera filen INFIL och skriv utfilen UTFIL.
+ Filnamnen måste ange i par och jokertecken i namnen ska *inte*
+ användas annars *kommer* du att förlora filer.
+
+ Användaren som påbörjar konverteringen i nyfilsläge (paratläge)
+ kommer att bli ägaren till den konverterade filen.
+ Läs-/skrivbehörigheter för den nya filen kommer att vara samma
+ behörigheter som för originalfilen minus umask(1) för användaren som
+ kör konverteringen.
+
+ -o, --oldfile FIL …
+ Gammalfilsläge. Konvertera filen FIL och skriv över den med
+ utmatningen. Programmet kör i detta läge som standard. Jokertecken i
+ filnamn får användas.
+
+ I gammalfilsläge (på-plats läge) kommer den konverterade filen att
+ få samma ägare, grupp samt läs-/skrivbehörigheter som originalfilen.
+ Även då filen konverteras av en annan användare som har
+ skrivbehörighet för filen (t.ex. användaren root). Konverteringen
+ kommer att avbrytas när det inte är möjligt att bevara
+ originalvärdena. Byte av ägare skulle kunna innebära att
+ originalägaren inte längre kan läsa filen. Byte av grupp skulle
+ kunna vara en säkerhetsrisk, filen skulle kunna bli läsbar för
+ användare som den inte är avsedd för. Stöd för bevarande av ägare,
+ grupp och läs-/skrivbehörigheter finns bara i Unix.
+
+ -q, --quiet
+ Tyst drift. Undertryck alla varningar och meddelanden. Returvärdet
+ är noll. Utom när felaktiga kommandoradsflaggor används.
+
+ -r, --remove-bom
+ Ta bort byteordningsmarkering (Byte Order Mark, BOM). Skriv inte en
+ BOM i utfilen. Detta är standardbeteende vid konvertering av
+ Unix-radbrytningar. Se vidare flaggan "-b".
+
+ -s, --safe
+ Hoppa över binära filer (standard).
+
+ -u, --keep-utf16
+ Behåll infilens original UTF-16-kodning. Utfilen kommer att skrivas
+ med samma UTF-16-kodning som infilen, omvänd eller rak byteordning
+ (little eller big endian). Detta förhindrar transformation till
+ UTF-8. En UTF-16 BOM kommer att skrivas i enlighet med detta. Denna
+ flagga kan inaktiveras med "-ascii"-flaggan.
+
+ -ul, --assume-utf16le
+ Antag att infilsformatet är UTF-16LE.
+
+ När det finns en byteordningsmarkering (Byte Order Mark) i infilen
+ så har BOM:en högre prioritet än denna flagga.
+
+ När du har gjort fel antagande (infilen var inte i UTF-16LE-format)
+ och konverteringens lyckas, kommer du att få en UTF-8 utfil med
+ felaktig text. Du kan göra denna konvertering ogjord med iconv(1)
+ genom att konvertera UTF-8 utfilen tillbaka till UTF-16LE. Detta
+ kommer att återskapa originalfilen.
+
+ Antagandet om UTF-16LE fungerar som ett *konverteringsläge*. Genom
+ att växla till standard *ascii*-läget kommer UTF-16LE antagandet att
+ stängas av.
+
+ -ub, --assume-utf16be
+ Antag att infilsformatet är UTF-16BE.
+
+ Denna flagga fungerar på samma sätt som flaggan "-ul".
+
+ -v, --verbose
+ Visa utförliga meddelanden. Extra information visas om
+ byteordningsmarkeringar och antalet konverterade radbrytningar.
+
+ -F, --follow-symlink
+ Följ symboliska länkar och konvertera målen.
+
+ -R, --replace-symlink
+ Ersätt symboliska länkar med konverterade filer (original målfilerna
+ förblir oförändrade).
+
+ -S, --skip-symlink
+ Behåll symboliska länkar och mål oförändrade (standard).
+
+ -V, --version
+ Visa versionsinformation och avsluta.
+
+MAC-LÄGE
+ I normalläge konverteras radbrytningar från DOS till Unix och vice
+ versa. Mac-radbrytningar konverteras inte.
+
+ I Mac-läge konverteras radbrytningar från Mac till Unix och vice versa.
+ DOS-radbrytningar ändras ej.
+
+ För att köra i Mac-läge använd kommandoradsflaggan "-c mac" eller använd
+ kommandona "mac2unix" eller "unix2mac".
+
+KONVERTERINGSLÄGEN
+ ascii
+ I läget "ascii" konverteras enbart radbrytningar. Detta är
+ standardkonverteringsläget.
+
+ Även om namnet på detta läge är ASCII, vilket är en
+ 7-bitarsstandard, så är det läget egentligen ett 8-bitarsläge.
+ Använd alltid detta läge vid konvertering av Unicode UTF-8-filer.
+
+ 7bit
+ I detta läge konverteras alla 8-bitars icke-ASCII tecken (med värden
+ från 128 till 255) till ett 7-bitars blanksteg.
+
+ iso Tecken konverteras mellan DOS teckenuppsättning (teckentabell) och
+ ISO teckenuppsättning ISO-8859-1 (Latin-1) på Unix. DOS tecken utan
+ motsvarande ISO-8859-1 tecken, för vilka konvertering är omöjligt,
+ kommer att ersättas med en punkt. Detsamma gäller för ISO-8859-1
+ tecken utan motsvarighet i DOS.
+
+ När enbart flaggan "-iso" används kommer dos2unix att försöka avgöra
+ den aktiva teckentabellen. När detta inte är möjligt kommer dos2unix
+ att använda standardteckentabellen CP437, vilken huvudsakligen
+ används i USA. För att tvinga en specifik tackentabell använd
+ flaggorna -437 (USA), -850 (Västeuropeisk), -860 (Portugisisk), -863
+ (Fransk-kanadensisk) eller -865 (Nordisk). Det finns också stöd för
+ Windows-teckentabell CP-1252 (Västeuropeisk) via flaggan -1252. För
+ andra teckentabeller använd dos2unix i kombination med iconv(1).
+ iconv kan konvertera mellan en lång lista av teckenkodningar.
+
+ Använd aldrig ISO-konvertering på Unicode-textfiler. Det kommer att
+ korrumpera UTF-8-kodade filer.
+
+ Några exempel:
+
+ Konvertera från DOS standardteckentabell till Unix Latin-1:
+
+ dos2unix -iso -n in.txt ut.txt
+
+ Konvertera från DOS CP850 till Unix Latin-1:
+
+ dos2unix -850 -n in.txt ut.txt
+
+ Konvertera från Windows CP1252 till Unix Latin-1:
+
+ dos2unix -1252 -n in.txt ut.txt
+
+ Konvertera från Windows CP1252 till Unix UTF-8 (Unicode):
+
+ iconv -f CP1252 -t UTF-8 in.txt | dos2unix > ut.txt
+
+ Konvertera från Unix Latin-1 till DOS-standardteckentabell:
+
+ unix2dos -iso -n in.txt ut.txt
+
+ Konvertera från Unix Latin-1 till DOS CP850:
+
+ unix2dos -850 -n in.txt ut.txt
+
+ Konvertera från Unix Latin-1 till Windows CP1252:
+
+ unix2dos -1252 -n in.txt ut.txt
+
+ Konvertera från Unix UTF-8 (Unicode) till Windows CP1252:
+
+ unix2dos < in.txt | iconv -f UTF-8 -t CP1252 > ut.txt
+
+ Se även <http://czyborra.com/charsets/codepages.html> och
+ <http://czyborra.com/charsets/iso8859.html>.
+
+UNICODE
+ Kodningar
+ Det finns flera olika Unicode kodningar. I Unix och Liinux kodas filer
+ vanligtvis med UTF-8-kodning. I Windows kan Unicode-textfiler kodas i
+ UTF-8, UTF-16 eller UTF-16 rak byteordning (big endian), men kodas
+ mestadels i UTF-16-format.
+
+ Konvertering
+ Unicode-textfiler kan ha DOS, Unix eller Mac-radbrytningar precis som
+ vanliga textfiler.
+
+ Alla versioner av dos2unix och unix2dos kan konvertera UTF-8-kodade
+ filer, eftersom UTF-8 designades för bakåtkompatibilitet med ASCII.
+
+ Dos2unix och unix2dos med Uncode-UTF-16-stöd, kan läsa UTF-16-kodade
+ textfiler i omvänd och rak byteordning (little och big endian). För att
+ se om dos2unix byggts med UTF-16-stöd skriv "dos2unix -V".
+
+ Under Unix/Linux kommer UTF-16-kodade filer att konverteras till
+ lokalens teckenkodning. Använd kommandot locale(1) för att ta reda på
+ vilken lokalens teckenkodning är. När konvertering inte är möjlig kommer
+ ett konverteringsfel att inträffa och filen kommer att hoppas över.
+
+ Under Windows konverteras UTF-16-filer som standard till UTF-8.
+ UTF-8-formaterade textfiler har bra stöd både under Windows och
+ Unix/Linux.
+
+ UTF-16- och UTF-8-kodning är fullt kompatibla, ingen text kommer att gå
+ förlorad i konverteringen. När ett UTF-16 till UTF-8-konverteringsfel
+ uppstår, till exempel när infilen i UTF-16-format innehåller ett fel,
+ kommer att filen att hoppas över.
+
+ När flaggan "-u" används kommer utfilen att skrivas med samma
+ UTF-16-kodning som infilen. Flaggan "-u" förhindrar konvertering till
+ UTF-8.
+
+ Dos2unix och unix2dos har ingen flagga för att konvertera UTF-8-filer
+ till UTF-16.
+
+ ISO- och 7-bitarslägeskonvertering fungerar inte på UTF-16-filer.
+
+ Byteordningsmarkering (Byte Order Mark)
+ I Windows har Unicode-textfiler typiskt en byteordningsmarkering (Byte
+ Order Mark, BOM) eftersom många Windows-program (inklusive Notepad)
+ lägger till BOM:ar som standard. Se även
+ <http://en.wikipedia.org/wiki/Byte_order_mark>.
+
+ I Unix har Unicode-textfiler typiskt ingen BOM. Filer antas vara kodade
+ i den lokala teckenuppsättningen.
+
+ Dos2Unix kan bara detektera om en fil är i UTF-16-format om filen har en
+ BOM. När en UTF-16-fil inte har en BOM så kommer dos2unix att de filen
+ som en binärfil.
+
+ Använd flaggan "-ul" eller "-ub" för att konvertera en UTF-16-fil utan
+ BOM.
+
+ Dos2unix skriver som standard ingen BOM i utfilen. Med flaggan "-b"
+ kommer Dos2unix att skriva en BOM när infilen har en BOM.
+
+ Unix2dos skriver som standard en BOM i utfilen när infilen har en BOM.
+ Använd flaggan "-r" för att ta bort BOM:en.
+
+ Dos2unix och unix2dos skriver alltid en BOM när flaggan "-m" används.
+
+ Unicode-filnamn under Windows
+ Dos2unix har valfritt stöd för läsning och skri8vning av Unicode-filnamn
+ i Windows kommandoprompt. Detta innebär att dos2unix kan öppna filer som
+ har tecken i sina namn som inte är en del av systemets atandard
+ ANSI-teckentabell. För att se om dos2unix för Windows byggdes med stöd
+ för Unicode-filnamn skriv "dos2unix -V".
+
+ Det finns en del problem med att visa Unicode-filnamn i en
+ Windows-konsol. Se vidare flaggan "-D", "--display-enc". Filnamnen kan
+ visas felaktigt i konsolen, men filerna som skrivs kommer att ha de
+ korrekta namnen.
+
+ Unicode-exempel
+ Konvertera från Windows UTF-16 (med BOM) till Unix UTF-8:
+
+ dos2unix -n in.txt ut.txt
+
+ Konvertera från Windows UTF-16LE (utan BOM) till Unix UTF-8:
+
+ dos2unix -ul -n in.txt ut.txt
+
+ Konvertera från Unix UTF-8 till Windows UTF-8 med BOM:
+
+ unix2dos -m -n in.txt ut.txt
+
+ Konvertera från Unix UTF-8 till Windows UTF-16:
+
+ unix2dos < in.txt | iconv -f UTF-8 -t UTF-16 > ut.txt
+
+GB18030
+ GB18030 är en standard från Kinesiska regeringen. En obligatorisk
+ delmängd av standarden GB18030 krävs officiellt för alla
+ programvaruprodukter som säljs i Kina. Se vidare
+ <http://en.wikipedia.org/wiki/GB_18030>.
+
+ GB18030 är fullständigt kompatibel med Unicode och kan anses vara ett
+ överföringsformat för unicode. Precis som UTF-8 är GB18030 kompatibel
+ med ASCII. GB18030 är också kompatibel med Windows-teckentabell 936,
+ också känd som GBK.
+
+ Under Unix/Linux kommer UTF-16-filer att konverteras till GB18030 när
+ lokalens teckenkodning är inställd på GB18030. Notera att detta endast
+ kommer att fungera om lokalen har stöd i systemet. Använd kommandot
+ "locale -a" för att få en lista över de lokaler som stöds.
+
+ Under Windows måste du använda flaggan "-gb" för att konvertera
+ UTF-16-filer till GB18030.
+
+ GB18030-kodade filer kan ha en byteordningsmarkering, precis som
+ Unicode-filer.
+
+EXEMPEL
+ Läsa inmatning från “stdin“ och skriv utmatning till “stdout“:
+
+ dos2unix
+ dos2unix -l -c mac
+
+ Konvertera och ersätta a.txt. Konvertera och ersätt b.txt:
+
+ dos2unix a.txt b.txt
+ dos2unix -o a.txt b.txt
+
+ Konvertera och ersätt a.txt i ascii-konverteringsläge:
+
+ dos2unix a.txt
+
+ Konvertera och ersätt a.txt i ascii-konverteringsläge, konvertera och
+ ersätt b.txt i 7bit-konverteringsläge:
+
+ dos2unix a.txt -c 7bit b.txt
+ dos2unix -c ascii a.txt -c 7bit b.txt
+ dos2unix -ascii a.txt -7 b.txt
+
+ Konvertera a.txt från Mac- till Unix-format:
+
+ dos2unix -c mac a.txt
+ mac2unix a.txt
+
+ Konvertera a.txt från Unix- till Mac-format:
+
+ unix2dos -c mac a.txt
+ unix2mac a.txt
+
+ Konvertera och ersätt a.txt medan originalet tidsstämpel behålls:
+
+ dos2unix -k a.txt
+ dos2unix -k -o a.txt
+
+ Konvertera a.txt och skriv till e.txt:
+
+ dos2unix -n a.txt e.txt
+
+ Konvertera a.txt och skriv till e.txt, låt e.txt behålla tidsstämpeln
+ från a.txt:
+
+ dos2unix -k -n a.txt e.txt
+
+ Konvertera och ersätt a.txt, konvertera b.txt och skriv till e.txt:
+
+ dos2unix a.txt -n b.txt e.txt
+ dos2unix -o a.txt -n b.txt e.txt
+
+ Konvertera c.txt och skriv till e.txt, konvertera och ersätt a.txt,
+ konvertera och ersätt b.txt, konvertera d.txt och skriv till f.txt:
+
+ dos2unix -n c.txt e.txt -o a.txt b.txt -n d.txt f.txt
+
+REKURSIV KONVERTERING
+ Använd dos2unix i kombination med kommandona find(1) och xargs(1) för
+ att rekursivt konvertera filer i en katalogstruktur. För att till
+ exempel konvertera alla .txt-filer i katalogträdet under den aktuella
+ katalogen skriv:
+
+ find . -name '*.txt' |xargs dos2unix
+
+ I en Windows-kommandoprompt kan följande kommando användas:
+
+ for /R %G in (*.txt) do dos2unix "%G"
+
+LOKALISERING
+ LANG
+ Det primära språket väljs med miljövariabeln LANG. LANG-variabeln
+ består av flera delas. Den första delen är språkkoden i gemener. Den
+ andra delen är valfri och utgör landskoden i versaler, föregången av
+ ett understreck. Det finns också en valfri tredje del:
+ teckenkodning, föregången av en punkt. Ett par exempel för skal av
+ POSIX-standard-typ:
+
+ export LANG=nl Nederländska
+ export LANG=nl_NL Nederländska, Nederländerna
+ export LANG=nl_BE Nederländska, Belgien
+ export LANG=es_ES Spanska, Spanien
+ export LANG=es_MX Spanska, Mexiko
+ export LANG=en_US.iso88591 Engelska, USA, Latin-1-kodning
+ export LANG=en_GB.UTF-8 Engelska, UK, UTF-8-kodning
+
+ För en fullständig lista över språk och landskoder se vidare i
+ gettext-manualen:
+ <http://www.gnu.org/software/gettext/manual/html_node/Usual-Language
+ -Codes.html>
+
+ På Unix-system kan du använda kommando locale(1) för att få
+ lokal-specifik information.
+
+ LANGUAGE
+ Med miljövariabeln LANGUAGE kan du ange en prioritetslista över
+ språk, separerade med kolon. Dos2unix kommer att ge företräde till
+ LANGAUGE över LANG. Exempelvis först nederländska och sedan tyska:
+ "LANGUAGE=nl:de". Du måste först ha aktiverat lokalisering, genom
+ att sätta LANG (eller LC_ALL) till ett värde annat än “C“, innan du
+ kan använda en prioritetslista för språk via LANGUAGE-variabeln. Se
+ vidare i gettext-manualen:
+ <http://www.gnu.org/software/gettext/manual/html_node/The-LANGUAGE-v
+ ariable.html>
+
+ Om du väljer ett språk som inte är tillgänglig kommer du att få
+ engelska meddelanden som standard.
+
+ DOS2UNIX_LOCALEDIR
+ Med miljövariabeln DOS2UNIX_LOCALEDIR kan LOCALEDIR som ställts in
+ vid kompilering åsidosättas. LOCALEDIR används för att hitta
+ språkfiler. Standardvärdet för GNU-program är
+ "/usr/local/share/locale". Flaggan --version kommer att visa vilken
+ LOCALEDIR som används.
+
+ Exempel (POSIX-skal):
+
+ export DOS2UNIX_LOCALEDIR=$HOME/share/locale
+
+RETURVÄRDE
+ Om allt går bra kommer noll att returneras. När ett systemfel uppstår
+ kommer det senaste systemfelet att returneras. För andra fel kommer 1
+ att returneras.
+
+ Returvärdet är alltid noll i tystläge, utom när felaktiga
+ kommandoradsflaggor används.
+
+STANDARDER
+ <http://en.wikipedia.org/wiki/Text_file>
+
+ <http://en.wikipedia.org/wiki/Carriage_return>
+
+ <http://en.wikipedia.org/wiki/Newline>
+
+ <http://en.wikipedia.org/wiki/Unicode>
+
+FÖRFATTARE
+ Benjamin Lin - <blin@socs.uts.edu.au>, Bernd Johannes Wuebben
+ (mac2unix-läge) - <wuebben@kde.org>, Christian Wurll (lägg till en extra
+ radbrytning) - <wurll@ira.uka.de>, Erwin Waterlander -
+ <waterlan@xs4all.nl> (upphovsman)
+
+ Projektsida: <http://waterlan.home.xs4all.nl/dos2unix.html>
+
+ SourceForge-sida: <http://sourceforge.net/projects/dos2unix/>
+
+SE ÄVEN
+ file(1) find(1) iconv(1) locale(1) xargs(1)
+
diff --git a/man/uk/man1/dos2unix.1 b/man/uk/man1/dos2unix.1
index b902608..accafcc 100644
--- a/man/uk/man1/dos2unix.1
+++ b/man/uk/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/uk/man1/dos2unix.htm b/man/uk/man1/dos2unix.htm
index 2c63dfd..eaf5e54 100644
--- a/man/uk/man1/dos2unix.htm
+++ b/man/uk/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
+<title>dos2unix 7.3.2 - програма для перетворення даних у текстовому форматі DOS/Mac у формат Unix, і навпаки</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/man/zh_CN/man1/dos2unix.1 b/man/zh_CN/man1/dos2unix.1
index 989d241..f6de3b6 100644
--- a/man/zh_CN/man1/dos2unix.1
+++ b/man/zh_CN/man1/dos2unix.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.31)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.32)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -71,7 +71,7 @@
.\" ========================================================================
.\"
.IX Title "dos2unix 1"
-.TH dos2unix 1 "2015-09-30" "dos2unix" "2015-09-30"
+.TH dos2unix 1 "2015-11-20" "dos2unix" "2015-11-20"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/man/zh_CN/man1/dos2unix.htm b/man/zh_CN/man1/dos2unix.htm
index a74c11c..5cc52a9 100644
--- a/man/zh_CN/man1/dos2unix.htm
+++ b/man/zh_CN/man1/dos2unix.htm
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>dos2unix 7.3.1 - DOS/Mac - Unix文件格式转换器</title>
+<title>dos2unix 7.3.2 - DOS/Mac - Unix文件格式转换器</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:ASSI@cygwin.nonet" />
</head>
diff --git a/po/da.po b/po/da.po
index 885ceae..38626c5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.3-beta8\n"
+"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
-"PO-Revision-Date: 2015-08-16 12:07+0100\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"PO-Revision-Date: 2015-10-05 12:07+0100\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
"Language: da\n"
@@ -75,7 +75,7 @@ msgstr ""
"Alle rettigheder forbeholdes.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -98,7 +98,7 @@ msgstr ""
" stilles til rådighed med distribueringen.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,67 +124,67 @@ msgstr ""
"(GÆLDER SELV VED IGNORERING ELLER ANDET) SOM KOMMER UD AF BRUGEN AF\n"
"DENNE SOFTWARE, SELVOM INFORMATION ER GIVET, AT DET VIL MEDFØRE SKADE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Brug: %s [tilvalg] [fil …] [-n indfil udfil …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii omdan kun linjeskift (standard)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso omdannelse mellem DOS- og ISO-8859-1-tegnsæt\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 brug Windows-tegnkodningstabel 1252 (Vesteuropa)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 brug DOS-tegnkodningstabel 437 (US) (standard)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 brug DOS-tegnkodningstabel 850 (Vesteuropa)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 brug DOS-tegnkodningstabel 860 (portugisisk)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 brug DOS-tegnkodningstabel 863 (fransk-canadisk)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 brug DOS-tegnkodningstabel 865 (nordisk)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 omdan 8-bit-tegn til 7-bit-plads\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom behold byte-rækkefølge-markering (BOM)\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom behold byte-rækkefølge-markering (standard)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -193,7 +193,7 @@ msgstr ""
" -c, --convmode omdannelsestilstand\n"
" convmode ascii, 7bit, iso, mac, standard er ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -202,22 +202,22 @@ msgstr ""
" -D, --display-enc angiv kodning for viste tekstbeskeder\n"
" kodning ansi, unicode, utf8, standarden er ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force gennemtving omdannelse af binære filer\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help vis denne hjælpetekst\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -226,27 +226,27 @@ msgstr ""
" -i, --info[=FLAG] vis filinformation\n"
" fil … filer at analysere\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate behold outputfils dato\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license vis softwarelicens\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline tilføj ekstra linjeskift\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom tilføj byte-rækkefølge-markering (standard UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -257,7 +257,7 @@ msgstr ""
" infile originalfil i ny-fil-tilstand\n"
" outfile outputfil i ny-fil-tilstand\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -266,52 +266,52 @@ msgstr ""
" -o, --oldfile skriv til gammel fil (standard)\n"
" file … filter til omdannelse i gammel-fil-tilstand\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stilletilstand, tilbagehold alle advarsler\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom fjern byte-rækkefølge-markering (standard)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom fjern byte-rækkefølge-markering\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe spring binære filer over (standard)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 behold UTF-16-kodning\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le antag at inputformatet er UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be antag at inputformatet er UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose uddybende operation\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink følg symbolske henvisninger og omdan deres mål\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -320,235 +320,235 @@ msgstr ""
" -R, --replace-symlink erstat symbolske henvisninger med omdannede filer\n"
" (oprindelige målfiler forbliver uændrede)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink behold symbolske henvisninger og deres mål uændrede (standard)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version vis versionsnummer\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-version (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-version (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-version (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-version (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS-version.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin-version.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-version (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-version (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-version (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-version (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-version (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-version (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-version (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-version (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s-version.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Med Unicode UTF-16-understøttelse.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Uden Unicode UTF-16-understøttelse.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Med Unicode filnavnsunderstøttelse.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Uden Unicode filnavnsunderstøttelse.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Med understøttelse for lokale sprog.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skriver %s BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Inddatafilen %s har %s BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Antager UTF-16LE-kodning.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Antager UTF-16BE-kodning.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Åbning af midlertidig outputfil mislykkedes: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "bruger %s som midlertidig fil\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Skrivning til midlertidig outputfil %s mislykkedes:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Ændring af tilladelser for midlertidig outputfil %s mislykkedes:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Ændring af ejer og gruppe for midlertidig outputfil %s mislykkedes:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemer med at følge symbolsk henvisning \"%s\"\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " outputfil forbliver i \"%s\"\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "der opstod problemer under omdøbning af »%s« til »%s«:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " som er målet for symbolsk henvisning \"%s\"\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Springer binær fil %s over\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "tegnkodningstabel %d understøttes ikke.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
-msgstr "Springer UTF-16-fil %s over. Størrelsen på wchar_t er %d byte.\n"
+msgstr "Springer UTF-16-filen %s over. Størrelsen på wchar_t er %d byte.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
-msgstr "Springer UTF-16-fil %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n"
+msgstr "Springer UTF-16-filen %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
-#, fuzzy, c-format
+#: common.c:1633 common.c:1725 common.c:1811
+#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
-msgstr "Springer UTF-16-fil %s over. Der opstod en UTF-16-konverteringsfejl på linje %u.\n"
+msgstr "Springer UTF-16-filen %s over. UTF-16-konvertering er ikke understøttet i denne version af %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Springer %s over, ikke en almindelig fil.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Springer %s over. Outputfil %s er en symbolsk henvisning.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Springer symbolsk henvisning %s over. Målet er ikke en almindelig fil.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Springer %s over. Målet for symbolsk henvisning %s er ikke en almindelig fil.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "omdanner fil %s til fil %s i Unix-format …\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "omdanner fil %s til fil %s i Mac-format …\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "omdanner fil %s til fil %s i DOS-format …\n"
@@ -559,42 +559,42 @@ msgstr "omdanner fil %s til fil %s i DOS-format …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i Unix-format …\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i Mac-format …\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "omdanner %s-filen %s til %s-filen %s i DOS-format …\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemer under omdannelse af fil %s til fil %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Springer symbolsk henvisning %s over.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "omdanner fil %s til Unix-format …\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "omdanner fil %s til Mac-format …\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "omdanner fil %s til DOS-format …\n"
@@ -604,75 +604,75 @@ msgstr "omdanner fil %s til DOS-format …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "omdanner %s-filen %s til %s-Unix-format …\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "omdanner %s-filen %s til %s-Mac-format …\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "omdanner %s-filen %s til %s-DOS-format …\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problemer under omdannelse af fil %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "kan ikke læse fra inputfilen %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "forkert flag »%c« for tilvalget -i eller --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "aktuel tegnkodningstabel: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ugyldig %s omdannelsestilstand specificeret\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "tilvalg \"%s\" kræver et argument\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "ugyldig %s visningstilstand specificeret\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "mål for fil %s er ikke angivet i ny-fil-tilstand\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "kan ikke læse fra inputfil: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan ikke skrive til outputfil: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "fejl: Ugyldigt surrogatpar. Mangler lav surrogat.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "fejl: Ugyldigt surrogatpar. Mangler høj surrogat.\n"
diff --git a/po/de.po b/po/de.po
index 5e540ef..780eeff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-15 16:30+0200\n"
"Last-Translator: Philipp Thomas <pth@suse.de>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -76,7 +76,7 @@ msgstr ""
"Alle Rechte vorbehalten.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -99,7 +99,7 @@ msgstr ""
" Material wiedergeben.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -128,67 +128,67 @@ msgstr ""
"FAHRLÄSSIGKEIT), DIE AUS DER VERWENDUNG DIESER SOFTWARE ERWÄCHST,\n"
"SELBST WENN AUF DIE MÖGLICHKEIT SOLCHER SCHÄDEN HINGEWIESEN WURDE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Aufruf: %s [Optionen] [Datei …] [-n Eingabedatei Ausgabedatei …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii wandelt nur Zeilenumbrüche um (Vorgabe)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso wandelt zwischen DOS- und ISO-8859-1-Zeichensatz um\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 verwendet Windows Codepage 1252 (Westeuropäisch)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 verwendet DOS Codepage 437 (US) (Vorgabe)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 verwendet DOS Codepage 850 (Westeuropäisch)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 verwendet DOS Codepage 860 (Portugiesisch)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 verwendet DOS Codepage 863 (Kanadisches Französisch)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 verwendet DOS Codepage 865 (Nordisch)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 wandelt 8Bit-Zeichen in solche aus dem 7Bit-Raum um\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom erhält die Bytereihenfolge-Markierung (Vorgabe)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -197,7 +197,7 @@ msgstr ""
" -c, --convmode gibt den Umwandlungsmodus an\n"
" convmode ascii, 7bit, iso, mac, Standard ist nach ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -206,22 +206,22 @@ msgstr ""
" -D, --display-enc die Kodierung für angezeigte Meldungen setzen\n"
" encoding ansi, unicode, utf8, Vorgabe ist ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force erzwingt die Umwandlung binärer Dateien\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 wandelt UTF-16 in GB18030 um\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help gibt diese Hilfe aus\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -230,27 +230,27 @@ msgstr ""
" -i, --info[=FLAGS] Dateiinformation anzeigen\n"
" Datei … zu analysierende Dateien\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate erhält das Datum der Ausgabedatei\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license gibt die Software-Lizenz aus\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline fügt einen Zeilenumbruch hinzu\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom eine Bytereihenfolge-Markierung hinzufen (Vorgabe UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -261,7 +261,7 @@ msgstr ""
" Eingabedatei Originaldatei im Neue-Datei-Modus\n"
" Ausgabedatei Ausgabedatei im Neue-Datei-Modus\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -270,52 +270,52 @@ msgstr ""
" -o, --oldfile überschreibt die alte Datei (Vorgabe)\n"
" Datei ... die im Alte-Datei-Modus umzuwandelnden Dateien\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stiller Modus, unterdrückt alle Warnungen\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung (Vorgabe)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom entfernt die Bytereihenfolge-Markierung\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe überspringt binäre Dateien (Vorgabe)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16-Kodierung beibehalten\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le setzt UTF-16LE als Eingabeformat voraus\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be setzt UTF-16BE als Eingabeformat voraus\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose ausführliche Ausgabe\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink folgt symbolischen Verknüpfungen und wandelt die Ziele um\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -324,237 +324,237 @@ msgstr ""
" -R, --replace-symlink ersetzt symbolische Verknüpfungen durch die umgewandelten\n"
" Dateien (die originale Ziele bleiben unangetastet)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
" -S, --skip-symlink lässt symbolische Verknüpfungen und deren Ziele\n"
" unangetastet (Vorgabe)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version gibt die Versionsnummer aus\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-Version (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-Version (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-Version (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-Version (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS-Version.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin-Version.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-Version (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-Version (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-Version (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-Version (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-Version (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-Version (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-Version (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-Version (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s-Version.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Mit Unterstützung für Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Ohne Unterstützung für Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Mit Unterstützung für Unicode-Dateinamen.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Ohne Unterstützung für Unicode-Dateinamen.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Mit Unterstützung von Landessprachen.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Das %s BOM wird geschrieben.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Die EIngabedatei %s hat ein %s BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Es wird UTF-16LE-Kodierung angenommen.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Es wird UTF-16LE-Kodierung angenommen.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wird als temporäre Datei verwendet\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Die temporäre Ausgabedatei %s konnte nicht geschrieben werden:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s scheiterte:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "Es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«.\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " Die Ausgabedatei verbleibt in »%s«\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welche das Ziel der symbolischen Verknüpfung »%s« ist\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "binäre Datei %s wird übersprungen\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Codepage %d wird nicht unterstützt.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16-Datei %s wird übersprungen, da beim Umwandeln ein Fehler in Zeile %u auftrat.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16-Datei %s wird übersprungen, da die Umwandlung von UTF-16 in dieser Version von %s nicht unterstützt wird.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Symbolische Verknüpfung %s wird übersprungen, da das Ziel keine reguläre Datei ist.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine reguläre Datei.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt …\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "Datei %s wird in Datei %s im Mac-Format umgewandelt …\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n"
@@ -565,42 +565,42 @@ msgstr "Datei %s wird in Datei %s im DOS-Format umgewandelt …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "%s-Datei %s wird zu %s-Datei %s im Unix-Format umgewandelt …\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "%s-Datei %s wird in %s-Datei %s im Mac-Format umgewandelt …\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "%s-Datei %s wird in %s-Datei %s im DOS-Format umgewandelt …\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "Beim Umwandeln von Datei %s zu Datei %s sind Probleme aufgetreten\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische Verknüpfung %s wird übersprungen.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "Datei %s wird ins Unix-Format umgewandelt …\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "Datei %s wird ins Mac-Format umgewandelt …\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "Datei %s wird ins DOS-Format umgewandelt …\n"
@@ -610,76 +610,76 @@ msgstr "Datei %s wird ins DOS-Format umgewandelt …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "%s-Datei %s wird ins %s-Unix-Format umgewandelt …\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "%s-Datei %s wird ins %s-Mac-Format umgewandelt …\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "%s-Datei %s wird ins %s-DOS-Format umgewandelt …\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "Aus der Eingabedatei %s kann nicht gelesen werden:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "falsches Flag »%c« für Option -i oder --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "Aktive Codepage: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "Der angegebene Umwandlungsmodus %s ist unzulässig\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "Die Option »%s« benötigt ein Argument\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "Die angegebene Ausgabekodierung %s ist unzulässig\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "Aus der Eingabedatei kann nicht gelesen werden: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "In die Ausgabedatei kann nicht geschrieben werden: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "Fehler: Ungültiges Surrogate-Paar. Das Low-Surrogate fehlt.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "Fehler: Ungültiges Surrogate-Paar. Das High-Surrogate fehlt.\n"
diff --git a/po/dos2unix.pot b/po/dos2unix.pot
index 67cfb16..ad0ae2d 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: 2015-09-23 19:33+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+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"
@@ -64,7 +64,7 @@ msgid ""
"\n"
msgstr ""
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -77,7 +77,7 @@ msgid ""
"\n"
msgstr ""
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -92,123 +92,123 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr ""
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr ""
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr ""
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr ""
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr ""
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr ""
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr ""
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr ""
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr ""
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr ""
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr ""
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr ""
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
" convmode ascii, 7bit, iso, mac, default to ascii\n"
msgstr ""
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
msgstr ""
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr ""
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr ""
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
" file ... files to analyze\n"
msgstr ""
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr ""
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr ""
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr ""
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr ""
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -216,294 +216,294 @@ msgid ""
" outfile output file in new-file mode\n"
msgstr ""
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
" file ... files to convert in old-file mode\n"
msgstr ""
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr ""
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr ""
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr ""
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr ""
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr ""
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr ""
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr ""
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr ""
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr ""
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
" (original target files remain unchanged)\n"
msgstr ""
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr ""
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr ""
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr ""
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr ""
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr ""
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr ""
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr ""
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr ""
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr ""
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr ""
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr ""
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr ""
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr ""
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr ""
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr ""
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr ""
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr ""
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr ""
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr ""
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr ""
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr ""
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr ""
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr ""
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr ""
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr ""
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr ""
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr ""
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr ""
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr ""
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr ""
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr ""
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr ""
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr ""
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr ""
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr ""
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr ""
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr ""
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr ""
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr ""
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr ""
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr ""
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr ""
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr ""
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr ""
@@ -514,42 +514,42 @@ msgstr ""
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr ""
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr ""
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr ""
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr ""
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr ""
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr ""
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr ""
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr ""
@@ -559,75 +559,75 @@ msgstr ""
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr ""
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr ""
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr ""
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr ""
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr ""
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr ""
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr ""
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr ""
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr ""
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr ""
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr ""
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr ""
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr ""
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index a447c07..c1a599d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3-beta8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-08-23 11:37+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -77,7 +77,7 @@ msgstr ""
"Ĉiuj rajtoj estas rezervitaj.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +97,7 @@ msgstr ""
" la manlibro kaj/aŭ en la aliaj materialoj kiuj akompanis la distribuon.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,67 +112,67 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uzmaniero: %s [opcioj] [dosiero ...] [-n enigdosiero eligdosiero ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii konverti nur linifinojn (defaŭlto)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konverti inter signaroj DOS kaj ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 uzi Vindozan kodpaĝon 1252 (Okcident-Eŭropa)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 uzi DOS-kodpaĝon 437 (Usona) (defaŭlto)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 uzi DOS-kodpaĝon 850 (Okcident-Eŭropa)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 uzi DOS-kodpaĝon 860 (Portugala)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 uzi DOS-kodpaĝon 863 (Kebekia)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 uzi DOS-kodpaĝon 865 (Nordlandaj)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konverti signojn kun jesa oka bito al spacetojn\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom reteni bajtordo-markon\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom reteni bajtordo-markon (defaŭlto)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -181,7 +181,7 @@ msgstr ""
" -c, --convmode uzenda konvertmoduso\n"
" MODUSO 'ascii', '7bit', 'iso', aŭ 'mac' (defaŭltas al 'ascii')\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -190,22 +190,22 @@ msgstr ""
" -D, --display-enc uzenda kodprezento por montritaj mesaĝoj\n"
" KODPREZENTO 'ansi', 'unicode', aŭ 'utf8' (defaŭltas al 'ansi')\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force perforte konverti ankaŭ duumajn dosierojn\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverti UTF-16 al GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help montri ĉi tiun helptekston\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -214,27 +214,27 @@ msgstr ""
" -i, --info[=FLAGOJ] montri (specifajn) informojn pri dosieroj\n"
" DOSIERO... ekzamenendaj dosieroj\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate konservi dattempon de eliga dosiero\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license montri la permesilon de la programo\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline aldoni aldonan linifinon\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom aldoni bajtordo-markon\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -245,7 +245,7 @@ msgstr ""
" ENIGDOSIERO eniga dosiero en novdosiera moduso\n"
" ELIGDOSIERO eliga dosiero en novdosiera moduso\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -254,52 +254,52 @@ msgstr ""
" -o, --oldfile skribi al ekzistanta dosiero (defaŭlto)\n"
" DOSIERO... konvertendaj dosieroj en olddosiera moduso\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet subpremi ĉiujn avertojn\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom forigi bajtordo-markon (defaŭlto)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom forigi bajtordo-markon\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe preterpasi duumajn dosierojn (defaŭlto)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 reteni UTF-16-kodprezenton\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le trakti enigon kvazaŭ UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be trakti enigo kvazaŭ UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose parolema funkciado\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink sekvi simbolajn ligojn kaj konverti ties celojn\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -308,235 +308,235 @@ msgstr ""
" -R, --replace-symlink anstataŭigi simbolajn ligojn per la konvertitaj dosieroj\n"
" (la celaj dosieroj ne ŝanĝiĝas)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink ne ŝanĝi simbolajn ligojn nek ties celojn (defaŭlto)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version montri programversion\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bita versio (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bita versio (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bita versio (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bita versio (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS-versio.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin-versio.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bita versio (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bita versio (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bita versio (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bita versio (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bita versio (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bita versio (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versio (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versio (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s-versio.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Kun subteno por Unikoda UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sen subteno por Unikoda UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Kun subteno por Unikodaj dosiernomoj.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Sen subteno por Unikodaj dosiernomoj.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Kun subteno por lokaĵoj.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skribiĝas %s-BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Eniga dosiero %s havas %s-BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Supoziĝas UTF-16LE-kodprezento.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Supoziĝas UTF-16BE-kodprezento.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Malsukcesis malfermi provizoran eligan dosieron: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "uziĝas %s kiel provizora dosiero\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Malsukcesis skribi al provizora eliga dosiero %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Malsukcesis ŝanĝi la permesojn de provizora eliga dosiero %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Malsukcesis ŝanĝi posedanton kaj grupon de provizora eliga dosiero %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemoj dum redukto de simbola ligo '%s'\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " eliga dosiero restas en '%s'\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemoj dum alinomigo de '%s' al '%s':"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " kiu estas la celo de simbola ligo '%s'\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Preterpasiĝas duuma dosiero %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Kodpaĝo %d ne subtenatas.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; la grando de 'wchar_t' estas %d bajtoj.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Preterpasiĝas UTF-16-a dosiero %s; okazis konverteraro de UTF-16 en linio %u.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Preterpasiĝas %s; ĝi ne estas normala dosiero.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Preterpasiĝas %s; eliga dosiero %s estas simbola ligo.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Preterpasiĝas simbola ligo %s; la celo ne estas normala dosiero.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Preterpasiĝas %s; la celo de simbola ligo %s ne estas normala dosiero.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s Unix-en...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s Mac-en...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n"
@@ -547,42 +547,42 @@ msgstr "konvertiĝas dosiero %s al dosiero %s DOS-en...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en al dosiero %4$s (%3$s)...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemoj dum konverto de dosiero %s al dosiero %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Preterpasiĝas simbola ligo %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konvertiĝas dosiero %s Unix-en...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konvertiĝas dosiero %s Mac-en...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konvertiĝas dosiero %s DOS-en...\n"
@@ -592,76 +592,76 @@ msgstr "konvertiĝas dosiero %s DOS-en...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Unix-en (%3$s)...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) Mac-en (%3$s)...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konvertiĝas dosiero %2$s (%1$s) DOS-en (%3$s)...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problemoj dum konverto de dosiero %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "ne eblas legi el eniga dosiero %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "malĝusta flago '%c' por opcio '-i' aŭ '--info'\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "aktiva kodpaĝo: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "malvalida konvertmoduso %s indikatas\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "opcio '%s' bezonas argumenton\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "malvalida montra kodprezento %s indikatas\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "celo de dosiero %s ne indikatas (en novdosiera moduso)\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "ne eblas legi el eniga dosiero: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "ne eblas skribi al eliga dosiero: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "eraro: nevalida surogata paro -- mankas la baza parto\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "eraro: nevalida surogata paro -- mankas la supra parto\n"
diff --git a/po/es.po b/po/es.po
index 77f2d8f..eb0cbcc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-20 14:17+0200\n"
"Last-Translator: Enrique Lazcorreta Puigmartí <enrique.lazcorreta@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
@@ -78,7 +78,7 @@ msgstr ""
"\n"
# Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -101,7 +101,7 @@ msgstr ""
"\n"
# Traducción obtenida de http://es.wikipedia.org/wiki/Licencia_BSD
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -127,67 +127,67 @@ msgstr ""
"O CUALQUIER OTRA CAUSA) QUE SURJA DE CUALQUIER MANERA DEL USO DE ESTE\n"
"SOFTWARE, INCLUSO SI SE HA ADVERTIDO DE LA POSIBILIDAD DE TALES DAÑOS.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uso: %s [parámetros] [archivo ...] [-n archivo_de_entrada archivo_de_salida ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii solamente convierte los saltos de línea (por defecto)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversión entre DOS y el conjunto de caracteres ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 usa la página de códigos Windows 1252 (Europa Occidental)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 usa la página de códigos DOS 437 (EE. UU.) (por defecto)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 usa la página de códigos DOS 850 (Europa Occidental)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 usa la página de códigos DOS 860 (Portugués)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 usa la página de códigos DOS 863 (Francocanadiense)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 usa la página de códigos DOS 865 (Nórdico)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 convierte caracteres de 8 bits al espacio de 7 bits\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom conserva la Marca de Orden del Byte, BOM (por defecto)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -196,7 +196,7 @@ msgstr ""
" -c, --convmode modo de conversión\n"
" modo_de_conversion ascii, 7bit, iso, mac, por defecto es ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -205,22 +205,22 @@ msgstr ""
" -D, --display-enc establece la codificación de los mensajes de texto que se muestran\n"
" codificación ansi, unicode, utf8, default to ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force fuerza la conversión de archivos binarios\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 convierte UTF-16 a GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help arroja esta ayuda\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -229,27 +229,27 @@ msgstr ""
" -i, --info[=FLAGS] muestra información del archivo\n"
" archivo ... archivos a analizar\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate conserva la fecha en el archivo de salida\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license muestra la licencia del programa\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline añade salto de línea adicional\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom añade la Marca de Orden del Byte, BOM (por defecto en UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -260,7 +260,7 @@ msgstr ""
" archivo_de_entrada archivo original en el modo de archivo nuevo\n"
" archivo_de_salida archivo de salida en el modo de archivo nuevo\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -269,52 +269,52 @@ msgstr ""
" -o, --oldfile escribe al archivo antiguo (por defecto)\n"
" archivo ... archivos a convertir en el modo de archivo antiguo\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet modo silencioso, suprime todas las advertencias\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM (por defecto)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom elimina la Marca de Orden del Byte, BOM\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignora archivos binarios (por defecto)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 mantiene la codificación UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le supone que el formato de entrada es UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be supone que el formato de entrada es UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose operación detallada\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink sigue los enlaces simbólicos y convierte los destinos\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -323,235 +323,235 @@ msgstr ""
" -R, --replace-symlink reemplaza los enlaces simbólicos con los archivos convertidos\n"
" (los archivos destino originales no son alterados)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink no altera los enlaces simbólicos ni sus destinos (por defecto)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version despliega el número de versión\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Versión DOS de 16 bit (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Versión DOS de 16 bit (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Versión DOS de 32 bit (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Versión DOS de 32 bit (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Versión para MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Versión para Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Versión Windows de 64 bit (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Versión Windows de 32 bit (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Versión Windows de 32 bit (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Versión Windows de 32 bit (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Versión Windows de 64 bit (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Versión Windows de 32 bit (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Versión para OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Versión para OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Versión para %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Con soporte Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sin soporte Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Con soporte Unicode UTF-16.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Sin soporte Unicode UTF-16.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Con soporte de idioma materno.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Escribiendo BOM %s.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "El archivo de entrada %s tiene BOM %s.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Se asume codificación UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Se asume codificación UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Error al abrir el archivo de salida temporal: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "usando %s como archivo temporal\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Error al escribir el archivo de salida temporal %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Error al cambiar los permisos del archivo temporal de salida %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Error al cambiar el propietario y grupo del archivo temporal de salida %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemas al resolver el enlace simbólico '%s'\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " el archivo de salida permanece en '%s'\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemas al renombrar '%s' como '%s':"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " cual es el destino del enlace simbólico '%s'\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignorando archivo binario %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "La página de códigos %d no está soportada.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignorando archivo UTF-16 %s, el tamaño de wchar_t es %d bytes.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Ignorando archivo UTF-16 %s, ocurrió un error de conversión a UTF-16 en la línea %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Ignorando archivo UTF-16 %s, la conversión a UTF-16 no está soportada en esta versión de %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignorando %s, no es un archivo regular.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignorando %s, el archivo de salida %s es un enlace simbólico.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignorando enlace simbólico %s, el destino no es un archivo regular.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignorando %s, el destino del enlace simbólico %s no es un archivo regular.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "convirtiendo archivo %s a %s in formato Unix...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "convirtiendo archivo %s a %s in formato Mac...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "convirtiendo archivo %s a %s en formato DOS...\n"
@@ -562,42 +562,42 @@ msgstr "convirtiendo archivo %s a %s en formato DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Unix...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato Mac...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "convirtiendo archivo %s %s en archivo %s %s en formato DOS...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemas al convertir el archivo %s a %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignorando enlace simbólico %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "convirtiendo archivo %s a formato Unix...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "convirtiendo archivo %s a formato Mac...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "convirtiendo archivo %s a formato DOS...\n"
@@ -607,76 +607,76 @@ msgstr "convirtiendo archivo %s a formato DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "convirtiendo archivo %s %s a formato %s Unix...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "convirtiendo archivo %s %s a formato %s Mac...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "convirtiendo archivo %s %s a formato %s DOS...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problemas convirtiendo el archivo %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "no puedo escribir al archivo de salida: %s"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "'%c' es un valor incorrecto para la opción -i o --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "Página de códigos activa: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "modo de conversión %s especificado es inválido\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "el parámetro '%s' requiere un argumento\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "el modo de conversión %s especificado no es válido\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "el destino del archivo %s no se especificó en el modo de archivo nuevo\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "no puedo escribir al archivo de salida: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "no puedo escribir al archivo de salida: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "error: Par sustituto no válido. Falta el sustituto bajo.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "error: Par sustituto no válido. Falta el sustituto alto.\n"
diff --git a/po/fr.po b/po/fr.po
index b38c01b..b5579b3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix-7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-15 20:26+0200\n"
"Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -73,7 +73,7 @@ msgstr ""
"Tous droits réservés.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -93,7 +93,7 @@ msgstr ""
"2. La distribution sous forme binaire doit reproduire le copyright ci-dessus\n"
" dans la documentation ou tout autre matériel fournis avec la distribution.\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -119,67 +119,67 @@ msgstr ""
"DE QUELQUE MANIÈRE D'UTILISATION DE CE LOGICIEL, MÊME SI LA POSSIBILITÉ\n"
"D'UN TEL DOMMAGE A ÉTÉ ANNONCÉE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Usage: %s [options] [fichier …] [-n fichier_entrée fichier_sortie …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii converti uniquement les sauts de ligne (par défaut)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversion entre les jeux de caractères DOS et ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 utilise le code page 1252 de Windows (Europe de l'ouest)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 utilise le code page 437 du DOS (US) (par défaut)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 utilise le code page 850 du DOS (Europe de l'ouest)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 utilise le code page 860 du DOS (Portugais)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 utilise le code page 863 du DOS (Français Canadien)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 utilise le code page 865 du DOS (Nordique)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 converti les caractères 8 bits vers l'espace 7 bits\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom garde la marque d'ordre des octets\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom garde la marque d'ordre des octets (par défaut)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -188,7 +188,7 @@ msgstr ""
" -c, --convmode mode de conversion\n"
" modeconv ascii, 7bit, iso, mac, ascii par défaut\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -197,22 +197,22 @@ msgstr ""
" -D, --display-enc choisi l'encodage pour afficher les messages textes\n"
" encodage ansi, unicode ou utf8 (ansi par défaut)\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force force la conversion de fichiers binaires\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 converti UTF-16 en GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help affiche ce texte d'aide\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -221,27 +221,27 @@ msgstr ""
" -i, --info[=FANIONS] affiche les informations du fichier\n"
" fichier … fichiers à analyser\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate conserve la date du fichier de sortie\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license affiche la licence du logiciel\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline ajoute des sauts de ligne supplémentaires\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom ajoute la marque d'ordre des octets (par défaut avec UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -252,7 +252,7 @@ msgstr ""
" fichier_entrée fichier original dans le mode « nouveau fichier »\n"
" fichier_sortie fichier de sortie dans le mode « nouveau fichier »\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -261,52 +261,52 @@ msgstr ""
" -o, --oldfile écrit dans l'ancien fichier (par défaut)\n"
" fichier … fichiers à convertir dans le mode « ancien fichier »\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet mode silencieux, supprime tous les avertissements\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom supprime la marque d'ordre des octets (par défaut)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom supprime la marque d'ordre des octets\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignore les fichiers binaires (par défaut)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 conserve l'encodage UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le suppose que le format d'entrée est UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be suppose que le format d'entrée est UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose opération verbeuse\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink suit les liens symboliques et converti les cibles\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -315,235 +315,235 @@ msgstr ""
" -R, --replace-symlink remplace les liens symboliques par les fichiers convertis\n"
" (les fichiers cibles originaux restent inchangés)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink conserve les liens symboliques et les cibles inchangés (par défaut)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version affiche le numéro de version\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Version DOS 16 bits (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Version DOS 16 bits (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Version DOS 32 bits (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Version DOS 32 bits (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Version MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Version Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Version Windows 64 bit (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Version Windows 32 bits (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Version Windows 32 bits (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Version Windows 32 bits (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Version Windows 64 bits (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Version Windows 32 bits (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Version OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Version OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Version %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Avec support pour l'Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sans support pour l'Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Avec support pour les noms de fichiers Unicode.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Sans support pour les noms de fichiers Unicode.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Avec support pour la langue native.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Écriture de la BOM %s.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Le fichier d'entrée %s a une BOM %s.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Suppose un encodage UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Suppose un encodage UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Échec à l'ouverture du fichier temporaire de sortie : %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "utilise %s comme fichier temporaire\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Échec d'écriture dans le fichier temporaire de sortie %s :"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Échec lors du changement des permissions du fichier temporaire de sortie %s :"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Échec lors du changement du propriétaire et du groupe du fichier temporaire de sortie %s :"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problème lors de la résolution du lien symbolique « %s »\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " le fichier de sortie reste dans « %s »\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problèmes en renommant « %s » en « %s » :"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " quelle est la cible du lien symbolique « %s »\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignore le fichier binaire %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "le code page %d n'est pas supporté.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignore le fichier UTF-16 %s, la taille de wchar_t n'est pas de %d octets.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Ignore le fichier UTF-16 %s, une erreur de conversion UTF-16 a eu lieu à la ligne %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Ignore le fichier UTF-16 %s, la conversion UTF-16 n'est pas supportée dans cette version de %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignore %s, pas un fichier régulier.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignore %s, le fichier de sortie %s est un lien symbolique.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignore le lien symbolique %s, la cible n'est pas un fichier régulier.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignore %s, la cible du lien symbolique %s n'est pas un fichier régulier.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format Unix…\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format Mac…\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n"
@@ -554,42 +554,42 @@ msgstr "conversion du fichier %s vers le fichier %s au format DOS…\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format Unix…\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format Mac…\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "conversion du fichier %s %s vers le fichier %s %s au format DOS…\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problèmes lors de la conversion du fichier %s vers le fichier %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignore le lien symbolique %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "conversion du fichier %s au format Unix…\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "conversion du fichier %s au format Mac…\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "conversion du fichier %s au format DOS…\n"
@@ -599,76 +599,76 @@ msgstr "conversion du fichier %s au format DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "conversion du fichier %s %s au format Unix %s…\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "conversion du fichier %s %s au format Mac %s…\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "conversion du fichier %s %s au format DOS %s…\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problèmes lors de la conversion du fichier %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "impossible de lire depuis le fichier d'entrée %s :"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "mauvais fanion « %c » pour l'option -i ou --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "code page actif : %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "mode de conversion %s spécifié invalide\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "l'option « %s » requiert un argument\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "l'encodage %s spécifié pour l'affichage est invalide\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "la cible du fichier %s n'est pas spécifiée en mode nouveau fichier\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "impossible de lire depuis le fichier d'entrée : %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "impossible d'écrire dans le fichier de sortie : %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "erreur: Demi-codet invalide. Le demi-codet bas est manquant.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "erreur: Demi-codet invalide. Le demi-codet haut est manquant.\n"
diff --git a/po/hu.po b/po/hu.po
index 3f354bb..cda8b36 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.2.3-beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-06-30 13:38+0200\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -75,7 +75,7 @@ msgstr ""
"Minden jog fenntartva.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +97,7 @@ msgstr ""
" dokumentációban, illetve a csomaggal részét képező egyéb anyagokban.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -125,67 +125,67 @@ msgstr ""
"OKOZOTT KÁRBAN (BELEÉRTVE A HANYAGSÁGOT ÉS EGYEBET), AKKOR IS, HA AZ\n"
"ILYEN KÁR LEHETŐSÉGÉRE FELHÍVTÁK A FIGYELMET.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Használat: %s [kapcsolók] [fájl ...] [-n be_fájl ki_fájl ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii csak sortörések átalakítása (alapértelmezett)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso átalakítás DOS és ISO-8859-1 karakterkészlet között\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows 1252-es kódlap használata (Nyugat-európai)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS 437-es kódlap használata (US) (alapértelmezett)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS 850-es kódlap használata (Nyugat-európai)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS 860-as kódlap használata (portugál)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS 863-as kódlap használata (francia-kanadai)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS 865-ös kódlap használata (északi)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 8-bites karakterek átalakítása 7-bitesre\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom bájtsorrendjel megtartása\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom bájtsorrendjel megtartása (alapértelmezett)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -194,7 +194,7 @@ msgstr ""
" -c, --convmode átalakítási mód\n"
" convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n"
-#: common.c:649
+#: common.c:646
#, fuzzy, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -203,22 +203,22 @@ msgstr ""
" -c, --convmode átalakítási mód\n"
" convmode ascii, 7bit, iso, mac, alapértelmezetten asci\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force bináris fájlok átalakításának kényszerítése\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 UTF-16 átalakítása GB18030-ra\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help ezen súgószöveg megjelenítése\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -227,27 +227,27 @@ msgstr ""
" -i, --info[=JELZŐK] fájlinformációk megjelenítése\n"
" fájl ... elemzendő fájlok\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate kimeneti fájl dátumának megtartása\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license szoftverlicenc megjelenítése\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline további új sor hozzáadása\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom bájtsorrendjel hozzáadása (alapértelmezetten UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -258,7 +258,7 @@ msgstr ""
" infile eredeti fájl új-fájl módban\n"
" outfile kimeneti fájl új-fájl módban\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -267,52 +267,52 @@ msgstr ""
" -o, --oldfile kiírás a régi fájlba (alapértelmezett)\n"
" file ... átalakítandó fájl régi-fájl módban\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet csöndes mód, minden figyelmeztetés elnyomása\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom bájtsorrendjel eltávolítása (alapértelmezett)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom bájtsorrendjel eltávolítása\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe bináris fájlok kihagyása (alapértelmezett)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16 kódolás megtartása\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le feltételezze, hogy a bemeneti formátum UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be feltételezze, hogy a bemeneti formátum UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose részletes működés\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink szimbolikus linkek követése és a célok átalakítása\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -321,239 +321,239 @@ msgstr ""
" -R, --replace-symlink szimbolikus linkek cseréje az átalakított fájlokkal\n"
" (az eredeti célfájlok változatlanok maradnak)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr ""
" -S, --skip-symlink szimbolikus linkek és célok változatlanul hagyása\n"
" (alapértelmezett)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version verziószám megjelenítése\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "16-bites DOS verzió (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "16-bites DOS verzió (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "32-bites DOS verzió (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "32-bites DOS verzió (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS verzió.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin verzió.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "64-bites Windows verzió (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "32-bites Windows verzió (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "32-bites Windows verzió (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "32-bites Windows verzió (MinGW)\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "64-bites Windows verzió (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "32-bites Windows verzió (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 verzió (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 verzió (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s verzió.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 támogatással.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 támogatás nélkül.\n"
-#: common.c:742
+#: common.c:739
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "Unicode UTF-16 támogatással.\n"
-#: common.c:744
+#: common.c:741
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "Unicode UTF-16 támogatás nélkül.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Natív nyelvi támogatással.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "%s BOM írása.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, fuzzy, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "A(z) %s bemeneti fájl %s BOM-mal rendelkezik.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE kódolás feltételezése.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE kódolás feltételezése.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Nem sikerült megnyitni az átmeneti kimeneti fájlt: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s használata átmeneti fájlként\n"
-#: common.c:1433
+#: common.c:1430
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Nem sikerült írni a(z) %s átmeneti kimeneti fájlba: %s\n"
-#: common.c:1464
+#: common.c:1461
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl jogosultságait: %s\n"
-#: common.c:1481
+#: common.c:1478
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Nem sikerült megváltoztatni a(z) %s átmeneti kimeneti fájl tulajdonosát és csoportját: %s\n"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "hiba a(z) „%s” szimbolikus link feloldásakor\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " kimeneti fájl maradt ebben: „%s”\n"
-#: common.c:1555
+#: common.c:1552
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "hiba a(z) „%s” átnevezésekor erre: „%s”: %s\n"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " mi a(z) „%s” szimbolikus link célja\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "A(z) %s bináris fájl kihagyása\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "a(z) %d kódlap nem támogatott.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, a wchar_t mérete %d bájt.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "A(z) %s UTF-16 fájl kihagyása, egy UTF-16 átalakítási hiba történt a(z) %u. sorban.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "A(z) %s kihagyása, nem egy szabályos fájl.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "A(z) %s kihagyása, a(z) %s kimeneti fájl egy szimbolikus link.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "A(z) %s szimbolikus link kihagyása, a cél nem egy szabályos fájl.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "A(z) %s kihagyása, a(z) %s szimbolikus link célja nem egy szabályos fájl.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra Unix formátumban…\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra Mac formátumban…\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n"
@@ -564,42 +564,42 @@ msgstr "a(z) %s fájl átalakítása %s fájlra DOS formátumban…\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Unix formátumban…\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra Mac formátumban…\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású %s fájlra DOS formátumban…\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "hiba a(z) %s fájl %s fájlra való átalakításakor\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "A(z) %s szimbolikus link kihagyása.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "a(z) %s fájl átalakítása Unix formátumra…\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "a(z) %s fájl átalakítása Mac formátumra…\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "a(z) %s fájl átalakítása DOS formátumra…\n"
@@ -609,76 +609,76 @@ msgstr "a(z) %s fájl átalakítása DOS formátumra…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Unix formátumra…\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású Mac formátumra…\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "a(z) %s kódolású %s fájl átalakítása %s kódolású DOS formátumra…\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "hiba a(z) %s fájl átalakításakor\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "nem sikerült olvasni a(z) %s bemeneti fájlból: %s\n"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "hibás „%c” jelző a -i vagy --info kapcsolókhoz\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "aktív kódlap: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "érvénytelen %s átalakítási mód lett megadva\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "a(z) „%s” kapcsolóhoz argumentum szükséges\n"
-#: common.c:2362
+#: common.c:2361
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "érvénytelen %s átalakítási mód lett megadva\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "a(z) %s fájl célja nincs megadva az új-fájl módban\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "nem sikerült olvasni a bemeneti fájlból: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "nem sikerült írni a kimeneti fájlba: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó alacsony helyettesítő.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "hiba: Érvénytelen helyettesítő pár. Hiányzó magas helyettesítő.\n"
diff --git a/po/ja.po b/po/ja.po
index f1f3065..ef7855f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.1-beta3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2014-11-07 11:35+0000\n"
"Last-Translator: YASUAKI TANIGUCHI <yasuakit@gmail.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -74,7 +74,7 @@ msgstr ""
"\n"
# ライセンス条項なので翻訳しません
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +97,7 @@ msgstr ""
"\n"
# ライセンス条項なので翻訳しません
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -123,67 +123,67 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "使用法: %s [options] [file ...] [-n infile outfile ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 改行のみ変換する (既定)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso DOS と ISO-8859-1 文字セット間で変換する\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows コードページ 1252 (西欧) を使用する\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS コードページ 437 (US) を使用する (既定)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS コードページ 850 (西欧) を使用する\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS コードページ 860 (ポルトガル語) を使用する\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS コードページ 863 (カナダのフランス語) を使用する\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS コードページ 865 (北欧) を使用する\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 8 ビット文字を 7 ビットに変換する\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom バイト順マークを保つ\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom バイト順マークを残す (既定)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -192,7 +192,7 @@ msgstr ""
" -c, --convmode 変換モード\n"
" convmode ascii, 7bit, iso, mac, 既定は ascii\n"
-#: common.c:649
+#: common.c:646
#, fuzzy, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -201,22 +201,22 @@ msgstr ""
" -c, --convmode 変換モード\n"
" convmode ascii, 7bit, iso, mac, 既定は ascii\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force バイナリファイルを強制的に変換する\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help このヘルプメッセージを表示する\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -225,27 +225,27 @@ msgstr ""
" -i, --info[=FLAGS] ファイル情報を表示する\n"
" file ... 分析するファイル\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate ファイルの日付を保持する\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license ソフトウェアライセンスを表示する\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 改行を追加する\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom バイト順マークを加える (UTF-8 の既定)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -256,7 +256,7 @@ msgstr ""
" infile このモードでの入力ファイル\n"
" outfile このモードでの出力ファイル\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -265,52 +265,52 @@ msgstr ""
" -o, --oldfile 元のファイルに書き込む (既定)\n"
" file ... このモードでの変換するファイル\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 抑止モード、全ての警告を抑止する\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom バイト順マークを削除する (既定)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom バイト順マークを削除する\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe バイナリファイルをスキップする (既定)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16 エンコーディングを保つ\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 入力の形式を UTF-16LE と見なす\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 入力の形式を UTF-16BE と見なす\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose 冗長表示をする\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink シンボリックリンクを辿り、対象を変換する\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -319,237 +319,237 @@ msgstr ""
" -R, --replace-symlink シンボリックリンクを変換後の対象ファイルに置換する\n"
" (元の対象ファイルは変更されずそのまま残る)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink シンボリックリンクを辿らず、対象をそのままにする (既定)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version バージョン番号を表示する\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 ビットバージョン (WATCOMC)。\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 ビットバージョン (TURBOC)。\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 ビットバージョン (WATCOMC)。\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 ビットバージョン (DJGPP)。\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS バージョン。\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin バージョン。\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 ビットバージョン (MinGW-w64)。\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 ビットバージョン (WATCOMC)。\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32 ビットバージョン (MinGW-w64)。\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 ビットバージョン (MinGW)。\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 ビットバージョン (MSVC %d)。\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 ビットバージョン (MSVC %d)。\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 バージョン (WATCOMC)。\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 バージョン (EMX)。\n"
-#: common.c:730
+#: common.c:727
#, fuzzy, c-format
msgid "%s version.\n"
msgstr "MSYS バージョン。\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 サポート付き。\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Unicode UTF-16 サポート無し。\n"
-#: common.c:742
+#: common.c:739
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "Unicode UTF-16 サポート付き。\n"
-#: common.c:744
+#: common.c:741
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "Unicode UTF-16 サポート無し。\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "ネイティブ言語サポート。\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr ""
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr ""
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr ""
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr ""
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE エンコーディングと見なしています。\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE エンコーディングと見なしています。\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "一時出力ファイルを開くのに失敗しました: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s を一時ファイルとして使用しています\n"
-#: common.c:1433
+#: common.c:1430
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "一時出力ファイル %s を開くのに失敗しました: %s\n"
-#: common.c:1464
+#: common.c:1461
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "一時出力ファイル %s のパーミッション変更に失敗しました: %s\n"
-#: common.c:1481
+#: common.c:1478
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "一時出力ファイル %s の所有者とグループの変更に失敗しました: %s\n"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "シンボリックリンク '%s' の解決中に問題が発生しました\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 出力ファイルは '%s' に残っています\n"
-#: common.c:1555
+#: common.c:1552
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr " '%s' から '%s' への名前変更で問題が発生しました: %s\n"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr ""
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "バイナリファイル %s をスキップしています\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "コードページ %d はサポートされていません\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16 ファイル %s をスキップしています。wchar_t のサイズは %d バイトです。\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16 ファイル %s をスキップしています。UTF-16 変換でエラーが発生しました。\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s をスキップしています。通常ファイルではありません。\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s をスキップしています。出力ファイル %s はシンボリックリンクです。\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "シンボリックリンク %s をスキップしています。対象が通常ファイルではありません。\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s をスキップしています。シンボリックリンク %s を辿った先が通常ファイルではありません。\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "%s から %s へ Unix 形式でファイル変換しています。\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "%s から %s へ Mac 形式でファイル変換しています。\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "%s から %s へ DOS 形式で変換しています。\n"
@@ -560,42 +560,42 @@ msgstr "%s から %s へ DOS 形式で変換しています。\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "%s から %s へ Unix 形式でファイル変換しています。\n"
-#: common.c:1751
+#: common.c:1750
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "%s から %s へ Mac 形式でファイル変換しています。\n"
-#: common.c:1753
+#: common.c:1752
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "%s から %s へ DOS 形式で変換しています。\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "ファイル %s からファイル %s へ変換中に問題が発生しました\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "シンボリックリンク %s をスキップしています。\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "ファイル %s を Unix 形式へ変換しています。\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "ファイル %s を Mac 形式へ変換しています。\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "ファイル %s を DOS 形式へ変換しています。\n"
@@ -605,76 +605,76 @@ msgstr "ファイル %s を DOS 形式へ変換しています。\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, fuzzy, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "ファイル %s を Unix 形式へ変換しています。\n"
-#: common.c:1836
+#: common.c:1835
#, fuzzy, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "ファイル %s を Mac 形式へ変換しています。\n"
-#: common.c:1838
+#: common.c:1837
#, fuzzy, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "ファイル %s を DOS 形式へ変換しています。\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "ファイル %s 変換中に問題が発生しました。\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "オプション -i または --info に対する間違ったフラグ '%c' です。\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "有効なコードページ: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "無効な %s 変換モードが指定されました\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "オプション '%s' には引数が必要です。\n"
-#: common.c:2362
+#: common.c:2361
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "無効な %s 変換モードが指定されました\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "対象ファイル %s が新規ファイルモードで指定されていません\n"
-#: common.c:2475
+#: common.c:2474
#, fuzzy, c-format
msgid "can not read from input file: %s\n"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "出力ファイルに書き込めません: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 69dc94d..724eb96 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix-7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-16 07:44+0100\n"
"Last-Translator: Åka Sikrom <a4@hush.com>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -75,7 +75,7 @@ msgstr ""
"Alle rettigheter tilhører rettighetshaveren.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +96,7 @@ msgstr ""
" distribusjonen.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,67 +122,67 @@ msgstr ""
"PROGRAMVAREN, SELV NÅR VEDKOMMENDE ER INFORMERT OM AT SLIK SKADE KAN \n"
"OPPSTÅ.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Bruk: %s [valg] [fil …] [-n inndatafil utdatafil …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii bare konverter linjeskift (standard)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konverter mellom tegnsettene DOS og ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 bruk Windows-kodeside 1252 (Vesteuropeisk)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 bruk DOS-kodeside 437 (US) (standard)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 bruk DOS-kodeside 850 (vesteuropeisk)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 bruk DOS-kodeside 860 (portugisisk)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 bruk DOS-kodeside 863 (fransk-kanadisk)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 bruk DOS-kodeside 865 (nordisk)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konverter 8-bit-tegn til 7-bit\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom behold «Byte Order»-merke\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom behold «Byte Order»-merke (standard)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -191,7 +191,7 @@ msgstr ""
" -c, --convmode konverteringsmodus\n"
" convmode ascii, 7bit, iso, mac (standardmodus er ascii)\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -200,22 +200,22 @@ msgstr ""
" -D, --display-enc endre koding av tekstmeldinger\n"
" encoding ansi, unicode, utf8 (ansi er standard)\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force tving konvertering av binærfiler\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konverter UTF-16 til GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help vis denne hjelpeteksten\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -224,27 +224,27 @@ msgstr ""
" -i, --info[=FLAGG] vis informasjon om fil\n"
" file … filer som skal undersøkes\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate behold utdata-filens dato\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license vis programvarelisens\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline legg til en ekstra ny linje\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom legg til «Byte Order»-merke (standard: UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -255,7 +255,7 @@ msgstr ""
" infile opprinnelig fil i ny fil-modus\n"
" outfile utdata-fil i ny fil-modus\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -264,52 +264,52 @@ msgstr ""
" -o, --oldfile skriv til gammel fil (standard)\n"
" file … filer som skal konverteres i gammel fil-modus\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet stillemodus, uten advarsler\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom fjern «Byte Order»-merke (standard)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom fjern «Byte Order»-merke\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe hopp over binærfiler (standard)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 behold UTF-16-koding\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le anta at inndata-formatet er UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be anta at inndata-formatet er UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose detaljert utskrift\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink følg symbolske lenker, og konverter lenkemål\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -318,235 +318,235 @@ msgstr ""
" -R, --replace-symlink erstatt symbolske lenker med konverterte filer\n"
" (opprinnelig målfil forblir uendret)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink hold både symbolske lenker og lenkemål uendret (standard)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version vis versjonsnummer\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bit-versjon (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bit-versjon (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bit-versjon (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bit-versjon (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS-versjon.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin-versjon.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bit-versjon (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bit-versjon (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bit-versjon (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bit-versjon (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bit-versjon (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bit-versjon (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versjon (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versjon (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s-versjon.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Med støtte for Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Uten støtte for Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Med støtte for Unicode-filnavn.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Uten støtte for Unicode-filnavn.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Med innebygd språkstøtte.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Skriver «Byte Order»-merke %s.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Inndatafil %s har %s BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Forventer UTF-16LE-koding.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Forventer UTF-16BE-koding.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Klarte ikke å åpne midlertidig utdata-fil: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "bruker %s som midlertidig fil\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Klarte ikke å skrive til midlertidig utdata-fil %s."
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Klarte ikke å endre rettigheter til midlertidig utdata-fil %s."
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Klarte ikke å endre eier og gruppetilhørighet for midlertidig utdata-fil %s."
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "det oppstod problemer med å følge den symbolske lenka «%s»\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " utdata-fil blir liggende i «%s»\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "det oppstod problemer med å gi «%s» det nye navnet «%s»."
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " som den symbolske lenka «%s» peker på\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Hopper over binærfil %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "kodesiden %d støttes ikke.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Hopper over UTF-16-fil %s. Størrelsen på wchar_t er %d byte.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Hopper over UTF-16-fil %s. Det oppstod en UTF-16-konverteringsfeil på linje %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Hopper over fila %s. Konvertering av UTF-16 støttes ikke av denne versjonen av %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Hopper over %s, som ikke er en vanlig fil.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Hopper over %s. Utdata-fil %s er en symbolsk lenke.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Hopper over symbolsk lenke %s. Målet er ikke en vanlig fil.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Hopper over %s. Målet for symbolsk lenke %s er ikke en vanlig fil.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konverterer fila %s til %s i Unix-format …\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konverterer fila %s til %s Mac-format …\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konverterer fila %s til %s i DOS-format …\n"
@@ -557,42 +557,42 @@ msgstr "konverterer fila %s til %s i DOS-format …\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s i Unix-format …\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s i Mac-format …\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konverterer %s-fila %s til %s-fila %s DOS-format …\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "det oppstod problemer under konvertering av fila %s til %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Hopper over symbolsk lenke %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konverterer fila %s til Unix-format …\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konverterer fila %s til Mac-format …\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konverterer fila %s til DOS-format …\n"
@@ -602,76 +602,76 @@ msgstr "konverterer fila %s til DOS-format …\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konverterer %s-fila %s til %s-Unix-format …\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konverterer %s-fila %s til %s-Mac-format …\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konverterer %s-fila %s til %s-DOS-format …\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "det oppstod problemer under konvertering av fila %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "klarte ikke å lese fra inndata-fil %s."
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "«%c» er et ugyldig flagg for -i (--info)\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "aktiv kodeside: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "du har valgt en ugyldig %s-konverteringsmodus\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "valget «%s» krever at du bruker et argument\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "du har valgt en ugyldig %s-koding\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "mål for fila %s er ikke valgt i ny fil-modus\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "klarte ikke å lese fra inndata-fil: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "klarte ikke å skrive til utdata-fil: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "feil: ugyldig surrogatpar. Nedre surrogat mangler.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "feil: ugyldig surrogatpar. Øvre surrogat mangler.\n"
diff --git a/po/nl.po b/po/nl.po
index 08028f3..793cd5e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-24 09:48+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -77,7 +77,7 @@ msgstr ""
"Alle rechten voorbehouden.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +97,7 @@ msgstr ""
" in de documentatie en/of andere materialen die bij de uitgave horen.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,67 +112,67 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Gebruik: %s [opties] [bestand ...] [-n invoerbestand uitvoerbestand ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii alleen regeleindes converteren (standaard)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso converteren tussen de tekensets DOS en ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 Windows-codetabel 1252 gebruiken (West-Europees)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 DOS-codetabel 437 gebruiken (VS) (standaard)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 DOS-codetabel 850 gebruiken (West-Europees)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 DOS-codetabel 860 gebruiken (Portugees)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 DOS-codetabel 863 gebruiken (Canadees Frans)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 DOS-codetabel 865 gebruiken (Scandinavisch)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 lettertekens met achtste bit gezet converteren naar spaties\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom een \"Byte Order Mark\" behouden (standaard)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -181,7 +181,7 @@ msgstr ""
" -c, --convmode te gebruiken conversiemodus\n"
" MODUS 'ascii', '7bit', 'iso', of 'mac' (standaard is 'ascii')\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -190,22 +190,22 @@ msgstr ""
" -D, --display-enc te gebruiken codering voor getoonde berichten\n"
" CODERING 'ansi', 'unicode', of 'utf8' (standaard is 'ansi')\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force conversie van binaire bestanden afdwingen\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 UTF-16 naar GB18030 converteren\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help deze hulptekst tonen\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -214,27 +214,27 @@ msgstr ""
" -i, --info[=VLAGGEN] bestandsinformatie weergeven\n"
" BESTAND... te analyseren bestand(en)\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate tijdsstempel van uitvoerbestand behouden\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license softwarelicentie tonen\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline extra regeleinde toevoegen\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom een \"Byte Order Mark\" toevoegen\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -245,7 +245,7 @@ msgstr ""
" INVOERBESTAND het originele bestand in nieuwbestand-modus\n"
" UITVOERBESTAND het geconverteerde bestand in nieuwbestand-modus\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -254,52 +254,52 @@ msgstr ""
" -o, --oldfile het oude bestand overschrijven (standaard)\n"
" BESTAND... te converteren bestand(en) in oudbestand-modus\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet alle waarschuwingen onderdrukken\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen (standaard)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom een \"Byte Order Mark\" verwijderen\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe binaire bestanden overslaan (standaard)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 UTF-16-codering behouden\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le aannemen dat de invoeropmaak UTF-16LE is\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be aannemen dat de invoeropmaak UTF-16BE is\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose gedetailleerde uitvoer produceren\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink symbolische koppelingen volgen en de doelen converteren\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -308,235 +308,235 @@ msgstr ""
" -R, --replace-symlink symbolische koppelingen vervangen door geconverteerde bestanden\n"
" (de originele doelbestanden blijven ongewijzigd)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink symbolische koppelingen en doelen ongewijzigd laten (standaard)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version programmaversie tonen\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16-bits versie (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16-bits versie (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32-bits versie (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32-bits versie (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS-versie.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin-versie.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64-bits versie (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32-bits versie (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32-bits versie (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32-bits versie (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64-bits versie (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32-bits versie (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2-versie (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2-versie (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s-versie.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Met ondersteuning voor Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Zonder ondersteuning voor Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Met ondersteuning voor Unicode-bestandsnamen.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Zonder ondersteuning voor Unicode-bestandsnamen.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Met ondersteuning voor taalregio's.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Schrijven van %s-BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Invoerbestand %s heeft een %s-BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "UTF-16LE-codering wordt aangenomen.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "UTF-16BE-codering wordt aangenomen.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Kan tijdelijk uitvoerbestand niet openen: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "%s wordt als tijdelijk bestand gebruikt\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Kan niet schrijven naar tijdelijk uitvoerbestand %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Kan toegangsrechten van tijdelijk uitvoerbestand %s niet wijzigen:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Kan eigenaar en groep van tijdelijk uitvoerbestand %s niet wijzigen:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemen met het herleiden van symbolische koppeling '%s'\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " uitvoerbestand blijft in '%s'\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemen met hernoemen van '%s' naar '%s':"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " welke het doel is van symbolische koppeling '%s'\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Binair bestand %s wordt overgeslagen\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Codetabel %d wordt niet ondersteund.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; de grootte van 'wchar_t' is %d bytes.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; er is een UTF-16-conversiefout opgetreden op regel %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "UTF-16-bestand %s wordt overgeslagen; UTF-16-conversie wordt niet ondersteund in deze versie van %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "%s wordt overgeslagen; uitvoerbestand %s is een symbolische koppeling.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier bestand is.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen regulier bestand is.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "converteren van bestand %s naar bestand %s in Unix-opmaak...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "converteren van bestand %s naar bestand %s in Mac-opmaak...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n"
@@ -547,42 +547,42 @@ msgstr "converteren van bestand %s naar bestand %s in DOS-opmaak...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Unix-opmaak...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in Mac-opmaak...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar bestand %4$s (%3$s) in DOS-opmaak...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemen met conversie van bestand %s naar bestand %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Symbolische koppeling %s wordt overgeslagen.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "converteren van bestand %s naar Unix-opmaak...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "converteren van bestand %s naar Mac-opmaak...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "converteren van bestand %s naar DOS-opmaak...\n"
@@ -592,76 +592,76 @@ msgstr "converteren van bestand %s naar DOS-opmaak...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar Unix-opmaak (%3$s)...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar Mac-opmaak (%3$s)...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "converteren van bestand %2$s (%1$s) naar DOS-opmaak (%3$s)...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problemen met conversie van bestand %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "kan niet lezen uit invoerbestand %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "onjuiste vlag '%c' voor optie '-i' of '--info'\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "actieve codetabel: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "ongeldige conversiemodus %s opgegeven\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "optie '%s' vereist een argument\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "ongeldige weergavecodering %s opgegeven\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "doel van bestand %s is niet opgegeven in 'nieuwbestand-modus'\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "kan niet lezen uit invoerbestand: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "kan niet schrijven naar uitvoerbestand: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "fout: ongeldig surrogaatpaar -- het lage deel ontbreekt\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "fout: ongeldig surrogaatpaar -- het hoge deel ontbreekt\n"
diff --git a/po/pl.po b/po/pl.po
index e4770b4..9601054 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-15 17:45+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -72,7 +72,7 @@ msgstr ""
"Wszelkie prawa zastrzeżone.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -94,7 +94,7 @@ msgstr ""
" dołączonych do dystrybucji.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -120,67 +120,67 @@ msgstr ""
"W JAKIKOLWIEK SPOSÓB W WYNIKU UŻYCIA TEGO OPROGRAMOWANIA, NAWET JEŚLI\n"
"OSTRZEŻONO O MOŻLIWOŚCI TAKICH SZKÓD.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Składnia: %s [opcje] [plik ...] [-n plik_wej plik_wyj ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii konwersja tylko końców linii (domyślne)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso konwersja między zestawem znaków DOS-a i ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 użycie strony kodowej Windows 1252 (zachodnioeuropejskiej)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 użycie strony kodowej DOS 437 (US; domyślna)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 użycie strony kodowej DOS 850 (zachodnioeuropejskiej)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 użycie strony kodowej DOS 860 (portugalskiej)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 użycie strony kodowej DOS 863 (kanadyjskiej francuskiej)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 użycie strony kodowej DOS 865 (nordyckiej)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 konwersja znaków 8-bitowych do przestrzeni 7-bitowej\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark)\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom zachowanie znacznika BOM (Byte Order Mark) (domyślne)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -189,7 +189,7 @@ msgstr ""
" -c, --convmode tryb konwersji\n"
" tryb konwersji ascii, 7bit, iso, mac; domyślnie ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -198,22 +198,22 @@ msgstr ""
" -D, --display-enc ustawienie kodowania wyświetlanych komunikatów\n"
" kodowanie ansi, unicode, utf8; domyślnie ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force wymuszenie konwersji plików binarnych\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 konwersja UTF-16 do GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help wyświetlenie tego opisu\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -222,27 +222,27 @@ msgstr ""
" -i, --info[=FLAGI] wyświetlenie informacji o pliku\n"
" plik ... pliki do analizy\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate zachowanie daty pliku wyjściowego\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license wyświetlenie licencji oprogramowania\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline dodanie dodatkowego znaku nowej linii\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom dodanie znacznika BOM (domyślnie UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -253,7 +253,7 @@ msgstr ""
" plik_wej plik oryginalny w trybie nowego pliku\n"
" plik_wyj plik wyjściowy w trybie nowego pliku\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -262,52 +262,52 @@ msgstr ""
" -o, --oldfile zapis do starego pliku (domyślne)\n"
" plik ... pliki do konwersji w trybie starego pliku\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet tryb cichy, pominięcie wszystkich ostrzeżeń\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark) (domyślne)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom usunięcie znacznika BOM (Byte Order Mark)\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe pomijanie plików binarnych (domyślne)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 zachowanie kodowania UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le przyjęcie formatu pliku wejściowego UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be przyjęcie formatu pliku wejściowego UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose działanie ze szczegółowym opisem\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink podążanie za dowiązaniami symbolicznymi i konwersja celów\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -316,235 +316,235 @@ msgstr ""
" -R, --replace-symlink zastępowanie dowiązań symbolicznych plikami wynikowymi\n"
" (oryginalne pliki docelowe pozostają bez zmian)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink bez zmian dowiązań symbolicznych i celów (domyślne)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version wyświetlenie numeru wersji\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Wersja 16-bitowa DOS (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Wersja 16-bitowa DOS (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Wersja 32-bitowa DOS (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Wersja 32-bitowa DOS (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Wersja MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Wersja Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Wersja 64-bitowa Windows (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Wersja 32-bitowa Windows (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Wersja 32-bitowa Windows (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Wersja 32-bitowa Windows (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Wersja 64-bitowa Windows (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Wersja 32-bitowa Windows (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Wersja OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Wersja OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Wersja %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Z obsługą Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Bez obsługi Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Z obsługą nazw plików w Unicode.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Bez obsługi nazw plików w Unicode.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Z obsługą języków narodowych.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Zapis znacznika BOM %s.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Plik wejściowy %s zawiera znacznik BOM %s.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Przyjęto kodowanie UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Przyjęto kodowanie UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Nie udało się otworzyć tymczasowego pliku wyjściowego: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "użycie %s jako pliku tymczasowego\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Nie udało się zapisać do tymczasowego pliku wyjściowego %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Nie udało się zmienić uprawnień tymczasowego pliku wyjściowego %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Nie udało się zmienić właściciela i grupy tymczasowego pliku wyjściowego %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "problemy z rozwiązaniem dowiązania symbolicznego '%s'\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " plik wyjściowy pozostaje w '%s'\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "problemy ze zmianą nazwy '%s' na '%s':"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " (czyli cel dowiązania symbolicznego '%s')\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Pominięto plik binarny %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "strona kodowa %d nie jest obsługiwana.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Pominięto plik UTF-16 %s, rozmiar wchar_t to %d bajt(y).\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Pominięto plik UTF-16 %s, wystąpił błąd konwersji UTF-16 w linii %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Pominięto plik UTF-16 %s, konwersja UTF-16 nie jest obsługiwana w tej wersji programu %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Pominięto %s, nie jest zwykłym plikiem.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Pominięto %s, plik wyjściowy %s jest dowiązaniem symbolicznym.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Pominięto dowiązanie symboliczne %s, cel nie jest zwykłym plikiem.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Pominięto %s, cel dowiązania symbolicznego %s nie jest zwykłym plikiem.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie uniksowym...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie Mac...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n"
@@ -555,42 +555,42 @@ msgstr "konwersja pliku %s do pliku %s w formacie DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie uniksowym...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie Mac...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "konwersja pliku %s %s do pliku %s %s w formacie DOS...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "problemy z konwersją pliku %s do pliku %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Pominięto dowiązanie symboliczne %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "konwersja pliku %s do formatu uniksowego...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "konwersja pliku %s do formatu Mac...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "konwersja pliku %s do formatu DOS...\n"
@@ -600,75 +600,75 @@ msgstr "konwersja pliku %s do formatu DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "konwersja pliku %s %s do formatu uniksowego %s...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "konwersja pliku %s %s do formatu Mac %s...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "konwersja pliku %s %s do formatu DOS %s...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "problemy z konwersją pliku %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "nie można czytać z pliku wejściowego %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "błędna flaga '%c' dla opcji -i lub --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "aktywna strona kodowa: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "podano błędny tryb konwersji %s\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "opcja '%s' wymaga argumentu\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "podano błędne kodowanie wyświetlania %s\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "nie podano celu pliku %s w trybie nowego pliku\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "nie można czytać z pliku wejściowego: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "nie można zapisać do pliku wyjściowego: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "błąd: Błędna para zamienna. Brak młodszego zamiennika.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "błąd: Błędna para zamienna. Brak starszego zamiennika.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 184a87a..552e10c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,22 +1,23 @@
# Brazilian Portuguese Translation for dos2unix.
# Copyright (C) 2015 Erwin Waterlander (msgids)
+# Copyright (C) 2015 Free Software Foundation, Inc.
# This file is distributed under the same license as the dos2unix package.
# Enrico Nicoletto <liverig@gmail.com>, 2014.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2014, 2015.
#
msgid ""
msgstr ""
-"Project-Id-Version: dos2unix 7.2-beta4\n"
+"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
-"PO-Revision-Date: 2015-01-03 17:09-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
+"PO-Revision-Date: 2015-10-09 06:37-0300\n"
+"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.1\n"
+"X-Generator: Poedit 1.8.5\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: dos2unix.c:79
@@ -76,7 +77,7 @@ msgstr ""
"Todos os direitos reservados.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -98,7 +99,7 @@ msgstr ""
" fornecidos com a distribuição.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,67 +125,67 @@ msgstr ""
"OU OUTRAS FORMAS) LEVANTADAS EM QUALQUER FORMA FORA DO USO DESTE SOFTWARE, MESMO\n"
"SE RESSALVADO DA POSSIBILIDADE DE TAL DANO.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Uso: %s [opções] [arquivo ...] [-n arquivo_entrada arquivo_saida ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii converte-se apenas as quebras de linha (padrão)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso conversão entre conjunto de caractere do DOS e ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 usa a página de código 1252 do Windows (Europa ocidental)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 usa a página de código 437 do DOS (EUA) (padrão)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 usa a página de código 850 do DOS (Europa ocidental)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 usa a página de código 860 do DOS (Português)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 usa a página de código 863 do DOS (Francês do Canadá)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 usa a página de código 865 do DOS (Nórdico)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 converte-se caracteres de 8 bit para espaço de 7 bit\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.)\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom mantém marca de ordem de byte (B.O.M.) (padrão)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -193,31 +194,31 @@ msgstr ""
" -c, --convmode modo de conversão\n"
" convmode ascii, 7bit, iso, mac, padrão para ascii\n"
-#: common.c:649
-#, fuzzy, c-format
+#: common.c:646
+#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
" encoding ansi, unicode, utf8, default to ansi\n"
msgstr ""
-" -c, --convmode modo de conversão\n"
-" convmode ascii, 7bit, iso, mac, padrão para ascii\n"
+" -D, --display-enc define codificação das mensagens de texto exibidas\n"
+" codificação ansi, unicode, utf8, default to ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force força a conversão de arquivos binários\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 converte-se de UTF-16 para GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help exibe este texto de ajuda\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -226,27 +227,27 @@ msgstr ""
" -i, --info[=OPÇÕES] exibe informação do arquivo\n"
" file ... arquivos pra analisar\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate mantém a data do arquivo de saída\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license exibe a licença do software\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline acrescenta nova linha adicional\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom adiciona marca de ordem de byte (B.O.M.) (padrão UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -257,7 +258,7 @@ msgstr ""
" infile arquivo original no modo de novo arquivo\n"
" outfile arquivo de saída no modo de novo arquivo\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -266,52 +267,52 @@ msgstr ""
" -o, --oldfile grava no arquivo antigo (padrão)\n"
" file ... arquivos a converter no modo de arquivo antigo\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet modo silencioso, esconde todos os avisos\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.) (default)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom remove marca de ordem de byte (B.O.M.)\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe ignora os arquivos binários (padrão)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 mantém codificação UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le supõe que o formato de entrada é UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be supõe que o formato de entrada é UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose operação detalhada\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink segue os links simbólicos e converte os destinos\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -320,237 +321,235 @@ msgstr ""
" -R, --replace-symlink substitui os links simbólicos por arquivos convertidos\n"
" (os arquivos originais de destino permanecem inalterados)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink mantém os links simbólicos e os destinos inalterados (padrão)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version exibe o número da versão\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS versão de 16 bit (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS versão de 16 bit (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS versão de 32 bit (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS versão de 32 bit (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Versão do MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Versão do Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows versão de 64 bit (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows versão de 32 bit (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows versão de 32 bit (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows versão de 32 bit (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows versão de 64 bit (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows versão de 32 bit (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Versão OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Versão OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Versão %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Com suporte a Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Sem suporte a Unicode UTF-16.\n"
-#: common.c:742
-#, fuzzy
+#: common.c:739
msgid "With Unicode file name support.\n"
-msgstr "Com suporte a Unicode UTF-16.\n"
+msgstr "Com suporte a nomes de arquivos em Unicode UTF-16.\n"
-#: common.c:744
-#, fuzzy
+#: common.c:741
msgid "Without Unicode file name support.\n"
-msgstr "Sem suporte a Unicode UTF-16.\n"
+msgstr "Sem suporte a nomes de arquivos em Unicode UTF-16.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Com suporte ao idioma nativo.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Escrevendo %s BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
-#, fuzzy, c-format
+#: common.c:1135
+#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Arquivo de entrada %s possui %s BOM\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Presume codificação UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Presumo codificação UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Ocorreu falha ao abrir o arquivo de saída temporário: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "usando %s como arquivo de temporário\n"
-#: common.c:1433
-#, fuzzy, c-format
+#: common.c:1430
+#, c-format
msgid "Failed to write to temporary output file %s:"
-msgstr "Ocorreu falha ao gravar no arquivo de saída temporário %s: %s\n"
+msgstr "Ocorreu falha ao gravar no arquivo de saída temporário %s:"
-#: common.c:1464
-#, fuzzy, c-format
+#: common.c:1461
+#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
-msgstr "Ocorreu falha ao alterar as permissões do arquivo de saída temporário %s: %s\n"
+msgstr "Ocorreu falha ao alterar as permissões do arquivo de saída temporário %s:"
-#: common.c:1481
-#, fuzzy, c-format
+#: common.c:1478
+#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
-msgstr "Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s: %s\n"
+msgstr "Ocorreu falha ao alterar o proprietário e o grupo do arquivo de saída temporário %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "ocorreram problemas ao determinar o link simbólico '%s'\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " o arquivo de saída permanece em '%s'\n"
-#: common.c:1555
-#, fuzzy, c-format
+#: common.c:1552
+#, c-format
msgid "problems renaming '%s' to '%s':"
-msgstr "ocorreram problemas ao renomear '%s' para '%s': %s\n"
+msgstr "ocorreram problemas ao renomear '%s' para '%s':"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " que é o destino do link simbólico '%s'\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Ignorando o arquivo binário %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "não há suporte a página de código %d.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Ignorando o arquivo UTF-16 %s, o tamanho de wchar_t é de %d bytes.\n"
-#: common.c:1632 common.c:1722 common.c:1808
-#, fuzzy, c-format
+#: common.c:1629 common.c:1721 common.c:1807
+#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
-msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16.\n"
+msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16 na linha %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
-#, fuzzy, c-format
+#: common.c:1633 common.c:1725 common.c:1811
+#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
-msgstr "Ignorando o arquivo UTF-16 %s, ocorreu um erro de conversão para UTF-16.\n"
+msgstr "Ignorando o arquivo UTF-16 %s, não há suporte a conversão para UTF-16 nesta versão do %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Ignorando %s, não é um arquivo comum.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Ignorando %s, o arquivo de saída %s é um link simbólico.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Ignorando o link simbólico %s, o destino não é o de um arquivo comum.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Ignorando %s, o destino do link simbólico %s não é o de um arquivo comum.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato Unix...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato Mac...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n"
@@ -561,42 +560,42 @@ msgstr "convertendo o arquivo %s para arquivo %s no formato DOS...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Unix...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato Mac...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "convertendo o arquivo %s %s para arquivo %s %s no formato DOS...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "ocorreram problemas ao converter o arquivo %s para arquivo %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Ignorando o link simbólico %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "convertendo o arquivo %s para formato Unix...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "convertendo o arquivo %s para formato Mac...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "convertendo o arquivo %s para formato DOS...\n"
@@ -606,82 +605,80 @@ msgstr "convertendo o arquivo %s para formato DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "convertendo o arquivo %s %s para formato do Unix %s...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "convertendo o arquivo %s %s para formato do Mac %s...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "convertendo o arquivo %s %s para formato do DOS %s...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "ocorreram problemas ao converter o arquivo %s\n"
-#: common.c:1912 common.c:1989
-#, fuzzy, c-format
+#: common.c:1911 common.c:1988
+#, c-format
msgid "can not read from input file %s:"
-msgstr "não foi possível gravar no arquivo de saída: %s\n"
+msgstr "não foi possível gravar no arquivo de entrada %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "opção incorreta \"%c\" para opção -i ou --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "página de código ativa: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "o modo de conversão %s especificado é inválido\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "a opção '%s' requer um argumento\n"
-#: common.c:2362
-#, fuzzy, c-format
+#: common.c:2361
+#, c-format
msgid "invalid %s display encoding specified\n"
-msgstr "o modo de conversão %s especificado é inválido\n"
+msgstr "a codificação de exibição %s especificada é inválida\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "o destino do arquivo %s não foi especificado no modo de novo arquivo\n"
-#: common.c:2475
-#, fuzzy, c-format
+#: common.c:2474
+#, c-format
msgid "can not read from input file: %s\n"
-msgstr "não foi possível gravar no arquivo de saída: %s\n"
+msgstr "não foi possível ler do arquivo de saída: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "não foi possível gravar no arquivo de saída: %s\n"
-#: common.c:2578
+# "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
-msgstr ""
+msgstr "erro: par de substitutos inválido. Faltando substituto baixo.\n"
-#: common.c:2593
+# "surrogate pair" é um termo do UTF-16, havendo traduções na Internet surrogate=substituto
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
-msgstr ""
-
-#, fuzzy
-#~ msgid "has %s BOM.\n"
-#~ msgstr "Escrevendo %s BOM.\n"
+msgstr "erro: par de substitutos inválido. Faltando substituto alto.\n"
#~ msgid "Skipping UTF-16 file %s, the current locale character encoding is not UTF-8.\n"
#~ msgstr "Ignorando o arquivo UTF-16 %s, a atual codificação local de caractere não é UTF-8.\n"
diff --git a/po/ru.po b/po/ru.po
index 26c8029..0c475a0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix-7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-16 19:02+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@d07.ru>\n"
@@ -76,7 +76,7 @@ msgstr ""
"Все права защищены.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -98,7 +98,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -124,67 +124,67 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Использование: %s [параметры] [файл …] [-n входной_файл выходной_файл …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii преобразовать только конец строки (по умолчанию)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso преобразовать DOS в ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 использовать кодировку Windows 1252 (Западно-Европейский)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 использовать кодировку DOS 437 (US) (по умолчанию)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 использовать кодировку DOS 850 (Западно-Европейский)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 использовать кодировку DOS 860 (Португальский)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 использовать кодировку DOS 863 (Франко-Канадский)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 использовать кодировку DOS 865 (Скандинавский)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 преобразовать 8-битные символы в 7-битные\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom сохранить метку порядка байтов (BOM)(по умолчанию)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -193,7 +193,7 @@ msgstr ""
" -c, --convmode режим преобразования\n"
" convmode ascii, 7bit, iso, mac, по умолчанию в ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -202,22 +202,22 @@ msgstr ""
" -D, --display-enc задать кодировку отображаемых текстовых сообщений\n"
" encoding ansi, unicode, utf8, по умолчанию ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force управление преобразованием двоичных файлов\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 преобразовать UTF-16 в GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help показать справку\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -226,27 +226,27 @@ msgstr ""
" -i, --info[=ФЛАГИ] показать информацию о файле\n"
" файл … файлы для анализа\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate сохранить дату выходного файла\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license отобразить лицензию программного обеспечения\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline добавить дополнительный разделитель строк\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom добавить метку порядка байтов (по умолчанию в UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -257,7 +257,7 @@ msgstr ""
" infile исходный файл в режиме нового файла\n"
" outfile выходной файл в режиме нового файла\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -266,52 +266,52 @@ msgstr ""
" -o, --oldfile записать в старый файл (по умолчанию)\n"
" file … файлы для преобразования в режиме старого файла\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet не показывать предупреждения\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom удалить метку порядка байтов (BOM) (по умолчанию)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom удалить метку порядка байтов (BOM)\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe пропустить двоичные файлы (по умолчанию)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 оставить кодировку UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le предположить, что входной формат UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be предположить, что входной формат UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose подробный режим\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink следовать символическим ссылкам и преобразовать цели\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -320,235 +320,235 @@ msgstr ""
" -R, --replace-symlink заменить символические ссылки преобразованными файлами\n"
" (оригинальные целевые файлы останутся без изменений)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink оставить символические ссылки и цели без изменений (по умолчанию)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version отобразить номер версии\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Версия для DOS, 16-битная (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Версия для DOS, 16-битная (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Версия для DOS, 32-битная (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Версия для DOS, 32-битная (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Версия с MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Версия с Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Версия для Windows, 64-битная (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Версия для Windows, 32-битная (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Версия для Windows, 32-битная (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Версия для Windows, 32-битная (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Версия для Windows, 64-битная (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Версия для Windows, 32-битная (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Версия для OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Версия для OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Версия для %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "С поддержкой Юникода UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без поддержки Юникода UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "С поддержкой имён файлов в Юникоде.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Без поддержки имён файлов в Юникоде.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "С поддержкой родного языка.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записывается %s BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Входной файл %s содержит %s BOM.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Предполагается кодировка UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Предполагается кодировка UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Не удалось открыть временный выходной файл: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "использование %s в качестве временного файла\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Не удалось записать во временный выходной файл %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Не удалось изменить права доступа ко временному выходному файлу %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Не удалось изменить владельца и группу временного выходного файла %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "конфликт при разрешении символической ссылки «%s»\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " выходной файл остаётся в «%s»\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "проблемы при переименовании «%s» в «%s»:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " который является целью символической ссылки «%s»\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Пропуск двоичного файла %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "кодовая страница %d не поддерживается.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Пропуск файла %s с UTF-16, размер wchar_t составляет %d байт.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Пропуск файла %s с UTF-16, возникла ошибка преобразования UTF-16 в строке %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Пропуск файла %s с UTF-16, преобразование UTF-16 не поддерживается в этой версии %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Пропуск %s, не является обычным файлом.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Пропуск %s, выходной файл %s является символической ссылкой.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Пропуск символической ссылки %s, цель не является обычным файлом.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Пропуск %s, цель символической ссылки %s не является обычным файлом.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "преобразование файла %s в файл %s в формат Unix…\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "преобразование файла %s в файл %s в формат Mac…\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "преобразование файла %s в файл %s в формат DOS…\n"
@@ -559,42 +559,42 @@ msgstr "преобразование файла %s в файл %s в форма
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат Unix…\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат Mac…\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "преобразование %s из файла %s в %s (файл %s) в формат DOS…\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "проблемы при преобразовании файла %s в файл %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Пропуск символической ссылки %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "преобразование файла %s в формат Unix…\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "преобразование файла %s в формат Mac…\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "преобразование файла %s в формат DOS…\n"
@@ -604,76 +604,76 @@ msgstr "преобразование файла %s в формат DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "преобразование %s из файла %s в %s формат Unix…\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "преобразование %s из файла %s в %s формат Mac…\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "преобразование %s из файла %s в %s формат DOS…\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "проблемы при преобразовании файла %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "не удалось прочитать из входного файла %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "некорректный флаг «%c» для параметра -i или --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "активная кодовая страница: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "задан неправильный %s режим преобразования\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "для параметра «%s» требуется аргумент\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "задана неправильная кодировка отображения (%s)\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "цель файла %s не задана в режиме нового файла\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "не удалось прочитать из входного файла: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не удалось записать в выходной файл: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "ошибка: некорректная суррогатная пара. Отсутствует младший суррогат.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "ошибка: некорректная суррогатная пара. Отсутствует старший суррогат.\n"
diff --git a/po/sr.po b/po/sr.po
index dff31a1..258f5d5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix-7.2-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-04-12 11:01+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
@@ -73,7 +73,7 @@ msgstr ""
"Сва права су задржана.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -89,7 +89,7 @@ msgstr ""
"1. Расподела изворног кода мора да садржи горње обавештење о ауторском праву, овај списак услова и следећи опозив.\n"
"2. Расподела у бинарном облику мора да понови обавештење горе наведеног ауторског права у документацији и/или у другом материјалу који долази уз дистрибуцију.\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -115,67 +115,67 @@ msgstr ""
"НЕПАЖЊУ ИЛИ ДРУГО) ДОВОДЕЋИ НА БИЛО КОЈИ НАЧИН ДО ПРЕКИДА УПОТРЕБЕ\n"
"ОВОГ СОФТВЕРА, ЧАК И АКО СТЕ ОБАВЕШТЕНИ О МОГУЋНОСТИ ТАКВИХ ШТЕТА.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Употреба: %s [опције] [датотека ...] [-n ул.датотека изл.датотека ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii претвара само прекиде реда (основно)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso претварање између скупа знакова ДОС-а и ИСО-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 користи Виндоуз кодну страницу 1252 (западно-европски)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 користи ДОС кодну страницу 437 (САД) (основно)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 користи ДОС кодну страницу 850 (западно-европски)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 користи ДОС кодну страницу 860 (португалски)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 користи ДОС кодну страницу 863 (канадски француски)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 користи ДОС кодну страницу 865 (норвешки)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 претвара 8-битне знакове у 7-битне размаке\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom задржава назнаку поретка бајта\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom задржава назнаку поретка бајта (основно)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -184,7 +184,7 @@ msgstr ""
" -c, --convmode режим претварања\n"
" режим претварања аскри, 7бита, исо, мек, подразумева аскри\n"
-#: common.c:649
+#: common.c:646
#, fuzzy, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -193,22 +193,22 @@ msgstr ""
" -c, --convmode режим претварања\n"
" режим претварања аскри, 7бита, исо, мек, подразумева аскри\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force присиљава претварање бинарних датотека\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 претвара УТФ-16 у ГБ18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help приказује овај текст помоћи\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -217,27 +217,27 @@ msgstr ""
" -i, --info[=ЗАСТАВЕ] приказује податке о датотеци\n"
" file ... датотеке за анализу\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate задржава датум излазне датотеке\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license приказује дозволу софтвера\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline додаје додатни нови ред\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom додаје назнаку поретка бајта (основно УТФ-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -248,7 +248,7 @@ msgstr ""
" улазна датотека изворна датотека у режиму нове датотеке\n"
" излазна датотека излазна датотека у режиму нове датотеке\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -257,52 +257,52 @@ msgstr ""
" -o, --oldfile пише у стару датотеку (основно)\n"
" датотека ... датотеке за претварање у режиму старе датотеке\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet тихи режим, потискује сва упозорења\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom уклања назнаку поретка бајта (основно)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom уклања назнаку поретка бајта\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe прескаче бинарне датотеке (основно)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 задржава УТФ-16 кодирање\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le подразумева да је улазни запис „UTF-16LE“\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be подразумева да је улазни запис „UTF-16BE“\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose опширне радње\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink прати симболичке везе и претвара мете\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -311,237 +311,237 @@ msgstr ""
" -R, --replace-symlink замењује симболичке везе претвореним датотекама\n"
" (изворне датотеке мете остају непромењене)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink задржава неизмењеним симболичке везе и мете (основно)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version приказује број издања\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "ДОС 16 бита издање (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "ДОС 16 бита издање (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "ДОС 32 бита издање (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "ДОС 32 бита издање (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "МСИС издање.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Цигвин издање.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Виндоуз 64 бита издање (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Виндоуз 32 бита издање (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Виндоуз 32 бита издање (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Виндоуз 32 бита издање (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Виндоуз 64 бита издање (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Виндоуз 32 бита издање (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "ОС/2 издање (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "ОС/2 издање (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "%s издање.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Са подршком Јуникода УТФ-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без подршке Јуникода УТФ-16.\n"
-#: common.c:742
+#: common.c:739
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "Са подршком Јуникода УТФ-16.\n"
-#: common.c:744
+#: common.c:741
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "Без подршке Јуникода УТФ-16.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Са подршком матерњег језика.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записујем %s НПБ-а.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "УТФ-16ЛЕ"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "УТФ-16БЕ"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "ГБ18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "УТФ-8"
-#: common.c:1138
+#: common.c:1135
#, fuzzy, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Улазна датотека „%s“ има %s НПБ-а.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Подразумевам УТФ-16ЛЕ кодирање.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Подразумевам УТФ-16БЕ кодирање.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Нисам успео да отворим привремену излазну датотеку: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "користим „%s“ као привремену датотеку\n"
-#: common.c:1433
+#: common.c:1430
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Нисам успео да пишем у привремену излазну датотеку „%s“: %s\n"
-#: common.c:1464
+#: common.c:1461
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Нисам успео да изменим овлашћења привремене излазне датотеке „%s“: %s\n"
-#: common.c:1481
+#: common.c:1478
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Нисам успео да изменим власника и групу привремене излазне датотеке „%s“: %s\n"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "проблеми решавања симболичке везе „%s“\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " излазна датотека остаје у „%s“\n"
-#: common.c:1555
+#: common.c:1552
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "проблеми преименовања „%s“ у „%s“: %s\n"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " који је мета симболичке везе „%s“\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Прескачем бинарну датотеку „%s“\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "Кодна страница „%d“ није подржана.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Прескачем УТФ-16 датотеку „%s“, величина „wchar_t“-а је %d бајта.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Прескачем УТФ-16 датотеку „%s“, дошло је од грешке УТФ-16 претварања.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Прескачем „%s“, није обична датотека.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Прескачем „%s“, излазна датотека „%s“ је симболичка веза.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Прескачем симболичку везу „%s“, мета није обична датотека.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Прескачем „%s“, мета симболичке везе „%s“ није обична датотека.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису Мека...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "претварам датотеку „%s“ у датотеку „%s“ у запису ДОС-а...\n"
@@ -552,42 +552,42 @@ msgstr "претварам датотеку „%s“ у датотеку „%s
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Мека...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "претварам %s датотеку „%s“ у %s датотеку „%s“ у запису Дос-а...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "проблеми претварања датотеке „%s“ у датотеку „%s“\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Прескачем симболичку везу „%s“.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "претварам датотеку „%s“ у запису Јуникса...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "претварам датотеку „%s“ у запису Мека...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "претварам датотеку „%s“ у запису ДОС-а...\n"
@@ -597,76 +597,76 @@ msgstr "претварам датотеку „%s“ у запису ДОС-а..
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Јуникса...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Мека...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "претварам %s датотеку „%s“ у %s запис Дос-а...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "проблеми претварања датотеке „%s“\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "не могу да пишем у излазну датотеку: %s\n"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "погрешна заставица „%c“ за опцију „-i“ или „--info“\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "радна кодна страница: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "наведен је неисправан „%s“ режим претварања\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "опција „%s“ захтева аргумент\n"
-#: common.c:2362
+#: common.c:2361
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "наведен је неисправан „%s“ режим претварања\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "мета датотеке „%s“ није наведена у режиму нове датотеке\n"
-#: common.c:2475
+#: common.c:2474
#, fuzzy, c-format
msgid "can not read from input file: %s\n"
msgstr "не могу да пишем у излазну датотеку: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не могу да пишем у излазну датотеку: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..392a952
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,677 @@
+# Swedish translation for dos2unix.
+# Copyright © 2014-2015 Erwin Waterlander, et al. (msgids)
+# This file is distributed under the same license as the dos2unix package.
+# Sebastian Rasmussen <sebras@gmail.com>, 2014, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dos2unix 7.3.1-beta5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"PO-Revision-Date: 2015-11-08 14:27+0100\n"
+"Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.6\n"
+
+#: dos2unix.c:79
+msgid ""
+"Copyright (C) 2009-2015 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 (C) 2009-2015 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"
+"Alla rättigheter reserverade.\n"
+"\n"
+
+#: dos2unix.c:212 dos2unix.c:249 unix2dos.c:149 unix2dos.c:209
+#, c-format
+msgid "Binary symbol 0x00%02X found at line %u\n"
+msgstr "Binärsymbol 0x00%02X hittades på rad %u\n"
+
+#: dos2unix.c:305 dos2unix.c:488 unix2dos.c:261 unix2dos.c:461
+#, c-format
+msgid "program error, invalid conversion mode %d\n"
+msgstr "programfel, ogiltigt konverteringsläge %d\n"
+
+#: dos2unix.c:313 dos2unix.c:494 unix2dos.c:269 unix2dos.c:467
+#, c-format
+msgid "Converted %u out of %u line breaks.\n"
+msgstr "Konverterade %u av %u radbrytningar.\n"
+
+#: dos2unix.c:371 unix2dos.c:327
+#, c-format
+msgid "using code page %d.\n"
+msgstr "använder teckentabell %d.\n"
+
+#: dos2unix.c:395 dos2unix.c:432 unix2dos.c:349 unix2dos.c:409
+#, c-format
+msgid "Binary symbol 0x%02X found at line %u\n"
+msgstr "Binärsymbol 0x%02X hittades på rad %u\n"
+
+#: dos2unix.c:525 unix2dos.c:498
+msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
+msgstr "fel: Värdet på miljövariabeln DOS2UNIX_LOCALEDIR är för långt.\n"
+
+#: unix2dos.c:69
+msgid ""
+"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 1994-1995 Benjamin Lin\n"
+"All rights reserved.\n"
+"\n"
+msgstr ""
+"Copyright (C) 2009-2015 Erwin Waterlander\n"
+"Copyright (C) 1994-1995 Benjamin Lin\n"
+"Alla rättigheter reserverade.\n"
+"\n"
+
+#: common.c:597
+msgid ""
+"Redistribution and use in source and binary forms, with or without\n"
+"modification, are permitted provided that the following conditions\n"
+"are met:\n"
+"1. Redistributions of source code must retain the above copyright\n"
+" notice, this list of conditions and the following disclaimer.\n"
+"2. Redistributions in binary form must reproduce the above copyright\n"
+" notice in the documentation and/or other materials provided with\n"
+" the distribution.\n"
+"\n"
+msgstr ""
+"Omdistribution och användning i källkods- och binärform, med eller utan\n"
+"modifiering, är tillåten givet att följande villkor är uppfyllda:\n"
+"1. Omdistribution av källkod måste behålla den ovanstående notisen om\n"
+" upphovsrätt, denna lista av villkor och den efterföljande \n"
+" ansvarsfriskrivningen.2. Omdistribution i binär form måste återge den ovanstående notisen om\n"
+" upphovsrätt i dokumentationen och/eller annat material som följer\n"
+" med distributionen.\n"
+"\n"
+
+#: common.c:607
+msgid ""
+"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
+"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
+"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n"
+"PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE\n"
+"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n"
+"CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT\n"
+"OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n"
+"BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n"
+"WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\n"
+"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
+"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+msgstr ""
+"DENNA MJUKVARA TILLHANDAHÅLLS AV UPPHOVSRÄTTSINNEHAVAREN I “BEFINTLIGT\n"
+"SKICK“ (AS IS) OCH ANSVAR FÖR UTTRYCKLIGA ELLER UNDERFÖRSTÅDDA,\n"
+"INKLUSIVE, MEN INTE BEGRÄNSAT TILL UNDERFÖRSTÅDDA GARANTIER VID KÖP\n"
+"OCH LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL AVVISAS. INTE I NÅGOT FALL SKALL\n"
+"UPPHOVSRÄTTSINNEHAVAREN VARA SKYLDIG UTGE ERSÄTTNING FÖR DIREKT,\n"
+"INDIREKT, OFÖRUTSEDD, SPECIELL, EXEMPLARISK ELLER FÖLJDRELATERAD SKADA\n"
+"(INKLUSIVE, MEN INTE BEGRÄNSAT TILL ANSKAFFNING AV ERSÄTTNINGSVAROR\n"
+"ELLER TJÄNSTER; FÖRLUST AV ANVÄNDNING, DATA ELLER FÖRTJÄNST; ELLER\n"
+"AVBROTT I VERKSAMHET) OAVSETT HUR DEN ORSAKATS OCH TEORIER OM ANSVAR,\n"
+"OAVSETT OM SKRIVET I KONTRAKT, STRIKT SKYLDIGHET ELLER FÖRSEELSE\n"
+"(INKLUSIVE OAKTSAMHET ELLER ANNAT) SOM PÅ NÅGOT SÄTT UPPSTÅTT VID\n"
+"ANVÄNDNING AV DENNA MJUKVARA, ÄVEN OM UNDERRÄTTAD OM MÖJLIGHETEN FÖR\n"
+"SÅDAN SKADA.\n"
+
+#: common.c:632
+#, c-format
+msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
+msgstr "Användning: %s [flaggor] [fil …] [-n infil utfil …]\n"
+
+#: common.c:633
+#, c-format
+msgid " -ascii convert only line breaks (default)\n"
+msgstr " -ascii konvertera bara radbrytningar (standard)\n"
+
+#: common.c:634
+#, c-format
+msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
+msgstr " -iso konvertering mellan DOS och ISO-8859-1 teckenuppsättningar\n"
+
+#: common.c:635
+#, c-format
+msgid " -1252 use Windows code page 1252 (Western European)\n"
+msgstr " -1252 använd Windows teckentabell 1252 (Västeuropeisk)\n"
+
+#: common.c:636
+#, c-format
+msgid " -437 use DOS code page 437 (US) (default)\n"
+msgstr " -437 använd DOS teckentabell 437 (USA) (standard)\n"
+
+#: common.c:637
+#, c-format
+msgid " -850 use DOS code page 850 (Western European)\n"
+msgstr " -850 använd DOS teckentabell 850 (Västeuropeisk)\n"
+
+#: common.c:638
+#, c-format
+msgid " -860 use DOS code page 860 (Portuguese)\n"
+msgstr " -860 använd DOS teckentabell 860 (portugisisk)\n"
+
+#: common.c:639
+#, c-format
+msgid " -863 use DOS code page 863 (French Canadian)\n"
+msgstr " -863 använd DOS teckentabell 863 (fransk-kanadensisk)\n"
+
+#: common.c:640
+#, c-format
+msgid " -865 use DOS code page 865 (Nordic)\n"
+msgstr " -865 använd DOS-teckentabell 865 (nordisk)\n"
+
+#: common.c:641
+#, c-format
+msgid " -7 convert 8 bit characters to 7 bit space\n"
+msgstr " -7 konvertera 8-bitars tecken till 7-bitars blanksteg\n"
+
+#: common.c:643
+#, c-format
+msgid " -b, --keep-bom keep Byte Order Mark\n"
+msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark)\n"
+
+#: common.c:645
+#, c-format
+msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
+msgstr " -b, --keep-bom behåll byteordningsmarkering (Byte Order Mark) (standard)\n"
+
+#: common.c:646
+#, c-format
+msgid ""
+" -c, --convmode conversion mode\n"
+" convmode ascii, 7bit, iso, mac, default to ascii\n"
+msgstr ""
+" -c, --convmode konverteringsläge\n"
+" konverteringsläge ascii, 7bit, iso, mac, standard är ascii\n"
+
+#: common.c:649
+#, c-format
+msgid ""
+" -D, --display-enc set encoding of displayed text messages\n"
+" encoding ansi, unicode, utf8, default to ansi\n"
+msgstr ""
+" -D, --display-enc ställ in kodning för visade textmeddelanden\n"
+" kodning ansi, unicode, utf8, standard är ansi\n"
+
+#: common.c:652
+#, c-format
+msgid " -f, --force force conversion of binary files\n"
+msgstr " -f, --force tvinga konvertering av binära filer\n"
+
+#: common.c:655
+#, c-format
+msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
+msgstr " -gb, --gb18030 konvertera UTF-16 till GB18030\n"
+
+#: common.c:658
+#, c-format
+msgid " -h, --help display this help text\n"
+msgstr " -h, --help visar denna hjälptext\n"
+
+#: common.c:659
+#, c-format
+msgid ""
+" -i, --info[=FLAGS] display file information\n"
+" file ... files to analyze\n"
+msgstr ""
+" -i, --info[=FLAGGOR] visa filinformation\n"
+" fil … filer att analysera\n"
+
+#: common.c:661
+#, c-format
+msgid " -k, --keepdate keep output file date\n"
+msgstr " -k, --keepdate behåll datum för utmatningsfilen\n"
+
+#: common.c:662
+#, c-format
+msgid " -L, --license display software license\n"
+msgstr " -L, --license visa mjukvarulicensen\n"
+
+#: common.c:663
+#, c-format
+msgid " -l, --newline add additional newline\n"
+msgstr " -l, --newline lägg till ytterligare nyrad\n"
+
+#: common.c:664
+#, c-format
+msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
+msgstr " -m, --add-bom lägg till byteordningsmarkering (Byte Order Mark) (standard för UTF-8)\n"
+
+#: common.c:665
+#, c-format
+msgid ""
+" -n, --newfile write to new file\n"
+" infile original file in new-file mode\n"
+" outfile output file in new-file mode\n"
+msgstr ""
+" -n, --newfile skriv till ny fil\n"
+" infil originafil i nyfilsläge\n"
+" utfil utmatningsfil i nyfilsläge\n"
+
+#: common.c:668
+#, c-format
+msgid ""
+" -o, --oldfile write to old file (default)\n"
+" file ... files to convert in old-file mode\n"
+msgstr ""
+" -o, --oldfile skriv till den gamla filen (standard)\n"
+" fil … filer att konvertera i äldrefilsläge\n"
+
+#: common.c:670
+#, c-format
+msgid " -q, --quiet quiet mode, suppress all warnings\n"
+msgstr " -q, --quiet tyst läge, dölj alla varningar\n"
+
+#: common.c:672
+#, c-format
+msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
+msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark) (standard)\n"
+
+#: common.c:674
+#, c-format
+msgid " -r, --remove-bom remove Byte Order Mark\n"
+msgstr " -r, --remove-bom ta bort byteordningsmarkering (Byte Order Mark)\n"
+
+#: common.c:675
+#, c-format
+msgid " -s, --safe skip binary files (default)\n"
+msgstr " -s, --safe hoppa över binära filer (standard)\n"
+
+#: common.c:677
+#, c-format
+msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
+msgstr " -u, --keep-utf16 behåll UTF-16 teckenkodning\n"
+
+#: common.c:678
+#, c-format
+msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
+msgstr " -ul, --assume-utf16le förmoda att inmatningsformatet är UTF-16LE\n"
+
+#: common.c:679
+#, c-format
+msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
+msgstr " -ub, --assume-utf16be förmoda att inmatningsformatet är UTF16-BE\n"
+
+#: common.c:681
+#, c-format
+msgid " -v, --verbose verbose operation\n"
+msgstr " -v, --verbose utförlig drift\n"
+
+#: common.c:683
+#, c-format
+msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
+msgstr " -F, --follow-symlink följ symboliska länkar och konvertera målen\n"
+
+#: common.c:686
+#, c-format
+msgid ""
+" -R, --replace-symlink replace symbolic links with converted files\n"
+" (original target files remain unchanged)\n"
+msgstr ""
+" -R, --replace-symlink ersätt symboliska länkar med konverterade filer\n"
+" (de ursprungliga målfilerna förblir oförändrade)\n"
+
+#: common.c:688
+#, c-format
+msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
+msgstr " -S, --skip-symlink behåll symboliska länkar och mål oförändrade (standard)\n"
+
+#: common.c:690
+#, c-format
+msgid " -V, --version display version number\n"
+msgstr " -V, --version visa versionsnummer\n"
+
+#: common.c:702
+msgid "DOS 16 bit version (WATCOMC).\n"
+msgstr "DOS 16-bitarsversion (WATCOMC).\n"
+
+#: common.c:704
+msgid "DOS 16 bit version (TURBOC).\n"
+msgstr "DOS 16-bitarsversion (TURBOC).\n"
+
+#: common.c:706
+msgid "DOS 32 bit version (WATCOMC).\n"
+msgstr "DOS 32-bitarsversion (WATCOMC).\n"
+
+#: common.c:708
+msgid "DOS 32 bit version (DJGPP).\n"
+msgstr "DOS 32-bitarsversion (DJGPP).\n"
+
+#: common.c:710
+msgid "MSYS version.\n"
+msgstr "MSYS-version.\n"
+
+#: common.c:712
+msgid "Cygwin version.\n"
+msgstr "Cygwin-version.\n"
+
+#: common.c:714
+msgid "Windows 64 bit version (MinGW-w64).\n"
+msgstr "Windows 64-bitarsversion (MinGW-w64).\n"
+
+#: common.c:716
+msgid "Windows 32 bit version (WATCOMC).\n"
+msgstr "Windows 32-bitarsversion (WATCOMC).\n"
+
+#: common.c:718
+msgid "Windows 32 bit version (MinGW-w64).\n"
+msgstr "Windows 32-bitarsversion (MinGW-w64).\n"
+
+#: common.c:720
+msgid "Windows 32 bit version (MinGW).\n"
+msgstr "Windows 32-bitarsversion (MinGW).\n"
+
+#: common.c:722
+#, c-format
+msgid "Windows 64 bit version (MSVC %d).\n"
+msgstr "Windows 64-bitarsversion (MSVC %d).\n"
+
+#: common.c:724
+#, c-format
+msgid "Windows 32 bit version (MSVC %d).\n"
+msgstr "Windows 32-bitarsversion (MSVC %d).\n"
+
+#: common.c:726
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "OS/2-version (WATCOMC).\n"
+
+#: common.c:728
+msgid "OS/2 version (EMX).\n"
+msgstr "OS/2-version (EMX).\n"
+
+#: common.c:730
+#, c-format
+msgid "%s version.\n"
+msgstr "%s version.\n"
+
+#: common.c:736
+msgid "With Unicode UTF-16 support.\n"
+msgstr "Med stöd för Unicode UTF-16.\n"
+
+#: common.c:738
+msgid "Without Unicode UTF-16 support.\n"
+msgstr "Utan stöd för Unicode UTF-16.\n"
+
+#: common.c:742
+msgid "With Unicode file name support.\n"
+msgstr "Med stöd för Unicode-filnamn.\n"
+
+#: common.c:744
+msgid "Without Unicode file name support.\n"
+msgstr "Utan stöd för Unicode-filnamn.\n"
+
+#: common.c:748
+msgid "With native language support.\n"
+msgstr "Med modersmålsstöd.\n"
+
+#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
+#: common.c:1093
+#, c-format
+msgid "Writing %s BOM.\n"
+msgstr "Skriver %s BOM.\n"
+
+#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+msgid "UTF-16LE"
+msgstr "UTF-16LE"
+
+#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+msgid "UTF-16BE"
+msgstr "UTF-16BE"
+
+#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+msgid "GB18030"
+msgstr "GB18030"
+
+#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#: common.c:1138
+#, c-format
+msgid "Input file %s has %s BOM.\n"
+msgstr "Infil %s har %s BOM.\n"
+
+#: common.c:1174 common.c:1217
+msgid "Assuming UTF-16LE encoding.\n"
+msgstr "Förmodar att UTF-16LE teckenkodning används.\n"
+
+#: common.c:1178 common.c:1221
+msgid "Assuming UTF-16BE encoding.\n"
+msgstr "Förmodar att UTF-16BE teckenkodning används.\n"
+
+#: common.c:1361
+#, c-format
+msgid "Failed to open temporary output file: %s\n"
+msgstr "Misslyckades att öppna temporär utmatningsfil: %s\n"
+
+#: common.c:1368
+#, c-format
+msgid "using %s as temporary file\n"
+msgstr "använder %s som temporär fil\n"
+
+#: common.c:1433
+#, c-format
+msgid "Failed to write to temporary output file %s:"
+msgstr "Misslyckades att skriva till temporär utmatningsfil %s:"
+
+#: common.c:1464
+#, c-format
+msgid "Failed to change the permissions of temporary output file %s:"
+msgstr "Misslyckades att ändra rättigheterna för temporär utmatningsfil %s:"
+
+#: common.c:1481
+#, c-format
+msgid "Failed to change the owner and group of temporary output file %s:"
+msgstr "Misslyckades att ändra ägare och grupp för temporär utmatningsfil %s:"
+
+#: common.c:1528
+#, c-format
+msgid "problems resolving symbolic link '%s'\n"
+msgstr "fel uppstod vid upplösning av symbolisk länk “%s“\n"
+
+#: common.c:1529 common.c:1561
+#, c-format
+msgid " output file remains in '%s'\n"
+msgstr " utfil förblir i “%s“\n"
+
+#: common.c:1555
+#, c-format
+msgid "problems renaming '%s' to '%s':"
+msgstr "fel när '%s' bytte namn till '%s':"
+
+#: common.c:1559
+#, c-format
+msgid " which is the target of symbolic link '%s'\n"
+msgstr " vilken är målet för den symboliska länken “%s“\n"
+
+#: common.c:1622 common.c:1712 common.c:1798
+#, c-format
+msgid "Skipping binary file %s\n"
+msgstr "Hoppar över binärfil %s\n"
+
+#: common.c:1625 common.c:1715 common.c:1801
+#, c-format
+msgid "code page %d is not supported.\n"
+msgstr "saknar stöd för teckentabell %d.\n"
+
+#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#, c-format
+msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
+msgstr "Hoppar över UTF-16-fil %s, storleken på wchar_t är %d byte.\n"
+
+#: common.c:1632 common.c:1722 common.c:1808
+#, c-format
+msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
+msgstr "Hoppar över UTF-16-fil %s, ett UTF-16-konverteringsfel inträffade på rad %u.\n"
+
+#: common.c:1636 common.c:1726 common.c:1812
+#, c-format
+msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
+msgstr "Hoppar över UTF-16 fil %s, UTF-16-konvertering saknar stöd i denna version av %s.\n"
+
+#: common.c:1700 common.c:1789 common.c:1854
+#, c-format
+msgid "Skipping %s, not a regular file.\n"
+msgstr "Hoppar över %s, är ingen vanlig fil.\n"
+
+#: common.c:1703
+#, c-format
+msgid "Skipping %s, output file %s is a symbolic link.\n"
+msgstr "Hoppar över %s, utfil %s är en symbolisk länk.\n"
+
+#: common.c:1706 common.c:1795 common.c:1859
+#, c-format
+msgid "Skipping symbolic link %s, target is not a regular file.\n"
+msgstr "Hoppar över symbolisk länk %s, målet är inte en vanlig fil.\n"
+
+#: common.c:1709
+#, c-format
+msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
+msgstr "Hoppar över %s, målet för den symboliska länken %s är inte en vanlig fil.\n"
+
+#: common.c:1732
+#, c-format
+msgid "converting file %s to file %s in Unix format...\n"
+msgstr "konverterar fil %s till fil %s i Unix-format…\n"
+
+#: common.c:1735
+#, c-format
+msgid "converting file %s to file %s in Mac format...\n"
+msgstr "konverterar fil %s till fil %s i Mac-format…\n"
+
+#: common.c:1737
+#, c-format
+msgid "converting file %s to file %s in DOS format...\n"
+msgstr "konverterar fil %s till fil %s i DOS-format…\n"
+
+#. TRANSLATORS:
+#. 1st %s is encoding of input file.
+#. 2nd %s is name of input file.
+#. 3rd %s is encoding of output file.
+#. 4th %s is name of output file.
+#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
+#: common.c:1748
+#, c-format
+msgid "converting %s file %s to %s file %s in Unix format...\n"
+msgstr "konverterar %s-fil %s till %s-fil %s i Unix-format…\n"
+
+#: common.c:1751
+#, c-format
+msgid "converting %s file %s to %s file %s in Mac format...\n"
+msgstr "konverterar %s-fil %s till %s-fil %s i Mac-format…\n"
+
+#: common.c:1753
+#, c-format
+msgid "converting %s file %s to %s file %s in DOS format...\n"
+msgstr "konverterar %s-fil %s till %s-fil %s i DOS-format…\n"
+
+#: common.c:1759
+#, c-format
+msgid "problems converting file %s to file %s\n"
+msgstr "fel vid konvertering från fil %s till fil %s\n"
+
+#: common.c:1792
+#, c-format
+msgid "Skipping symbolic link %s.\n"
+msgstr "Hoppar över symbolisk länk %s.\n"
+
+#: common.c:1818
+#, c-format
+msgid "converting file %s to Unix format...\n"
+msgstr "konverterar fil %s till Unix-format…\n"
+
+#: common.c:1821
+#, c-format
+msgid "converting file %s to Mac format...\n"
+msgstr "konverterar fil %s till Mac-format…\n"
+
+#: common.c:1823
+#, c-format
+msgid "converting file %s to DOS format...\n"
+msgstr "konverterar fil %s till DOS-format…\n"
+
+#. TRANSLATORS:
+#. 1st %s is encoding of input file.
+#. 2nd %s is name of input file.
+#. 3rd %s is encoding of output (input file is overwritten).
+#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
+#: common.c:1833
+#, c-format
+msgid "converting %s file %s to %s Unix format...\n"
+msgstr "konverterar %s-fil %s till %s Unix-format…\n"
+
+#: common.c:1836
+#, c-format
+msgid "converting %s file %s to %s Mac format...\n"
+msgstr "konverterar %s-fil %s till %s Mac-format…\n"
+
+#: common.c:1838
+#, c-format
+msgid "converting %s file %s to %s DOS format...\n"
+msgstr "konverterar %s-fil %s till %s DOS-format…\n"
+
+#: common.c:1844
+#, c-format
+msgid "problems converting file %s\n"
+msgstr "fel vid konvertering av fil %s\n"
+
+#: common.c:1912 common.c:1989
+#, c-format
+msgid "can not read from input file %s:"
+msgstr "kan inte läsa från inmatningsfil %s:"
+
+#: common.c:2162
+#, c-format
+msgid "wrong flag '%c' for option -i or --info\n"
+msgstr "felaktig flagga '%c' för argumentet -i eller --info\n"
+
+#: common.c:2287 common.c:2324
+#, c-format
+msgid "active code page: %d\n"
+msgstr "aktiv teckentabell: %d\n"
+
+#: common.c:2336
+#, c-format
+msgid "invalid %s conversion mode specified\n"
+msgstr "ogiltigt konverteringsläge %s angivet\n"
+
+#: common.c:2344 common.c:2370
+#, c-format
+msgid "option '%s' requires an argument\n"
+msgstr "flaggan “%s“ kräver ett argument\n"
+
+#: common.c:2362
+#, c-format
+msgid "invalid %s display encoding specified\n"
+msgstr "ogiltig %s-kodning angiven\n"
+
+#: common.c:2382 common.c:2395 common.c:2461
+#, c-format
+msgid "target of file %s not specified in new-file mode\n"
+msgstr "målet för fil %s specificerades inte i nyfilsläge\n"
+
+#: common.c:2475
+#, c-format
+msgid "can not read from input file: %s\n"
+msgstr "kan inte läsa från inmatningsfil: %s\n"
+
+#: common.c:2487 common.c:2501
+#, c-format
+msgid "can not write to output file: %s\n"
+msgstr "kan inte skriva till utfil: %s\n"
+
+#: common.c:2578
+msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
+msgstr "fel: Ogiltigt surrogatpar. Den lägre delen av surrogatparet saknas.\n"
+
+#: common.c:2593
+msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
+msgstr "fel: Ogiltigt surrogatpar. Den högre delen av surrogatparet saknas.\n"
diff --git a/po/uk.po b/po/uk.po
index 73c6776..38f3993 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-15 16:32+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -76,7 +76,7 @@ msgstr ""
"Усі права застережено.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -105,7 +105,7 @@ msgstr ""
" від відповідальності у документації і/або інших супровідних матеріалах.)\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -131,67 +131,67 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Користування: %s [параметри] [файл ...] [-n вхідний_файл результат ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii перетворити лише символи розриву рядків (типово)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso виконати перетворення з кодування DOS до кодування ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 використати кодову таблицю 1252 Windows (західноєвропейські мови)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 використовувати кодову сторінку DOS 437 (США) (типово)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 використовувати кодову сторінку DOS 850 (західноєвропейські мови)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 використовувати сторінку DOS 860 (португальська)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 використовувати сторінку DOS 863 (канадська французька)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 використовувати сторінку DOS 865 (скандинавські мови)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 перетворювати 8-бітові символи на 7-бітові\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom зберегти позначку порядку байтів (BOM)\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom зберегти позначку порядку байтів (типово)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -200,7 +200,7 @@ msgstr ""
" -c, --convmode режим перетворення\n"
" режим ascii, 7bit, iso, mac, типовим є ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -209,22 +209,22 @@ msgstr ""
" -D, --display-enc встановити кодування показаних текстових повідомлень,\n"
" кодування ansi, unicode, utf8, типовим є ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force примусове перетворення бінарних файлів\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 перетворити UTF-16 на GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help показати це довідкове повідомлення\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -233,27 +233,27 @@ msgstr ""
" -i, --info[=ПРАПОРЦІ] показати дані щодо файла\n"
" файл ... файли, які слід проаналізувати\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate зберігати дату створення файла для результату\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license показати ліцензійну угоду щодо програмного забезпечення\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline вставити додатковий символ розриву рядка\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -b, --add-bom додати позначку порядку байтів (типово UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -264,7 +264,7 @@ msgstr ""
" вхідний_файл початковий файл у режимі створення файлів\n"
" результат файл результату у режимі створення файлів\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -273,52 +273,52 @@ msgstr ""
" -o, --oldfile записати до старого файла (типово)\n"
" файл ... файли, які слід перетворити у режимі без створення файлів\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet режим без повідомлень, не показувати попередження\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom вилучити позначку порядку байтів (типово)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom вилучити позначку порядку байтів (BOM)\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe пропускати двійкові файли (типово)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 зберегти кодування UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le припускати, що вхідним форматом є UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be припускати, що вхідним форматом є UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose режим докладних повідомлень\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink переходити за символічними посиланням і перетворювати файли, на які вони вказують\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -327,235 +327,235 @@ msgstr ""
" -R, --replace-symlink замінити символічні посилання перетвореними файлами\n"
" (початкові файли, на які вони вказують, змінено не буде)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink не змінювати символічні посилання та файли, на які вони посилаються (типово)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version показати дані щодо номера версії\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS, 16-бітова версія (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS, 16-бітова версія (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS, 32-бітова версія (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS, 32-бітова версія (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Версія MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Версія Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows, 64-бітова версія (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows, 32-бітова версія (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows, 32-бітова версія (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows, 32-бітова версія (MinGW)\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows, 64-бітова версія (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows, 32-бітова версія (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Версія для OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Версія для OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Версія %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "З підтримкою Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Без підтримки Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "З підтримкою назв файлів у Unicode.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Без підтримки Unicode у назвах файлів.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "З підтримкою природної мови.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Записуємо позначку порядку байтів %s.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "У вхідному файлі %s позначкою порядку байтів є %s.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Припускаємо кодування UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Припускаємо кодування UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Не вдалося відкрити файл для виведення тимчасових даних: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "використовуємо %s як тимчасовий файл\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Не вдалося записати дані до тимчасового файла виведення %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Не вдалося змінити права доступу до тимчасового файла виведення даних %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Не вдалося змінити власника і групу тимчасового файла виведення даних %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "проблеми з обробкою символічного посилання «%s»\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " файл результатів залишився у «%s»\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "проблеми з перейменуванням «%s» на «%s»:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " на який посилається символічне посилання «%s»\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Пропускаємо двійковий файл %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "підтримки кодової сторінки %d не передбачено.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, розміром wchar_t є %d байтів.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, сталася помилка під час перетворення даних UTF-16 у рядку %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Пропускаємо файл у кодуванні UTF-16, %s, перетворення UTF-16 для цієї версії %s не передбачено.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Пропускаємо %s, не є звичайним файлом.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Пропускаємо %s, файл результату, %s, є символічним посиланням.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Пропускаємо символічне посилання %s, призначення не є звичайним файлом.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Пропускаємо %s, об’єкт, на який посилається символічне посилання %s, не є звичайним файлом.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі Unix...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі Mac...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "перетворюємо файл %s на файл %s у форматі DOS...\n"
@@ -566,42 +566,42 @@ msgstr "перетворюємо файл %s на файл %s у форматі
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Unix...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі Mac...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "перетворюємо файл у кодуванні %s %s на файл у кодуванні %s %s у форматі DOS...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "під час перетворення файла %s на файл %s виникли проблеми\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Пропускаємо символічне посилання %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "перетворюємо файл %s до формату Unix...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "перетворюємо файл %s до формату Mac...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "перетворюємо файл %s до формату DOS...\n"
@@ -611,76 +611,76 @@ msgstr "перетворюємо файл %s до формату DOS...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s Unix...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s Mac...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "перетворюємо файл у кодуванні %s %s до формату %s DOS...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "під час перетворення файла %s виникли проблеми\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "не вдалося прочитати дані із файла вхідних даних %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "помилковий прапорець «%c» для параметра -i або --info\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "активна кодова сторінка: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "вказано некоректний режим перетворення %s\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "до параметра «%s» слід вказувати аргумент\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "вказано некоректне кодування для показу %s\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "не вказано призначення для файла %s у режимі створення файлів\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "не вдалося прочитати дані із файла вхідних даних: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "не вдалося виконати запис до файла результатів: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "помилка: некоректна пара заміщення. Пропущено нижній компонент.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "помилка: некоректна пара заміщення. Пропущено верхній компонент.\n"
diff --git a/po/vi.po b/po/vi.po
index ac1351f..595979f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-16 08:01+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -76,7 +76,7 @@ msgstr ""
"Giữ toàn bộ bản quyền.\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -97,7 +97,7 @@ msgstr ""
" bản phân phối.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -112,67 +112,67 @@ msgid ""
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
msgstr ""
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "Cách dùng: %s [các-tùy-chọn] [tập-tin …] [-n tập-tin-vào tập-tin-ra …]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii chỉ chuyển đổi các ngắt dòng (mặc định)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso chuyển đổi giữa DOS và ISO-8859-1\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 dùng trang mã Windows 1252 (Tây Âu)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 dùng trang mã DOS 437 (US) (mặc định)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 dùng trang mã DOS 850 (Tây Âu)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 dùng trang mã DOS 860 (Bồ Đào Nha)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 dùng trang mã DOS 863 (Ca Na Đa Pháp)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 dùng trang mã DOS 865 (Bắc Âu)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 chuyển đổi các ký tự 8 bit thành 7 bit\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark”\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -b, --keep-bom giữ nguyên “Byte Order Mark” (mặc định)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -181,7 +181,7 @@ msgstr ""
" -c, --convmode chế độ chuyển đổi\n"
" chế độ chuyển đổi: ascii, 7bit, iso, mac, mặc định là ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -190,22 +190,22 @@ msgstr ""
" -D, --display-enc đặt bảng mã để hiển thị các thông báo\n"
" bảng mã: ansi, unicode, utf8, mặc định là ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force bắt buộc chuyển đổi các tập tin nhị phân\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 đổi từ UTF-16 sang GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help hiển thị trợ giúp này\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -214,27 +214,27 @@ msgstr ""
" -i, --info[=CỜ] hiển thị thông tin tập tin\n"
" tập-tin … các tập tin cần phân tích\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate giữ nguyên ngày tháng tập tin đầu ra\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license hiển thị giấy phép dùng phần mềm\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline bổ xung thêm dòng mới\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom thêm “Byte Order Mark” (mặc định UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -245,7 +245,7 @@ msgstr ""
" tập-tin-vào tập tin gốc trong chế độ tập-tin-mới\n"
" tập-tin-ra tập tin đầu ra trong chế độ tập-tin-mới\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -254,52 +254,52 @@ msgstr ""
" -o, --oldfile ghi vào tập tin cũ (mặc định)\n"
" tập-tin … các tập tin cần chuyển đổi trong chế độ tập-tin-cũ\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet chế độ im lặng, chặn mọi cảnh báo\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark” (mặc định)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom gỡ bỏ “Byte Order Mark”\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe bỏ qua tập tin nhị phân (mặc định)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 giữ bảng mã UTF-16\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le coi rằng định dạng đầu vào là UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be coi rằng định dạng đầu vào là UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose thông báo chi tiết\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink theo liên kết mềm và chuyển đổi đích\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -308,235 +308,235 @@ msgstr ""
" -R, --replace-symlink thay thế liên kết mềm bằng tập tin đã chuyển đổi\n"
" (các tập tin đích nguyên gốc thì để nguyên không thay đổi)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink giữ liên kết mềm và đích không thay đổi (mặc định)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version hiển thị số hiệu phiên bản\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "Phiên bản DOS 16 bit (WATCOMC).\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "Phiên bản DOS 16 bit (TURBOC).\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "Phiên bản DOS 32 bit (WATCOMC).\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "Phiên bản DOS 32 bit (DJGPP).\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "Phiên bản MSYS.\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Phiên bản Cygwin.\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Phiên bản Windows 64 bit (MinGW-w64).\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Phiên bản Windows 32 bit (WATCOMC).\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Phiên bản Windows 32 bit (MinGW-w64).\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Phiên bản Windows 32 bit (MinGW).\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Phiên bản Windows 64 bit (MSVC %d).\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Phiên bản Windows 32 bit (MSVC %d).\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "Phiên bản OS/2 (WATCOMC).\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "Phiên bản OS/2 (EMX).\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "Phiên bản %s.\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "Có hỗ trợ Unicode UTF-16.\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "Không hỗ trợ Unicode UTF-16.\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "Có hỗ trợ tên tập tin dạng Unicode.\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "Không hỗ trợ tên tập tin dạng Unicode.\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "Có hỗ trợ bản địa hóa ngôn ngữ.\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "Đang ghi %s BOM.\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "Tập tin đầu vào %s có BOM %s.\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "Coi là bảng mã UTF-16LE.\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "Coi là bảng mã UTF-16BE.\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "Gặp lỗi khi mở tập tin đầu ra tạm thời: %s\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "đang dùng %s làm tập tin tạm\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "Gặp lỗi khi ghi vào tập tin đầu ra tạm thời %s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "Gặp lỗi khi thay đổi quyền hạn của tập tin đầu ra tạm %s:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "Gặp lỗi khi đổi chủ sở hữu và nhóm của tập tin đầu ra tạm %s:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "gặp lỗi khi phân giải liên kết mềm “%s”\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " tập tin đầu ra còn trong “%s”\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "gặp lỗi khi đổi tên “%s” thành “%s”:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " cái là đích của liên kết mềm “%s”\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "Bỏ qua tập tin nhị phân %s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "không hỗ trợ trang mã %d.\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, cỡ của wchar_t không phải là %d byte.\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, đã xảy ra lỗi chuyển đổi UTF-16 trên dòng %u.\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "Bỏ qua tập tin UTF-16 %s, chuyển đổi UTF-16 không được hỗ trợ ở phiên bản này của %s.\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "Bỏ qua %s, đây không phải là tập tin thường.\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "Bỏ qua %s, tập tin đầu ra %s là một liên kết mềm.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "Bỏ qua liên kết mềm %s, đích của nó không phải là một tập tin thường.\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "Bỏ qua liên kết mềm %s, đích %s của liên kết mềm không phải là một tập tin thường.\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s thành tập tin “%s” theo định dạng Unix…\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng Mac…\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo định dạng DOS…\n"
@@ -547,42 +547,42 @@ msgstr "Đang chuyển đổi tập tin “%s” thành tập tin “%s” theo
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Unix %s…\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng Mac %s…\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” thành tập tin “%s” theo định dạng DOS %s…\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "Đang chuyển đổi tập tin %s thành tập tin %s\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "Bỏ qua liên kết mềm %s.\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Unix…\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng Mac…\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n"
@@ -592,76 +592,76 @@ msgstr "Đang chuyển đổi tập tin “%s” sang định dạng DOS…\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Unix %s…\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng Mac %s…\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "Đang chuyển đổi tập tin %s “%s” sang định dạng DOS %s…\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "gặp trục trặc khi chuyển đổi tập tin %s\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "không thể đọc từ tập tin đầu vào %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "cờ “%c” cho tùy chọn -i hay --info bị sai\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "trang mã đang hoạt động: %d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "đã đưa ra chế độ chuyển đổi %s không hợp lệ\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "tùy chọn “%s” yêu cầu một đối số\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "đã đưa ra bảng mã hiển thị không hợp lệ %s\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "đích của tập tin %s không được chỉ định trong chế độ tập-tin-mới\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "không thể đọc từ tập tin đầu vào: %s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "không thể ghi vào tập tin đầu ra: %s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế dưới.\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "lỗi: Cặp thay thế không hợp lệ. Thiếu cái thay thế trên.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8cd50b4..a612e5c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 7.3.1-beta5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2015-09-24 18:57+0800\n"
"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -74,7 +74,7 @@ msgstr ""
"保留所有权利。\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +96,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,67 +122,67 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "用法:%s [选项] [文件 ...] [-n 输入文件 输出文件 ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 只转换换行符(默认)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso 在 DOS 和 ISO-8859-1 字符集之间转换\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 使用Windows 1252 编码页(西欧)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 使用DOS 437 编码页(US)(默认)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 使用DOS 850 编码页(西欧)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 使用DOS 860 编码页(葡萄牙)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 使用DOS 863 编码页(加拿大法語)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 使用DOS 865 编码页(北欧)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 转换8 位字符到7 位空间\n"
-#: common.c:643
+#: common.c:640
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -b, --keep-bom 保留UTF-8 BOM头\n"
-#: common.c:645
+#: common.c:642
#, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr "-b, --keep-bom 保留UTF-8 BOM头(默认)\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -191,7 +191,7 @@ msgstr ""
" -c, --convmode 转换模式\n"
" convmode ascii、7bit、iso或mac,默认为ascii\n"
-#: common.c:649
+#: common.c:646
#, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -200,22 +200,22 @@ msgstr ""
" -D, --display-enc 设置消息文本的编码\n"
" encoding ansi、unicode或utf8,默认为ansi\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force 强制转换二进制文件\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr " -gb, --gb18030 转换UTF-16为GB18030\n"
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help 显示本说明文字\n"
-#: common.c:659
+#: common.c:656
#, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -224,27 +224,27 @@ msgstr ""
" -i, --info[=FLAGS] 显示文件信息\n"
" 文件 ... 需要分析的文件\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate 保留输出文件时间\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license 显示软件协议\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 加入额外的换行符\n"
-#: common.c:664
+#: common.c:661
#, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom 添加UTF-8 BOM头(默认为UTF-8)\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -255,7 +255,7 @@ msgstr ""
" infile 新文件模式中的原始文件\n"
" outfile 新文件模式中的输出文件\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -264,52 +264,52 @@ msgstr ""
" -o, --oldfile 写入原文件(默认)\n"
" file ... 旧文件模式中要转换的文件\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 安静模式,不显示所有警告\n"
-#: common.c:672
+#: common.c:669
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -r, --remove-bom 移除UTF-8 BOM头(默认)\n"
-#: common.c:674
+#: common.c:671
#, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -r, --remove-bom 移除UTF-8 BOM头\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe 跳过二进制文件(默认)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr " -u, --keep-utf16 保留UTF-16编码\n"
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 假定输入文件格式为UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 假定输入文件格式为UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr " -v, --verbose 显示更多信息\n"
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink 根据符号链接转换其目标文件\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -318,235 +318,235 @@ msgstr ""
" -R, --replace-symlink 取代符号链接为转换后的文件\n"
" (原链接目标文件保持不变)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink 保持符号链接及其目标不变(默认)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version 显示版本号\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "16位DOS版本 (WATCOMC)。\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "16位DOS版本(TURBOC)。\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "32位DOS版本(WATCOMC)。\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "32位DOS版本(DJGPP)。\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS版本。\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin版本。\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "64位Windows版本(MinGW-w64)。\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "32位Windows版本(WATCOMC)。\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "32位Windows版本(MinGW-w64)。\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "32位Windows版本(MinGW)。\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "64位Windows版本(MSVC %d)。\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "32位Windows版本(MSVC %d)。\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 版本(WATCOMC)。\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 版本(EMX)。\n"
-#: common.c:730
+#: common.c:727
#, c-format
msgid "%s version.\n"
msgstr "版本 %s。\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "有Unicode UTF-16 支持。\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "无Unicode UTF-16 支持。\n"
-#: common.c:742
+#: common.c:739
msgid "With Unicode file name support.\n"
msgstr "有Unicode文件名支持。\n"
-#: common.c:744
+#: common.c:741
msgid "Without Unicode file name support.\n"
msgstr "无Unicode文件名支持。\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "含本地语言支持。\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr "写入 %s BOM。\n"
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr "UTF-16LE"
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr "UTF-16BE"
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr "GB18030"
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr "UTF-8"
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr "输入文件 %s 有 %s BOM。\n"
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr "假定为UTF-16LE编码。\n"
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr "假定为UTF-16BE编码。\n"
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "打开临时输出文件 %s 失败\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "使用 %s 作为临时文件\n"
-#: common.c:1433
+#: common.c:1430
#, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "写入临时输出文件失败%s:"
-#: common.c:1464
+#: common.c:1461
#, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "改变临时输出文件 %s 的权限失败:"
-#: common.c:1481
+#: common.c:1478
#, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "改变临时输出文件 %s 的所有者和群组失败:"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "解析符号链接“%s”遇到问题\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 输出文件“%s”未改变\n"
-#: common.c:1555
+#: common.c:1552
#, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "重新命名“%s”到“%s”错误:"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " 後者为符号链接'%s' 的目标\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "跳过二进制文件%s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "不支持编码页 %d。\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "跳过 UTF-16 文件 %s,wchar_t 的大小为 %d 位。\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "跳过 UTF-16 文件 %s,UTF-16 转换发生错误于第 %u 行。\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "跳过 UTF-16 文件 %s,本版本 %s 不支持UTF-16。\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "跳过 %s,不是一个普通文件。\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "跳过 %s,输出文件 %s 是一个符号链接。.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "跳过符号链接 %s,目标不是一个普通文件。\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "跳过 %s,符号链接 %s 目标不是一个普通文件。\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "正在转换文件 %s 为Unix格式到 %s...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "正在转换文件 %s 为Mac格式到 %s...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "正在转换文件 %s 为DOS格式到 %s...\n"
@@ -557,42 +557,42 @@ msgstr "正在转换文件 %s 为DOS格式到 %s...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为Unix格式的 %3$s 文件 %4$s...\n"
-#: common.c:1751
+#: common.c:1750
#, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为Mac格式的 %3$s 文件 %4$s...\n"
-#: common.c:1753
+#: common.c:1752
#, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "正在转换 %1$s 文件 %2$s 为DOS格式的 %3$s 文件 %4$s...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "转换文件 %s 到 %s 错误\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "跳过符号链接 %s。\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "正在转换文件 %s 为Unix格式...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "正在转换文件 %s 为Mac格式...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "正在转换文件 %s 为DOS格式...\n"
@@ -602,76 +602,76 @@ msgstr "正在转换文件 %s 为DOS格式...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "正在转换 %s 文件 %s 为Unix格式的 %s 文件...\n"
-#: common.c:1836
+#: common.c:1835
#, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "正在转换 %s 文件 %s 为Mac格式的 %s 文件...\n"
-#: common.c:1838
+#: common.c:1837
#, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "正在转换 %s 文件 %s 为DOS格式的 %s 文件...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "转换文件 %s 出错\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, c-format
msgid "can not read from input file %s:"
msgstr "无法读取输入文件 %s:"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr "-i/--info选项的标志“%c”错误\n"
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "作用中编码页:%d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "指定的转换模式 %s 不合法\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "选项“%s”需要一个参数\n"
-#: common.c:2362
+#: common.c:2361
#, c-format
msgid "invalid %s display encoding specified\n"
msgstr "指定了无效的显示编码 %s\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "新文件模式中未指明文件 %s 的目的位置\n"
-#: common.c:2475
+#: common.c:2474
#, c-format
msgid "can not read from input file: %s\n"
msgstr "无法读取输入文件:%s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "无法写入输出文件:%s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr "错误:无效的代理对。缺少低位字符。\n"
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr "错误:无效的代理对。缺少高位字符。\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 585e59a..4093225 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dos2unix 6.0.5-b3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-03 21:32+0200\n"
+"POT-Creation-Date: 2015-11-05 20:11+0100\n"
"PO-Revision-Date: 2014-03-14 00:43+0800\n"
"Last-Translator: mail6543210 <mail6543210@yahoo.com.tw>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -74,7 +74,7 @@ msgstr ""
"保留所有權利。\n"
"\n"
-#: common.c:597
+#: common.c:594
msgid ""
"Redistribution and use in source and binary forms, with or without\n"
"modification, are permitted provided that the following conditions\n"
@@ -96,7 +96,7 @@ msgstr ""
" the distribution.\n"
"\n"
-#: common.c:607
+#: common.c:604
msgid ""
"THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY\n"
"EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
@@ -122,67 +122,67 @@ msgstr ""
"OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\n"
"IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
-#: common.c:632
+#: common.c:629
#, c-format
msgid "Usage: %s [options] [file ...] [-n infile outfile ...]\n"
msgstr "用法: %s [選項] [file ...] [-n infile outfile ...]\n"
-#: common.c:633
+#: common.c:630
#, c-format
msgid " -ascii convert only line breaks (default)\n"
msgstr " -ascii 只轉換換行字元(預設)\n"
-#: common.c:634
+#: common.c:631
#, c-format
msgid " -iso conversion between DOS and ISO-8859-1 character set\n"
msgstr " -iso 在DOS 和ISO-8859-1 字元集間轉換\n"
-#: common.c:635
+#: common.c:632
#, c-format
msgid " -1252 use Windows code page 1252 (Western European)\n"
msgstr " -1252 使用Windows 1252 編碼頁(西歐)\n"
-#: common.c:636
+#: common.c:633
#, c-format
msgid " -437 use DOS code page 437 (US) (default)\n"
msgstr " -437 使用DOS 437 編碼頁(US) (預設)\n"
-#: common.c:637
+#: common.c:634
#, c-format
msgid " -850 use DOS code page 850 (Western European)\n"
msgstr " -850 使用DOS 850 編碼頁(西歐)\n"
-#: common.c:638
+#: common.c:635
#, c-format
msgid " -860 use DOS code page 860 (Portuguese)\n"
msgstr " -860 使用DOS 860 編碼頁(葡萄牙)\n"
-#: common.c:639
+#: common.c:636
#, c-format
msgid " -863 use DOS code page 863 (French Canadian)\n"
msgstr " -863 使用DOS 863 編碼頁(加拿大法語)\n"
-#: common.c:640
+#: common.c:637
#, c-format
msgid " -865 use DOS code page 865 (Nordic)\n"
msgstr " -865 使用DOS 865 編碼頁(北歐)\n"
-#: common.c:641
+#: common.c:638
#, c-format
msgid " -7 convert 8 bit characters to 7 bit space\n"
msgstr " -7 轉換8 位元字元到7 位元空間\n"
-#: common.c:643
+#: common.c:640
#, fuzzy, c-format
msgid " -b, --keep-bom keep Byte Order Mark\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:645
+#: common.c:642
#, fuzzy, c-format
msgid " -b, --keep-bom keep Byte Order Mark (default)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:646
+#: common.c:643
#, c-format
msgid ""
" -c, --convmode conversion mode\n"
@@ -191,7 +191,7 @@ msgstr ""
" -c, --convmode 轉換模式\n"
" convmode ascii, 7bit, iso, mac, 預設為ascii\n"
-#: common.c:649
+#: common.c:646
#, fuzzy, c-format
msgid ""
" -D, --display-enc set encoding of displayed text messages\n"
@@ -200,22 +200,22 @@ msgstr ""
" -c, --convmode 轉換模式\n"
" convmode ascii, 7bit, iso, mac, 預設為ascii\n"
-#: common.c:652
+#: common.c:649
#, c-format
msgid " -f, --force force conversion of binary files\n"
msgstr " -f, --force 強制轉換二進位檔案\n"
-#: common.c:655
+#: common.c:652
#, c-format
msgid " -gb, --gb18030 convert UTF-16 to GB18030\n"
msgstr ""
-#: common.c:658
+#: common.c:655
#, c-format
msgid " -h, --help display this help text\n"
msgstr " -h, --help 顯示本說明文字\n"
-#: common.c:659
+#: common.c:656
#, fuzzy, c-format
msgid ""
" -i, --info[=FLAGS] display file information\n"
@@ -224,27 +224,27 @@ msgstr ""
" -o, --oldfile 寫入原檔案(預設)\n"
" file ... 原檔模式中要轉換的檔案\n"
-#: common.c:661
+#: common.c:658
#, c-format
msgid " -k, --keepdate keep output file date\n"
msgstr " -k, --keepdate 保留輸出檔時間\n"
-#: common.c:662
+#: common.c:659
#, c-format
msgid " -L, --license display software license\n"
msgstr " -L, --license 顯示軟體授權\n"
-#: common.c:663
+#: common.c:660
#, c-format
msgid " -l, --newline add additional newline\n"
msgstr " -l, --newline 加入額外的換行\n"
-#: common.c:664
+#: common.c:661
#, fuzzy, c-format
msgid " -m, --add-bom add Byte Order Mark (default UTF-8)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:665
+#: common.c:662
#, c-format
msgid ""
" -n, --newfile write to new file\n"
@@ -255,7 +255,7 @@ msgstr ""
" infile 新檔模式中的原始檔案\n"
" outfile 新檔模式中的輸出檔案\n"
-#: common.c:668
+#: common.c:665
#, c-format
msgid ""
" -o, --oldfile write to old file (default)\n"
@@ -264,52 +264,52 @@ msgstr ""
" -o, --oldfile 寫入原檔案(預設)\n"
" file ... 原檔模式中要轉換的檔案\n"
-#: common.c:670
+#: common.c:667
#, c-format
msgid " -q, --quiet quiet mode, suppress all warnings\n"
msgstr " -q, --quiet 安靜模式,抑制所有警告\n"
-#: common.c:672
+#: common.c:669
#, fuzzy, c-format
msgid " -r, --remove-bom remove Byte Order Mark (default)\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:674
+#: common.c:671
#, fuzzy, c-format
msgid " -r, --remove-bom remove Byte Order Mark\n"
msgstr " -m, --add-bom 加入UTF-8 BOM\n"
-#: common.c:675
+#: common.c:672
#, c-format
msgid " -s, --safe skip binary files (default)\n"
msgstr " -s, --safe 略過二進位檔案(預設)\n"
-#: common.c:677
+#: common.c:674
#, c-format
msgid " -u, --keep-utf16 keep UTF-16 encoding\n"
msgstr ""
-#: common.c:678
+#: common.c:675
#, c-format
msgid " -ul, --assume-utf16le assume that the input format is UTF-16LE\n"
msgstr " -ul, --assume-utf16le 假設輸入檔格式為UTF-16LE\n"
-#: common.c:679
+#: common.c:676
#, c-format
msgid " -ub, --assume-utf16be assume that the input format is UTF-16BE\n"
msgstr " -ub, --assume-utf16be 假設輸入檔格式為UTF-16BE\n"
-#: common.c:681
+#: common.c:678
#, c-format
msgid " -v, --verbose verbose operation\n"
msgstr ""
-#: common.c:683
+#: common.c:680
#, c-format
msgid " -F, --follow-symlink follow symbolic links and convert the targets\n"
msgstr " -F, --follow-symlink 依循符號連結轉換其目標檔案\n"
-#: common.c:686
+#: common.c:683
#, c-format
msgid ""
" -R, --replace-symlink replace symbolic links with converted files\n"
@@ -318,237 +318,237 @@ msgstr ""
" -R, --replace-symlink 取代符號連結為轉換後的檔案\n"
" (原連結目標檔案保持不變)\n"
-#: common.c:688
+#: common.c:685
#, c-format
msgid " -S, --skip-symlink keep symbolic links and targets unchanged (default)\n"
msgstr " -S, --skip-symlink 保持符號連結及其目標不變(預設)\n"
-#: common.c:690
+#: common.c:687
#, c-format
msgid " -V, --version display version number\n"
msgstr " -V, --version 顯示版本號碼\n"
-#: common.c:702
+#: common.c:699
msgid "DOS 16 bit version (WATCOMC).\n"
msgstr "DOS 16 位元版本(WATCOMC)。\n"
-#: common.c:704
+#: common.c:701
msgid "DOS 16 bit version (TURBOC).\n"
msgstr "DOS 16 位元版本(TURBOC)。\n"
-#: common.c:706
+#: common.c:703
msgid "DOS 32 bit version (WATCOMC).\n"
msgstr "DOS 32 位元版本(WATCOMC)。\n"
-#: common.c:708
+#: common.c:705
msgid "DOS 32 bit version (DJGPP).\n"
msgstr "DOS 32 位元版本(DJGPP)。\n"
-#: common.c:710
+#: common.c:707
msgid "MSYS version.\n"
msgstr "MSYS 版本。\n"
-#: common.c:712
+#: common.c:709
msgid "Cygwin version.\n"
msgstr "Cygwin 版本。\n"
-#: common.c:714
+#: common.c:711
msgid "Windows 64 bit version (MinGW-w64).\n"
msgstr "Windows 64 位元版本(MinGW-w64)。\n"
-#: common.c:716
+#: common.c:713
msgid "Windows 32 bit version (WATCOMC).\n"
msgstr "Windows 32 位元版本(WATCOMC)。\n"
-#: common.c:718
+#: common.c:715
msgid "Windows 32 bit version (MinGW-w64).\n"
msgstr "Windows 32 位元版本(MinGW-w64)。\n"
-#: common.c:720
+#: common.c:717
msgid "Windows 32 bit version (MinGW).\n"
msgstr "Windows 32 位元版本(MinGW)。\n"
-#: common.c:722
+#: common.c:719
#, c-format
msgid "Windows 64 bit version (MSVC %d).\n"
msgstr "Windows 64 位元版本(MSVC %d)。\n"
-#: common.c:724
+#: common.c:721
#, c-format
msgid "Windows 32 bit version (MSVC %d).\n"
msgstr "Windows 32 位元版本(MSVC %d)。\n"
-#: common.c:726
+#: common.c:723
msgid "OS/2 version (WATCOMC).\n"
msgstr "OS/2 版本(WATCOMC)。\n"
-#: common.c:728
+#: common.c:725
msgid "OS/2 version (EMX).\n"
msgstr "OS/2 版本(EMX)。\n"
-#: common.c:730
+#: common.c:727
#, fuzzy, c-format
msgid "%s version.\n"
msgstr "MSYS 版本。\n"
-#: common.c:736
+#: common.c:733
msgid "With Unicode UTF-16 support.\n"
msgstr "有Unicode UTF-16 支援。\n"
-#: common.c:738
+#: common.c:735
msgid "Without Unicode UTF-16 support.\n"
msgstr "無Unicode UTF-16 支援。\n"
-#: common.c:742
+#: common.c:739
#, fuzzy
msgid "With Unicode file name support.\n"
msgstr "有Unicode UTF-16 支援。\n"
-#: common.c:744
+#: common.c:741
#, fuzzy
msgid "Without Unicode file name support.\n"
msgstr "無Unicode UTF-16 支援。\n"
-#: common.c:748
+#: common.c:745
msgid "With native language support.\n"
msgstr "含本地語言支援。\n"
-#: common.c:1053 common.c:1060 common.c:1067 common.c:1074 common.c:1086
-#: common.c:1093
+#: common.c:1050 common.c:1057 common.c:1064 common.c:1071 common.c:1083
+#: common.c:1090
#, c-format
msgid "Writing %s BOM.\n"
msgstr ""
-#: common.c:1053 common.c:1109 common.c:1647 common.c:1667
+#: common.c:1050 common.c:1106 common.c:1644 common.c:1665
msgid "UTF-16LE"
msgstr ""
-#: common.c:1060 common.c:1112 common.c:1649 common.c:1669
+#: common.c:1057 common.c:1109 common.c:1646 common.c:1667
msgid "UTF-16BE"
msgstr ""
-#: common.c:1067 common.c:1086 common.c:1118 common.c:1659
+#: common.c:1064 common.c:1083 common.c:1115 common.c:1657
msgid "GB18030"
msgstr ""
-#: common.c:1074 common.c:1093 common.c:1115 common.c:1661
+#: common.c:1071 common.c:1090 common.c:1112 common.c:1659
msgid "UTF-8"
msgstr ""
-#: common.c:1138
+#: common.c:1135
#, c-format
msgid "Input file %s has %s BOM.\n"
msgstr ""
-#: common.c:1174 common.c:1217
+#: common.c:1171 common.c:1214
msgid "Assuming UTF-16LE encoding.\n"
msgstr ""
-#: common.c:1178 common.c:1221
+#: common.c:1175 common.c:1218
msgid "Assuming UTF-16BE encoding.\n"
msgstr ""
-#: common.c:1361
+#: common.c:1358
#, c-format
msgid "Failed to open temporary output file: %s\n"
msgstr "暫存檔 %s 開啟失敗\n"
-#: common.c:1368
+#: common.c:1365
#, c-format
msgid "using %s as temporary file\n"
msgstr "使用 %s 作為暫存檔\n"
-#: common.c:1433
+#: common.c:1430
#, fuzzy, c-format
msgid "Failed to write to temporary output file %s:"
msgstr "暫存檔寫入失敗%s:%s\n"
-#: common.c:1464
+#: common.c:1461
#, fuzzy, c-format
msgid "Failed to change the permissions of temporary output file %s:"
msgstr "輸出暫存檔 %s 權限變更失敗:%s\n"
-#: common.c:1481
+#: common.c:1478
#, fuzzy, c-format
msgid "Failed to change the owner and group of temporary output file %s:"
msgstr "輸出暫存檔 %s 擁有者及群組變更失敗:%s\n"
-#: common.c:1528
+#: common.c:1525
#, c-format
msgid "problems resolving symbolic link '%s'\n"
msgstr "解析符號連結'%s' 發生問題\n"
-#: common.c:1529 common.c:1561
+#: common.c:1526 common.c:1558
#, c-format
msgid " output file remains in '%s'\n"
msgstr " 輸出檔案'%s' 未改變\n"
-#: common.c:1555
+#: common.c:1552
#, fuzzy, c-format
msgid "problems renaming '%s' to '%s':"
msgstr "重新命名「%s」到「%s」錯誤:%s\n"
-#: common.c:1559
+#: common.c:1556
#, c-format
msgid " which is the target of symbolic link '%s'\n"
msgstr " 後者為符號連結'%s' 的目標\n"
-#: common.c:1622 common.c:1712 common.c:1798
+#: common.c:1619 common.c:1711 common.c:1797
#, c-format
msgid "Skipping binary file %s\n"
msgstr "略過二進位檔案%s\n"
-#: common.c:1625 common.c:1715 common.c:1801
+#: common.c:1622 common.c:1714 common.c:1800
#, c-format
msgid "code page %d is not supported.\n"
msgstr "未支援%d 編碼頁。\n"
-#: common.c:1629 common.c:1719 common.c:1805 common.c:1865
+#: common.c:1626 common.c:1718 common.c:1804 common.c:1864
#, c-format
msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
msgstr "略過 UTF-16 檔案 %s,wchar_t 的大小是 %d 位元組。\n"
-#: common.c:1632 common.c:1722 common.c:1808
+#: common.c:1629 common.c:1721 common.c:1807
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred on line %u.\n"
msgstr "略過 UTF-16 檔案 %s,UTF-16 轉換發生錯誤。\n"
-#: common.c:1636 common.c:1726 common.c:1812
+#: common.c:1633 common.c:1725 common.c:1811
#, fuzzy, c-format
msgid "Skipping UTF-16 file %s, UTF-16 conversion is not supported in this version of %s.\n"
msgstr "略過 UTF-16 檔案 %s,UTF-16 轉換發生錯誤。\n"
-#: common.c:1700 common.c:1789 common.c:1854
+#: common.c:1699 common.c:1788 common.c:1853
#, c-format
msgid "Skipping %s, not a regular file.\n"
msgstr "略過 %s,不是一個普通檔案。\n"
-#: common.c:1703
+#: common.c:1702
#, c-format
msgid "Skipping %s, output file %s is a symbolic link.\n"
msgstr "略過 %s,輸出檔 %s 是一個符號連結。.\n"
-#: common.c:1706 common.c:1795 common.c:1859
+#: common.c:1705 common.c:1794 common.c:1858
#, c-format
msgid "Skipping symbolic link %s, target is not a regular file.\n"
msgstr "略過符號連結 %s,目標不是一個普通檔案。\n"
-#: common.c:1709
+#: common.c:1708
#, c-format
msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
msgstr "略過 %s,符號連結 %s 目標不是一個普通檔案。\n"
-#: common.c:1732
+#: common.c:1731
#, c-format
msgid "converting file %s to file %s in Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
-#: common.c:1735
+#: common.c:1734
#, c-format
msgid "converting file %s to file %s in Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
-#: common.c:1737
+#: common.c:1736
#, c-format
msgid "converting file %s to file %s in DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
@@ -559,42 +559,42 @@ msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
#. 3rd %s is encoding of output file.
#. 4th %s is name of output file.
#. E.g.: converting UTF-16LE file in.txt to UTF-8 file out.txt in Unix format...
-#: common.c:1748
+#: common.c:1747
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式到 %s...\n"
-#: common.c:1751
+#: common.c:1750
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式到 %s...\n"
-#: common.c:1753
+#: common.c:1752
#, fuzzy, c-format
msgid "converting %s file %s to %s file %s in DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式到 %s...\n"
-#: common.c:1759
+#: common.c:1758
#, c-format
msgid "problems converting file %s to file %s\n"
msgstr "轉換檔案 %s 到 %s 錯誤\n"
-#: common.c:1792
+#: common.c:1791
#, c-format
msgid "Skipping symbolic link %s.\n"
msgstr "略過符號連結 %s。\n"
-#: common.c:1818
+#: common.c:1817
#, c-format
msgid "converting file %s to Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式...\n"
-#: common.c:1821
+#: common.c:1820
#, c-format
msgid "converting file %s to Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式...\n"
-#: common.c:1823
+#: common.c:1822
#, c-format
msgid "converting file %s to DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式...\n"
@@ -604,76 +604,76 @@ msgstr "正在轉換 %s 為DOS 格式...\n"
#. 2nd %s is name of input file.
#. 3rd %s is encoding of output (input file is overwritten).
#. E.g.: converting UTF-16LE file foo.txt to UTF-8 Unix format...
-#: common.c:1833
+#: common.c:1832
#, fuzzy, c-format
msgid "converting %s file %s to %s Unix format...\n"
msgstr "正在轉換 %s 為Unix 格式...\n"
-#: common.c:1836
+#: common.c:1835
#, fuzzy, c-format
msgid "converting %s file %s to %s Mac format...\n"
msgstr "正在轉換 %s 為Mac 格式...\n"
-#: common.c:1838
+#: common.c:1837
#, fuzzy, c-format
msgid "converting %s file %s to %s DOS format...\n"
msgstr "正在轉換 %s 為DOS 格式...\n"
-#: common.c:1844
+#: common.c:1843
#, c-format
msgid "problems converting file %s\n"
msgstr "轉換檔案 %s 錯誤\n"
-#: common.c:1912 common.c:1989
+#: common.c:1911 common.c:1988
#, fuzzy, c-format
msgid "can not read from input file %s:"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2162
+#: common.c:2161
#, c-format
msgid "wrong flag '%c' for option -i or --info\n"
msgstr ""
-#: common.c:2287 common.c:2324
+#: common.c:2280 common.c:2323
#, c-format
msgid "active code page: %d\n"
msgstr "作用中編碼頁:%d\n"
-#: common.c:2336
+#: common.c:2335
#, c-format
msgid "invalid %s conversion mode specified\n"
msgstr "指定的轉換模式 %s 不合法\n"
-#: common.c:2344 common.c:2370
+#: common.c:2343 common.c:2369
#, c-format
msgid "option '%s' requires an argument\n"
msgstr "選項'%s' 需要一個引數\n"
-#: common.c:2362
+#: common.c:2361
#, fuzzy, c-format
msgid "invalid %s display encoding specified\n"
msgstr "指定的轉換模式 %s 不合法\n"
-#: common.c:2382 common.c:2395 common.c:2461
+#: common.c:2381 common.c:2394 common.c:2460
#, c-format
msgid "target of file %s not specified in new-file mode\n"
msgstr "新檔模式中未指明檔案 %s 的目的位置\n"
-#: common.c:2475
+#: common.c:2474
#, fuzzy, c-format
msgid "can not read from input file: %s\n"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2487 common.c:2501
+#: common.c:2486 common.c:2500
#, c-format
msgid "can not write to output file: %s\n"
msgstr "無法寫入輸出檔:%s\n"
-#: common.c:2578
+#: common.c:2577
msgid "error: Invalid surrogate pair. Missing low surrogate.\n"
msgstr ""
-#: common.c:2593
+#: common.c:2592
msgid "error: Invalid surrogate pair. Missing high surrogate.\n"
msgstr ""
diff --git a/test/Makefile b/test/Makefile
index d8440b6..e2a55e9 100755
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,6 +1,7 @@
-TESTS = ascii.t iso.t utf8.t utf16.t misc.t
+TESTS = ascii.t iso.t utf8.t misc.t
d2u_os=$(shell uname -s)
+UCS = 1
# Checking WIN32 version in MSYS shell.
ifeq ($(findstring MINGW,$(d2u_os)),MINGW)
@@ -14,10 +15,16 @@ TESTS += gb18030.t
endif
endif
-# Windows version does not support symlinks like the Unix version.
+# DOS and Windows version do not support symlinks like the Unix version.
+ifeq ($(DJGPP),)
ifneq ($(findstring MINGW,$(d2u_os)),MINGW)
TESTS += symlink.t
endif
+endif
+
+ifeq ($(UCS),1)
+TESTS +=utf16.t
+endif
all: test
diff --git a/test/info.txt b/test/info.txt
index ac3fbb5..58a6431 100644
--- a/test/info.txt
+++ b/test/info.txt
@@ -2,8 +2,6 @@
0 6 0 no_bom text unix.txt
0 0 6 no_bom text mac.txt
6 6 6 no_bom text mixed.txt
- 50 0 0 UTF-16LE text utf16le.txt
- 50 0 0 UTF-16BE text utf16be.txt
0 51 52 no_bom binary utf16len.txt
0 50 0 no_bom text utf8unix.txt
50 0 0 UTF-8 text utf8dos.txt
diff --git a/test/info_ucs.txt b/test/info_ucs.txt
new file mode 100644
index 0000000..ac3fbb5
--- /dev/null
+++ b/test/info_ucs.txt
@@ -0,0 +1,10 @@
+ 6 0 0 no_bom text dos.txt
+ 0 6 0 no_bom text unix.txt
+ 0 0 6 no_bom text mac.txt
+ 6 6 6 no_bom text mixed.txt
+ 50 0 0 UTF-16LE text utf16le.txt
+ 50 0 0 UTF-16BE text utf16be.txt
+ 0 51 52 no_bom binary utf16len.txt
+ 0 50 0 no_bom text utf8unix.txt
+ 50 0 0 UTF-8 text utf8dos.txt
+ 50 0 0 GB18030 text gb18030.txt
diff --git a/test/iso.t b/test/iso.t
index 19b27f3..b1f2dda 100755
--- a/test/iso.t
+++ b/test/iso.t
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# Requires perl-Test-Simple installation.
-use Test::Simple tests => 12;
+use Test::Simple tests => 14;
$suffix = "";
if (-e "../dos2unix.exe") {
@@ -29,8 +29,11 @@ $UNIX2MAC = "../unix2mac" . $suffix;
# You now see the same characters as in the Windows Command Prompt
# with the non-convertable characters replaced with a dot.
+system("$DOS2UNIX -v -iso -437 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_437.txt");
+ok( $? == 0, 'DOS to Unix conversion, cp437 to iso88591 with option -iso' );
+
system("$DOS2UNIX -v -437 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_437.txt");
-ok( $? == 0, 'DOS to Unix conversion, cp437 to iso88591' );
+ok( $? == 0, 'DOS to Unix conversion, cp437 to iso88591 without option -iso' );
system("$DOS2UNIX -v -850 -n chardos.txt out_unix.txt; cmp out_unix.txt iso_850.txt");
ok( $? == 0, 'DOS to Unix conversion, cp850 to iso88591' );
@@ -65,8 +68,11 @@ ok( $? == 0, 'DOS to Unix conversion, cp1252 to iso88591' );
# You now see the same characters as in the Mintty terminal
# with the non-convertable characters replaced with a dot.
+system("$UNIX2DOS -v -iso -437 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_437.txt");
+ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp437 with option -iso' );
+
system("$UNIX2DOS -v -437 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_437.txt");
-ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp437' );
+ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp437 without option -iso' );
system("$UNIX2DOS -v -850 -n charunix.txt out_dos.txt; cmp out_dos.txt cp_850.txt");
ok( $? == 0, 'Unix to DOS conversion, iso88591 to cp850' );
diff --git a/test/misc.t b/test/misc.t
index 680ea6d..0888e07 100755
--- a/test/misc.t
+++ b/test/misc.t
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# Requires perl-Test-Simple installation.
-use Test::Simple tests => 22;
+use Test::Simple tests => 13;
$suffix = "";
if (-e "../dos2unix.exe") {
@@ -23,12 +23,6 @@ ok( $? == 0, 'DOS to Unix conversion, stdin/out' );
system("$UNIX2DOS -v < unix.txt > out_dos.txt; cmp out_dos.txt dos.txt");
ok( $? == 0, 'Unix to DOS conversion, stdin/out' );
-system("cat utf16le.txt | $DOS2UNIX -v > out_unix.txt; cmp out_unix.txt utf8unix.txt");
-ok( $? == 0, 'UTF-16LE with BOM to UTF-8, stdin/out' );
-
-system("cat utf16u.txt | $UNIX2DOS -v -u > out_dos.txt; cmp out_dos.txt utf16.txt");
-ok( $? == 0, 'UTF-16LE with BOM to UTF-16LE, stdin/out' );
-
system("$DOS2UNIX -v -n utf16len.txt out_bin.txt");
# file out_bin.txt may not exist.
if (-e "out_bin.txt") {
@@ -81,32 +75,9 @@ ok( $? == 0, 'Dos2unix, force ASCII file with binary symbols' );
system("$UNIX2DOS -v -f -n unix_bin.txt out_dos.txt; cmp out_dos.txt dos_bin.txt");
ok( $? == 0, 'Unix2dos, force ASCII file with binary symbols' );
-system("$DOS2UNIX -v -7 -n utf16le.txt out_unix.txt chardos.txt out_u7.txt; cmp out_unix.txt utf8unix.txt");
-ok( $? == 0, '7bit disabled for utf16');
-
-system("cmp out_u7.txt charu7.txt");
-ok( $? == 0, '7bit enabled again, dos2unix');
-
-system("$UNIX2DOS -v -7 -n utf8unxb.txt out_dos.txt charunix.txt out_d7.txt; cmp out_dos.txt utf8dos.txt");
-ok( $? == 0, '7bit disabled for utf8 with BOM');
-
-system("cmp out_d7.txt chard7.txt");
-ok( $? == 0, '7bit enabled again, unix2dos');
-
-system("$UNIX2DOS -v -u -m -n unix.txt out_dos.txt; cmp out_dos.txt dos_bom.txt");
-ok( $? == 0, 'Option -u must not disable -m on ASCII input');
-
-system("$DOS2UNIX -i dos.txt unix.txt mac.txt mixed.txt utf16le.txt utf16be.txt utf16len.txt utf8unix.txt utf8dos.txt gb18030.txt > outinfo.txt");
+system("$DOS2UNIX -i dos.txt unix.txt mac.txt mixed.txt utf16len.txt utf8unix.txt utf8dos.txt gb18030.txt > outinfo.txt");
system("$DOS2UNIX outinfo.txt; diff info.txt outinfo.txt");
ok( $? == 0, 'Option -i, --info');
-system("$DOS2UNIX -ul -i utf16le.txt utf16len.txt utf8unxb.txt gb18030.txt > outinfo.txt");
-system("$DOS2UNIX outinfo.txt; diff info_ul.txt outinfo.txt");
-ok( $? == 0, 'Option -i, --info combined with -ul');
-
-system("$DOS2UNIX -ub -i utf16be.txt utf16ben.txt utf8unxb.txt gb18030.txt > outinfo.txt");
-system("$DOS2UNIX outinfo.txt; diff info_ub.txt outinfo.txt");
-ok( $? == 0, 'Option -i, --info combined with -ub');
-
system("$DOS2UNIX -v -n gb18030.txt out_unix.txt; cmp out_unix.txt gb18030u.txt");
ok( $? == 0, 'Remove GB18030 BOM');
diff --git a/test/utf16.t b/test/utf16.t
index 75886bd..aaaf6a6 100755
--- a/test/utf16.t
+++ b/test/utf16.t
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# Requires perl-Test-Simple installation.
-use Test::Simple tests => 24;
+use Test::Simple tests => 34;
$suffix = "";
if (-e "../dos2unix.exe") {
@@ -76,6 +76,39 @@ system("$DOS2UNIX -v -n invallow.txt out_unix.txt");
$result = ($? >> 8);
ok( $result == 1, 'Dos2unix, invalid surrogate pair, missing high surrogate' );
+system("cat utf16le.txt | $DOS2UNIX -v > out_unix.txt; cmp out_unix.txt utf8unix.txt");
+ok( $? == 0, 'UTF-16LE with BOM to UTF-8, stdin/out' );
+
+system("cat utf16u.txt | $UNIX2DOS -v -u > out_dos.txt; cmp out_dos.txt utf16.txt");
+ok( $? == 0, 'UTF-16LE with BOM to UTF-16LE, stdin/out' );
+
+system("$UNIX2DOS -v -u -m -n unix.txt out_dos.txt; cmp out_dos.txt dos_bom.txt");
+ok( $? == 0, 'Option -u must not disable -m on ASCII input');
+
+system("$DOS2UNIX -ul -i utf16le.txt utf16len.txt utf8unxb.txt gb18030.txt > outinfo.txt");
+system("$DOS2UNIX outinfo.txt; diff info_ul.txt outinfo.txt");
+ok( $? == 0, 'Option -i, --info combined with -ul');
+
+system("$DOS2UNIX -ub -i utf16be.txt utf16ben.txt utf8unxb.txt gb18030.txt > outinfo.txt");
+system("$DOS2UNIX outinfo.txt; diff info_ub.txt outinfo.txt");
+ok( $? == 0, 'Option -i, --info combined with -ub');
+
+system("$DOS2UNIX -v -7 -n utf16le.txt out_unix.txt chardos.txt out_u7.txt; cmp out_unix.txt utf8unix.txt");
+ok( $? == 0, '7bit disabled for utf16');
+
+system("cmp out_u7.txt charu7.txt");
+ok( $? == 0, '7bit enabled again, dos2unix');
+
+system("$UNIX2DOS -v -7 -n utf8unxb.txt out_dos.txt charunix.txt out_d7.txt; cmp out_dos.txt utf8dos.txt");
+ok( $? == 0, '7bit disabled for utf8 with BOM');
+
+system("cmp out_d7.txt chard7.txt");
+ok( $? == 0, '7bit enabled again, unix2dos');
+
+system("$DOS2UNIX -i dos.txt unix.txt mac.txt mixed.txt utf16le.txt utf16be.txt utf16len.txt utf8unix.txt utf8dos.txt gb18030.txt > outinfo.txt");
+system("$DOS2UNIX outinfo.txt; diff info_ucs.txt outinfo.txt");
+ok( $? == 0, 'Option -i, --info');
+
$ENV{'LC_ALL'} = 'C';
system("$DOS2UNIX -v -n utf16le.txt out_unix.txt");
diff --git a/version.mk b/version.mk
index 2f19b13..a624b74 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-DOS2UNIX_VERSION = 7.3.1
-DOS2UNIX_VERSION_SHORT = 731
-DOS2UNIX_DATE = 2015-09-30
+DOS2UNIX_VERSION = 7.3.2
+DOS2UNIX_VERSION_SHORT = 732
+DOS2UNIX_DATE = 2015-11-20
DOS2UNIX_AUTHOR = 'Erwin Waterlander'