summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gettext-runtime/po/ChangeLog4
-rw-r--r--gettext-runtime/po/vi.po29
-rw-r--r--gettext-tools/examples/ChangeLog15
-rw-r--r--gettext-tools/examples/po/bg.po21
-rw-r--r--gettext-tools/examples/po/ca.po97
-rw-r--r--gettext-tools/examples/po/es.po21
-rw-r--r--gettext-tools/examples/po/ja.po21
-rw-r--r--gettext-tools/examples/po/pl.po24
-rw-r--r--gettext-tools/examples/po/pt_BR.po27
-rw-r--r--gettext-tools/examples/po/ru.po23
-rw-r--r--gettext-tools/examples/po/sk.po21
-rw-r--r--gettext-tools/examples/po/sl.po23
-rw-r--r--gettext-tools/examples/po/sv.po21
-rw-r--r--gettext-tools/examples/po/uk.po21
-rw-r--r--gettext-tools/examples/po/vi.po41
-rw-r--r--gettext-tools/po/ChangeLog19
-rw-r--r--gettext-tools/po/bg.po357
-rw-r--r--gettext-tools/po/ca.po357
-rw-r--r--gettext-tools/po/de.po326
-rw-r--r--gettext-tools/po/es.po323
-rw-r--r--gettext-tools/po/fi.po323
-rw-r--r--gettext-tools/po/ja.po323
-rw-r--r--gettext-tools/po/ko.po333
-rw-r--r--gettext-tools/po/pl.po323
-rw-r--r--gettext-tools/po/pt_BR.po329
-rw-r--r--gettext-tools/po/ru.po368
-rw-r--r--gettext-tools/po/sk.po357
-rw-r--r--gettext-tools/po/sl.po1047
-rw-r--r--gettext-tools/po/sr.po332
-rw-r--r--gettext-tools/po/sv.po323
-rw-r--r--gettext-tools/po/uk.po323
-rw-r--r--gettext-tools/po/vi.po441
32 files changed, 3496 insertions, 3117 deletions
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index 93ad38d..cb13b53 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-24 Daiki Ueno <ueno@gnu.org>
+
+ * vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
+
2014-10-15 Daiki Ueno <ueno@gnu.org>
* gettext 0.19.3 released.
diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index b105f07..bc3548d 100644
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -1,31 +1,30 @@
# Vietnamese Translation for Gettext Runtime.
-# Copyright © 2013 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho Gettext Runtime.
+# Copyright © 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-runtime 0.18.2\n"
+"Project-Id-Version: gettext-runtime 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2012-12-25 14:19+0900\n"
-"PO-Revision-Date: 2013-04-15 08:11+0700\n"
+"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"PO-Revision-Date: 2014-12-11 08:08+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
#: gnulib-lib/closeout.c:66
msgid "write error"
msgstr "lỗi ghi"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Lỗi hệ thống không rõ"
@@ -127,7 +126,7 @@ msgstr "đối số còn thiếu"
#: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để xem thông tin thêm.\n"
+msgstr "Hãy thử lệnh “%s --help” để xem thông tin thêm.\n"
#: src/envsubst.c:176
#, c-format, no-wrap
@@ -229,7 +228,7 @@ msgstr ""
#: src/gettext.c:249
#, c-format, no-wrap
msgid "Display native language translation of a textual message.\n"
-msgstr "Hiển thị bản dịch ngôn ngữ mẹ đẻ của một chuỗi kiểu văn bản.\n"
+msgstr "Hiển thị bản dịch ngôn ngữ mẹ đẻ của một chuỗi nguyên văn.\n"
#: src/gettext.c:253
#, c-format, no-wrap
@@ -243,7 +242,7 @@ msgid ""
" [TEXTDOMAIN] MSGID retrieve translated message corresponding\n"
" to MSGID from TEXTDOMAIN\n"
msgstr ""
-" -d, --domain=MIỀN_VĂN_BẢN lấy các chuỗi đã dịch từ miền này\n"
+" -d, --domain=MIỀN_VĂN_BẢN lấy các chuỗi đã dịch từ MIỀN_VĂN_BẢN này\n"
" -e cho phép mở rộng một số kiểu thoát chuỗi\n"
" -E (bị bỏ qua để tương thích)\n"
" -h, --help hiện trợ giúp này rồi thoát\n"
@@ -277,7 +276,7 @@ msgstr ""
#: src/ngettext.c:212
#, c-format, no-wrap
msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "Sử dụng: %s [TÙY_CHỌN] [MIỀN_VĂN_BẢN] MSGID MSGID-NHIỀU SỐ_ĐẾM\n"
+msgstr "Cách dùng: %s [TÙY_CHỌN] [MIỀN_VĂN_BẢN] MSGID MSGID-NHIỀU SỐ_LƯỢNG\n"
#: src/ngettext.c:217
#, c-format, no-wrap
@@ -300,7 +299,7 @@ msgid ""
" MSGID MSGID-PLURAL translate MSGID (singular) / MSGID-PLURAL (plural)\n"
" COUNT choose singular/plural form based on this value\n"
msgstr ""
-" -d, --domain=MIỀN_VĂN_BẢN lấy chuỗi đã dịch từ “miền” này\n"
+" -d, --domain=MIỀN_VĂN_BẢN lấy chuỗi đã dịch từ “MIỀN_VĂN_BẢN” này\n"
" -e cho phép mở rộng một số kiểu thoát chuỗi\n"
" -E (bị bỏ qua để không tương thích)\n"
" -h, --help hiện trợ giúp này rồi thoát\n"
@@ -318,7 +317,7 @@ msgid ""
"variable TEXTDOMAINDIR.\n"
"Standard search directory: %s\n"
msgstr ""
-"Tham số MIỀN-VĂN-BẢN không đưa ra thì miền được quyết định\n"
+"Tham số MIỀN-VĂN-BẢN không đưa ra thì tên miền được lấy\n"
"từ biến môi trường TEXTDOMAIN (miền văn bản). Nếu không tìm thấy\n"
"bản dịch trong thư mục bình thường, vị trí khác có thể được\n"
"chỉ ra bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 91d74a3..7fb00f4 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,18 @@
+2014-12-24 Daiki Ueno <ueno@gnu.org>
+
+ * po/bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
+ * po/ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.
+ * po/es.po: Update from Antonio Ceballos <aceballos@gmail.com>.
+ * po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
+ * po/pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
+ * po/pt_BR.po: Update from Rafael Ferreira <rafael.f.f1@gmail.com>.
+ * po/ru.po: Update from Yuri Kozlov <yuray@komyakino.ru>.
+ * po/sk.po: Update from Marcel Telka <marcel@telka.sk>.
+ * po/sl.po: Update from Primož Peterlin <primozz.peterlin@gmail.com>.
+ * po/sv.po: Update from Jan Djärv <jan.h.d@swipnet.se>.
+ * po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
+ * po/vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
+
2014-12-05 Daiki Ueno <ueno@gnu.org>
examples: Regenerate stamp-po after POT has changed
diff --git a/gettext-tools/examples/po/bg.po b/gettext-tools/examples/po/bg.po
index 089aa47..ce140ae 100644
--- a/gettext-tools/examples/po/bg.po
+++ b/gettext-tools/examples/po/bg.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-11 13:29+0300\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-16 22:12+0200\n"
"Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
"Language-Team: Bulgarian <dict@ludost.net>\n"
"Language: bg\n"
@@ -16,7 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -46,10 +47,22 @@ msgstr "Здравейте на всички !"
msgid "This program is running as process number %d."
msgstr "Програмата е пусната под процес номер %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Здравейте"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Примерно приложение"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Задава чувствителност на надписа."
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Определя дали надписа да е чувствителен."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/ca.po b/gettext-tools/examples/po/ca.po
index 05c739d..f6e2180 100644
--- a/gettext-tools/examples/po/ca.po
+++ b/gettext-tools/examples/po/ca.po
@@ -1,49 +1,71 @@
# Catalan messages for GNU gettext-examples.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gettext-examples package.
-# Ivan Vilata i Balaguer <ivan@selidor.net>, 2003.
+# Copyright (C) 2003, 2014 Yoyodyne, Inc. (msgids)
+# This file is distributed under the same license as the gettext package.
+# Ivan Vilata i Balaguer <ivan@selidor.net>, 2003, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.13.1\n"
-"POT-Creation-Date: 2003-12-12 19:11+0100\n"
-"PO-Revision-Date: 2003-12-18 10:41+0100\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
+"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-12 14:23+0100\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hello-c/hello.c:31 hello-c-gnome/hello.c:47 hello-c++/hello.cc:40
-#: hello-c++-qt/hello.cc:46 hello-c++-kde/hellowindow.cc:42
-#: hello-c++-gnome/hello.cc:51 hello-objc/hello.m:31
-#: hello-objc-gnustep/Hello.m:50 hello-objc-gnome/hello.m:48
-#: hello-sh/hello.sh:15 hello-python/hello.py.in:13
-#: hello-clisp/hello.lisp.in:12 hello-librep/hello.jl.in:13
-#: hello-smalltalk/hello.st.in:32 hello-java/Hello.java:15
-#: hello-java-awt/Hello.java:24 hello-java-swing/Hello.java:21
-#: hello-gawk/hello.awk:12 hello-pascal/hello.hello_world
-#: hello-ycp/hello.ycp:16 hello-tcl/hello.tcl:12 hello-tcl-tk/hello.tcl:14
-#: hello-perl/hello-1.pl.in:16 hello-perl/hello-2.pl.in:11
-#: hello-php/hello.php:13
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
+#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
+#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
+#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
+#: hello-objc-gnustep/Hello.m:49 hello-objc-gnome/hello.m:47
+#: hello-sh/hello.sh:14 hello-python/hello.py.in:12
+#: hello-clisp/hello.lisp.in:11 hello-librep/hello.jl.in:12
+#: hello-guile/hello.scm:15 hello-smalltalk/hello.st.in:31
+#: hello-java/Hello.java:14 hello-java-awt/Hello.java:23
+#: hello-java-swing/Hello.java:20 hello-java-qtjambi/Hello.java:27
+#: hello-csharp/hello.cs:14 hello-csharp-forms/hello.cs:29
+#: hello-gawk/hello.awk:11 hello-pascal/hello.hello_world
+#: hello-ycp/hello.ycp:15 hello-tcl/hello.tcl:11 hello-tcl-tk/hello.tcl:13
+#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
+#: hello-php/hello.php:12
msgid "Hello, world!"
msgstr "Hola, món!"
-#: hello-c/hello.c:32 hello-c-gnome/hello.c:52 hello-c++/hello.cc:41
-#: hello-c++-gnome/hello.cc:56 hello-objc/hello.m:32
-#: hello-objc-gnustep/Hello.m:59 hello-objc-gnome/hello.m:53
-#: hello-librep/hello.jl.in:15 hello-gawk/hello.awk:13
-#: hello-pascal/hello.running_as hello-tcl/hello.tcl:13
-#: hello-tcl-tk/hello.tcl:17 hello-perl/hello-1.pl.in:18
-#: hello-php/hello.php:15
+#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
+#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
+#: hello-c++-wxwidgets/hello.cc:71 hello-objc/hello.m:31
+#: hello-objc-gnustep/Hello.m:58 hello-objc-gnome/hello.m:52
+#: hello-librep/hello.jl.in:14 hello-gawk/hello.awk:12
+#: hello-pascal/hello.running_as hello-tcl/hello.tcl:12
+#: hello-tcl-tk/hello.tcl:16 hello-perl/hello-1.pl.in:19
+#: hello-php/hello.php:14
+#, php-format
msgid "This program is running as process number %d."
msgstr "Aquest programa està corrent amb el número de procés %d."
-#: hello-c++-qt/hello.cc:53 hello-c++-kde/hellowindow.cc:49
-#: hello-smalltalk/hello.st.in:33 hello-ycp/hello.ycp:20
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Hola"
+
+#: hello-c-gnome3/hello.ui:5
+msgid "Example Application"
+msgstr "Aplicació d’exemple"
+
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Fes sensible l’etiqueta"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Indica si fer l’etiqueta sensible o no."
+
+#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
+#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
msgid "This program is running as process number %1."
msgstr "Aquest programa està corrent amb el número de procés %1."
@@ -56,26 +78,29 @@ msgstr "Exemple Hola"
msgid "Hello world example"
msgstr "Exemple Hola Món"
-#: hello-sh/hello.sh:18
+#: hello-sh/hello.sh:17
+#, sh-format
msgid "This program is running as process number $pid."
msgstr "Aquest programa està corrent amb el número de procés $pid."
-#: hello-python/hello.py.in:14
+#: hello-python/hello.py.in:13
#, python-format
msgid "This program is running as process number %(pid)d."
msgstr "Aquest programa està corrent amb el número de procés %(pid)d."
-#: hello-clisp/hello.lisp.in:14
-#, lisp-format
+#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
+#, scheme-format
msgid "This program is running as process number ~D."
msgstr "Aquest programa està corrent amb el número de procés ~D."
-#: hello-java/Hello.java:19 hello-java-awt/Hello.java:29
-#: hello-java-swing/Hello.java:26
-#, java-format
+#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
+#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
+#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
+#, csharp-format
msgid "This program is running as process number {0}."
msgstr "Aquest programa està corrent amb el número de procés {0}."
-#: hello-perl/hello-2.pl.in:13
+#: hello-perl/hello-2.pl.in:14
+#, perl-brace-format
msgid "This program is running as process number {pid}."
msgstr "Aquest programa està corrent amb el número de procés {pid}."
diff --git a/gettext-tools/examples/po/es.po b/gettext-tools/examples/po/es.po
index 8470357..8c09d76 100644
--- a/gettext-tools/examples/po/es.po
+++ b/gettext-tools/examples/po/es.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples-0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-07-20 11:17+0200\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-11 00:40+0100\n"
"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
@@ -20,7 +20,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -50,10 +51,22 @@ msgstr "¡Hola, mundo!"
msgid "This program is running as process number %d."
msgstr "Este programa está corriendo como el proceso número %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Hola"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Ejemplo de aplicación"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Hace sensible la etiqueta"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Si hacer que la etiqueta sea sensible."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/ja.po b/gettext-tools/examples/po/ja.po
index 1789112..a8116b6 100644
--- a/gettext-tools/examples/po/ja.po
+++ b/gettext-tools/examples/po/ja.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-11 14:01+0900\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-11 08:49+0900\n"
"Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"Language: ja\n"
@@ -16,7 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -46,10 +47,22 @@ msgstr ", ˤ!"
msgid "This program is running as process number %d."
msgstr "Υץϥץֹ %d ưƤޤ."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "ˤ"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr ""
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "٥򿵽Ť˰褦"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Υ٥򿵽Ť˰褦ꤹ뤫ݤ"
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/pl.po b/gettext-tools/examples/po/pl.po
index b90fa21..b66fc91 100644
--- a/gettext-tools/examples/po/pl.po
+++ b/gettext-tools/examples/po/pl.po
@@ -1,14 +1,13 @@
# Polish translations for the GNU gettext messages, gettext-examples domain
# Copyright (C) 2010 Yoyodyne, Inc. (msgids)
# This file is distributed under the same license as the gettext package.
-# This file is distributed under the same license as the gettext package.
# Rafał Maszkowski <rzm@icm.edu.pl>, 2003, 2010, 2014 „”
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples-0.19-rc1\n"
+"Project-Id-Version: gettext-examples-0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-10 17:30+0200\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-10 21:50+0100\n"
"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -17,7 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -33,7 +33,7 @@ msgstr ""
#: hello-perl/hello-1.pl.in:17 hello-perl/hello-2.pl.in:12
#: hello-php/hello.php:12
msgid "Hello, world!"
-msgstr "Witaj świecie!"
+msgstr "Cześć, świecie!"
#: hello-c/hello.c:31 hello-c-gnome/hello.c:51 hello-c-gnome3/hello.c:70
#: hello-c++/hello.cc:40 hello-c++-gnome/hello.cc:55
@@ -47,10 +47,22 @@ msgstr "Witaj świecie!"
msgid "This program is running as process number %d."
msgstr "Ten program działa jako proces o numerze %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Cześć"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Program przykładowy"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Ustawienie interpretacji etykiet"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Czy ustawić interpretację etykiet."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/pt_BR.po b/gettext-tools/examples/po/pt_BR.po
index 0c85525..22b50cf 100644
--- a/gettext-tools/examples/po/pt_BR.po
+++ b/gettext-tools/examples/po/pt_BR.po
@@ -1,25 +1,26 @@
# Brazilian Portuguese translation for gettext-example
-# Copyright (C) 2013 Yoyodyne, Inc. (msgids)
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Yoyodyne, Inc. (msgids)
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-10 20:49-0300\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@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.6.4\n"
+"X-Generator: Poedit 1.6.11\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -49,10 +50,22 @@ msgstr "Olá, mundo!"
msgid "This program is running as process number %d."
msgstr "Este programa está executando com número de processo %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Olá"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Aplicativo exemplo"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Definir sensibilidade a rótulo"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Se esta ação é sensível a rótulo ou não."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/ru.po b/gettext-tools/examples/po/ru.po
index 7f78279..d82b242 100644
--- a/gettext-tools/examples/po/ru.po
+++ b/gettext-tools/examples/po/ru.po
@@ -6,10 +6,10 @@
# Yuri Kozlov <yuray@komyakino.ru>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-11 07:42+0400\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-15 19:16+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"
@@ -19,7 +19,8 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -49,10 +50,22 @@ msgstr "Здравствуй, мир!"
msgid "This program is running as process number %d."
msgstr "Эта программа выполняется как процесс под номером %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Здравствуйте"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Пример приложения"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Чувствительность значка"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Задаёт чувствительность значка."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
@@ -61,7 +74,7 @@ msgstr "Эта программа выполняется как процесс
#: hello-c++-kde/hello.cc:46
msgid "Hello example"
-msgstr "Пример: Здравствуй"
+msgstr "Пример: Здравствуйте"
#: hello-c++-kde/hello.cc:48
msgid "Hello world example"
diff --git a/gettext-tools/examples/po/sk.po b/gettext-tools/examples/po/sk.po
index 634733b..e843122 100644
--- a/gettext-tools/examples/po/sk.po
+++ b/gettext-tools/examples/po/sk.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-examples 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-10 18:15+0200\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-15-10 20:44+0100\n"
"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"Language: sk\n"
@@ -16,7 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -46,10 +47,22 @@ msgstr "Ahoj svet!"
msgid "This program is running as process number %d."
msgstr "Tento program beží ako proces s číslom %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Ahoj"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Ukážková aplikácia"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Nastaviť titulok ako citlivý"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Či nastaviť titulok ako citlivý."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/sl.po b/gettext-tools/examples/po/sl.po
index f48f51e..4b976e5 100644
--- a/gettext-tools/examples/po/sl.po
+++ b/gettext-tools/examples/po/sl.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the gettext package.
#
# Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2005, 2014.
-# $Id: gettext-examples-0.19-rc1.sl.po,v 1.3 2014/05/18 21:28:21 peterlin Exp $
+# $Id: gettext-examples-0.19.4-rc1.sl.po,v 1.2 2014/12/11 09:15:50 peterlin Exp $
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-18 23:28+0200\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-11 10:15+0100\n"
"Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
"Language: sl\n"
@@ -18,7 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -48,10 +49,22 @@ msgstr "Pozdravljen, svet!"
msgid "This program is running as process number %d."
msgstr "Ta program teče kot proces številka %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Zdravo"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Zgled aplikacije"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Nastavi oznako kot občutljivo"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Ali naj nastavimo oznako kot občutljivo"
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/sv.po b/gettext-tools/examples/po/sv.po
index c50c2af..0ad8a2a 100644
--- a/gettext-tools/examples/po/sv.po
+++ b/gettext-tools/examples/po/sv.po
@@ -4,10 +4,10 @@
# Jan Djärv <jan.h.d@swipnet.se>, 2003, 2006, 2014
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-15 07:02+0200\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-23 09:18+0100\n"
"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -15,7 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -45,10 +46,22 @@ msgstr "Hej världen!"
msgid "This program is running as process number %d."
msgstr "Detta program kör som process nummer %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Hej"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Exempelprogram"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Sätt etikett aktiv"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Om etikett ska sättas aktiv"
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/uk.po b/gettext-tools/examples/po/uk.po
index 7becc3d..ca50e6b 100644
--- a/gettext-tools/examples/po/uk.po
+++ b/gettext-tools/examples/po/uk.po
@@ -6,10 +6,10 @@
# Yuri Chornoivan <yurchor@ukr.net>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-10 17:05+0300\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-10 22:33+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -19,7 +19,8 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -49,10 +50,22 @@ msgstr "Привіт, світе!"
msgid "This program is running as process number %d."
msgstr "Ця програма виконується як процес з номером %d."
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Привіт"
+
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Програма-приклад"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Зробити мітку чутливою"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Чи слід робити мітку чутливою."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
diff --git a/gettext-tools/examples/po/vi.po b/gettext-tools/examples/po/vi.po
index 7e7c85e..af01968 100644
--- a/gettext-tools/examples/po/vi.po
+++ b/gettext-tools/examples/po/vi.po
@@ -1,17 +1,17 @@
# Vietnamese Translation for Gettext Examples.
-# Bản dịch tiếng Việt dành cho Gettext Examples.
+# Bản dịch tiếng Việt dành cho các ví dụ của gói gettext.
# Copyright © 2014 Yoyodyne, Inc. (msgids)
# Copyright © 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012 -2014.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014.
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-examples 0.19-rc1\n"
+"Project-Id-Version: gettext-examples 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:38+0900\n"
-"PO-Revision-Date: 2014-05-11 07:46+0700\n"
+"POT-Creation-Date: 2014-12-10 13:23+0900\n"
+"PO-Revision-Date: 2014-12-11 08:03+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -20,10 +20,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Langugae-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Generator: Poedit 1.5.5\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-#: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c-gnome3/hello.ui:22
+#: hello-c/hello.c:30 hello-c-gnome/hello.c:46
+#: hello-c-gnome3/hello.desktop.in.in:5 hello-c-gnome3/hello.ui:22
#: hello-c++/hello.cc:39 hello-c++-qt/hello.cc:45
#: hello-c++-kde/hellowindow.cc:42 hello-c++-gnome/hello.cc:50
#: hello-c++-wxwidgets/hello.cc:68 hello-objc/hello.m:30
@@ -51,17 +50,29 @@ msgstr "Chào thế giới!"
#: hello-php/hello.php:14
#, php-format
msgid "This program is running as process number %d."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình %d."
+msgstr "Chương trình này đang chạy với mã số tiến trình %d."
+
+#: hello-c-gnome3/hello.desktop.in.in:4
+msgid "Hello"
+msgstr "Chào"
#: hello-c-gnome3/hello.ui:5
msgid "Example Application"
msgstr "Ứng dụng mẫu"
+#: hello-c-gnome3/hello.gschema.xml:7
+msgid "Set label sensitive"
+msgstr "Đặt phân biệt nhãn"
+
+#: hello-c-gnome3/hello.gschema.xml:8
+msgid "Whether to set the label sensitive."
+msgstr "Có đặt phân biệt nhãn hay không."
+
#: hello-c++-qt/hello.cc:52 hello-c++-kde/hellowindow.cc:49
#: hello-smalltalk/hello.st.in:32 hello-ycp/hello.ycp:19
#, ycp-format
msgid "This program is running as process number %1."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình %1."
+msgstr "Chương trình này đang chạy với mã số tiến trình %1."
#: hello-c++-kde/hello.cc:46
msgid "Hello example"
@@ -74,26 +85,26 @@ msgstr "Ví dụ “Chào thế giới”"
#: hello-sh/hello.sh:17
#, sh-format
msgid "This program is running as process number $pid."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình $pid."
+msgstr "Chương trình này đang chạy với mã số tiến trình $pid."
#: hello-python/hello.py.in:13
#, python-format
msgid "This program is running as process number %(pid)d."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình %(pid)d."
+msgstr "Chương trình này đang chạy với mã số tiến trình %(pid)d."
#: hello-clisp/hello.lisp.in:13 hello-guile/hello.scm:17
#, scheme-format
msgid "This program is running as process number ~D."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình ~D."
+msgstr "Chương trình này đang chạy với mã số tiến trình ~D."
#: hello-java/Hello.java:18 hello-java-awt/Hello.java:28
#: hello-java-swing/Hello.java:25 hello-java-qtjambi/Hello.java:34
#: hello-csharp/hello.cs:17 hello-csharp-forms/hello.cs:36
#, csharp-format
msgid "This program is running as process number {0}."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình {0}."
+msgstr "Chương trình này đang chạy với mã số tiến trình {0}."
#: hello-perl/hello-2.pl.in:14
#, perl-brace-format
msgid "This program is running as process number {pid}."
-msgstr "Chương trình này đang chạy với số hiệu tiến trình {pid}."
+msgstr "Chương trình này đang chạy với mã số tiến trình {pid}."
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 6d4b44e..e786919 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,22 @@
+2014-12-24 Daiki Ueno <ueno@gnu.org>
+
+ * bg.po: Update from Roumen Petrov <transl@roumenpetrov.info>.
+ * ca.po: Update from Ivan Vilata i Balaguer <ivan@selidor.net>.
+ * de.po: Update from Mario Blättermann <mario.blaettermann@gmail.com>.
+ * es.po: Update from Antonio Ceballos <aceballos@gmail.com>.
+ * fi.po: Update from Jorma Karvonen <karvonen.jorma@gmail.com>.
+ * ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
+ * ko.po: Update from Changwoo Ryu <cwryu@debian.org>.
+ * pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>.
+ * pt_BR.po: Update from Rafael Ferreira <rafael.f.f1@gmail.com>.
+ * ru.po: Update from Pavel Maryanov <acid@jack.kiev.ua>.
+ * sk.po: Update from Marcel Telka <marcel@telka.sk>.
+ * sl.po: Update from Primoz PETERLIN <primozz.peterlin@gmail.com>.
+ * sr.po: Update from Мирослав Николић <miroslavnikolic@rocketmail.com>.
+ * sv.po: Update from Jan Djärv <jan.h.d@swipnet.se>.
+ * uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
+ * vi.po: Update from Trần Ngọc Quân <vnwildman@gmail.com>.
+
2014-10-15 Daiki Ueno <ueno@gnu.org>
* gettext 0.19.3 released.
diff --git a/gettext-tools/po/bg.po b/gettext-tools/po/bg.po
index de3e9a7..0f2ef2c 100644
--- a/gettext-tools/po/bg.po
+++ b/gettext-tools/po/bg.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 14:09+0300\n"
+"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"PO-Revision-Date: 2014-12-16 22:12+0200\n"
"Last-Translator: Roumen Petrov <transl@roumenpetrov.info>\n"
"Language-Team: Bulgarian <dict@ludost.net>\n"
"Language: bg\n"
@@ -31,22 +31,22 @@ msgstr "двусмислен аргумент %s за %s"
msgid "Valid arguments are:"
msgstr "Правилни аргументи са:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "не можа да се намери временна директория, да се опита с задаване на $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "не можа да се създаде временна директория използвайки за пример \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "не можа да се изтрие временен файл %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "не можа да се изтрие временна директория %s"
@@ -55,38 +55,38 @@ msgstr "не можа да се изтрие временна директори
msgid "write error"
msgstr "грешка при запис"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "запазване на правата върху %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "грешка при отваряне за четене на %s"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "не можа да се отвори за запис резервно копие %s"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "грешка при четене от %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "грешка при записване в %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "грешка след прочитане на %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -103,12 +103,12 @@ msgstr "не е намерен компилатор за C#, да се опит
msgid "C# virtual machine not found, try installing pnet"
msgstr "не е намерена виртуална машина за C#, да се опита при инсталиран pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Неизвестна системна грешка"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -170,31 +170,31 @@ msgstr "%s: опцията '-W %s' е без аргументи\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: опцията '-W %s' изисква аргумент\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "неправилен аргумент за \"версия на източник\"за compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "неправилен аргумент за \"версия на резултат\" за compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "пропадна създаването на \"%s\""
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "грешка при записване на файл \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "не е намерен компилатор за Java, да се опита с инсталиран gcj или със задаване на $JAVAC"
@@ -204,15 +204,15 @@ msgstr "не е намерен компилатор за Java, да се опи
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "не е намерена виртуална машина за Java, да се опита с инсталиран gcj или със задаване на $JAVAC"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s В/И грешка при подпроцес"
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "паметта е изчерпана"
@@ -222,13 +222,13 @@ msgstr "паметта е изчерпана"
msgid "creation of threads failed"
msgstr "пропадна създаването на клас нишки(threads)"
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "пропадна записването към подпроцес %s "
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
#, c-format
msgid "read from %s subprocess failed"
msgstr "пропадна четенето от подпроцес %s "
@@ -238,12 +238,12 @@ msgstr "пропадна четенето от подпроцес %s "
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "не може да се зададе неблокиран В/И към подпроцес %s"
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:336
#, c-format
msgid "communication with %s subprocess failed"
msgstr "пропадна връзката с подпроцес %s"
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:456
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "подпроцесът %s приключи с код за изход %d"
@@ -282,8 +282,8 @@ msgstr "“"
msgid "setting permissions for %s"
msgstr "задаване на права върху %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "не можа да се създаде канал"
@@ -310,7 +310,7 @@ msgid "%s subprocess got fatal signal %d"
msgstr "подпроцес %s получи пагубен сигнал %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/read-mo.c:258 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
@@ -700,10 +700,10 @@ msgstr "При директива номер %u, знакът '%c' не е ци
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Знакът, който прекратява директива номер %u, не е число между 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -717,58 +717,58 @@ msgstr ""
"Това е свободен програмен продукт: свободни сте да го променяте и разпространявате.\n"
"Не се дават НИКАКВИ ГАРАНЦИИ до степента позволена от закона.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Създадена от %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Бруно Хаибле"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "твърде много аргументи"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "За повече сведения, опитайте '%s --help'.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Употреба: %s [ОПЦИЯ]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Извежда мрежовото име на машината.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Формати за извеждане:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short кратко мрежово име\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -777,33 +777,33 @@ msgstr ""
" -f, --fqdn, --long дълго мрежово име, включващо пълно име на интернет\n"
" област(domain) и синоними\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адреси за мрежово име\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Осведомително извеждане:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help извеждане на тази помощ и изход\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -813,32 +813,33 @@ msgstr " -V, --version извеждане на сведение
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"Подавайте доклади за грешки на <bug-gnu-gettext@gnu.org>,\n"
"а за грешки в превода на <dict@fsa-bg.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "не можа да се определи мрежовото име"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "позволява се най-много един входящ файл"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s и %s са взаимоизключващи се"
@@ -859,7 +860,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -867,7 +868,7 @@ msgstr "Задължителни аргументи за \"дълги\" опци
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -880,7 +881,7 @@ msgstr " ВХФАЙЛ входящ PO файл\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -894,7 +895,7 @@ msgstr "Ако не е зададено име на входящ файл или
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -902,13 +903,13 @@ msgstr "Местоположение на резултатата:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=ФАЙЛ записване на резултата в зададения файл\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1017,35 +1018,35 @@ msgstr " --obsolete синоним за --only-obsolete --clea
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Синтаксис на входящия файл:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input входящия файл е със синтаксис на Java .properties\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input входящия файл е със синтаксис на NeXTstep/GNUstep .низове\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Подробности за извеждане:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1057,28 +1058,28 @@ msgstr ""
" КОГА може да бъде 'always', 'never', 'auto', или 'html'.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=СТИЛФАЙЛ задава CSS правила за --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape без използване на Си освобождаващи последователности в резултата (по подразбиране)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape използване на Си освобождаващи последователности в резултата, без разширени знаци\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1109,29 +1110,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict записва строго отговарящ за уеднаквяване .po файл\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output записване на Java .properties файл\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output записване на NeXTstep/GNUstep .strings файл\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ЦЯЛО установяване на ширината на изходящата страница\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1141,14 +1142,14 @@ msgstr ""
" по-дълги от ширината на изходящата страница\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output резултатът да е подреден\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1231,13 +1232,13 @@ msgstr ""
" извеждане на неповтарящите се съобщения\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input входящите файлове са с Java .properties синтаксис\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1260,27 +1261,27 @@ msgstr ""
" --use-first използване на първия наличен превод за всяко\n"
" съобщение, без сливане на отделни преводи\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=ИМЕКАТАЛОГ задава поле 'Language' за заглавния блок\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Петер Милер"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "не е зададен входящ файл"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "точно 2 входящи файла са необходими"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Употреба: %s [ОПЦИЯ] def.po ref.pot\n"
@@ -1312,17 +1313,17 @@ msgstr " def.po преводи\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot препратки към източници\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Уточняване на операциите:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain приложи ref.pot за всяка от областите в def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching да не се използва размито съвпадение\n"
@@ -1347,17 +1348,17 @@ msgstr "съобщението не е преведено "
msgid "this message needs to be reviewed by the translator"
msgstr "съобщението трябва да се прегледа от преводача"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "съобщението се използва, но не е определено..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...но определението е подобно"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "съобщението се използва, но не е определено в %s"
@@ -1429,25 +1430,25 @@ msgstr "Цел за преобразуване:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Кодировка по подразбиране е текущата кодировка на локала.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent резултат в стил с отместване\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location подтискане на редове '#: filename:line'\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location запазване на редове '#: файл:ред' (по подразбиране)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict строг уеднаквен стил за резултат\n"
@@ -1706,7 +1707,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " имефайл.po ... входящи файлове\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Режими на работа:\n"
@@ -1940,7 +1941,7 @@ msgstr " --no-hash двоичният файл няма да
msgid " --statistics print statistics about translations\n"
msgstr " --statistics извежда статистика за преводите\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose увеличава нивото на подробност\n"
@@ -1995,20 +1996,20 @@ msgstr "пренебрегнат мъгляв(fuzzy) 'msgstr' запис"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: предупреждение: файла източник съдържа мъгляви преводи"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s не съществува"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s съществува, но е нечетим"
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:87
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-java.c:181 src/x-javascript.c:171 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
@@ -2121,7 +2122,7 @@ msgstr " --sort-output резултатът да е подред
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file подреждане на резултата по място на файла\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2131,7 +2132,7 @@ msgstr ""
"от обкръжението LANG, като е описано в файла ABOUT-NLS. Това е\n"
"необходимо, за да се тества превода.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2142,12 +2143,12 @@ msgstr ""
"Да се зададе локал, чрез опцията --locale или .po файл за резултат, \n"
"чрез опцията --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Създаден %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2156,12 +2157,12 @@ msgstr ""
"Създаване на нов PO файл, запълвайки метаинформацията със стойности\n"
"от потребителското обкръжение.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=ВХФАЙЛ входящ POT файл\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2170,12 +2171,12 @@ msgstr ""
"Ако не е зададен входящ файл, текущата директория се претърсва за POT файл.\n"
"Ако той е -, се чете от стандартния вход.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=ФАЙЛ записване на резултата в указания PO файл\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2185,17 +2186,17 @@ msgstr ""
"потребителските настройки за локал. Ако той е -, резултатът се извежда на\n"
"стандартния изход.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC задаване на целевия локал\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator приема се, че PO файла се създава автоматично\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2203,12 +2204,12 @@ msgstr ""
"Намерен е повече от един .pot файл.\n"
"Да се зададе входящ .pot файл с опцията --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "грешка при четене на текущата директория"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2216,14 +2217,14 @@ msgstr ""
"Не е намерен .pot файл в текущата директория.\n"
"Да се зададе входящ .pot файл с опцията --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "пропадна подпроцесът %s и той излезе с код %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2236,7 +2237,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Български превод за пакет %s"
@@ -2268,7 +2269,7 @@ msgstr "целевата кодировка, \"%s\", не е с преносим
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/xgettext.c:544 src/xgettext.c:3426
#, c-format
msgid "warning: "
msgstr "предупреждение: "
@@ -2463,17 +2464,17 @@ msgstr "поддръжката на множествено число е доп
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr е без отбелязване за ускорена клавишна комбинация '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr е отбелязан с твърде много отметки за клавишни комбинации '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "все още заглавното поле '%s' е с началната стойност по подразбиране\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "в заглавния блок липсва поле '%s'\n"
@@ -2509,16 +2510,16 @@ msgstr "Превръщането от \"%s\" към \"%s\" създаде пов
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Не може да се превърне от \"%s\" към \"%s\". %s използва iconv(). Тази версия е създадена без iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s е правилно само с %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "тип на резервно копие"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2542,17 +2543,17 @@ msgstr ""
"съвпадение, за получаван на по-добри резултати ще се използват размити\n"
"(fuzzy) съвпадения\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po преводи препращащи към на старите източници\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot препратки към новите източници\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2561,7 +2562,7 @@ msgstr ""
" -C, --compendium=ФАЙЛ допълнителна библиотека с преведени съобщения,\n"
" може да се укаже повече от веднъж\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2570,27 +2571,27 @@ msgstr ""
" -U, --update обнови def.po,\n"
" не прави нищо, ако def.po е осъвременен\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Място на изходящия файл при обновяване:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Резултата се записва обратно в def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=КОНТРОЛ създаване на резервно копие на def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=НАСТ задава наставка за резервно копие\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2607,7 +2608,7 @@ msgstr ""
" existing, nil номериран, ако съществува такъв, иначе обикновен\n"
" simple, never винаги се създава обикновено резервно копие\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2616,32 +2617,32 @@ msgstr ""
"Наставката за резервно копие е `~', освен ако е зададена с --suffix или с\n"
"променливата на обкръжението SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous запазване на предишните msgid-ита на преведените съобщения\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent подтискане на показването ход на процеса\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "това съобщение трябва да зададе форми за множествено число"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "това съобщение не трябва да зададе форми за множествено число"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sПрочетени %ld стари + %ld препратки, сляти %ld, мъгляви %ld, липсващи %ld, остаряли %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2861,7 +2862,7 @@ msgstr "формата за множествено число с грешен и
msgid "too many errors, aborting"
msgstr "твърде много грешки, прекратяване"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "неправилно многобайтова последователност"
@@ -2918,22 +2919,22 @@ msgstr "повторно определение на съобщение"
msgid "this is the location of the first definition"
msgstr "това е мястото на първото определение"
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:177 src/read-mo.c:205
#, c-format
msgid "file \"%s\" is truncated"
msgstr "файлът \"%s\" е отрязан"
-#: src/read-mo.c:129
+#: src/read-mo.c:132
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "файлът \"%s\" съдържа низ не завършващ на NUL"
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:169 src/read-mo.c:280
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "файла \"%s\" не е в ГНУ .mo формат"
-#: src/read-mo.c:178
+#: src/read-mo.c:183
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "файла \"%s\" съдържа незавършващ с NUL низ на позиция %s"
@@ -3112,12 +3113,16 @@ msgstr "пропадна компилирането на клас на Java, д
msgid "error while opening \"%s\" for writing"
msgstr "грешка при отваряне на \"%s\" за запис"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "непълна многобайтова последователност"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "съобщения за превод не трябва да съдържат освобождаваща последователност '\\%c'"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3130,7 +3135,7 @@ msgstr ""
"кодировка. Да се обмисли използването на чисто ASCII msgid.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3219,17 +3224,17 @@ msgstr "%s:%d: предупреждение: незавършен низ"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: предупреждение: незавършен регулярен израз"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "предупреждение: неправилен знак на Uникод"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1344 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:619
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: предупреждение: незавършена константа за буква"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1390 src/x-c.c:1430 src/x-vala.c:729
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: предупреждение: незавършен заместител на низ"
@@ -3298,12 +3303,12 @@ msgstr "%s:%d: предупреждение: неправилен знак на
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: предупреждение: незавършена низова константа"
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2018 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: предупреждение: намерено е ')', където се очаква'}'"
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2052 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: предупреждение: намерено е '}', където се очаква ')'"
@@ -3524,7 +3529,7 @@ msgstr "%s:%d: неправилен израз от тип низ"
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
msgstr "%s:%lu: предупреждение: синтаксиса $\"...\" е забранен от съображения за сигурност, вместо това да се използва eval_gettext"
-#: src/x-vala.c:413
+#: src/x-vala.c:414
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: предупреждение: предсрочно прекъснат регулярен израз"
@@ -3863,7 +3868,7 @@ msgstr "предупреждение: липсва съдържание за м
msgid "context mismatch between singular and plural form"
msgstr "Несъответствие на съдържание м/у единствено и множествено число"
-#: src/xgettext.c:3419
+#: src/xgettext.c:3427
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -3875,7 +3880,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS променлива, иначе се задава\n"
", на командния ред, опция --msgid-bugs-address.\n"
-#: src/xgettext.c:3638
+#: src/xgettext.c:3646
#, c-format
msgid "language '%s' unknown"
msgstr "непознат език '%s'"
diff --git a/gettext-tools/po/ca.po b/gettext-tools/po/ca.po
index dffd2c2..dd9fe53 100644
--- a/gettext-tools/po/ca.po
+++ b/gettext-tools/po/ca.po
@@ -50,10 +50,10 @@
# options). Also strings used in multiline error and warning messages. ivb
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 21:36+0200\n"
+"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"PO-Revision-Date: 2014-12-12 13:33+0100\n"
"Last-Translator: Ivan Vilata i Balaguer <ivan@selidor.net>\n"
"Language-Team: Catalan <ca@dodds.net>\n"
"Language: ca\n"
@@ -78,25 +78,25 @@ msgstr "l’argument %s és ambigu per a %s"
msgid "Valid arguments are:"
msgstr "Els arguments vàlids són:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "no s’ha trobat un directori temporal, proveu d’establir la variable d’entorn TMPDIR"
# No usa quote(). ivb
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "no s’ha pogut crear un directori temporal amb la plantilla «%s»"
# No usa quote(). ivb
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "no s’ha pogut eliminar el fitxer temporal «%s»"
# No usa quote(). ivb
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "no s’ha pogut eliminar el directori temporal «%s»"
@@ -106,43 +106,43 @@ msgid "write error"
msgstr "error d’escriptura"
# Condició d’error. Usa quote(). ivb
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "en preservar els permissos de %s"
# Usa quote(). ivb
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "error en obrir %s per a llegir"
# Usa quote(). ivb
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "no s’ha pogut obrir el fitxer còpia de seguretat %s per a escriure"
# Usa quote(). ivb
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
# Usa quote(). ivb
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "error en escriure %s"
# Usa quote(). ivb
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "error després d’haver llegit %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -160,12 +160,12 @@ msgid "C# virtual machine not found, try installing pnet"
msgstr "no s’ha trobat cap màquina virtual de C#, instal·leu «pnet»"
# Amb el mateix format que els errors de la libc. ivb
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Error desconegut del sistema"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -227,31 +227,31 @@ msgstr "%s: l’opció «-W %s» no admet arguments\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: l’opció «-W %s» necessita un argument\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "l’argument «source_version» passat a compile_java_class() no és vàlid"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "l’argument «target_version» passat a compile_java_class() no és vàlid"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "no s’ha pogut crear «%s»"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "error en escriure el fitxer «%s»"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establiu la variable d’entorn JAVAC"
@@ -261,15 +261,15 @@ msgstr "no s’ha trobat cap compil·lador de Java, instal·leu «gcj» o establ
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "no s’ha trobat cap màquina virtual de Java, instal·leu «gij» o establiu la variable d’entorn JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "error d’E/S amb el subprocés «%s»"
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "la memòria s’ha exhaurit"
@@ -279,13 +279,13 @@ msgstr "la memòria s’ha exhaurit"
msgid "creation of threads failed"
msgstr "la creació de fils ha fallat"
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "no s’ha pogut escriure al subprocés «%s»"
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
#, c-format
msgid "read from %s subprocess failed"
msgstr "no s’ha pogut llegir del subprocés «%s»"
@@ -295,12 +295,12 @@ msgstr "no s’ha pogut llegir del subprocés «%s»"
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "no s’ha pogut establir una E/S no blocadora amb el subprocés «%s»"
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:336
#, c-format
msgid "communication with %s subprocess failed"
msgstr "la comunicació amb el subprocés «%s» ha fallat"
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:456
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "el subprocés «%s» ha terminat amb codi d’eixida %d"
@@ -340,8 +340,8 @@ msgstr "»"
msgid "setting permissions for %s"
msgstr "en establir els permissos de %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "no s’ha pogut crear una canonada"
@@ -368,7 +368,7 @@ msgid "%s subprocess got fatal signal %d"
msgstr "el subprocés «%s» ha rebut el senyal fatal %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/read-mo.c:258 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
@@ -764,10 +764,10 @@ msgstr "A la directiva número %u, el caràcter «%c» no és un dígit entre 1
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "El caràcter que termina la directiva número %u no és un dígit entre 1 i 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -781,58 +781,58 @@ msgstr ""
"Aquest és programari lliure: podeu modificar‐lo i redistribuir‐lo si voleu.\n"
"No hi ha CAP GARANTIA, en la mesura que ho permeta la llei.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Escrit per %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "sobren arguments"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Proveu «%s --help» per a obtenir més informació.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Forma d’ús: %s [OPCIÓ]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Mostra el nom d’estació de la màquina.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Format de l’eixida:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short Nom curt de l’estació.\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -841,33 +841,33 @@ msgstr ""
" -f, --fqdn, --long Nom llarg de l’estació, inclou el nom de domini\n"
" completament qualificat i els àlies.\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address Adreces corresponents al nom d’estació.\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Eixida informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help Mostra aquesta ajuda i ix.\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -877,30 +877,31 @@ msgstr " -V, --version Mostra informació sobre la versió i ix.\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Informeu dels errors a <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "no s’ha pogut obtenir el nom d’estació"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "es permet com a molt un fitxer d’entrada"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "«%s» i «%s» són mútuament excloents"
@@ -921,7 +922,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -931,7 +932,7 @@ msgstr ""
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -944,7 +945,7 @@ msgstr " FITXER_ENTRADA Fitxer PO d’entrada.\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -963,7 +964,7 @@ msgstr ""
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -971,7 +972,7 @@ msgstr "Ubicació del fitxer d’eixida:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr ""
@@ -979,7 +980,7 @@ msgstr ""
" Escriu l’eixida al fitxer especificat.\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1100,14 +1101,14 @@ msgstr " --obsolete Equival a «--only-obsolete --clear-obsolete».\n
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Sintaxi del fitxer d’entrada:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
@@ -1116,7 +1117,7 @@ msgstr ""
" Java.\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1126,15 +1127,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Detalls de l’eixida:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1147,8 +1148,8 @@ msgstr ""
" (sempre, mai, automàtic, HTML).\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
@@ -1156,7 +1157,7 @@ msgstr ""
" «--color».\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1165,7 +1166,7 @@ msgstr ""
" defecte).\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1174,7 +1175,7 @@ msgstr ""
" de caràcters estesos.\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1207,8 +1208,8 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict Genera un fitxer PO estrictament conforme amb Uniforum.\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
@@ -1216,8 +1217,8 @@ msgstr ""
" Genera un fitxer amb sintaxi «.properties» de Java.\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
@@ -1226,15 +1227,15 @@ msgstr ""
" NeXTstep/GNUstep.\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=AMPLADA Estableix l’amplada de pàgina de l’eixida.\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1244,14 +1245,14 @@ msgstr ""
" l’amplada de pàgina.\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output Genera una eixida ordenada.\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1340,7 +1341,7 @@ msgstr ""
" els missatges únics.\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
@@ -1349,7 +1350,7 @@ msgstr ""
" de Java.\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1373,7 +1374,7 @@ msgstr ""
" --use-first Empra la primera traducció de cada missatge, no mescla\n"
" diverses traduccions.\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr ""
@@ -1381,21 +1382,21 @@ msgstr ""
" Estableix el camp «Language» en l’entrada de capçalera.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "no s’ha especificat cap fitxer d’entrada"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "cal que especifiqueu exactament dos fitxers d’entrada"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Forma d’ús: %s [OPCIÓ] def.po ref.pot\n"
@@ -1428,17 +1429,17 @@ msgstr " def.po Traduccions.\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot Referències al codi font.\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadors del funcionament:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain Aplica «ref.pot» a cadascun dels dominis de «def.po».\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
@@ -1467,17 +1468,17 @@ msgstr "aquest missatge no està traduït"
msgid "this message needs to be reviewed by the translator"
msgstr "aquest missatge ha de ser revisat pel traductor"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "aquest missatge s’empra però no s’ha definit…"
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "…però aquesta definició és similar"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "aquest missatge s’empra però no s’ha definit en «%s»"
@@ -1553,19 +1554,19 @@ msgstr "Objectiu de la conversió:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "La codificació per defecte és la del locale actual.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent Genera el fitxer PO emprant l’estil indentat.\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location No escriu les línies «#: nom_fitxer:línia».\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
@@ -1573,7 +1574,7 @@ msgstr ""
" defecte).\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict Genera un fitxer PO estrictament conforme amb Uniforum.\n"
@@ -1844,7 +1845,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " nom_fitxer.po… Fitxers d’entrada.\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Mode de funcionament:\n"
@@ -2109,7 +2110,7 @@ msgstr ""
msgid " --statistics print statistics about translations\n"
msgstr " --statistics Mostra estadístiques sobre les traduccions.\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose Augmenta el nivell de descripció.\n"
@@ -2165,21 +2166,21 @@ msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: avís: el fitxer font conté una traducció difusa"
# No empra quote(). ivb
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "«%s» no existeix"
# No empra quote(). ivb
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "«%s» existeix però no s’ha pogut llegir"
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:87
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-java.c:181 src/x-javascript.c:171 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
@@ -2301,7 +2302,7 @@ msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file Ordena les eixides per llurs ubicacions en fitxer.\n"
# Multilínia. ivb
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2313,7 +2314,7 @@ msgstr ""
"vostres traduccions.\n"
# Multilínia. ivb
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2324,12 +2325,12 @@ msgstr ""
"Per favor, especifiqueu el locale mitjançant l’opció «--locale» o el\n"
"fitxer PO d’eixida mitjançant l’opció «--output-file».\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "S’ha creat «%s».\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2338,14 +2339,14 @@ msgstr ""
"Crea un fitxer PO nou, inicialitzant‐ne la metainformació amb valors obtesos\n"
"de l’entorn de l’usuari.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
" -i, --input=FITXER_ENTRADA\n"
" Fitxer POT d’entrada.\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2354,14 +2355,14 @@ msgstr ""
"Si no s’especifica el fitxer d’entrada, es cercarà el fitxer POT al directori\n"
"actual. Si el fitxer d’entrada és «-» es llegirà l’entrada estàndard.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr ""
" -o, --output-file=FITXER\n"
" Escriu l’eixida al fitxer PO especificat.\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2372,17 +2373,17 @@ msgstr ""
"s’escriuran a l’eixida estàndard.\n"
# Espere que s’entenga… ivb
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=ii_PP Estableix el locale objectiu (idioma i país).\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator Assumeix que el fitxer PO és generat automàticament.\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2390,13 +2391,13 @@ msgstr ""
"S’ha trobat més d’un fitxer «.pot».\n"
"Per favor, especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "error en llegir el directori actual"
# Multilínia. ivb
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2404,7 +2405,7 @@ msgstr ""
"No s’ha trobat cap fitxer «.pot» al directori actual. Per favor,\n"
"especifiqueu el fitxer POT d’entrada amb l’opció «--input».\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
@@ -2412,7 +2413,7 @@ msgid "%s subprocess failed with exit code %d"
msgstr "el subprocés «%s» ha fallat amb codi d’eixida %d"
# Aquest missatge va directament per pantalla… ivb
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2426,7 +2427,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Traduccions al català del paquet «%s»"
@@ -2458,7 +2459,7 @@ msgstr "el joc de caràcters destinació, «%s», no és un nom portable de codi
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/xgettext.c:544 src/xgettext.c:3426
#, c-format
msgid "warning: "
msgstr "avís: "
@@ -2670,17 +2671,17 @@ msgstr "el maneig de plurals és una extensió del «gettext» de GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "manca la marca d’accelerador de teclat «%c» en «msgstr»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "sobren marques d’accelerador de teclat «%c» en «msgstr»"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "el camp de capçalera «%s» encara té el valor inicial per defecte\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "manca el camp de capçalera «%s» a la capçalera\n"
@@ -2719,16 +2720,16 @@ msgstr "No es pot convertir de «%s» a «%s». «%s» es basa en iconv(). Aqu
# ivb (2001/12/26)
# ivb Els «%s» es refereixen a opcions -> femení.
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "«%s» només és vàlida amb «%s»"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "tipus de còpia de seguretat"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2752,17 +2753,17 @@ msgstr ""
"Quan no es puga trobar una coincidència exacta s’emprarà una comparació difusa\n"
"per a produir uns resultats millors.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po Traduccions referents al codi font antic.\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot Referències al nou codi font.\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2772,7 +2773,7 @@ msgstr ""
" Biblioteca addicional de traduccions de missatges; es\n"
" pot especificar diverses voltes.\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2781,27 +2782,27 @@ msgstr ""
" -U, --update Actualitza «def.po», no fa res si «def.po» ja es troba\n"
" actualitzat.\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Ubicació del fitxer d’eixida al mode d’actualització:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "El resultat es torna a escriure sobre «def.po».\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL Crea una còpia de seguretat de «def.po».\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIX Substitueix el sufix habitual de còpia de seguretat.\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2820,7 +2821,7 @@ msgstr ""
" simples en cas contrari.\n"
" simple, never Fa còpies de seguretat simples sempre.\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2829,22 +2830,22 @@ msgstr ""
"El sufix de còpia de seguretat és «~», si no s’estableix amb «--suffix» o amb\n"
"la variable d’entorn SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous Manté els «msgid» anteriors dels missatges traduïts.\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent No mostra els indicadors de progrés.\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "cal definir formes plurals d’aquest missatge"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "no s’han de definir formes plurals d’aquest missatge"
@@ -2853,14 +2854,14 @@ msgstr "no s’han de definir formes plurals d’aquest missatge"
# ivb Pense que «aprofitades» queda més clar que «mesclades»; es refereix
# ivb a les traduccions obteses directament de «def.po». El primer «%s» és
# ivb (o no) una nova línia.
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sS’han llegit %ld traduccions antigues + %ld referències, %ld aprofitades, %ld difuses, %ld mancants, %ld obsoletes.\n"
# ivb (2002/01/08)
# ivb Indica el final del processament, el gènere i nombre no són importants.
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3102,7 +3103,7 @@ msgstr "la forma plural té un índex incorrecte"
msgid "too many errors, aborting"
msgstr "hi ha massa errors, s’avorta"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "la seqüència multioctet no és vàlida"
@@ -3161,24 +3162,24 @@ msgstr "la definició del missatge és duplicada"
msgid "this is the location of the first definition"
msgstr "aquesta és la ubicació de la primera definició"
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:177 src/read-mo.c:205
#, c-format
msgid "file \"%s\" is truncated"
msgstr "el fitxer «%s» és truncat"
-#: src/read-mo.c:129
+#: src/read-mo.c:132
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "el fitxer «%s» conté una cadena no acabada en nul"
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:169 src/read-mo.c:280
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "el fitxer «%s» no és en el format MO de GNU"
# ivb (2002/08/08)
# ivb «%s» és una cadena amb forma «sysdep_string[%u]»
-#: src/read-mo.c:178
+#: src/read-mo.c:183
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "el fitxer «%s» conté una cadena no acabada en nul, en «%s»"
@@ -3359,13 +3360,17 @@ msgstr "no s’ha pogut compil·lar la classe Java, per favor establiu la variab
msgid "error while opening \"%s\" for writing"
msgstr "error en obrir «%s» per a escriure"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "la seqüència multioctet no és completa"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "els missatges internacionalitzats no han de contenir la seqüència d’escapada «%c»"
# Multilínia. ivb
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3379,7 +3384,7 @@ msgstr ""
"%s\n"
# Multilínia. ivb
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3477,17 +3482,17 @@ msgstr "%s:%d: avís: la cadena no està terminada"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: avís: l’expressió regular no està terminada"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "avís: el caràcter Unicode no és vàlid"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1344 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:619
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: avís: la constant caràcter no està terminada"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1390 src/x-c.c:1430 src/x-vala.c:729
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: avís: el literal cadena no està terminat"
@@ -3563,12 +3568,12 @@ msgstr "%s:%d: avís: el caràcter Unicode no és vàlid"
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: avís: la constant cadena no està terminada"
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2018 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: avís: s’ha trobat «)» on s’esperava «}»"
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2052 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: avís: s’ha trobat «}» on s’esperava «)»"
@@ -3819,7 +3824,7 @@ msgstr "%s:%d: l’expressió de cadena no és vàlida"
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
msgstr "%s:%lu: avís: la sintaxi «$\"…\"» està desaprovada per motius de seguretat; useu «eval_gettext» al seu lloc"
-#: src/x-vala.c:413
+#: src/x-vala.c:414
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: avís: el literal expressió regular termina massa aviat"
@@ -4211,7 +4216,7 @@ msgid "context mismatch between singular and plural form"
msgstr "els contexts de les formes singular i plural no corcorden"
# Multilínia. ivb
-#: src/xgettext.c:3419
+#: src/xgettext.c:3427
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -4224,7 +4229,7 @@ msgstr ""
"d’ordres.\n"
# Llenguatge de programació. ivb
-#: src/xgettext.c:3638
+#: src/xgettext.c:3646
#, c-format
msgid "language '%s' unknown"
msgstr "el llenguatge «%s» no és conegut"
diff --git a/gettext-tools/po/de.po b/gettext-tools/po/de.po
index 70b8823..9361b23 100644
--- a/gettext-tools/po/de.po
+++ b/gettext-tools/po/de.po
@@ -83,10 +83,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-10 18:01+0100\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-30 20:25+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
"Language: de\n"
@@ -110,24 +110,24 @@ msgstr "mehrdeutiges Argument %s für %s"
msgid "Valid arguments are:"
msgstr "Gültige Argumente sind:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "temporäres Verzeichnis ist nicht zu finden; bitte setzen Sie $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr ""
"es ist nicht möglich, ein temporäres Verzeichnis mittels\n"
"der Vorlage »%s« anzulegen"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "Temporäre Datei %s kann nicht entfernt werden"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
@@ -136,38 +136,38 @@ msgstr "Temporäres Verzeichnis %s kann nicht entfernt werden"
msgid "write error"
msgstr "Fehler beim Schreiben"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "Berechtigungen für %s werden beibehalten"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "Öffnen der Datei %s zum Lesen fehlgeschlagen"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "Öffnen der Sicherungsdatei %s zum Schreiben fehlgeschlagen"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "Fehler beim Lesen von %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "Fehler beim Schreiben von %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "Fehler nach dem Lesen von %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -184,12 +184,12 @@ msgstr "C#-Compiler nicht gefunden; bitte »pnet« installieren"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Virtuelle C#-Maschine nicht gefunden; bitte »pnet« installieren"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Unbekannter Systemfehler"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -251,31 +251,31 @@ msgstr "%s: Option »-W %s« erwartet kein Argument\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: Option »-W %s« erwartet ein Argument\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "ungültiges Argument source_version für compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "ungültiges Argument target_version für compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "Fehler beim Anlegen von »%s«"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "Fehler beim Schreiben von Datei »%s«"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java-Compiler nicht gefunden; bitte »gcj« installieren oder $JAVAC setzen"
@@ -287,15 +287,15 @@ msgstr ""
"Virtuelle Java-Maschine nicht gefunden; bitte »gcj« installieren oder\n"
"$JAVA setzen"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "Subprozess %s mit Ein-/Ausgabefehler"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "Speicher aufgebraucht"
@@ -306,7 +306,7 @@ msgid "creation of threads failed"
msgstr "Erstellung der Threads fehlgeschlagen"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "Schreiben zum Subprozess %s fehlgeschlagen"
@@ -367,8 +367,8 @@ msgstr "«"
msgid "setting permissions for %s"
msgstr "Festlegung der Berechtigungen für %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "Es ist nicht möglich, eine Pipe einzurichten"
@@ -791,10 +791,10 @@ msgstr "In der %u. Formatanweisung ist das Zeichen »%c« keine Ziffer zwischen
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Das Zeichen, das die %u. Formatanweisung terminiert, ist keine Ziffer zwischen 1 und 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -810,58 +810,58 @@ msgstr ""
"weiterzugeben.\n"
"Es gibt KEINE GARANTIE, soweit gesetzlich zulässig.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Geschrieben von %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "zu viele Argumente"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "»%s --help« gibt weitere Informationen.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Aufruf: %s [OPTION]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Rechnernamen (Hostname) ausgeben.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Format der Ausgabe:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short kurzer Rechnername\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -870,33 +870,33 @@ msgstr ""
" -f, --fqdn, --long langer Rechnername, einschließlich des\n"
" vollqualifizierten Domainnamen (FQDN) und Aliasse\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address Adressen für den Rechnernamen\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Informative Ausgabe:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help diese Hilfe anzeigen und beenden\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -906,10 +906,10 @@ msgstr " -V, --version Versionsnummer anzeigen und beenden\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
@@ -918,22 +918,23 @@ msgstr ""
"Für die deutsche Übersetzung sind die Übersetzer der Mailingliste\n"
"<translation-team-de@lists.sourceforge.net> zuständig.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "es ist nicht möglich, den Rechnernamen (Hostname) zu ermitteln"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "höchstens eine Eingabedatei erlaubt"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s und %s schließen sich gegenseitig aus"
@@ -954,7 +955,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -964,7 +965,7 @@ msgstr ""
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -977,7 +978,7 @@ msgstr " EINGABEDATEI PO-Eingabedatei\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -993,7 +994,7 @@ msgstr ""
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -1001,13 +1002,13 @@ msgstr "Angaben zu Ausgabedateien:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=DATEI Ausgabe in die angegebene DATEI schreiben\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1124,14 +1125,14 @@ msgstr " --obsolete Synonym für »--only-obsolete --clear-obs
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Syntax der Eingabedatei:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
@@ -1139,7 +1140,7 @@ msgstr ""
" Java\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1148,15 +1149,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Details zur Ausgabe:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1168,14 +1169,14 @@ msgstr ""
" Bei kann »always«, »never«, »auto« oder »html« sein.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STILDATEI CSS-Datei mit Stil-Regel für --color angeben\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1184,7 +1185,7 @@ msgstr ""
" (Vorgabe)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1193,7 +1194,7 @@ msgstr ""
" Zeichen in Ausgabe verwenden\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1224,8 +1225,8 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict .po-Datei streng nach Uniforum-Format erstellen\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr ""
@@ -1233,8 +1234,8 @@ msgstr ""
" ausgeben\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
@@ -1242,15 +1243,15 @@ msgstr ""
" erstellen\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ANZAHL Breite der Ausgabe auf ANZAHL Spalten festlegen\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1261,14 +1262,14 @@ msgstr ""
" Zeilen umbrechen\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output sortierte Ausgabe erstellen\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1352,7 +1353,7 @@ msgstr ""
" anfordern, die nur einmal vorkommen\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
@@ -1360,7 +1361,7 @@ msgstr ""
" Java\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1384,27 +1385,27 @@ msgstr ""
" Meldung verwenden, nicht mehrere\n"
" Übersetzungen zusammenziehen\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=KATALOGNAME »Language«-Feld in dem Kopfeintrag setzen\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "keine Eingabedateien angegeben"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "es werden genau zwei Eingabedateien benötigt"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Aufruf: %s [OPTION] Def.po Ref.pot\n"
@@ -1439,17 +1440,17 @@ msgstr " Def.po Übersetzungen\n"
msgid " ref.pot references to the sources\n"
msgstr " Ref.pot Referenzen auf die Quelldateien\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Optionen, die Verarbeitungen modifizieren:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain Ref.pot auf jeden Bereich in Def.po anwenden\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching fuzzy-Übereinstimmung nicht verwenden\n"
@@ -1474,17 +1475,17 @@ msgstr "diese Meldung ist unübersetzt"
msgid "this message needs to be reviewed by the translator"
msgstr "diese Meldung muss vom Übersetzer geprüft werden"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "diese Meldung kommt vor, ist aber nicht definiert..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...diese Definition ist ähnlich"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
@@ -1494,7 +1495,7 @@ msgstr "diese Meldung kommt vor, ist aber in %s nicht definiert"
msgid "warning: this message is not used"
msgstr "Warnung: diese Meldung kommt nicht vor"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1561,19 +1562,19 @@ msgstr ""
"Die Vorgabe für die Kodierung ist die Kodierung der aktuellen\n"
"Spracheinstellung.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent Ausgabe eingerückt darstellen\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location Zeilen mit »#: Datei:Zeilennr.« nicht schreiben\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
@@ -1581,7 +1582,7 @@ msgstr ""
" (Vorgabe)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict .po-Datei streng nach Uniforum-Format erstellen\n"
@@ -1845,7 +1846,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " Datei.po ... Eingabedateien\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Art der Verarbeitung:\n"
@@ -2098,7 +2099,7 @@ msgstr " --no-hash Binärdatei soll keine Hash-Tabelle enthal
msgid " --statistics print statistics about translations\n"
msgstr " --statistics Statistik zu den Übersetzungen anzeigen\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose mehr Hinweise während der Verarbeitung geben\n"
@@ -2155,12 +2156,12 @@ msgstr "ungenauer »msgstr«-Eintrag wird ignoriert"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: Warnung: Quelldatei enthält ungenaue Übersetzungen"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s existiert nicht"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s existiert, aber kann nicht gelesen werden"
@@ -2293,7 +2294,7 @@ msgstr " --sort-output sortierte Ausgabe erstellen\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file Ausgabe gemäß Vorkommen in Dateien erstellen\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2303,7 +2304,7 @@ msgstr ""
"Bitte setzen Sie die Umgebungsvariable LANG, wie in der Datei ABOUT-NLS\n"
"beschrieben. Dies ist notwendig, damit Sie Ihre Übersetzungen testen können.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2315,12 +2316,12 @@ msgstr ""
"oder die .po-Datei für die Ausgabe mit der Option »--output-file«\n"
"fest.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "%s wurde erstellt.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2329,12 +2330,12 @@ msgstr ""
"Neue PO-Datei erstellen und die Meta-Informationen mit Werten der Umgebung des\n"
"Benutzers initialisieren.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=EINGABEDATEI POT-Eingabedatei\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2344,12 +2345,12 @@ msgstr ""
"POT-Datei gesucht. Wenn die Eingabedatei »-« ist, wird die Standardeingabe\n"
"gelesen.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=DATEI Ausgabe in die angegebene DATEI schreiben\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2359,17 +2360,17 @@ msgstr ""
"»--locale« oder von den Lokale-Einstellungen des Benutzers ab.\n"
"Ergebnisse werden nach der Standardausgabe geschrieben, wenn »-« angegeben ist.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC Lokale für die Ausgabe setzen\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator automatische Erstellung der PO-Datei annehmen\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2377,12 +2378,12 @@ msgstr ""
"Mehr als eine .pot-Datei gefunden.\n"
"Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "Fehler beim Lesen des aktuellen Verzeichnisses"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2390,14 +2391,14 @@ msgstr ""
"Keine .pot-Datei im aktuellen Verzeichnis gefunden.\n"
"Bitte geben Sie die .pot-Datei für die Eingabe mit der Option »--input« an.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "Subprozess %s mit dem Exit-Code %d fehlgeschlagen"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2410,7 +2411,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "German translation for %s"
@@ -2646,17 +2647,17 @@ msgstr "Die Plural-Behandlung ist eine Erweiterung von GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "bei »msgstr« fehlt die Markierung »%c« für den Tastatur-Schnellzugriff"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "»msgstr« weist mehr als eine Markierung »%c« für den Tastatur-Schnellzugriff auf"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "Das Feld »%s« im Kopfeintrag hat immer noch den anfänglichen Vorgabewert\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "Im Kopfeintrag fehlt das Feld »%s«\n"
@@ -2698,16 +2699,16 @@ msgstr ""
"Es ist nicht möglich, von »%s« nach »%s« zu konvertieren.\n"
"%s hängt von iconv() ab. Diese Version wurde ohne iconv() erstellt."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s ist nur mit %s gültig"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "Art der Sicherung"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2731,19 +2732,19 @@ msgstr ""
"exakte Übereinstimmung bei Meldungen gibt, wird mittels nicht-exakter Suche\n"
"versucht, ein besseres Ergebnis zu erzielen.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr ""
" Def.po Übersetzungen, die sich auf die alten Quellen\n"
" beziehen\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " Ref.pot Referenzen aus den neuen Quellen\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2752,7 +2753,7 @@ msgstr ""
" -C, --compendium=DATEI zusätzliche Bibliothek mit Übersetzungen, es\n"
" können mehrere angegeben werden\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2761,29 +2762,29 @@ msgstr ""
" -U, --update Def.po aktualisieren; nichts unternehmen,\n"
" wenn Def.po bereits aktuell ist\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Angaben zu Ausgabedateien im Aktualisierungsmodus:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Das Ergebnis wird nach Def.po zurückgeschrieben.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROLLE Eine Sicherungskopie von Def.po anlegen\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr ""
" --suffix=SUFFIX Das übliche Suffix der Sicherungskopie\n"
" überschreiben\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2802,7 +2803,7 @@ msgstr ""
" andernfalls einfache.\n"
" simple, never immer einfache Sicherungskopien erstellen\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2811,36 +2812,36 @@ msgstr ""
"Das Suffix für Sicherungskopien ist ~, außer wenn --suffix oder die\n"
"Umgebungsvariable SIMPLE_BACKUP_SUFFIX gesetzt ist.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous die vorherigen Schlüssel der übersetzten Meldungen\n"
" beibehalten\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent Fortschrittsanzeige unterdrücken\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "diese Meldung sollte Pluralformen definieren"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "diese Meldung sollte keine Pluralformen definieren"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr ""
"%s%ld alte + %ld Referenzeinträge gelesen,\n"
"%ld stimmen überein, %ld ungenau, %ld fehlen, %ld veraltet.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3074,7 +3075,7 @@ msgstr "Pluralform hat einen falschen Index"
msgid "too many errors, aborting"
msgstr "zu viele Fehler: Abbruch"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "ungültige Multibyte-Sequenz"
@@ -3329,12 +3330,16 @@ msgstr ""
msgid "error while opening \"%s\" for writing"
msgstr "Fehler beim Öffnen von »%s« zum Schreiben"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "unvollständige Multibyte-Sequenz"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "Zu übersetzende Meldungen sollten nicht die Escape-Sequenz »\\%c« enthalten"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3348,7 +3353,7 @@ msgstr ""
"ausweichen, der stattdessen nur aus ASCII-kodierten Zeichen besteht.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3438,17 +3443,17 @@ msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: Warnung: regulärer Ausdruck nicht korrekt terminiert"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "Warnung: ungültiges Unicode-Zeichen"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: Warnung: Zeichenkonstante nicht korrekt terminiert"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: Warnung: Zeichenkette nicht korrekt terminiert"
@@ -4145,6 +4150,3 @@ msgstr "<unbenannt>"
#~ msgid "%s:%lu: warning: unterminated string"
#~ msgstr "%s:%lu: Warnung: nicht terminierte Zeichenkette"
-
-#~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: fatal Fehler: Die Plural-Meldung steht vor der Singular-Meldung\n"
diff --git a/gettext-tools/po/es.po b/gettext-tools/po/es.po
index 26ba475..8e1d3d9 100644
--- a/gettext-tools/po/es.po
+++ b/gettext-tools/po/es.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-07-22 08:10+0200\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-17 23:32+0200\n"
"Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
"Language-Team: Spanish <es@tp.org.es>\n"
"Language: es\n"
@@ -32,22 +32,22 @@ msgstr "el argumento %s es ambiguo para %s"
msgid "Valid arguments are:"
msgstr "Los argumentos válidos son:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "no se puede encontrar un directorio temporal, pruebe poner $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "no se puede crear un directorio temporal utilizando el formato \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "no se puede borrar el fichero temporal %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "no se puede borrar el directory temporal %s"
@@ -56,38 +56,38 @@ msgstr "no se puede borrar el directory temporal %s"
msgid "write error"
msgstr "error de escritura"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "preservando los permisos para %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "error al abrir el fichero %s para lectura"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "no se puede abrir el fichero de respaldo %s para escritura"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "error al leer %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "error al escribir %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "error después de leer %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -106,12 +106,12 @@ msgstr "No se encontró la máquina virtual de C#, intente instalar pnet"
# Nota: El error es del sistema, pero no se sabe cuál es el error,
# por eso es (además) desconocido.
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Error del sistema desconocido"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -173,31 +173,31 @@ msgstr "%s: la opción '-W %s' no admite ningún argumento\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: la opción '%s' requiere un argumento\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "argumento source_version no válido para compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "argumento target_version no válido para compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "fallo al crear \"%s\""
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "hubo un error al escribir el fichero \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "No se encuentró al compilador de Java, intente instalar gcj o poner $JAVAC"
@@ -207,15 +207,15 @@ msgstr "No se encuentró al compilador de Java, intente instalar gcj o poner $JA
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "No se encontró a la máquina virtual de Java, intente instalar gij o poner $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "error de E/S en el subproceso %s"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "Memoria agotada"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "fallo al crear hilos de ejecución"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "fallo en la escritura la subproceso %s"
@@ -285,8 +285,8 @@ msgstr "»"
msgid "setting permissions for %s"
msgstr "configurando permisos para %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "no se puede crear la tubería"
@@ -703,10 +703,10 @@ msgstr "En la instrucción número %u, el carácter '%c' no es un dígito entre
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "El carácter que termina la instrucción número %u no es un dígito entre 1 y 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -720,58 +720,58 @@ msgstr ""
"Esto es software libre: es usted libre de cambiarlo y redistribuirlo.\n"
"SIN NINGUNA GARANTÍA, dentro de los límites legales.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "demasiados argumentos"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Pruebe '%s --help' para más información.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Modo de empleo: %s [OPCIÓN]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Muestra el nombre de la máquina.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Formato de salida:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short nombre de corto de la máquina\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -780,33 +780,33 @@ msgstr ""
" -f, --fqdn, --long nombre largo de la máquina, incluye el nombre\n"
" completo del dominio y los alias,\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address direcciones para el nombre de la máquina\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Salida informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help muestra esta ayuda y finaliza\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -816,30 +816,31 @@ msgstr " -V, --version muestra la versión y finaliza\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Comunicar los `bugs' a <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "no se pudo obtener el nombre de la máquina"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "solo se permite un fichero de entrada máximo"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s y %s son mutuamente excluyentes"
@@ -860,7 +861,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -869,7 +870,7 @@ msgstr "Los argumentos obligatorios para las opciones largas también son obliga
# acepto sugerencia de em pero agrego un "el". mm
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -882,7 +883,7 @@ msgstr " FICHEROENTRADA fichero PO de entrada\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -898,7 +899,7 @@ msgstr "Si no se especifica un fichero de entrada o si es -, se lee la entrada e
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -906,13 +907,13 @@ msgstr "Localización del fichero de salida:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=FICHERO escribe la salida al FICHERO especificado\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1023,35 +1024,35 @@ msgstr " --obsolete sinónimo de --only-obsolete --clean-obsol
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Sintaxis del fichero de entrada:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input el fichero de entrada sigue la misma sintaxis que .properties de Java\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input el fichero de entrada sigue la sintaxis de .strings de NeXTstep/GNUstep\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Detalles de salida:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1062,28 +1063,28 @@ msgstr ""
" --color=CUANDO utiliza colores y otros atributos de texto si se cumple CUANDO.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=FICHEROESTILO especifica fichero de reglas de estilo CSS para --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape no utiliza escapes de C en la salida (por omisión)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape utiliza escapes de C en la salida, sin caracteres extendidos\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1114,29 +1115,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict escribe un fichero .po con Uniforum estricto\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output escribe un fichero .properties de Java\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output escribe un fichero .strings de NeXTstep/GNUstep\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NÚMERO pone la anchura de la página de salida\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1146,14 +1147,14 @@ msgstr ""
" sean mayores a la anchura de la página de salida\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output genera una salida ordenada\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1237,13 +1238,13 @@ msgstr ""
" que solo se impriman los mensajes únicos\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input los ficheros de entrada siguen la misma sintaxis que .properties de Java\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1266,27 +1267,27 @@ msgstr ""
" --use-first utiliza la primera traducción disponible para\n"
" cada mensaje, no mezcla varias traducciones\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=NOMBRECATALOGO pone el campo 'Language' en la cabecera\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "no se especificaron ficheros de entrada"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "se requieren exactamente 2 ficheros de entrada"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Modo de empleo: %s [OPCIÓN] def.po ref.pot\n"
@@ -1380,19 +1381,19 @@ msgstr " def.po traducciones\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referencias a las fuentes\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadores de operación:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr ""
" -m, --multi-domain aplica ref.pot a cada uno de los dominios en\n"
" def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching no utiliza la coincidencia difusa\n"
@@ -1419,17 +1420,17 @@ msgstr "este mensaje no está traducido"
msgid "this message needs to be reviewed by the translator"
msgstr "este mensaje debe ser revisado por el traductor"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "este mensaje se usa pero no está definido..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...pero esta definición es parecida"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "este mensaje se usa pero no está definido en %s"
@@ -1460,7 +1461,7 @@ msgstr "atención: este mensaje no se utiliza"
#
# 07061996mm: Mujer fatal es menos que mortal, menos que peligroso e incita a la
# aventura. Quizá no sea tan malo como dice Enrique, a menos que...
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1525,25 +1526,25 @@ msgstr "Objetivo de conversión:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "La codificación por omisión es la que está en uso por la funcion locale.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent estilo de salida con sangrías\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location no escribe las líneas '#: fichero:línea'\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location genera líneas '#: fichero:línea' (por omisión)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict escribe en estilo Uniforum estricto\n"
@@ -1812,7 +1813,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " fichero.po ... ficheros de entrada\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Modo de operación:\n"
@@ -2058,7 +2059,7 @@ msgstr " --no-hash el fichero binario no incluirá la tabla d
msgid " --statistics print statistics about translations\n"
msgstr " --statistics muestra las estadísticas sobre las traducciones\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose aumenta la cantidad de mensajes\n"
@@ -2121,12 +2122,12 @@ msgstr "se descarta la línea difusa 'msgstr'"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: atención: el fichero fuente contiene una traducción difusa"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s no existe"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s existe pero no se puede leer"
@@ -2259,7 +2260,7 @@ msgstr " --sort-output genera una salida ordenada\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file ordena la salida por localización de ficheros\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2269,7 +2270,7 @@ msgstr ""
"de entorno LANG, tal como se describe en el fichero ABOUT-NLS. Esto\n"
"es necesario para que se puedan probar las traducciones.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2280,12 +2281,12 @@ msgstr ""
"Especifique el formato local a través de la opción --locale o\n"
"el fichero de salida .po a través de la opción --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Creado %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2294,12 +2295,12 @@ msgstr ""
"Crea un nuevo fichero PO, inicializando la metainformación con valores\n"
"tomados del entorno del usuario.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=FICHEROENTRADA fichero de entrada POT\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2308,12 +2309,12 @@ msgstr ""
"Si no se da el fichero de entrada, el fichero POT se busca en el directorio\n"
"actual. Si es -, se lee la entrada estándar.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=FICHERO escribe la salida al fichero PO especificado\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2323,19 +2324,19 @@ msgstr ""
"de la selección local del usuario. Si es -, los resultados se escriben en\n"
"la salida estándar.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC configura el locale de destino\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr ""
" --no-translator supone que el fichero PO será generado\n"
" automáticamente\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2343,12 +2344,12 @@ msgstr ""
"Se ha encontrado más de un fichero .pot\n"
"Favor de especificar el fichero .pot de entrada utilizando la opción --input\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "error en la lectura del directorio actual"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2356,14 +2357,14 @@ msgstr ""
"No se encuentra el fichero .pot en el directorio actual.\n"
"Favor de especificar el fichero .pot de entrada utilizando la opción --input\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "fallo en el subproceso %s con código de salida %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2377,7 +2378,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Traducciones al español para el paquete %s"
@@ -2658,17 +2659,17 @@ msgstr "el manejo del plural es una extensión del gettext de GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr no tiene la marca del acelerador de teclado '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr tiene demasiadas marcas de aceleración de teclado '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "el campo de cabecera '%s' aún tiene el valor inicial por omisión\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "el campo '%s' no está presente en la cabecera\n"
@@ -2704,16 +2705,16 @@ msgstr "La conversión de \"%s\" a \"%s\" introduce duplicados: algunos msgid di
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "No se puede convertir de \"%s\" a \"%s\". %s se basa en iconv(). Esta versión fue construida sin iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s solo es válido con %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "tipo de respaldo"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2736,17 +2737,17 @@ msgstr ""
"haya una coincidencia exacta, se utilizará el método de comparación difusa\n"
"para obtener mejores resultados.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po traducciones que se refieren a las viejas fuentes\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referencias a las nuevas fuentes\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2755,7 +2756,7 @@ msgstr ""
" -C, --compendium=FICHERO biblioteca adicional de traducción de mensajes,\n"
" puede ser especificada más de una vez\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2764,27 +2765,27 @@ msgstr ""
" -U, --update actualiza def.po,\n"
" no hace nada si def.po ya está actualizado\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Localización del fichero de salida en modo de actualización:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "El resultado se escribió sobre def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL hace un respado de def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIJO sobreescribe el sufijo de respaldo\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2803,7 +2804,7 @@ msgstr ""
" no es así\n"
" simple, never siempre hace backups sencillos\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2812,27 +2813,27 @@ msgstr ""
"El sufijo del respaldo es '~', a menos que se modifique con --suffix o con\n"
"la variable de entorno SIMPLE_BACKUP_SUFFIX\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous conserva los msgids anteriores de los mensajes traducidos\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent suprime los indicadores de progreso\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "este mensaje debería definir las formas plurales"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "este mensaje no debería definir las formas plurales"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr ""
@@ -2840,7 +2841,7 @@ msgstr ""
"incorporados %ld, convertidos en difusos %ld, faltan %ld, obsoletos %ld.\n"
# Porque no mejor poner simplemente 'fin'? mm++
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -3098,7 +3099,7 @@ msgstr "la primera forma del plural tiene un índice incorrecto"
msgid "too many errors, aborting"
msgstr "demasiados errores, programa interrumpido"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "sucesión de multibyte inválida"
@@ -3381,12 +3382,16 @@ msgstr "fallo en la compilación de la clase Java, intente poner $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "error al abrir el fichero \"%s\" para escritura"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "sucesión de multibyte incompleta"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "Los mensajes internacionalizados no deben contener la secuencia de escape '\\%c'"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3399,7 +3404,7 @@ msgstr ""
"caracteres diferente a la suya. Considere la opción de utilizar un msgctxt\n"
"en ASCII puro. %s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3488,17 +3493,17 @@ msgstr "%s:%d: atención: cadena no finalizada"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: atención: expresión regular no finalizada"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "atención: carácter Unicode inválido"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: atención: constante de tipo carácter no finalizada"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: atención: literal de cadena no finalizada"
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index f2064b6..8bbebb2 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-06-22 14:08+0300\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-19 19:27+0300\n"
"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
"Language: fi\n"
@@ -33,22 +33,22 @@ msgstr "argumentti %s kontekstille %s ei ole yksiselitteinen"
msgid "Valid arguments are:"
msgstr "Kelvolliset argumentit ovat:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "tilapäisen hakemiston löytäminen epäonnistui, yritä asettaa $TMPDIR-muuttuja"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "tilapäisen hakemiston luominen mallinnetta ”%s” käyttämällä epäonnistui"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "väliaikaistiedoston %s poistaminen epäonnistui"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
@@ -57,38 +57,38 @@ msgstr "tilapäisen hakemiston %s poistaminen epäonnistui"
msgid "write error"
msgstr "kirjoitusvirhe"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "säilytetään käyttöoikeudet kohteelle %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "virhe avattaessa tiedostoa %s lukemista varten"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "varmuuskopiotiedoston %s avaaminen kirjoittamista varten epäonnistui"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "virhe luettaessa tiedostoa %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "virhe kirjoitettaessa tiedostoa %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "virhe tiedoston %s lukemisen jälkeen"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -105,12 +105,12 @@ msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Tuntematon järjestelmän virhe"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -172,31 +172,31 @@ msgstr "%s: valitsin ’-W %s’ ei salli argumenttia\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: valitsin ’-W %s’ vaatii argumentin\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "virheellinen source_version-argumentti kohteelle compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "virheellinen target_version-argumentti kohteelle compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "tiedoston ”%s” luominen epäonnistui"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta muuttuja $JAVAC"
@@ -206,15 +206,15 @@ msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta muuttuja
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta muuttuja $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s aliprosessisiirräntävirhe"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "muisti loppui"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "säikeiden luominen epäonnistui"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "kirjoittaminen aliprosessiin %s epäonnistui"
@@ -285,8 +285,8 @@ msgstr "”"
msgid "setting permissions for %s"
msgstr "asetetaan käyttöoikeuksia kohteelle %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "putken luominen epäonnistui"
@@ -705,10 +705,10 @@ msgid "The character that terminates the directive number %u is not a digit betw
msgstr "Merkki, joka päättää direktivin numero %u ei ole luku välillä 1...9."
# Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -722,58 +722,58 @@ msgstr ""
"Tämä on vapaa ohjelmisto ja sen muuttaminen ja levittäminen edelleen on sallittua.\n"
"Ohjelmalle EI ANNETA TAKUUTA lain sallimissa rajoissa.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Kirjoittanut %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "liian monta argumenttia"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Komento ’%s --help’ antaa lisää tietoja.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Käyttö: %s [VALITSIN]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Näytä laitteen konenimi.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Tulosteen muoto:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short lyhyt tietokonenimi\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -782,33 +782,33 @@ msgstr ""
" -f, --fqdn, --long pitkä tietokonenimi, sisältää kokonaan kelpuutetun\n"
" verkkoaluenimen ja aliakset\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address osoitteet tietokoneelle\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Selittävä tuloste:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help näytä tämä ohje ja poistu\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -818,32 +818,33 @@ msgstr " -V, --version tulosta ohjelman versiotiedot ja poistu\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"Ilmoita ohjelmiston vioista (englanniksi) osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
"Ilmoita suomennoksen vioista osoitteeseen <translation-team-fi@lists.sourceforge.net>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "ei saatu tietokonenimeä"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "enintään yksi syötetiedosto on sallittu"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "valitsimet %s ja %s ovat toisensa poissulkevia"
@@ -864,7 +865,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -872,7 +873,7 @@ msgstr "Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -885,7 +886,7 @@ msgstr " SYÖTETIEDOSTO syötteen PO-tiedosto\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -899,7 +900,7 @@ msgstr "Jos syötetiedostoa ei ole annettu tai se on -, luetaan vakiosyöte.\n"
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -907,13 +908,13 @@ msgstr "Tulostetiedostosijainti:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=TIEDOSTO kirjoita tuloste määriteltyyn tiedostoon\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1024,35 +1025,35 @@ msgstr " --obsolete synonyymi valitsimelle --only-obsolete --c
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Syötetiedoston syntaksi:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input syötetiedosto on Java .properties -syntaksissa\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input syötetiedosto on NeXTstep/GNUstep .strings -syntaksissa\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Tulosteen yksityiskohdat:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1064,28 +1065,28 @@ msgstr ""
" MILLOIN saattaa olla ’always’, ’never’, ’auto’, tai ’html’.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=TYYLITIEDOSTO määritä CSS-tyylisääntötiedosto valitsimelle --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape älä käytä C-koodinvaihtomerkkejä tulosteessa (oletus)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape käytä C-koodinvaihtomerkkejä tulosteessa, ei laajennettuja merkkejä\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1116,29 +1117,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict luo tiukasti Uniforum-yhteensopiva .po-tiedosto\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output luo Java .properties -tiedosto\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output luo NeXTstep/GNUstep .strings -tiedosto\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMERO aseta tulostesivun leveys\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1148,14 +1149,14 @@ msgstr ""
" tulostesivun leveys, useammalle riville\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output tuota lajiteltu tuloste\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1240,13 +1241,13 @@ msgstr ""
" että vain uniikkeja viestejä tulostetaan\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input syötetiedostot ovat Java .properties -syntaksissa\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1269,28 +1270,28 @@ msgstr ""
" --use-first käytä ensimmäistä käytettävissä olevaa käännöstä\n"
" jokaiselle viestille, älä yhdistä useita käännöksiä\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=LUETTELONIMI aseta ’Language’-kenttä otsakkeessa\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "syötetiedostoja ei annettu"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "tarvitaan täsmälleen kaksi syötetiedostoa"
# Tiedostoihin ref.pot ja def.po viitataan muissa teksteissä, joten ne on paras jättää suomentamatta.
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Käyttö: %s [VALITSIN] def.po ref.pot\n"
@@ -1323,17 +1324,17 @@ msgstr " def.po käännökset\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot viitteet lähteisiin\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Toimintomääreet:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain käytä ref.pot-tiedostoa jokaiselle nimiavaruudelle tiedostossa def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching älä käytä vajaustäsmäystä\n"
@@ -1358,17 +1359,17 @@ msgstr "tämä viesti on kääntämättä"
msgid "this message needs to be reviewed by the translator"
msgstr "kääntäjän on katselmoitava tämä viesti"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...mutta tämä määrittely on samanlainen"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty nimiavaruudessa %s"
@@ -1378,7 +1379,7 @@ msgstr "tätä viestiä käytetään, mutta sitä ei ole määritelty nimiavaruu
msgid "warning: this message is not used"
msgstr "varoitus: tätä viestiä ei käytetä"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1440,25 +1441,25 @@ msgstr "Muunnoskohde:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Oletuskoodaus on nykyisen paikallisasetuksen koodaus.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent sisennetty tulostetyyli\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location vaienna ’#: filename:line’ -rivit\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location säilytä ’#: filename:line’ -rivit (oletus)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict tiukka Uniforum-tulostetyyli\n"
@@ -1717,7 +1718,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " tiedosto.po ... syötetiedostot\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Toimintatila:\n"
@@ -1952,7 +1953,7 @@ msgstr " --no-hash binaaritiedosto ei sisällä hash-taulua\n
msgid " --statistics print statistics about translations\n"
msgstr " --statistics tulosta tilastot käännöksistä\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose kasvata laveustasoa\n"
@@ -2007,12 +2008,12 @@ msgstr "vajaa ’msgstr’-merkkijono jätetty huomioimatta"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s ei ole olemassa"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s on olemassa, mutta sen lukeminen epäonnistui"
@@ -2135,7 +2136,7 @@ msgstr " --sort-output tuota lajiteltu tuloste\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file lajitttele tuloste tiedoston sijainnin perusteella\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2145,7 +2146,7 @@ msgstr ""
"ympäristömuuttuja, kuten kuvaillaan ABOUT-NLS-tiedostossa.\n"
"Se on välttämätöntä, jotta voit testata käännöksiäsi.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2156,24 +2157,24 @@ msgstr ""
"Määritä paikallisasetus valitsimen --locale tai\n"
"tulosteen .po-tiedosot valitsimen --output-file avulla .\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Luotu %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr "Luo uuden PO-tiedoston alustaen meta-tiedot arvoilla käyttäjän ympäristöstä.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=SYÖTETIEDOSTO syötteen POT-tiedosto\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2182,12 +2183,12 @@ msgstr ""
"Jos syötetiedostoa ei anneta, nykyisestä hakemistosta etsitään POT-tiedosto.\n"
"Jos se on -, luetaan vakiosyöte.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=TIEDOSTO kirjoita tuloste määriteltyyn PO-tiedostoon\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2196,17 +2197,17 @@ msgstr ""
"Jos tulostetiedostoa ei ole annettu, se riippuu valitsimesta --locale tai käyttäjän\n"
"paikkallisasetuksista. Jos se on -, tulokset kirjoitetaan vakiotulosteeseen.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC aseta kohdepaikallisasetus\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator otaksu PO-tiedosto tuotetuksi automaattisesti\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2214,12 +2215,12 @@ msgstr ""
"Löytyi useampi kuin yksi .pot-tiedosto.\n"
"Määritä syötteen .pot-tiedosto valitsimella --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "virhe luettaessa nykyistä hakemistoa"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2227,14 +2228,14 @@ msgstr ""
"Nykyisestä hakemistosta ei löytynyt .pot-tiedostoa.\n"
"Määritä syötteen .pot-tiedosto valitsimella --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s aliprosessi epäonnistui poistumiskoodilla %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2247,7 +2248,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Suomenkielinen käännös %s-paketille"
@@ -2475,17 +2476,17 @@ msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr-merkkijonosta puuttuu pikanäppäinmerkki ’%c’"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr-merkkijonossa on liian monta pikanäppäinmerkkiä ’%c’"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "otsakekenttä ’%s’ on edelleen oletusarvossaan\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "otsakekenttä ’%s’ puuttuu otsakkeessa\n"
@@ -2521,16 +2522,16 @@ msgstr "Muunnos koodauksesta ”%s” koodaukseen ”%s” esitteli kaksoiskappa
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Muuntaminen koodauksesta ”%s” koodaukseen ”%s” epäonnistui. %s käyttää funktiota iconv(). Tämä versio on rakennettu ilman funktiota iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "valitsin %s on kelvollinen vain valitsimen %s kanssa"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "varmuuskopiotyyppi"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2553,17 +2554,17 @@ msgstr ""
"kommentit ja tiedostosijainnit säilytetään. Siellä missä ei löydetä\n"
"tarkkaa täsmäystä, käytetään vajaustäsmäystä paremman tuloksen tuottamiseksi.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po käännökset, jotka viittaavat vanhoihin lähdekoodeihin\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot viittaa uusiin lähdekoodeihin\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2572,7 +2573,7 @@ msgstr ""
" -C, --compendium=TIEDOSTO viestikäännösten lisäkirjasto,\n"
" saatetaan määritellä useammin kuin kerran\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2581,27 +2582,27 @@ msgstr ""
" -U, --update päivitä tiedosto def.po,\n"
" älä tee mitään, jos tiedosto def.po on jo ajan tasalla\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Tulostetiedostosijainti päivitystilassa:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Tulos kirjoitetaan takaisin tiedostoon def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL tee tiedoston def.po varmuuskopio\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=LOPPULIITE korvaa tavallisen varmuuskopioloppuliitteen\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2619,7 +2620,7 @@ msgstr ""
" yksinkertainen\n"
" simple, never tee aina yksinkertaisia varmuuskopioita\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2628,33 +2629,33 @@ msgstr ""
"Varmuuskopioloppuliite on ’~’, ellei ole asetettu valitsimella --suffix tai\n"
"ympäristömuuttujalla SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous säilytä käännettyjen viestien aikaisemmat msgid-merkkijonot\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent vaienna edistymisindikaattorit\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "tämän viestin pitäisi määritellä monikkomuodot"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "tämän viestin ei pitäisi määritellä monikkomuotoja"
# Ensimmäinen parametri on joko tyhjä merkkijono tai rivinvaihto
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sLuettu %ld vanhaa + %ld viitettä, yhdistettyjä %ld, vajaita %ld, puuttuvia %ld, vanhentuneita %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2875,7 +2876,7 @@ msgstr "monikkomuodolla on väärä indeksi"
msgid "too many errors, aborting"
msgstr "liian monia virheitä, keskeytetään"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "virheellinen monitavusekvenssi"
@@ -3131,12 +3132,16 @@ msgstr "epäonnistunut Java-luokan kääntäminen, yritä asettaa muuttuja $JAVA
msgid "error while opening \"%s\" for writing"
msgstr "virhe avattaessa tiedostoa ”%s” kirjoittamista varten"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "vaillinainen monitavusekvenssi"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "paikallistettujen viestien ei pitäisi sisältää ’\\%c’-koodinvaihtosekvenssiä"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3150,7 +3155,7 @@ msgstr ""
"msgctxt-merkkijonon käyttämistä.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3239,17 +3244,17 @@ msgstr "%s:%d: varoitus: päättämätön merkkijono"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: varoitus: päättämätön säännöllinen lauseke"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "varoitus: virheellinen Unicode-merkki"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: varoitus: päättämätön merkkivakio"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: varoitus: päättämätön merkkijonoliteraali"
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index 2107e84..5c77b8f 100644
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 13:39+0900\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-18 08:13+0900\n"
"Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
"Language: ja\n"
@@ -31,22 +31,22 @@ msgstr "%2$s Ф %1$s ۣǤ"
msgid "Valid arguments are:"
msgstr ":"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "ǥ쥯ȥդޤ. $TMPDIR ꤷƤߤƤ"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "ƥץ졼 \"%s\" Ȥäưǥ쥯ȥ뤳ȤǤޤ"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "ե \"%s\" Ǥޤ"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "ǥ쥯ȥ %s Ǥޤ"
@@ -55,38 +55,38 @@ msgstr "ǥ쥯ȥ %s Ǥޤ"
msgid "write error"
msgstr "񤭹ߥ顼"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "%s Ф륢ݻ"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "%s ɤ߹⤦Ȥƥ顼ȯޤ"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "Хååץե %s 񤭹Ѥ˳ȤǤޤ"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "%s ɤ߹˥顼ȯޤ"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "%s 񤭹˥顼ȯޤ"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "%s ɤ߹˥顼ȯޤ"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -103,12 +103,12 @@ msgstr "C# ѥ餬Ĥޤ. pnet 򥤥󥹥ȡ뤷ƤߤƤ"
msgid "C# virtual machine not found, try installing pnet"
msgstr "C# ۥޥ󤬸Ĥޤ. pnet 򥤥󥹥ȡ뤷ƤߤƤ"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "̤ΤΥƥ२顼"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -170,31 +170,31 @@ msgstr "%s: ץ '-W %s' ˰Ϥޤ\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: ץ '-W %s' ˤϰɬפǤ\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "compile_java_class Ф̵ source_version "
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class Ф̵ target_version "
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "\"%s\" ˼Ԥޤ"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "\"%s\" ե񤭹˥顼ȯޤ"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Java ѥ餬Ĥޤ. gcj 򥤥󥹥ȡ뤹뤫 $JAVAC ꤷƤߤƤ"
@@ -204,15 +204,15 @@ msgstr "Java ѥ餬Ĥޤ. gcj 򥤥󥹥ȡ뤹뤫 $JAVAC
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Java ۥޥ󤬸Ĥޤ. gij 򥤥󥹥ȡ뤹뤫 $JAVA ꤷƤ"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s ֥ץϥ顼"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "Ȥ̤ޤ"
@@ -223,7 +223,7 @@ msgid "creation of threads failed"
msgstr "åɤ˼"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "%s ؽ񤭽Ф֥ץԤޤ"
@@ -282,8 +282,8 @@ msgstr "'"
msgid "setting permissions for %s"
msgstr "%s Ф륢"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "ѥפ뤳ȤǤޤ"
@@ -699,10 +699,10 @@ msgstr "ֹ̿ %u Ǥ, ʸ '%c' 1 9 δ֤οǤϤޤ."
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "ֹ̿ %u νüʸ 1 9 δ֤οǤϤޤ."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -720,58 +720,58 @@ msgstr ""
"ϥե꡼եȥǤΤѹȺۤϼͳǤ.\n"
"ˡΧϰϤ̵ݾڤǤ.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr " %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "¿ޤ"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "¿ξ뤿ˤ '%s --help' ϤƤ.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "ˡ: %s [ץ]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "ޥΥۥ̾ɽ.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Ϸ:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short ûۥ̾\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -780,33 +780,33 @@ msgstr ""
" -f, --fqdn, --long Ĺۥ̾, FQDN (Fully Qualified Domain Name)\n"
" ̾ (ꥢ) ޤ\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address ۥ̾Ф륢ɥ쥹\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr ":\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help Υإפɽƽλ\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -816,30 +816,31 @@ msgstr " -V, --version Сɽƽλ\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "ХݡȤ <bug-gnu-gettext@gnu.org> ޤ.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "ۥ̾ǤޤǤ"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr " 1Ĥϥե뤬ޤ"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s %s ȿǤ"
@@ -858,7 +859,7 @@ msgstr "°˽äΥå̤, °򤦤ޤޤ.\n"
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -866,7 +867,7 @@ msgstr "ĹץɬܤΰûץˤɬܤǤ.\n"
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -879,7 +880,7 @@ msgstr " INPUTFILE PO ե\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -893,7 +894,7 @@ msgstr "ϥե뤬ꤵʤ, ⤷ - ξɸϤɤ߹ޤޤ.
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -901,13 +902,13 @@ msgstr "ϥեλ:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=FILE ꤷե˽\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1016,35 +1017,35 @@ msgstr " --obsolete --only-obsolete --clear-obsolete Ʊ\n"
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "ϥեʸˡ:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input ϥե Java .properties ʸˡ\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input ϥե NeXTstep/GNUstep .strings ʸˡ\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Ϥξܺ:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1056,21 +1057,21 @@ msgstr ""
" WHEN 'always', 'never', 'auto', ޤ 'html'.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STYLEFILE --color Ф CSS 롼\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape Ϥ C ΥפȤʤ (ɸ)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1079,7 +1080,7 @@ msgstr ""
" ĥʸޤʤ\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1110,29 +1111,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict ̩ Uniforum .po ե\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output Java .properties ե\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output NeXTstep/GNUstep .strings ե\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMBER ϥڡ\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1140,14 +1141,14 @@ msgid ""
msgstr " --no-wrap ϥڡĹåԤԤʤ\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output Ȥ줿Ϥ\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1229,13 +1230,13 @@ msgstr ""
" Τߤɽ\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input ϥե Java .properties ʸˡ\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1256,27 +1257,27 @@ msgstr ""
" --use-first ơΥåκǽͭȤ\n"
" ʣޡʤ\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=CATALOGNAME إåܤ 'Language' \n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "ϥե뤬ꤵƤޤ"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "Τ 2Ĥϥե뤬ɬפǤ"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "ˡ: %s [ץ] def.po ref.pot\n"
@@ -1309,17 +1310,17 @@ msgstr " def.po \n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot ؤλ\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr ":\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain ref.pot def.po ΥɥᥤγơŬ\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching ޤԤʤ\n"
@@ -1344,17 +1345,17 @@ msgstr "Υå̤Ǥ"
msgid "this message needs to be reviewed by the translator"
msgstr "ΥåԤˤӥ塼ɬפǤ"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "ΥåϻȤޤƤޤ..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...Ƥޤ"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ΥåϻȤޤ %s ǤƤޤ"
@@ -1364,7 +1365,7 @@ msgstr "ΥåϻȤޤ %s ǤƤޤ"
msgid "warning: this message is not used"
msgstr "ٹ: ΥåϻȤޤ"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1424,25 +1425,25 @@ msgstr "Ѵо:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "ɸΥ󥳡ǥ󥰤ϸߤΥΥ󥳡ǥ󥰤Ǥ.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent ν\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location '#: filename:line' ιԤϤʤ\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location '#: filename:line' ιԤݻ (ɸ)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict ̩ Uniforum Ϸ\n"
@@ -1695,7 +1696,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " filename.po ... ϥե\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "⡼:\n"
@@ -1927,7 +1928,7 @@ msgstr " --no-hash Хʥեϥϥåơ֥ޤޤ
msgid " --statistics print statistics about translations\n"
msgstr " --statistics ˴ؤ׾ɽ\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose ǥ٥夲\n"
@@ -1982,12 +1983,12 @@ msgstr "ޤ (fuzzy) 'msgstr' ȥ̵뤵ޤ"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: ٹ: եˤޤ (fuzzy) ޤ"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s ¸ߤޤ"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s ¸ߤޤɤ߹ޤ"
@@ -2110,7 +2111,7 @@ msgstr " --sort-output Ȥ줿Ϥ\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file եǽϤ򥽡\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2119,7 +2120,7 @@ msgstr ""
"ʤϸ˴ؤΤʤĶˤޤ. ABOUT-NLS ˵Ҥ줿褦\n"
"Ķѿ LANG ꤷƤ. ƥȤ뤳ȤǤޤ.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2130,24 +2131,24 @@ msgstr ""
"--locale ץǥꤹ뤫, --output-file ץ\n"
"Ϥ .po եꤷƤ.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "%s .\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr " PO ե. 桼Ķͤǥ᥿ޤ.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=INPUTFILE Ϥ POT ե\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2156,12 +2157,12 @@ msgstr ""
"ϥե뤬ꤵʤϥȥǥ쥯ȥ POT ե뤬\n"
"ޤ. ⤷ϥե뤬 - ʤɸϤɤ߹ޤޤ.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=FILE ꤵ줿 PO ե˽\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2170,17 +2171,17 @@ msgstr ""
"ϥե뤬ꤵʤ, ϥե --locale ץ󤫥桼\n"
"˰¸ޤ. ⤷ - ʤз̤ɸϤ˽Ϥޤ.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC оݤȤʤ\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator PO ե뤬ưȲ\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2188,12 +2189,12 @@ msgstr ""
"1İʾ .pot ե򸫤Ĥޤ.\n"
"--input ץϤ .pot եꤷƤ.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "ȥǥ쥯ȥɤ߹ߥ顼"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2201,14 +2202,14 @@ msgstr ""
"ȥǥ쥯ȥ .pot ե뤬ĤޤǤ.\n"
"--input ץϤ .pot եꤷƤ.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s ֥ץ, λ %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2222,7 +2223,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "%s ѥåФ"
@@ -2448,17 +2449,17 @@ msgstr "ʣ GNU gettext γĥǤ"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr ˤϥܡɥ졼ε '%c' ޤ"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr ˤϤޤ¿Υܡɥ졼ε '%c' ޤ"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "إå '%s' ɸͤΤޤޤǤ\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "إå '%s' إåˤޤ\n"
@@ -2494,16 +2495,16 @@ msgstr "\"%s\" \"%s\" ؤѴʣ, Ĥΰۤʤä msgid ʤ
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "\"%s\" \"%s\" ѴǤޤ. %s iconv() ˰¸Ƥޤ.ΥС iconv() ʤǺƤޤ."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s %s ˤΤͭǤ"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "Хååץ"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2525,17 +2526,17 @@ msgstr ""
"Ĥޤ. Τ˰פƤĽ꤬Ĥʤ, ޤ (fuzzy)\n"
"ȤȤɤ̤Ǥ礦. \n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po ŤФ뻲\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot Ф뻲\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2544,7 +2545,7 @@ msgstr ""
" -C, --compendium=FILE åɲʸ\n"
" 1ʾꤵǽ\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2553,27 +2554,27 @@ msgstr ""
" -U, --update def.po 򹹿\n"
" def.po ˺ǿǤǤв⤷ʤ\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "⡼ɤǤνϥեξ:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "̤ def.po ˽ᤵޤ.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL def.po ΥХååפ\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX ̾ΥХåå\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2590,7 +2591,7 @@ msgstr ""
" existing, nil ֹդХååפֹդ, Ǥʤñ\n"
" simple, never ñΥХååפ\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2599,32 +2600,32 @@ msgstr ""
"--suffix Ķѿ SIMPLE_BACKUP_SUFFIX ꤵƤʤ,\n"
"Хåå '~' Ǥ.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous 줿å msgid Ĥ\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent ʹԾɽʤ\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "Υåʣ٤Ǥ"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "Υåʣ٤ǤϤޤ"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%s %ld() + %ld() ɤ߹ (ޡ %ld, ޤ %ld, %ld, ˴ %ld).\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2842,7 +2843,7 @@ msgstr "ʣ˴ְäޤ"
msgid "too many errors, aborting"
msgstr "顼¿᤮Τ, Ǥڤޤ"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "ʣХȤΥ"
@@ -3093,12 +3094,16 @@ msgstr "Java 饹Υѥ˼. $JAVAC ꤷƤߤƤ"
msgid "error while opening \"%s\" for writing"
msgstr "\"%s\" ˽񤭹⤦Ȥƥ顼ȯޤ"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "ԴʣХȤΥ"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "ݲ줿å '\\%c' Ȥץ󥹤ޤǤϤޤ"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3112,7 +3117,7 @@ msgstr ""
"ƤƤ.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3201,17 +3206,17 @@ msgstr "%s:%d: ٹ: ʸ˽üޤ"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: ٹ: ɽ˽üޤ"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "ٹ: Unicode ʸ"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: ٹ: ʸ˽üޤ"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: ٹ: ʸ˽üޤ"
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index f9898e2..19f87ca 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 06:21+0900\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-18 05:54+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
"Language: ko\n"
@@ -33,22 +33,22 @@ msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 애매합니다"
msgid "Valid arguments are:"
msgstr "올바른 인자는 다음과 같습니다:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "임시 디렉터리가 없습니다, $TMPDIR 환경변수를 세팅하십시오"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "서식 \"%s\"을(를) 이용해 임시 디렉터리를 만들 수 없습니다"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "임시 파일 %s을(를) 지울 수 없습니다"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
@@ -57,38 +57,38 @@ msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
msgid "write error"
msgstr "쓰기 오류"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "%s에 대한 권한 보존"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "읽으려고 %s 파일을 여는 동안 오류 발생"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "%s 백업 파일을 위해 열지 못했습니다"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "%s 파일을 읽는 동안 오류 발생"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "%s 파일을 쓰는 동안 오류 발생"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "%s 파일을 읽은 후에 오류 발생"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -105,12 +105,12 @@ msgstr "C# 컴파일러가 없습니다. pnet을 설치해 보십시오"
msgid "C# virtual machine not found, try installing pnet"
msgstr "C# 가상기계가 없습니다. pnet을 설치해 보십시오"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "알 수 없는 시스템 오류"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -172,31 +172,31 @@ msgstr "%s: '-W %s' 옵션은 인수를 허용하지 않습니다\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: '-W %s' 옵션은 인수가 필요합니다\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니다"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "compile_java_class에 대한 target_version 인자가 잘못되었습니다"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "\"%s\"을(를) 만드는 데 실패했습니다"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "자바 컴파일러가 없습니다. gcj를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
@@ -206,15 +206,15 @@ msgstr "자바 컴파일러가 없습니다. gcj를 설치하거나 $JAVAC 환
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s 하위 프로세스 입출력 오류"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "메모리가 바닥났습니다"
@@ -225,7 +225,7 @@ msgid "creation of threads failed"
msgstr "스레드 만들기에 실패했습니다"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "%s 하위 프로세스에 쓰기가 실패했습니다"
@@ -284,8 +284,8 @@ msgstr "'"
msgid "setting permissions for %s"
msgstr "%s에 대한 권한 설정"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "파이프를 만들 수 없습니다"
@@ -704,10 +704,10 @@ msgstr "지시자 %u번에서, 문자 '%c'이(가) 1과 9 사이의 숫자가
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -721,58 +721,58 @@ msgstr ""
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "%s이(가) 만들었습니다.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "브루노 헤이블(Bruno Haible)"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "인수가 너무 많음"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "더 많은 정보를 보려면 '%s --help' 하십시오.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "사용법: %s [<옵션>]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "이 기계의 호스트이름을 표시합니다.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "출력 형식:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short 짧은 호스트이름\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -781,33 +781,33 @@ msgstr ""
" -f, --fqdn, --long 긴 호스트이름, 완전 공인 도메인이름(Fully Qualified\n"
" Domain Name) 및 별명(alias)들을 모두 포함\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address 호스트이름에 대한 주소\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "정보 출력:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help 이 도움말을 보여주고 끝납니다\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -817,30 +817,31 @@ msgstr " -V, --version 버전 정보를 표시하고 끝납니다
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "호스트이름을 알아낼 수 없습니다"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "최대 한 개의 입력파일만이 허용됩니다"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s과(와) %s은(는) 서로 배타적입니다"
@@ -859,7 +860,7 @@ msgstr "번역 메시지를 그 속성에 따라 걸러내고, 그 속성을 조
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -867,7 +868,7 @@ msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -880,7 +881,7 @@ msgstr " <입력파일> 입력 PO 파일\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -894,7 +895,7 @@ msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -902,13 +903,13 @@ msgstr "출력 파일 위치:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=<파일> 지정한 파일로 출력합니다\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1019,35 +1020,35 @@ msgstr " --obsolete \"--only-obsolete --clear-obsolete\"와
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "입력 파일 문법:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input 입력 파일이 자바 .properties 문법입니다\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input 입력 파일이 NeXTstep/GNUstep .strings 문법입니다\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "출력 상세:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1059,28 +1060,28 @@ msgstr ""
" <상황>은 'always', 'never', 'auto', 혹은 'html'.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=<스타일파일> --color 옵션에 대해 CSS 스타일을 지정합니다\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape 출력에 C 이스케이프를 쓰지 않습니다(기본값)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape 출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않습니다\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1111,29 +1112,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict 엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output 자바 .properties 파일을 씁니다\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output NeXTstep/GNUstep .strings 파일을 씁니다\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=<숫자> 출력 페이지의 너비를 지정합니다\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1143,14 +1144,14 @@ msgstr ""
" 자르지 않습니다.\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output 정렬된 출력을 만들어 냅니다\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1232,13 +1233,13 @@ msgstr ""
" 유일한 메시지만을 출력합니다.\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input 입력 파일이 자바 .properties 문법으로 되어 있습니다\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1259,27 +1260,27 @@ msgstr ""
" --use-first 각 메시지중에서 첫번째로 나타나는 번역문만\n"
" 사용하고, 여러 번역문을 합치지 않습니다\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=<목록이름> 헤더에 'Language' 항목을 설정합니다\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "피터 밀러(Peter Miller)"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "입력 파일이 주어지지 않았습니다"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "정확히 2개의 입력 파일이 필요합니다"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "사용법: %s [<옵션>] def.po ref.pot\n"
@@ -1311,17 +1312,17 @@ msgstr " def.po 번역문\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot 소스를 참조\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "동작 변경:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain ref.pot 파일을 def.po의 각 도메인에 적용합니다\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching 퍼지 매칭을 하지 않습니다\n"
@@ -1346,17 +1347,17 @@ msgstr "이 메시지는 번역되지 않았습니다"
msgid "this message needs to be reviewed by the translator"
msgstr "이 메시지는 번역자의 검토가 필요합니다"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "이 메시지는 사용되지만 정의되지 않았습니다..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...하지만 이 정의는 유사합니다"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
@@ -1366,7 +1367,7 @@ msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
msgid "warning: this message is not used"
msgstr "경고: 이 메시지는 사용되지 않습니다"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1425,25 +1426,25 @@ msgstr "변환 목표:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent 들여쓰기된 출력 형태\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location ''#: 파일_이름:줄번호' 줄을 쓰지 않습니다\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location '#: 파일_이름:줄번호 줄을 만듭니다(기본값)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict 엄격한 Uniforum 출력 형태로 씁니다\n"
@@ -1698,7 +1699,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " <파일이름>.po ... 입력 파일\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "동작 모드:\n"
@@ -1929,7 +1930,7 @@ msgstr " --no-hash 이진 파일에 해쉬 테이블을 넣
msgid " --statistics print statistics about translations\n"
msgstr " --statistics 번역에 대한 통계를 표시합니다\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose 더 자세히 출력합니다\n"
@@ -1986,12 +1987,12 @@ msgstr "퍼지 'msgstr' 항목은 무시됨"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: 경고: 소스 파일에 퍼지 번역문이 들어 있습니다"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s 파일이 없습니다"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s 파일이 있지만 읽을 수 없습니다"
@@ -2111,7 +2112,7 @@ msgstr " --sort-output 정렬된 출력을 만듭니다\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file 파일의 위치에 따라 출력을 정렬합니다\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2121,7 +2122,7 @@ msgstr ""
"여러분의 LANG 환경변수를 세팅하십시오. 세팅해야만이 여러분의\n"
"번역문을 테스트할 수 있습니다.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2132,24 +2133,24 @@ msgstr ""
"--locale 옵션으로 로캘을 지정하거나 --output-file 옵션으로\n"
"출력 .po 파일을 지정하십시오.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "%s을(를) 만들었습니다.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr "새로운 PO 파일을 만들고, 사용자의 환경에서 메타 정보를 초기화합니다\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=<입력파일> 입력 POT 파일\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2158,12 +2159,12 @@ msgstr ""
"만약 입력 파일이 주어지지 않으면, 현재 디렉터리에서 POT 파일을 찾습니다.\n"
"입력 파일이 \"-\"이면, 표준 입력을 읽습니다.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=<파일> 지정한 PO 파일로 출력합니다\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2172,17 +2173,17 @@ msgstr ""
"만약 출력 파일이 주어지지 않으면, --locale 옵션이나 사용자의 로캘 세팅에\n"
"따라 결정됩니다. 출력 파일이 \"-\"이면, 표준 출력에 씁니다.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC 목표 로캘을 지정합니다\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator PO 파일이 자동으로 만들어졌다고 가정합니다\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2190,12 +2191,12 @@ msgstr ""
"두 개 이상의 .pot 파일을 찾았습니다.\n"
"입력 .pot 파일을 --input 옵션으로 지정하십시오.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "현재 디렉터리를 읽는 데 오류가 발생했습니다"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2203,14 +2204,14 @@ msgstr ""
"현재 디렉터리에서 .pot 파일을 찾을 수 없습니다.\n"
"--input 옵션으로 입력 .pot 파일을 지정하십시오.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s 하위 프로세스가 종료 코드 %d 번으로 실패했습니다"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2223,7 +2224,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "%s 패키지에 대한 한국어 번역문"
@@ -2447,17 +2448,17 @@ msgstr "복수 처리는 GNU gettext 확장 기능입니다"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "'%s' 헤더 필드가 아직도 초기의 기본값을 가지고 있습니다\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "헤더에 헤더 필드 '%s'이(가) 빠졌음\n"
@@ -2493,16 +2494,16 @@ msgstr "\"%s\"에서 \"%s\"(으)로 변환하면 중복됩니다: 다른 두 개
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, 이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "백업 종류"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2525,17 +2526,17 @@ msgstr ""
"보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻으려고 퍼지\n"
"매칭이 사용됩니다.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po 과거 소스를 참조하는 번역문\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot 새로운 소스를 참조\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2544,7 +2545,7 @@ msgstr ""
" -C, --compendium=<파일> 메시지 번역 라이브러리 추가,\n"
" 두 개 이상 지정할 수 있습니다\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2553,27 +2554,27 @@ msgstr ""
" -U, --update def.po를 업데이트합니다\n"
" 이미 def.po를 업데이트했다면 아무 것도 안 합니다\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "업데이트 모드에서 출력 파일 위치:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=<컨트롤> def.po의 백업을 만듭니다\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=<접미어> 일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2590,39 +2591,39 @@ msgstr ""
" existing, nil 번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단히\n"
" simple, never 간단한 백업만을 만듭니다\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
"environment variable.\n"
msgstr "--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접미어는 '~'입니다.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous 이전에 번역한 메시지의 msgid를 놔 둡니다\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent 진행상태 표시를 하지 않습니다\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "이 메시지는 복수형을 지정해야만 합니다"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "예전 %s%ld + 참조문 %ld, 결합 %ld, 퍼지 %ld, 빠짐 %ld, 쓸모없음 %ld개를 읽었습니다.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2842,7 +2843,7 @@ msgstr "복수형의 인덱스가 잘못되었습니다"
msgid "too many errors, aborting"
msgstr "오류가 너무 많아서 중단합니다"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "잘못된 가변바이트 문자열"
@@ -2869,7 +2870,7 @@ msgstr "알 수 없는 키워드 \"%s\""
#: src/po-lex.c:854
#, c-format
msgid "invalid control sequence"
-msgstr "잘못된 제어 순서열"
+msgstr "잘못된 제어 시퀀스"
#: src/po-lex.c:981
#, c-format
@@ -3091,12 +3092,16 @@ msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를
msgid "error while opening \"%s\" for writing"
msgstr "쓰려고 \"%s\"을(를) 여는 동안 오류 발생"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "잘못된 가변바이트 시퀀스"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
-msgstr "국제화된 메시지에는 '\\%c' 이스케이프 순서열이 들어 있으면 안 됩니다"
+msgstr "국제화된 메시지에는 '\\%c' 이스케이프 시퀀스가 들어 있으면 안 됩니다"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3109,7 +3114,7 @@ msgstr ""
"발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3195,17 +3200,17 @@ msgstr "%s:%d: 경고: 완결되지 않은 문자열"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: 경고: 완결되지 않은 정규식"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "경고: 잘못된 유니코드 문자"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: 경고: 완결되지 않은 문자 상수"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
@@ -3493,7 +3498,7 @@ msgstr "%s:%d: 잘못된 문자열 표현"
#: src/x-sh.c:1074
#, c-format
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다; 대신에 eval_gettext를 사용하십시오"
+msgstr "%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다. 대신에 eval_gettext를 사용하십시오"
#: src/x-vala.c:413
#, c-format
@@ -3518,7 +3523,7 @@ msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
-msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다; C 형식으로 간주함"
+msgstr "경고: '%s' 파일의 확장자 '%s'을(를) 알 수 없습니다. C 형식으로 간주함"
#: src/xgettext.c:859
#, c-format
@@ -3842,7 +3847,7 @@ msgid ""
msgstr ""
"--msgid-bugs-address 옵션이 지정되지 않았습니다.\n"
"'Makevars' 파일을 사용할 경우, MSGID_BUGS_ADDRESS\n"
-"변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
+"변수를 지정하십시오. 그렇지 않으면 --msgid-bugs-address\n"
"명령행 옵션을 사용하십시오.\n"
#: src/xgettext.c:3638
diff --git a/gettext-tools/po/pl.po b/gettext-tools/po/pl.po
index e470b7f..eebe865 100644
--- a/gettext-tools/po/pl.po
+++ b/gettext-tools/po/pl.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-06-03 23:13+0200\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-17 21:17+0200\n"
"Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"Language: pl\n"
@@ -34,22 +34,22 @@ msgstr "niejednoznaczny argument %s opcji %s"
msgid "Valid arguments are:"
msgstr "Prawidłowe argumenty to:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "nie można znaleźć katalogu tymczasowego - należy ustawić $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "nie można utworzyć katalogu tymczasowego przy użyciu szablonu \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "nie można usunąć pliku tymczasowego %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "nie można usunąć katalogu tymczasowego %s"
@@ -58,38 +58,38 @@ msgstr "nie można usunąć katalogu tymczasowego %s"
msgid "write error"
msgstr "błąd zapisu"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "zachowanie uprawnień do %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "błąd w czasie otwierania %s do czytania"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "błąd otwarcia kopii zapasowej %s do pisania"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "błąd czytania %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "błąd pisania do %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "błąd po przeczytaniu %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -106,12 +106,12 @@ msgstr "Nie znaleziono kompilatora C#, proszę zainstalować pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Nie znaleziono maszyny wirtualnej C#, proszę zainstalować pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Nieznany błąd systemu"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -173,31 +173,31 @@ msgstr "%s: opcja „-W %s” nie może mieć argumentu\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: opcja „-W %s” wymaga argumentu\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "błędny argument source_version do compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "błędny argument target_version do compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "tworzenie \"%s\" nie powiodło się"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "błąd podczas pisania do pliku \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Nie znaleziono kompilatora Javy, proszę zainstalować gcj lub ustawić $JAVAC"
@@ -207,15 +207,15 @@ msgstr "Nie znaleziono kompilatora Javy, proszę zainstalować gcj lub ustawić
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Nie znaleziono maszyny wirtualnej Javy, proszę zainstalować gij lub ustawić $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "błąd wejścia/wyjścia podprocesu %s"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "pamięć wyczerpana"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "kompilacja wątków nie udała się"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "pisanie do podprocesu %s nie powiodło się"
@@ -285,8 +285,8 @@ msgstr "\""
msgid "setting permissions for %s"
msgstr "ustawienie uprawnień do %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "nie można utworzyć potoku"
@@ -707,10 +707,10 @@ msgstr "W dyrektywie numer %u znak „%c” nie jest cyfrą od 1 do 9."
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Znak kończący dyrektywę %u nie jest cyfrą od 1 do 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -724,58 +724,58 @@ msgstr ""
"To jest wolne oprogramowanie: możesz je modyfikować i rozpowszechniać.\n"
"Autorzy NIE DAJĄ GWARANCJI, na ile pozwala na to prawo.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Program napisał %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "za dużo argumentów"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Napisz „%s --help” żeby otrzymać więcej informacji.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Składnia: %s [OPCJA]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Wypisanie nazwy komputera.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Format wyjścia:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short krótka nazwa komputera\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -784,33 +784,33 @@ msgstr ""
" -f, --fqdn, --long długa nazwa komputera, zawierająca pełną nazwę\n"
" domeny i aliasy\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresy komputera\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Informacje:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help wyświetlenie tego opisu i zakończenie\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -820,30 +820,31 @@ msgstr " -V, --version wypisanie informacji o wersji i zakończen
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Raporty o błędach prosimy wysyłać do bug-gnu-gettext@gnu.org .\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "nie można odczytać nazwy komputera"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "dozwolony najwyżej jeden plik wejściowy"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s i %s wzajemnie się wykluczają"
@@ -864,7 +865,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -872,7 +873,7 @@ msgstr "Argumenty obowiązkowe opcji długich są obowiązkowe także dla krótk
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -885,7 +886,7 @@ msgstr " PLIK-WEJŚCIOWY wczytanie pliku PO\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -901,7 +902,7 @@ msgstr ""
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -909,13 +910,13 @@ msgstr "Położenie pliku wyjściowego:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=PLIK zapisanie wyniku do podanego pliku\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1039,20 +1040,20 @@ msgstr " --obsolete synonim dla --only-obsolete --clear-obsole
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Składnia pliku wejściowego:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input plik wejściowy ma składnię .properties Javy\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1061,15 +1062,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Szczegóły dotyczące wyjścia:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1083,28 +1084,28 @@ msgstr ""
" „html”.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=PLIKSTYLU podanie pliku reguł CSS dla opcji --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape nie używanie sekwencji C na wyjściu (domyślne)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape używanie sekwencji C, bez znaków rozszerzonych\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1135,29 +1136,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict zapisanie pliku .po ściśle zgodnego z Uniforum\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output zapisanie pliku .properties Javy\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output zapisanie pliku .strings NeXTstep/GNUstep\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=LICZBA ustawienie szerokości strony dla wyjścia\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1167,14 +1168,14 @@ msgstr ""
" niż szerokość strony\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output generowanie posortowanego wyjścia\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1256,13 +1257,13 @@ msgstr ""
" wyłącznie unikalnych komunikatów\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input pliki wejściowe mają składnię .properties Javy\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1285,27 +1286,27 @@ msgstr ""
" --use-first użycie pierwszego dostępnego tłumaczenia\n"
" każdego komunikatu zamiast łączenia wielu\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=NAZWA_KATALOGU ustawienie pola „Language” w nagłówku\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "nie podano plików wejściowych"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "wymagane są dokładnie dwa pliki wejściowe"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Składnia: %s [OPCJA] def.po ref.pot\n"
@@ -1338,17 +1339,17 @@ msgstr " def.po tłumaczenia\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot odniesienia do źródeł\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modyfikatory operacji:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain zastosowanie ref.pot dla wszystkich domen def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching nie używanie dopasowywania rozmytego\n"
@@ -1373,17 +1374,17 @@ msgstr "ten komunikat jest nieprzetłumaczony"
msgid "this message needs to be reviewed by the translator"
msgstr "ten komunikat powinien być sprawdzony przez tłumacza"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...ale ta definicja jest podobna"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
@@ -1393,7 +1394,7 @@ msgstr "ten komunikat jest użyty, ale nie jest zdefiniowany w %s"
msgid "warning: this message is not used"
msgstr "uwaga: ten komunikat nie został użyty"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1455,25 +1456,25 @@ msgstr "Cel konwersji:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Domyślnym kodowaniem jest kodowanie dla aktualnej lokalizacji.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent zapisanie pliku .po w stylu z wcięciami\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location pominięcie linii „#: plik:linia”\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location zachowanie linii „#: plik:linia” (domyślne)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict zapisanie pliku .po ściśle zgodnego z Uniforum\n"
@@ -1735,7 +1736,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " nazwa-pliku.po ... pliki wejściowe\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Tryb działania:\n"
@@ -1972,7 +1973,7 @@ msgstr " --no-hash tworzenie pliku binarnego bez tablicy hasz
msgid " --statistics print statistics about translations\n"
msgstr " --statistics wypisanie statystyk dotyczących tłumaczeń\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose zwiększenie ilości podawanych informacji\n"
@@ -2027,12 +2028,12 @@ msgstr "zignorowana niepewna (fuzzy) wartość „msgstr”"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: uwaga: plik źródłowy zawiera tłumaczenie budzące wątpliwości"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s nie istnieje"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s istnieje, ale nie może zostać przeczytany"
@@ -2153,7 +2154,7 @@ msgstr " --sort-output generowanie posortowanego wyjścia\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sortowanie wyjścia według położenia pliku\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2163,7 +2164,7 @@ msgstr ""
"środowiskową LANG zgodnie z opisem w pliku ABOUT-NLS. Jest to\n"
"niezbędne do testowania tłumaczeń.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2174,12 +2175,12 @@ msgstr ""
"Proszę podać lokalizację za pomocą opcji --locale lub plik\n"
"wyjściowy .po za pomocą opcji --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Utworzono %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2188,12 +2189,12 @@ msgstr ""
"Stworzenie nowego pliku PO, inicjalizując meta-informacje wartościami ze\n"
"środowiska użytkownika.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input-PLIK-WEJŚCIOWY plik wejściowy POT\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2202,12 +2203,12 @@ msgstr ""
"Jeśli nie podano pliku wejściowego, plik POT jest szukany w bieżącym katalogu.\n"
"Jeśli plik to -, czytane jest standardowe wejście.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=PLIK zapisanie wyniku do podanego pliku PO\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2217,17 +2218,17 @@ msgstr ""
"ustawień lokalizacji użytkownika. Jeśli plik to -, wyniki są wypisywane na\n"
"standardowym wyjściu.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=JJ_KK ustawienie docelowej lokalizacji\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator uznanie, że plik PO jest generowany automatycznie\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2235,12 +2236,12 @@ msgstr ""
"Znaleziono więcej niż jeden plik .pot.\n"
"Proszę podać plik .pot za pomocą opcji --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "błąd podczas czytania bieżącego katalogu"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2248,14 +2249,14 @@ msgstr ""
"Nie znaleziono pliku .pot w katalogu bieżącym.\n"
"Proszę podać plik .pot za pomocą opcji --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "podproces %s zawiódł z kodem wyjścia %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2268,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Polskie tłumaczenia dla pakietu %s"
@@ -2498,17 +2499,17 @@ msgstr "obsługa form mnogich jest rozszerzeniem gettexta GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "w msgstr brakuje skrótu oznaczenia klawiszowego „%c”"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr zawiera zbyt dużo oznaczeń skrótów klawiszowych „%c”"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "pole nagłówka „%s” nadal zawiera początkową wartość domyślną\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "w nagłówku brakuje pola „%s”\n"
@@ -2544,16 +2545,16 @@ msgstr "Konwersja z \"%s\" do \"%s\" wprowadza duplikaty: niektóre różniące
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Nie można przekonwertować z \"%s\" do \"%s\". %s opiera się na iconv(). Ta wersja została zbudowana bez iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s jest prawidłowe tylko z %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "typ zapasowy"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2575,17 +2576,17 @@ msgstr ""
"kropką i pozycje w plikach będą zachowane. Tam, gdzie nie można dopasować\n"
"dokładnie, używane jest dopasowanie rozmyte dla lepszych wyników.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po tłumaczenia odnoszące się do starych źródeł\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot odniesienia do nowych źródeł\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2594,7 +2595,7 @@ msgstr ""
" -C, --compendium=PLIK dodatkowa biblioteka tłumaczeń komunikatów,\n"
" może być podana więcej niż raz\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2603,27 +2604,27 @@ msgstr ""
" -U, --update uaktualnienie def.po, nie wykonywanie\n"
" niczego jeśli def.po jest już aktualny\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Położenie pliku wyjściowego w trybie uaktualniania:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Wynik jest zapisywany z powrotem do def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROLA utworzenie kopii zapasowej def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=KOŃCÓWKA zmiana domyślnej końcówki kopii zapasowej\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2640,7 +2641,7 @@ msgstr ""
" existing, nil numerowanie jeśli istnieją numerowane, proste jeśli nie\n"
" simple, never tworzenie zawsze prostych kopii zapasowych\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2649,34 +2650,34 @@ msgstr ""
"Końcówka nazwy kopii zapasowej to „~”, o ile nie ustawiono przez --suffix\n"
"lub zmienną środowiskową SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous zachowanie poprzednich identyfikatorów\n"
" przetłumaczonych komunikatów\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent pominięcie znaczników postępu\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "ten komunikat powinien definiować formy mnogie"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "ten komunikat nie powinien definiować form mnogich"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sPrzeczytane %ld starych + %ld odnośników, %ld dołączonych, %ld niedokładnych, %ld brakujących, %ld przestarzałych.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2896,7 +2897,7 @@ msgstr "forma mnoga ma zły indeks"
msgid "too many errors, aborting"
msgstr "za dużo błędów, przerwanie wykonywania"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "błędna sekwencja wielobajtowa"
@@ -3147,12 +3148,16 @@ msgstr "kompilacja klasy Javy nie udała się, proszę ustawić $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "błąd otwarcia \"%s\" do pisania"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "niekompletna sekwencja wielobajtowa"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "umiędzynaradawiane komunikaty nie powinny zawierać sekwencji „\\%c”"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3165,7 +3170,7 @@ msgstr ""
"innego niż ty. Rozważ używanie w nazwach msgctxt wyłącznie znaków ASCII.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3253,17 +3258,17 @@ msgstr "%s:%d: uwaga: niezakończony napis"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: uwaga: niezakończone wyrażenie regularne"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "uwaga: błędny znak unikodowy"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: uwaga: niezakończona stała znakowa"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: uwaga: niezakończona stała łańcuchowa"
diff --git a/gettext-tools/po/pt_BR.po b/gettext-tools/po/pt_BR.po
index 52a5a21..42349ea 100644
--- a/gettext-tools/po/pt_BR.po
+++ b/gettext-tools/po/pt_BR.po
@@ -8,17 +8,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-10 17:53-0300\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-17 16:44-0300\n"
"Last-Translator: Rafael Ferreira <rafael.f.f1@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.6.4\n"
+"X-Generator: Poedit 1.6.9\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: gnulib-lib/argmatch.c:133
@@ -35,22 +35,22 @@ msgstr "argumento ambíguo %s para %s"
msgid "Valid arguments are:"
msgstr "Argumentos válidos são:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "não foi possível localizar um diretório temporário, tente definir $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "não foi possível criar um diretório temporário usando o modelo \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "não foi possível remover arquivo temporário %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "não foi possível remover diretório temporário %s"
@@ -59,38 +59,38 @@ msgstr "não foi possível remover diretório temporário %s"
msgid "write error"
msgstr "erro de escrita"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "preservando permissões para %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "erro ao abrir %s para leitura"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "não foi possível abrir arquivo backup %s para gravação"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "erro ao ler %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "erro ao escrever %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "erro após leitura de %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -107,12 +107,12 @@ msgstr "Compilador C# não encontrado, tente instalar pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Máquina virtual C# não encontrada, tente instalar pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Erro de sistema desconhecido"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -174,31 +174,31 @@ msgstr "%s: opção \"-W %s\" não aceita um argumento\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: opção \"-W %s\" requer um argumento\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "argumento source_version inválido para compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "argumento target_version inválido para compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "falha ao criar \"%s\""
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "erro ao gravar o arquivo \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "compilador de Java não encontrado, tente instalar gcj ou definir $JAVAC"
@@ -208,15 +208,15 @@ msgstr "compilador de Java não encontrado, tente instalar gcj ou definir $JAVAC
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "máquina virtual Java não encontrada, tente instalar gij ou definir $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "erro de E/S no subprocesso de %s"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "memória insuficiente"
@@ -227,7 +227,7 @@ msgid "creation of threads failed"
msgstr "criação de fluxos falhou"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "escrita para subprocesso %s falhou"
@@ -286,8 +286,8 @@ msgstr "\""
msgid "setting permissions for %s"
msgstr "definindo permissões para %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "não foi possível criar redirecionamento (pipe)"
@@ -704,10 +704,10 @@ msgstr "Na diretiva de número %u, o caractere \"%c\" não é um dígito entre 1
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "O caractere que termina a diretiva de número %u não é um dígito entre 1 e 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -721,58 +721,58 @@ msgstr ""
"Este é um software livre: você é livre para alterar e redistribui-lo.\n"
"NÃO HÁ GARANTIA, à extensão permitida pela lei.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Escrito por %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "excesso de argumentos"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Tente \"%s --help\" para mais informações.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Uso: %s [OPÇÃO]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Emite o nome da máquina.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Formato da saída:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short nome de máquina curto\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -781,33 +781,33 @@ msgstr ""
" -f, --fqdn, --long nome de máquina longo, inclui fully qualified\n"
" domain e apelidos (aliases)\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address endereços para o nome da máquina\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Saída informativa:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help exibe essa ajuda e sai\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -817,30 +817,31 @@ msgstr " -V, --version exibe a informação da versão e sai\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Relate erros para <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "não foi possível obter nome de máquina"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "no máximo um arquivo é permitido"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s e %s são mutuamente exclusivos"
@@ -861,7 +862,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -869,7 +870,7 @@ msgstr "Argumentos obrigatórios para opções longas também o são para opçõ
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -882,7 +883,7 @@ msgstr " ARQUIVO-ENTRADA arquivo PO de entrada\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -898,7 +899,7 @@ msgstr "Se nenhum arquivo de entrada for passado ou se for -, a entrada padrão
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -906,13 +907,13 @@ msgstr "Localização do arquivo de saída:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=ARQUIVO escreve a saída para o arquivo especificado\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1032,14 +1033,14 @@ msgstr " --obsolete sinônimo de --only-obsolete --clear-obsol
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Sintaxe do arquivo de entrada:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
@@ -1047,7 +1048,7 @@ msgstr ""
" .properties Java\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1056,15 +1057,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Detalhes de entrada:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1077,8 +1078,8 @@ msgstr ""
" \"html\".\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
@@ -1086,14 +1087,14 @@ msgstr ""
" --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape não usa escapes de C na saída (padrão)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1102,7 +1103,7 @@ msgstr ""
" estendido\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1135,29 +1136,29 @@ msgstr ""
" com Uniforum estrito\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output escreve em arquivo .properties de Java\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output escreve um arquivo .strings de NeXTstep/GNUstep\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NÚMERO define a largura da página de saída\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1168,14 +1169,14 @@ msgstr ""
" linhas\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output gera uma saída ordenada\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1258,7 +1259,7 @@ msgstr ""
" apenas mensagens únicas sejam exibidas\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
@@ -1266,7 +1267,7 @@ msgstr ""
" .properties do Java\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1289,7 +1290,7 @@ msgstr ""
" --use-first usa a primeira tradução disponível para cada\n"
" mensagem, não mescla várias traduções\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr ""
@@ -1297,21 +1298,21 @@ msgstr ""
" cabeçalho\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "nenhum arquivo de entrada informado"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "são necessários 2 arquivos de entrada"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Uso: %s [OPÇÃO] def.po ref.pot\n"
@@ -1344,17 +1345,17 @@ msgstr " def.po traduções\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referências para as fontes\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modificadores de operação:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain aplica ref.pot a cada um dos domínios em def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching não usa marcação de aproximada\n"
@@ -1379,17 +1380,17 @@ msgstr "esta mensagem está não traduzida"
msgid "this message needs to be reviewed by the translator"
msgstr "esta mensagem precisa ser revisada pelo tradutor"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "esta mensagem é usada, mas não foi definida..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...mas esta definição é similar"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "esta mensagem é utilizada mas não definida em %s"
@@ -1399,7 +1400,7 @@ msgstr "esta mensagem é utilizada mas não definida em %s"
msgid "warning: this message is not used"
msgstr "atenção: esta mensagem não é utilizada"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1461,19 +1462,19 @@ msgstr "Alvo de conversão:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "A codificação padrão é a codificação do local atual.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent estilo de saída com recuo\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location suprime as linhas \"#: nome-de-arquivo:linha\"\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
@@ -1481,7 +1482,7 @@ msgstr ""
" (padrão)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict estilo de saída Uniform estrito\n"
@@ -1742,7 +1743,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " arquivo.po ... arquivos de entrada\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Modo de operação:\n"
@@ -1997,7 +1998,7 @@ msgstr " --no-hash arquivo binário não vai incluir a tabela
msgid " --statistics print statistics about translations\n"
msgstr " --statistics imprime estatísticas sobre traduções\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose aumenta o nível de detalhamento\n"
@@ -2052,12 +2053,12 @@ msgstr "mensagem \"msgstr\" aproximada (fuzzy) ignorada"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: aviso: arquivo fonte contém traduções aproximadas"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s não existe"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s existe, mas não pode ler"
@@ -2187,7 +2188,7 @@ msgstr " --sort-output gera uma saída ordenada\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file ordena a saída por localização de arquivo\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2197,7 +2198,7 @@ msgstr ""
"sua variável de ambiente LANG, como descrita no arquivo ABOUT-NLS. Isso é\n"
"necessário para que você possa testar suas traduções.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2208,12 +2209,12 @@ msgstr ""
"Por favor, especifique a localização por meio da opção --locale\n"
"ou do arquivo de saída .po através da opção --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Criado %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2222,14 +2223,14 @@ msgstr ""
"Cria um novo arquivo PO, inicializando as informações meta com valores do\n"
"ambiente do usuário.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr ""
" -i, --input=ARQUIVO-ENTRADA\n"
" arquivo POT de entrada\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2239,12 +2240,12 @@ msgstr ""
"pelo arquivo POT.\n"
"Se ele for -, a entrada padrão é lida.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=ARQUIVO escreve a saída para o arquivo PO especificado\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2254,17 +2255,17 @@ msgstr ""
"ou da configuração de localização do usuário. Se ele for -, os resultados são\n"
"escritos para a saída padrão.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC define a localização alvo\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator pressupõe que o arquivo PO é gerado automaticamente\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2272,12 +2273,12 @@ msgstr ""
"Encontrado mais de um arquivo .pot.\n"
"Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "erro ao ler o diretório atual"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2285,14 +2286,14 @@ msgstr ""
"Encontrado nenhum arquivo .pot no diretório atual.\n"
"Por favor, especifique o arquivo .pot de entrada por meio da opção --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "subprocesso de %s falhou com código de saída %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2305,7 +2306,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Traduções em português brasileiro para o pacote %s"
@@ -2534,17 +2535,17 @@ msgstr "manipulação de plural é uma extensão do GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr não possui a marca de acelerador de teclado \"%c\""
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr possui marcas de aceleradores de teclado \"%c\" demais"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "campo de cabeçalho \"%s\" ainda possui o valor inicial padrão\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "campo de cabeçalho \"%s\" faltando no cabeçalho\n"
@@ -2580,16 +2581,16 @@ msgstr "Conversão de \"%s\" para \"%s\" introduz duplicatas: algumas msgids dif
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Não foi possível converter de \"%s\" para \"%s\". %s depende do iconv(). Esta versão foi compilada sem iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s é válida apenas com %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "tipo de cópia de segurança"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2612,17 +2613,17 @@ msgstr ""
"de arquivos serão preservados. Onde não se encontrar uma coincidência exata, é\n"
"marcado como aproximada (fuzzy) para se ter melhores resultados.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po traduções referindo a fontes antigas\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referências a fontes novas\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2631,7 +2632,7 @@ msgstr ""
" -C, --compendium=ARQUIVO biblioteca adicional de traduções de mensagens\n"
" pode ser especificada mais de uma vez\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2640,27 +2641,27 @@ msgstr ""
" -U, --update atualiza def.po,\n"
" faz nada se def.po estiver atualizado\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Localização de arquivo de saída no modo de atualização:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "O resultado é escrito de volta no def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROLE faz um backup do def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFIXO sobrescreve o sufixo padrão do backup\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2677,7 +2678,7 @@ msgstr ""
" existing, nil numerado se backups numerados existirem; Se não, simples\n"
" simple, never sempre faz backups simples\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2686,32 +2687,32 @@ msgstr ""
"O sufixo de backup é '~', a menos que seja definido com --suffix ou com a\n"
"variável de ambiente SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous mantém msgids anteriores de mensagens traduzidas\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent suprime indicadores de progresso\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "esta mensagem deveria definir formas de plural"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "esta mensagem não deveria definir formas de plural"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sLeu %ld antigas + %ld referências, mesclou %ld, marcou como aproximadas %ld, perdidas %ld, obsoletas %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2940,7 +2941,7 @@ msgstr "forma plural tem o índice errado"
msgid "too many errors, aborting"
msgstr "excesso de erros - abortando"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "sequência multi-byte inválida"
@@ -3191,12 +3192,16 @@ msgstr "compilação de classe Java falhou, por favor tente definir $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "erro ao abrir o arquivo \"%s\" para gravação"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "sequência multi-byte incompleta"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "mensagens internacionalizadas não devem conter o caractere de escape \"\\%c\""
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3209,7 +3214,7 @@ msgstr ""
"caracteres diferente da sua. Considere usar um msgctxt ASCII puro.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3297,17 +3302,17 @@ msgstr "%s:%d: aviso: string não terminada"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: aviso: expressão regular não terminada"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "aviso: caractere Unicode inválido"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: aviso: constante de caractere não terminada"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: aviso: string literal não terminada"
@@ -3331,7 +3336,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Sequência multi-byte longa e inválida.\n"
+"%s:%d: Sequência multi-byte longa e incompleta.\n"
"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
#: src/x-csharp.c:297
@@ -3434,7 +3439,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Sequência multi-byte longa e inválida.\n"
+"%s:%d: Sequência multi-byte longa e incompleta.\n"
"Por favor, especifique a codificação fonte correta por meio de --from-code.\n"
#: src/x-javascript.c:303
diff --git a/gettext-tools/po/ru.po b/gettext-tools/po/ru.po
index fb5fe98..7de6390 100644
--- a/gettext-tools/po/ru.po
+++ b/gettext-tools/po/ru.po
@@ -4,20 +4,21 @@
#
# Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001-2007.
# Yuri Kozlov <yuray@komyakino.ru>, 2014.
+# Pavel Maryanov <acid@jack.kiev.ua>, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 13:59+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-11-19 09:30+0200\n"
+"Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
"Language-Team: Russian <gnu@mx.ru>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 1.6.9\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -33,22 +34,22 @@ msgstr "неоднозначный аргумент %s для %s"
msgid "Valid arguments are:"
msgstr "Допустимые аргументы:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "невозможно найти временный каталог, попробуйте установить $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "невозможно создать временный каталог с помощью шаблона «%s»"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "невозможно удалить временный файл %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "невозможно удалить временный каталог %s"
@@ -57,38 +58,38 @@ msgstr "невозможно удалить временный каталог %s
msgid "write error"
msgstr "ошибка записи"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "сохранение прав доступа для %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "ошибка при открытии файла %s для чтения"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "не удалось открыть файл резервной копии %s для записи"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "ошибка чтения %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "ошибка записи %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "ошибка после чтения %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -105,12 +106,12 @@ msgstr "Не найден компилятор C#, попробуйте пост
msgid "C# virtual machine not found, try installing pnet"
msgstr "Не найдена виртуальная машина C#, попробуйте поставить pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Неизвестная системная ошибка"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -172,31 +173,31 @@ msgstr "%s: у параметра «-W %s» не может быть аргум
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: для параметра «-W %s» требуется аргумент\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "неправильный аргумент source_version для compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "неправильный аргумент target_version для compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "ошибка при создании «%s»"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "ошибка записи файла «%s»"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Не найден компилятор Java, поставьте gcj или установите переменную $JAVAC"
@@ -206,15 +207,15 @@ msgstr "Не найден компилятор Java, поставьте gcj ил
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Не найдена виртуальная машина Java, поставьте gij или установите переменную $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "ошибка ввода/вывода в дочернем процессе %s"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "память исчерпана"
@@ -225,7 +226,7 @@ msgid "creation of threads failed"
msgstr "ошибка при создании нитей"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "ошибка при записи в дочерний процесс %s"
@@ -284,8 +285,8 @@ msgstr "»"
msgid "setting permissions for %s"
msgstr "установка прав доступа для %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "невозможно создать канал"
@@ -703,10 +704,10 @@ msgstr "В директиве номер %u символ «%c» не являе
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Символ, завершающий директиву номер %u не является цифрой между 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -720,58 +721,58 @@ msgstr ""
"Это свободное ПО: вы можете продавать и распространять его.\n"
"Нет НИКАКИХ ГАРАНТИЙ до степени, разрешённой законом.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Автор программы — %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Бруно Хайбл"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "слишком много аргументов"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "По команде «%s --help» можно получить дополнительную информацию.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Использование: %s [ПАРАМЕТР]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Печатает имя данной машины.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Формат вывода:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short короткое имя машины\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -780,33 +781,33 @@ msgstr ""
" -f, --fqdn, --long длинное имя машины, включает полностью\n"
" заданное доменное имя и псевдонимы\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адреса для заданного имени машины\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Информационный вывод:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help показать эту справку и выйти\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -816,30 +817,31 @@ msgstr " -V, --version показать информацию о
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Об ошибках сообщайте по адресу <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "невозможно получить имя машины"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "принимается не более одного входного файла"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s и %s взаимно исключают друг друга"
@@ -860,7 +862,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -868,7 +870,7 @@ msgstr "Аргументы, обязательные для длинных па
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -881,7 +883,7 @@ msgstr " ВХОДНОЙ-ФАЙЛ входной PO-файл\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -895,7 +897,7 @@ msgstr "Если входной файл не задан или задан ка
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -903,13 +905,13 @@ msgstr "Нахождение выходного файла:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=ФАЙЛ записать вывод в указанный файл\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1024,35 +1026,35 @@ msgstr " --obsolete синоним для --only-obsolete --cl
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Синтаксис входного файла:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input входной файл имеет синтаксис Java .properties\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input входной файл имеет синтаксис NeXTstep/GNUstep .strings\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Подробности выходного формата:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1066,14 +1068,14 @@ msgstr ""
" «never» (никогда), «auto» или «html»\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=ФАЙЛ_СТИЛЯ указать файл правил стилей CSS для --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1082,7 +1084,7 @@ msgstr ""
" последовательности языка C (по умолчанию)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1091,7 +1093,7 @@ msgstr ""
" а не расширенные символы\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1126,29 +1128,29 @@ msgstr ""
" Uniforum\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output записать .properties-файл Java\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output записать .strings-файл NeXTstep/GNUstep\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ЧИСЛО задает ширину выходной страницы\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1158,14 +1160,14 @@ msgstr ""
" ширины выходной страницы\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output сортировать вывод\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1250,13 +1252,13 @@ msgstr ""
" печать только уникальных сообщений\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input входные файлы имеют синтаксис Java .properties\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1279,27 +1281,27 @@ msgstr ""
" --use-first использовать первый доступный перевод для\n"
" каждого сообщения, не объединять переводы\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=ИМЯ_КАТАЛОГА задать поле «Language» в заголовке\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Питер Миллер"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "не заданы входные файлы"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "необходимо задать два входных файла"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Использование: %s [ПАРАМЕТР] def.po ref.pot\n"
@@ -1332,17 +1334,17 @@ msgstr " def.po переводы\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot ссылки на исходники\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Модификаторы режима работы:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain применить ref.pot ко всем доменам из def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching не применять нечеткое сопоставление\n"
@@ -1367,17 +1369,17 @@ msgstr "это сообщение не переведено"
msgid "this message needs to be reviewed by the translator"
msgstr "это сообщение должно быть проверено переводчиком"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "это сообщение используется программой, но не было определено..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...однако здесь определено похожее сообщение"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "это сообщение не было определено в %s"
@@ -1387,7 +1389,7 @@ msgstr "это сообщение не было определено в %s"
msgid "warning: this message is not used"
msgstr "предупреждение: это сообщение не используется"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1450,19 +1452,19 @@ msgstr "Цель преобразования:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "По умолчанию используется кодировка текущей локали.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent использовать на выводе отступы\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location убрать строки «#: файл:строка»\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
@@ -1470,7 +1472,7 @@ msgstr ""
" (по умолчанию)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr ""
@@ -1736,7 +1738,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " имя-файл.po ... входные файлы\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Режим работы:\n"
@@ -1974,7 +1976,7 @@ msgstr " --no-hash двоичный файл не будет
msgid " --statistics print statistics about translations\n"
msgstr " --statistics напечатать статистику о переводах\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose увеличить подробность диагностических сообщений\n"
@@ -2031,12 +2033,12 @@ msgstr "неточная запись «msgstr» игнорируется"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: предупреждение: исходный файл содержит неточные переводы"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s не существует"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s существует, но недоступен для чтения"
@@ -2171,7 +2173,7 @@ msgstr " --sort-output сортировать вывод\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file сортировать вывод по именам файлов\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2181,7 +2183,7 @@ msgstr ""
"Установите переменную окружения LANG как описано в файле ABOUT-NLS. Это\n"
"необходимо, чтобы вы могли проверить свои переводы.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2192,12 +2194,12 @@ msgstr ""
"Укажите локаль с помощью параметра --locale или выходной\n"
"po-файл с помощью параметра --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Создано %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2206,12 +2208,12 @@ msgstr ""
"Создаёт новый PO-файл, инициализируя метаинформацию на основе\n"
"пользовательского окружения.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=ВХОДНОЙ-ФАЙЛ входной POT-файл\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2220,12 +2222,12 @@ msgstr ""
"Если входной файл не задан, он ищется в текущем каталоге.\n"
"Если входной файл задан как -, читается стандартный ввод.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=ФАЙЛ записать вывод в указанный файл\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2235,17 +2237,17 @@ msgstr ""
"установленной локали. Если он задан как -, результаты выводятся на\n"
"стандартный вывод.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=ЯЯ_СС задает целевую локаль\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator предполагать, что PO-файл сгенерирован автоматически\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2253,12 +2255,12 @@ msgstr ""
"Найдено более одного pot-файла.\n"
"Укажите входной pot-файл с помощью параметра --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "ошибка при чтении текущего каталога"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2266,28 +2268,28 @@ msgstr ""
"В текущем каталоге не найден pot-файл.\n"
"Укажите входной pot-файл с помощью параметра --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
-msgstr "дочерний процесс %s завершился неуспехом с выходным кодом %d"
+msgstr "дочерний процесс %s завершился аварийно с кодом выхода %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
"you in case of unexpected technical problems.\n"
msgstr ""
-"Новый каталог сообщений должен содержать ваш адрес электронной почты,\n"
-"чтобы пользователи могли присылать свои замечания по поводу ваших\n"
-"передов, а также чтобы сопроводители программ могли связаться с вами в\n"
-"том случае, если возникнут непредвиденные технические проблемы.\n"
+"В новом каталоге сообщений должен быть указан адрес вашей электронной\n"
+"почты, чтобы пользователи могли присылать свои замечания по поводу ваших\n"
+"переводов, а также чтобы сопроводители программ могли связаться с вами\n"
+"на случай, если возникнут непредвиденные технические проблемы.\n"
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Английские переводы для пакета %s"
@@ -2515,17 +2517,17 @@ msgstr "обработка форм во множественном числе
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "в msgstr недостает отметки клавиатурного эквивалента «%c»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "в msgstr слишком много отметок клавиатурных эквивалентов «%c»"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "поле заголовка «%s» всё ещё содержит первоначальное значение по умолчанию\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "в заголовке отсутствует поле «%s»\n"
@@ -2561,16 +2563,16 @@ msgstr "Преобразование из «%s» в «%s» порождает д
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Невозможно преобразовать из «%s» в «%s». %s полагается на iconv(). Эта версия была собрана без iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s допустимо только с %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "тип резервного копирования"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2595,17 +2597,17 @@ msgstr ""
"используется приблизительное сравнение, если нельзя найти точное\n"
"совпадение.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po переводы, ссылающиеся на старые исходники\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot ссылки на новые исходники\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2614,7 +2616,7 @@ msgstr ""
" -C, --compendium=ФАЙЛ дополнительная библиотека переводов сообщений, \n"
" можно указывать несколько раз\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2623,27 +2625,27 @@ msgstr ""
" -U, --update обновить def.po,\n"
" ничего не делать, если def.po уже обновлен\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Нахождение выходного файла в режиме обновления:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Результат записывается обратно в def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=МЕТОД сделать резервную копию def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=СУФФИКС перекрыть обычный суффикс резервной копии\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2661,7 +2663,7 @@ msgstr ""
" simple, never всегда делать простые резервные копии\n"
"\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2671,34 +2673,34 @@ msgstr ""
"установлен иной с помощью параметра --suffix или переменной окружения\n"
"SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr ""
" --previous сохранить предыдущие msgid переведённых\n"
" сообщений\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent не выводить индикатор хода выполнения\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "данное сообщение должно определять формы во множественном числе"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "данное сообщение не должно определять формы во множественном числе"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sПрочитано сообщений: старых %ld + новых %ld; объединено %ld, помечено неточными %ld, недостающих %ld, недействительных %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2914,7 +2916,7 @@ msgstr "форма множественного числа имеет непра
msgid "too many errors, aborting"
msgstr "слишком много ошибок, завершение"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "неверная многобайтовая последовательность"
@@ -3166,12 +3168,16 @@ msgstr "компиляция класса Java завершилась с оши
msgid "error while opening \"%s\" for writing"
msgstr "ошибка открытия «%s» для записи"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "неполная многобайтовая последовательность"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "переводимые сообщения не должны содержать экранирующую последовательность «\\%c»"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3184,7 +3190,7 @@ msgstr ""
"кодировку, что и вы. Подумайте об использовании в msgctxt только ASCII.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3274,17 +3280,17 @@ msgstr "%s:%d: предупреждение: незавершенная стро
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: предупреждение: незавершенное регулярное выражение"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "предупреждение: неверный символ Unicode"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: предупреждение: незавершенная символьная константа"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: предупреждение: незавершенная строка"
@@ -3299,7 +3305,7 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:285
@@ -3308,7 +3314,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"%s:%d: Длинная неполная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:297
@@ -3317,7 +3323,7 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце файла.\n"
"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:306
@@ -3326,7 +3332,7 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце строки.\n"
"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374
@@ -3340,7 +3346,7 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code.\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code.\n"
#: src/x-csharp.c:1390 src/x-python.c:1138
@@ -3402,7 +3408,7 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:291
@@ -3411,7 +3417,7 @@ msgid ""
"%s:%d: Long incomplete multibyte sequence.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"%s:%d: Длинная неполная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:303
@@ -3420,7 +3426,7 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of file.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце файла.\n"
"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:312
@@ -3429,7 +3435,7 @@ msgid ""
"%s:%d: Incomplete multibyte sequence at end of line.\n"
"Please specify the correct source encoding through --from-code\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце строки.\n"
"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:344
@@ -3438,7 +3444,7 @@ msgid ""
"%s:%d: Invalid multibyte sequence.\n"
"Please specify the source encoding through --from-code\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code\n"
#: src/x-javascript.c:954
@@ -3506,7 +3512,7 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
@@ -3517,7 +3523,7 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Длинная неполная мультибайтная последовательность.\n"
+"%s:%d: Длинная неполная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
@@ -3528,7 +3534,7 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце файла.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце файла.\n"
"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
@@ -3539,7 +3545,7 @@ msgid ""
"Please specify the correct source encoding through --from-code or through a\n"
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Неполная мультибайтная последовательность в конце строки.\n"
+"%s:%d: Неполная многобайтовая последовательность в конце строки.\n"
"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
@@ -3550,7 +3556,7 @@ msgid ""
"Please specify the source encoding through --from-code or through a comment\n"
"as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"%s:%d: Неверная мультибайтная последовательность.\n"
+"%s:%d: Неверная многобайтовая последовательность.\n"
"Укажите входную кодировку с помощью параметра --from-code или с помощью\n"
"комментария, как описано на http://www.python.org/peps/pep-0263.html.\n"
diff --git a/gettext-tools/po/sk.po b/gettext-tools/po/sk.po
index a129a84..d00426b 100644
--- a/gettext-tools/po/sk.po
+++ b/gettext-tools/po/sk.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.19-rc1\n"
+"Project-Id-Version: GNU gettext-tools 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-10 17:44+0200\n"
+"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"PO-Revision-Date: 2014-12-10 20:44+0100\n"
"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"Language: sk\n"
@@ -32,22 +32,22 @@ msgstr "nejednoznačný parameter %s pre %s"
msgid "Valid arguments are:"
msgstr "Platné parametre sú:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "nemožno nájsť dočasný adresár, skúste nastaviť $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "nemožno vytvoriť dočasný adresár so šablónou \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "nemožno odstrániť dočasný súbor %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "nemožno odstrániť dočasný adresár %s"
@@ -56,38 +56,38 @@ msgstr "nemožno odstrániť dočasný adresár %s"
msgid "write error"
msgstr "chyba zápisu"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "zachovanie oprávnení pre %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "chyba pri otváraní %s na čítanie"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "nemožno otvoriť záložný súbor %s na zápis"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "chyba pri čítaní %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "chyba pri zápise %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "chyba po čítaní %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -104,12 +104,12 @@ msgstr "Kompilátor C# nebol nájdený. Skúste nainštalovať pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Virtuálny stroj C# nebol nájdený. Skúste nainštalovať pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Neznáma systémová chyba"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -171,31 +171,31 @@ msgstr "%s: voľba '-W %s' nepovoľuje parameter\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: voľba '-W %s' vyžaduje parameter\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "neplatný parameter source_version pre compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "neplatný parameter target_version pre compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "zlyhalo vytvorenie \"%s\""
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "chyba počas zápisu do súboru \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Kompilátor Javy nebol nájdený. Skúste nainštalovať gcj alebo nastavte $JAVAC"
@@ -205,15 +205,15 @@ msgstr "Kompilátor Javy nebol nájdený. Skúste nainštalovať gcj alebo nasta
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Virtuálny stroj Javy nebol nájdený. Skúste nainštalovať gij alebo nastavte $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "V/V chyba podprocesu %s"
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "pamäť je vyčerpaná"
@@ -223,13 +223,13 @@ msgstr "pamäť je vyčerpaná"
msgid "creation of threads failed"
msgstr "vytváranie vláken zlyhalo"
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "zápis do podprocesu %s zlyhal"
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
#, c-format
msgid "read from %s subprocess failed"
msgstr "čítanie z podprocesu %s zlyhalo"
@@ -239,12 +239,12 @@ msgstr "čítanie z podprocesu %s zlyhalo"
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "nemožno nastaviž neblokujúce V/V do podprocesu %s"
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:336
#, c-format
msgid "communication with %s subprocess failed"
msgstr "komunikácia s podprocesom %s zlyhala"
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:456
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "podproces %s skončil s ukončovacím kódom %d"
@@ -283,8 +283,8 @@ msgstr "“"
msgid "setting permissions for %s"
msgstr "nastavovanie oprávnení pre %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "nemožno vytvoriť rúru"
@@ -311,7 +311,7 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s podproces dostal kritický signál %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/read-mo.c:258 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
@@ -702,10 +702,10 @@ msgstr "V direktíve číslo %u, znak '%c' nie je číslica medzi 1 a 9."
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Znak, ktorý ukončuje direktívu číslo %u nie je číslica medzi 1 a 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -719,58 +719,58 @@ msgstr ""
"Toto je voľne šíriteľný softvér: môžete ho voľne meniť a ďalej šíriť.\n"
"Neposkytuje sa ŽIADNA ZÁRUKA, v rozsahu povolenom zákonmi.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Napísal %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "príliš veľa parametrov"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Skúste '%s --help' a dozviete sa viac informácií.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Použitie: %s [VOĽBA]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Zobraziť hostiteľské meno stroja.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Výstupný formát:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short krátke meno hostiteľa\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -779,33 +779,33 @@ msgstr ""
" -f, --fqdn, --long dlhé meno hostiteľa, vrátane plne kvalifikovaného\n"
" doménového mena a prezývok\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresy pre meno hostiteľa\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Informatívny výstup:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help zobraziť túto nápovedu a skončiť\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -815,32 +815,33 @@ msgstr " -V, --version zobraziť informáciu o verzii a skončiť
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"Správy o chybách zasielajte na adresu <bug-gnu-gettext@gnu.org> (iba anglicky).\n"
"Komentáre k slovenskému prekladu zasielajte na adresu <sk-i18n@lists.linux.sk>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "Nemôžem získať meno hostiteľa"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "povolený najviac jeden vstupný súbor"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s a %s sa navzájom vylučujú"
@@ -861,7 +862,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -869,7 +870,7 @@ msgstr "Povinné parametre pre dlhé voľby sú povinnými aj pre skrátené vo
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -882,7 +883,7 @@ msgstr " VSTUPNÝSÚBOR vstupný PO súbor\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -898,7 +899,7 @@ msgstr "Ak nie je zadaný vstupný súbor alebo je -, je načítaný štandardn
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -906,13 +907,13 @@ msgstr "Umiestnenie výstupného súboru:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=SÚBOR zapísať výstup do zadaného súboru\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1026,35 +1027,35 @@ msgstr " --obsolete synonymum pre --only-obsolete --clear-obso
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Syntax vstupného súboru:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input vstupný súbor má syntax Java .properties\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input vstupný súbor má syntax NeXTstep/GNUstep .strings\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Podrobnosti výstupu:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1067,14 +1068,14 @@ msgstr ""
" 'auto' (automaticky) alebo 'html'.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=SÚBORŠTÝLU zadať pravidlo štýlu CSS pre --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1083,7 +1084,7 @@ msgstr ""
" jazyka C (predvolené)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1092,7 +1093,7 @@ msgstr ""
" bez rozšírených znakov\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1127,29 +1128,29 @@ msgstr ""
" Uniforum\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output zapísať Java súbor .properties\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output zapísať súbor NeXTstep/GNUstep .strings\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ČÍSLO nastaviť šírku výstupnej strany\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1159,14 +1160,14 @@ msgstr ""
" výstupnej strany do viacerých riadkov\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output generovať utriedený výstup\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1249,13 +1250,13 @@ msgstr ""
" len unikátnych správ\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input vstupné súbory májú syntax Java .properties\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1278,27 +1279,27 @@ msgstr ""
" --use-first použiť prvý dostupný preklad pre každú správu,\n"
" nezlučovať viacero prekladov\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=NÁZOVKATALÓGU nastaviť pole 'Language' v položke hlavička\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "neboli zadané vstupné súbory"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "potrebné sú presne 2 vstupné súbory"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Použitie: %s [VOĽBA] def.po ref.pot\n"
@@ -1330,17 +1331,17 @@ msgstr " def.po preklady\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot odkazy na zdrojové súbory\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modifikátory operácie:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain použije ref.pot na všetky domény v def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr ""
@@ -1367,17 +1368,17 @@ msgstr "táto správa je nepreložená"
msgid "this message needs to be reviewed by the translator"
msgstr "táto správa musí byť skontrolovaná prekladateľom"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "táto správa je použitá, ale nie je definovaná..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...ale táto definícia je podobná"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "táto správa je použitá, ale nie je definovaná v %s"
@@ -1449,19 +1450,19 @@ msgstr "Cieľ konverzie:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Predvolené kódovanie je kódovanie aktuálneho národného prostredia.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent výstup s použitím odsadzovania\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location nezapisovať riadky '#: meno_súboru:riadok'\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr ""
@@ -1469,7 +1470,7 @@ msgstr ""
" (predvolené)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict presné dodržiavanie štýlu Uniforum\n"
@@ -1735,7 +1736,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " menosúboru.po ... vstupné súbory\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Mód činnosti:\n"
@@ -1973,7 +1974,7 @@ msgstr " --no-hash binárny súbor nebude obsahovať hašovac
msgid " --statistics print statistics about translations\n"
msgstr " --statistics zobraziť štatistiky prekladov\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose zvýšiť úroveň táravosti\n"
@@ -2028,20 +2029,20 @@ msgstr "nepresná položka 'msgstr' bola ignorovaná"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: upozornenie: zdrojový súbor obsahuje nepresné preklady"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s neexistuje"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s existuje, ale nedá sa čítať"
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:87
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-java.c:181 src/x-javascript.c:171 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
@@ -2158,7 +2159,7 @@ msgstr " --sort-output generovať utriedený výstup\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file utriediť výstup podľa umiestnenia v súboroch\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2169,7 +2170,7 @@ msgstr ""
"ABOUT-NLS. Toto je potrebné na to, aby ste mohli otestovať\n"
"vaše preklady.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2180,12 +2181,12 @@ msgstr ""
"Zadajte, prosím, národné prostredie pomocou voľby --locale alebo\n"
"výstupný .po súbor pomocou voľby --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Vytvorený %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2194,12 +2195,12 @@ msgstr ""
"Vytvorí nový PO súbor, inicializuje meta informácie podľa hodnôt z prostredia\n"
"používateľa.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=VSTUPNÝSÚBOR vstupný POT súbor\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2208,12 +2209,12 @@ msgstr ""
"Ak nie je zadaný vstupný súbor, bude vyhľadaný POT súbor v aktuálnom adresári.\n"
"Ak je -, načítaný je štandardný vstup.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=SÚBOR zapísať výstup do zadaného PO súboru\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2223,17 +2224,17 @@ msgstr ""
"nastavenia národného prostredia používateľa. Ak je -, výstup je zapísaný na\n"
"štandardný výstup.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC nastaviť cieľové národné prostredie\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator označiť, že PO súbor je generovaný automaticky\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2241,12 +2242,12 @@ msgstr ""
"Nájdených viac ako jeden .pot súbor.\n"
"Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "chyba pri čítaní adresára"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2254,14 +2255,14 @@ msgstr ""
"V aktuálnom adresári nebol nájdený žiaden .pot súbor.\n"
"Prosím zadajte vstupný .pot súbor pomocou voľby --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "podproces %s zlyhal s ukončovacím kódom %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2274,7 +2275,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Slovenské preklady pre balík %s"
@@ -2306,7 +2307,7 @@ msgstr "cieľová znaková sada \"%s\" nie je prenositeľné meno kódovania."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/xgettext.c:544 src/xgettext.c:3426
#, c-format
msgid "warning: "
msgstr "upozornenie: "
@@ -2504,17 +2505,17 @@ msgstr "spracovanie množných čísel je rozšírením GNU"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "v msgstr chýba značka klávesovej skratky '%c'"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr obsahuje príliš veľa značiek klávesových skratiek '%c'"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "položka hlavičky '%s' ešte obsahujú počiatočnú štandardnú hodnotu\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "položka hlavičky '%s' v hlavičke chýba\n"
@@ -2550,16 +2551,16 @@ msgstr "Konverzia z \"%s\" do \"%s\" zavedie duplicity: niektoré rozdielne msgi
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Nemôžem konvertovať z \"%s\" do \"%s\". %s spolieha na iconv(). Táto verzia bola preložená bez iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s je platné len s %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "typ zálohy"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2583,17 +2584,17 @@ msgstr ""
"pri ktorých nemožno nájsť presnú zhodu, bude použitý fuzzy algoritmus,\n"
"ktorý dosahuje lepšie výsledky.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po preklady podľa starých zdrojových súborov\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot odkazy na nové zdrojové súbory\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2602,7 +2603,7 @@ msgstr ""
" -C, --compendium=SÚBOR prídavná knižnica prekladov správ, môže byť\n"
" zadaná viac ako raz\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2611,27 +2612,27 @@ msgstr ""
" -U, --update aktualizovať def.po,\n"
" nerobiť nič, ak def.po je aktuálny\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Umiestnenie výstupného súboru v režime aktualizácie:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Výsledok je zapísaný späť do def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=CONTROL vytvoriť zálohu súboru def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=PRÍPONA prekryť obvyklú príponu zálohy\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2648,7 +2649,7 @@ msgstr ""
" existing, nil numbered, ak existuje číslovaná záloha, inak simple\n"
" simple, never vždy vytvoriť jednoduchú zálohu\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2657,32 +2658,32 @@ msgstr ""
"Prípona zálohy je '~', pokiaľ nie je zadaná voľba --suffix alebo nastavená\n"
"premenná prostredia SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous zachovať predchádzajúce msgid preložených správ\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent potlačiť indikátory postupu\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "táto správa by mala definovať tvary množného čísla"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "táto správa by nemala definovať tvary množného čísla"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sNačítané %ld starých + %ld odkazov, %ld zlučených, %ld nepresných, %ld chýbajucich, %ld zrušených.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2900,7 +2901,7 @@ msgstr "množné číslo má nesprávny index"
msgid "too many errors, aborting"
msgstr "vyskytlo sa príliš veľa chýb, ukončuje sa program"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "neplatná viacznaková sekvencia"
@@ -2957,22 +2958,22 @@ msgstr "duplicitná definícia správy"
msgid "this is the location of the first definition"
msgstr "toto je miesto prvého definovania"
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:177 src/read-mo.c:205
#, c-format
msgid "file \"%s\" is truncated"
msgstr "súbor \"%s\" je skrátený"
-#: src/read-mo.c:129
+#: src/read-mo.c:132
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "súbor \"%s\" obsahuje reťazce, ktoré nie sú ukončené nulou"
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:169 src/read-mo.c:280
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "súbor \"%s\" nie je vo formáte GNU .mo"
-#: src/read-mo.c:178
+#: src/read-mo.c:183
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "súbor \"%s\" obsahuje reťazec, ktorý nie je ukončený nulou, na %s"
@@ -3151,12 +3152,16 @@ msgstr "kompilácia triedy Java zlyhala, prosím skúste nastaviť $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "chyba pri otváraní súboru \"%s\" na zápis"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "nekompletná viacznaková sekvencia"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "internacionalizované správy nesmú obsahovať riadiacu sekvenciu '\\%c'"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3169,7 +3174,7 @@ msgstr ""
"ako vy. Zvážte namiesto toho použitie msgctxt len s ASCII znakmi.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3257,17 +3262,17 @@ msgstr "%s:%d: upozornenie: neukončený reťazec"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: upozornenie: neukončený regulárny výraz"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "upozornenie: neplatný znak Unicode"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1344 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:619
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: upozornenie: neukončená znaková konštanta"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1390 src/x-c.c:1430 src/x-vala.c:729
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: upozornenie: neukončený znakový reťazec"
@@ -3336,12 +3341,12 @@ msgstr "%s:%d: upozornenie: neplatný znak Unicode"
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: upozornenie: neukončená reťazcová konštanta"
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2018 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: upozornenie: nájdené ')' tam, kde bolo očakávané '}'"
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2052 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: upozornenie: nájdené '}' tam, kde bolo očakávané ')'"
@@ -3562,7 +3567,7 @@ msgstr "%s:%d: neplatný výraz reťazca"
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
msgstr "%s:%lu: upozornenie: syntax $\"...\" je neodporúčaná z bezpečnostných dôvodov; použite namiesto toho eval_gettext"
-#: src/x-vala.c:413
+#: src/x-vala.c:414
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: upozornenie: reťazec regulárneho výrazu je ukončený príliš skoro"
@@ -3908,7 +3913,7 @@ msgstr "upozornenie: chýbajúci kontext pre parameter množného čísla kľú
msgid "context mismatch between singular and plural form"
msgstr "nezhoda kontextu medzi jednotným a množným číslom"
-#: src/xgettext.c:3419
+#: src/xgettext.c:3427
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -3920,7 +3925,7 @@ msgstr ""
"MSGID_BUGS_ADDRESS; inak prosím zadajte voľbu príkazového\n"
"riadka --msgid-bugs-address.\n"
-#: src/xgettext.c:3638
+#: src/xgettext.c:3646
#, c-format
msgid "language '%s' unknown"
msgstr "jazyk '%s' je neznámy"
diff --git a/gettext-tools/po/sl.po b/gettext-tools/po/sl.po
index 75e3c2d..dd3e777 100644
--- a/gettext-tools/po/sl.po
+++ b/gettext-tools/po/sl.po
@@ -1,16 +1,16 @@
# -*- mode:po; coding:utf-8; -*- Slovenian messages for GNU gettext package
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2011, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2006, 2007, 2011, 2013, 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
-# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013.
+# Primož Peterlin <primozz.peterlin@gmail.com>, 1996, 1999-2003, 2006, 2007, 2011, 2013, 2014.
#
-# $Id: gettext-tools-0.18.3.sl.po,v 1.2 2013/12/11 22:24:44 peterlin Exp $
+# $Id: gettext-tools-0.19.3.sl.po,v 1.2 2014/11/16 20:08:47 peterlin Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.18.3\n"
+"Project-Id-Version: GNU gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2013-06-25 17:48+0900\n"
-"PO-Revision-Date: 2013-12-11 23:24+0100\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-11-16 21:08+0100\n"
"Last-Translator: Primoz PETERLIN <primozz.peterlin@gmail.com>\n"
"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
"Language: sl\n"
@@ -33,22 +33,22 @@ msgstr "dvoumen argument %s za %s"
msgid "Valid arguments are:"
msgstr "Veljavni argumenti so:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "začasnega imenika ni mogoče najti, poskusite nastaviti $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "ni mogoče ustvariti začasnega imenika z vzorcem \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "začasne datoteke %s ni mogoče odstraniti"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "začasnega imenika %s ni mogoče odstraniti"
@@ -57,38 +57,38 @@ msgstr "začasnega imenika %s ni mogoče odstraniti"
msgid "write error"
msgstr "napaka pri pisanju"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "ohranjamo dovoljenja za %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "datoteke %s ni moč odpreti za branje"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "varnostne kopije %s ni mogoče odpreti za pisanje"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "napaka pri branju %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "napaka pri pisanju na %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "napaka po branju %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -105,12 +105,12 @@ msgstr "Prevajalnika za C# ni najti; poskusite namestiti pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Virtualnega stroja za C# ni najti; poskusite namestit pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Neznana sistemska napaka"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -172,31 +172,31 @@ msgstr "%s: izbira »-W %s« ne dovoljuje argumenta\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: izbira »-W %s« zahteva argument\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "neveljaven argument source_version za compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "neveljaven argument target_version za compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131
-#: src/write-java.c:1143
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
+#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "ustvarjanje »%s« neuspešno"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
-#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811
-#: src/write-qt.c:748 src/write-tcl.c:222
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
+#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
+#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "napaka pri pisanju na datoteko »%s«"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
@@ -206,16 +206,16 @@ msgstr "Prevajalnika za javo ni najti; namestite gcj ali nastavite $JAVAC"
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Virtualnega javanskega stroja ni najti; namestite gij ali nastavite $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "V/I napaka v podprocesu %s"
# Morda ,,Zmanjkalo pomnilnika''?
-#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "zmanjkalo pomnilnika"
@@ -226,7 +226,7 @@ msgid "creation of threads failed"
msgstr "ustvarjanje niti ni uspelo"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "posredovanje podatkov podprocesu %s neuspešno"
@@ -285,8 +285,8 @@ msgstr "«"
msgid "setting permissions for %s"
msgstr "nastavljamo dovoljenja za %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "cevovoda ni mogoče ustvariti"
@@ -313,8 +313,8 @@ msgid "%s subprocess got fatal signal %d"
msgstr "podproces %s prejel kritični signal %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1925
-#: src/xgettext.c:1938 src/xgettext.c:1948
+#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
msgstr "datoteke \"%s\" ni moč odpreti za branje"
@@ -614,7 +614,7 @@ msgid "In the directive number %u, the size specifier is incompatible with the c
msgstr "V direktivi številka %u je določilo velikosti nezdružljivo s pretvornim faktorjem »%c«."
#: src/format-perl-brace.c:199 src/format-python.c:471
-#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-python-brace.c:434 src/format-python-brace.c:447
#: src/format-sh.c:308
#, c-format
msgid "a format specification for argument '%s' doesn't exist in '%s'"
@@ -649,27 +649,27 @@ msgstr "formatno določilo za argument »%s«, kot v »%s«, v »%s« ne obstaja
msgid "format specifications in '%s' and '%s' for argument '%s' are not the same"
msgstr "formatni določili v »%s« in »%s« za argument »%s« nista enaki"
-#: src/format-python-brace.c:136
+#: src/format-python-brace.c:137
#, c-format
msgid "In the directive number %u, '%c' cannot start a field name."
msgstr "V direktivi številka %u »%c« ne more začenjati imena polja."
-#: src/format-python-brace.c:149
+#: src/format-python-brace.c:150
#, c-format
msgid "In the directive number %u, '%c' cannot start a getattr argument."
msgstr "V direktivi števika %u »%c« ne more začenjati argumenta getattr."
-#: src/format-python-brace.c:164
+#: src/format-python-brace.c:165
#, c-format
msgid "In the directive number %u, '%c' cannot start a getitem argument."
msgstr "V direktivi številka %u »%c« ne more začenjati argumenta getitem."
-#: src/format-python-brace.c:184
+#: src/format-python-brace.c:185
#, c-format
msgid "In the directive number %u, no more nesting is allowed in a format specifier."
msgstr "V direktivi številka %u ni dovoljeno nadaljnje gnezdenje formatnega določilnika."
-#: src/format-python-brace.c:210
+#: src/format-python-brace.c:270
#, c-format
msgid "In the directive number %u, there is an unterminated format directive."
msgstr "V direktivi številka %u je nezaključena formatna direktiva."
@@ -705,11 +705,11 @@ msgstr "V direktivi številka %u znak »%c« ni števka med 1 in 9."
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Znak, ki zaključuje direktivo številka %u, ni števka med 1 in 9."
-#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
-#: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
-#: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -722,58 +722,58 @@ msgstr ""
"To je prost program; smete ga spreminjati in deliti z drugimi.\n"
"Za program ni NOBENEGA JAMSTVA do zakonsko podanih omejitev.\n"
-#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
-#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
-#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
-#: src/xgettext.c:605
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Avtor(ica) %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgconv.c:241
-#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
-#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "preveč argumentov"
-#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
-#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358
-#: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Poskusite »%s --help« za izčrpnejša navodila\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Uporaba: %s [IZBIRA]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Izpis gostiteljskega imena računalnika.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Oblika izpisa:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short kratka oblika gostiteljskega imena\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -782,34 +782,34 @@ msgstr ""
" -f, --fqdn, --long dolga oblika gostiteljskega imena, vključno s polnim\n"
" internetim imenom in vzdevki\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address internetni naslov za gostiteljsko ime\n"
-#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
-#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420
-#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Informativni izpis:\n"
-#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
-#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422
-#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help ta navodila\n"
-#: src/hostname.c:232 src/msgattrib.c:529 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
-#: src/msgfilter.c:480 src/msgfmt.c:779 src/msggrep.c:627 src/msginit.c:424
-#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1004
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
msgstr " -V, --version različica programa\n"
@@ -818,43 +818,41 @@ msgstr " -V, --version različica programa\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:536 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
-#: src/msgfilter.c:487 src/msgfmt.c:790 src/msggrep.c:634 src/msginit.c:431
-#: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Morebitne napake v programu sporočite na <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "gostiteljskega imena ni moč ugotoviti"
-#: src/msgattrib.c:365 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
+#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "dovoljena je največ ena vhodna datoteka"
-#: src/msgattrib.c:371 src/msgattrib.c:375 src/msgcat.c:311 src/msgcat.c:315
-#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
-#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
-#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
-#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
-#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
-#: src/xgettext.c:615 src/xgettext.c:619 src/xgettext.c:626 src/xgettext.c:629
-#: src/xgettext.c:632
+#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
+#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s in %s se med seboj izključujeta"
-#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:421 src/msgconv.c:307 src/msggrep.c:516 src/msguniq.c:326
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]\n"
msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]\n"
-#: src/msgattrib.c:419
+#: src/msgattrib.c:426
#, c-format, no-wrap
msgid ""
"Filters the messages of a translation catalog according to their attributes,\n"
@@ -863,61 +861,61 @@ msgstr ""
"Filtriranje sporočil iz kataloga prevodov glede na njihova določila\n"
"in rokovanje z njimi.\n"
-#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
-#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
-#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
-#: src/msguniq.c:341
+#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
+#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
+#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
msgstr ""
"Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
"tudi za kratko obliko.\n"
-#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
-#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
-#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846
+#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
+#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
+#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
msgstr "Izbira vhodne datoteke:\n"
-#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:435 src/msgconv.c:320 src/msggrep.c:531 src/msguniq.c:347
#, c-format
msgid " INPUTFILE input PO file\n"
msgstr " VHODNA_DATOTEKA vhodna datoteka PO\n"
-#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
-#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
-#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:852
+#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
+#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
+#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
msgstr " -D, --directory=IMENIK vhodne datoteke iščemo tudi v navedenem IMENIKU\n"
-#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
-#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
+#: src/msgattrib.c:439 src/msgconv.c:324 src/msgexec.c:285 src/msgfilter.c:424
+#: src/msggrep.c:535 src/msgunfmt.c:453 src/msguniq.c:351
#, c-format
msgid "If no input file is given or if it is -, standard input is read.\n"
msgstr "Če vhodna datoteka ni podana ali je enaka -, se bere standardni vhod.\n"
-#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533
-#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
-#: src/xgettext.c:857
+#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
+#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
msgstr "Izbira izhodne datoteke:\n"
-#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535
-#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
+#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
+#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=DATOTEKA izhod zapisujemo v navedeno DATOTEKO\n"
-#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
-#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
-#: src/msgunfmt.c:493 src/msguniq.c:357
+#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
+#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
"The results are written to standard output if no output file is specified\n"
@@ -926,129 +924,134 @@ msgstr ""
"Če izhodna datoteka ni podana ali je enaka -, se rezultat izpiše na standardni\n"
"izhod.\n"
-#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:450 src/msgcat.c:406 src/msgcomm.c:397 src/msguniq.c:362
#, c-format
msgid "Message selection:\n"
msgstr "Izbira sporočil:\n"
-#: src/msgattrib.c:445
+#: src/msgattrib.c:452
#, c-format
msgid " --translated keep translated, remove untranslated messages\n"
msgstr " --translated obdržimo prevedena sporočila, zavržemo neprevedena\n"
-#: src/msgattrib.c:447
+#: src/msgattrib.c:454
#, c-format
msgid " --untranslated keep untranslated, remove translated messages\n"
msgstr " --untranslated obdržimo neprevedena sporočila, zavržemo prevedena\n"
-#: src/msgattrib.c:449
+#: src/msgattrib.c:456
#, c-format
msgid " --no-fuzzy remove 'fuzzy' marked messages\n"
msgstr " --no-fuzzy brez ohlapnih samodejno prevedenih sporočil\n"
-#: src/msgattrib.c:451
+#: src/msgattrib.c:458
#, c-format
msgid " --only-fuzzy keep 'fuzzy' marked messages\n"
msgstr " --only-fuzzy zgolj ohlapna samodejno prevedena sporočila\n"
-#: src/msgattrib.c:453
+#: src/msgattrib.c:460
#, c-format
msgid " --no-obsolete remove obsolete #~ messages\n"
msgstr " --no-obsolete brez zastarelih (#~) sporočil\n"
-#: src/msgattrib.c:455
+#: src/msgattrib.c:462
#, c-format
msgid " --only-obsolete keep obsolete #~ messages\n"
msgstr " --only-obsolete zgolj zastarela (#~) sporočila\n"
-#: src/msgattrib.c:458
+#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
msgstr "Rokovanje z določili:\n"
-#: src/msgattrib.c:460
+#: src/msgattrib.c:467
#, c-format
msgid " --set-fuzzy set all messages 'fuzzy'\n"
msgstr " --set-fuzzy vsa sporočila označimo kot ohlapno pprevedena\n"
-#: src/msgattrib.c:462
+#: src/msgattrib.c:469
#, c-format
msgid " --clear-fuzzy set all messages non-'fuzzy'\n"
msgstr " --clear-fuzzy izbrišemo vse oznake o ohlapnosti prevodov\n"
-#: src/msgattrib.c:464
+#: src/msgattrib.c:471
#, c-format
msgid " --set-obsolete set all messages obsolete\n"
msgstr " --set-obsolete vsa sporočila označimo kot zastarela\n"
-#: src/msgattrib.c:466
+#: src/msgattrib.c:473
#, c-format
msgid " --clear-obsolete set all messages non-obsolete\n"
msgstr " --clear-obsolete izbrišemo vse oznake o zastarelosti prevodov\n"
-#: src/msgattrib.c:468
+#: src/msgattrib.c:475
#, c-format
msgid ""
" --previous when setting 'fuzzy', keep previous msgids\n"
" of translated messages.\n"
msgstr " --previous obdržimo prejšnja polja msgid prevedenih sporočil\n"
-#: src/msgattrib.c:471
+#: src/msgattrib.c:478
#, c-format
msgid " --clear-previous remove the \"previous msgid\" from all messages\n"
msgstr " --clear-previous izbrišemo oznake \"previous msgid\" iz vseh sporočil\n"
-#: src/msgattrib.c:473
+#: src/msgattrib.c:480
+#, c-format
+msgid " --empty when removing 'fuzzy', also set msgstr empty\n"
+msgstr " --empty ob odstranitvi oznake »fuzzy« izbriši msgstr\n"
+
+#: src/msgattrib.c:482
#, c-format
msgid " --only-file=FILE.po manipulate only entries listed in FILE.po\n"
msgstr " --only-file=DATOTEKA.po obdelamo le vnose, navedene v DATOTEKI.po\n"
-#: src/msgattrib.c:475
+#: src/msgattrib.c:484
#, c-format
msgid " --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n"
msgstr " --ignore-file=DATOTEKA.po obdelamo vnose razen navedenih v DATOTEKI.po\n"
-#: src/msgattrib.c:477
+#: src/msgattrib.c:486
#, c-format
msgid " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n"
msgstr " --fuzzy isto kot --only-fuzzy --clear-fuzzy\n"
-#: src/msgattrib.c:479
+#: src/msgattrib.c:488
#, c-format
msgid " --obsolete synonym for --only-obsolete --clear-obsolete\n"
msgstr " --obsolete isto kot --only-obsolete --clear-obsolete\n"
-#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
-#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
-#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
-#: src/msguniq.c:368
+#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
+#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
+#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Skladnja vhodne datoteke:\n"
-#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
-#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
+#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input skladnja vhodne datoteke je javanska .properties\n"
-#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
-#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
+#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input skladnja vhodne datoteke je NeXTstep/GNUstep .strings\n"
-#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587
-#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
-#: src/xgettext.c:946
+#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
+#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Podrobnosti izpisa:\n"
-#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
-#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948
+#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1060,115 +1063,117 @@ msgstr ""
" POGOJU; POGOJ je lahko »always«, »never«, »auto«\n"
" ali »html«\n"
-#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952
+#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=DATOTEKA-CSS določi slogovna pravila CSS za --color\n"
-#: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
-#: src/xgettext.c:954
+#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
-#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
-#: src/msguniq.c:390 src/xgettext.c:956
+#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
+#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr ""
-" -E, --escape z ubežnimi sekvencami v skladnji C, brez \n"
-" razširjenega nabora znakov\n"
+" -E, --escape z ubežnimi sekvencami v skladnji C, brez\n"
+" razširjenega nabora znakov\n"
-#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
-#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958
+#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
+#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
-msgstr " --force-po vedno izpišemo datoteko PO, četudi prazno\n"
+msgstr " --force-po vedno izpišemo datoteko PO, četudi prazno\n"
-#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:960
+#: src/msgattrib.c:512 src/msgcat.c:447 src/msgcomm.c:431 src/msguniq.c:395
+#: src/xgettext.c:983
#, c-format
msgid " -i, --indent write the .po file using indented style\n"
msgstr " -i, --indent izpis datoteke PO z zamiki\n"
-#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:962
+#: src/msgattrib.c:514 src/msgcat.c:449 src/msgcomm.c:433 src/msguniq.c:397
+#: src/xgettext.c:985
#, c-format
msgid " --no-location do not write '#: filename:line' lines\n"
msgstr " --no-location brez vrstic »#: datoteka:vrstica« v izpisu\n"
-#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:964
+#: src/msgattrib.c:516 src/msgcat.c:451 src/msgcomm.c:435 src/msguniq.c:399
+#: src/xgettext.c:987
#, c-format
msgid " -n, --add-location generate '#: filename:line' lines (default)\n"
msgstr " -n, --add-location z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
-#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:966
+#: src/msgattrib.c:518 src/msgcat.c:453 src/msgcomm.c:437 src/msguniq.c:401
+#: src/xgettext.c:989
#, c-format
msgid " --strict write out strict Uniforum conforming .po file\n"
msgstr " --strict izpis v strogi obliki Uniforum, brez razširitev GNU\n"
-#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
-#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
-#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
+#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output zapiši javansko datoteko .properties\n"
-#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
-#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970
+#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output zapiši NeXTstep/GNUstep datoteko .strings\n"
-#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
-#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972
+#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
-msgstr " -w, --width=ŠTEVILO širina strani pri izpisu, v znakih\n"
+msgstr " -w, --width=ŠTEVILO širina strani pri izpisu, v znakih\n"
-#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
-#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974
+#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
" the output page width, into several lines\n"
-msgstr " --no-wrap brez deljenja dolgih sporočil v več vrstic\n"
+msgstr ""
+" --no-wrap sporočil, daljših od širine strani, ne\n"
+" razlomi v več vrstic\n"
-#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
-#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
-#: src/msguniq.c:411 src/xgettext.c:977
+#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
+#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
-msgstr " -s, --sort-output izhod abecedno urejen po sporočilih\n"
+msgstr " -s, --sort-output izhod abecedno urejen po sporočilih\n"
-#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
-#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
-#: src/xgettext.c:979
+#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
+#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
-msgstr " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n"
+msgstr " -F, --sort-by-file izhod abecedno urejen po izvornih datotekah\n"
-#: src/msgcat.c:321 src/msgcomm.c:326
+#: src/msgcat.c:322 src/msgcomm.c:327
#, c-format
msgid "impossible selection criteria specified (%d < n < %d)"
msgstr "določeni kriteriji izbire niso mogoči (%d < n < %d)"
-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832
+#: src/msgcat.c:367 src/msgcomm.c:359 src/xgettext.c:855
#, c-format
msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
msgstr "Uporaba: %s [IZBIRA] [VHODNA_DATOTEKA]...\n"
-#: src/msgcat.c:371
+#: src/msgcat.c:372
#, c-format, no-wrap
msgid ""
"Concatenates and merges the specified PO files.\n"
@@ -1190,23 +1195,23 @@ msgstr ""
"ohranijo, razen če z izbiro --use-first ne zahtevamo, da se ohranijo samo\n"
"tisti iz prve datoteke PO, ki jih definira.\n"
-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848
+#: src/msgcat.c:389 src/msgcomm.c:380 src/xgettext.c:871
#, c-format
msgid " INPUTFILE ... input files\n"
msgstr " VHODNA_DATOTEKA ... vhodna datoteka (ali več vhodnih datotek)\n"
-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850
+#: src/msgcat.c:391 src/msgcomm.c:382 src/xgettext.c:873
#, c-format
msgid " -f, --files-from=FILE get list of input files from FILE\n"
msgstr " -f, --files-from=DATOTEKA seznam vhodnih datotek preberemo iz DATOTEKE\n"
-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
-#: src/xgettext.c:854
+#: src/msgcat.c:395 src/msgcomm.c:386 src/msgen.c:325 src/msgfmt.c:794
+#: src/xgettext.c:877
#, c-format
msgid "If input file is -, standard input is read.\n"
msgstr "Če je vhodna datoteka enaka -, se bere standardni vhod.\n"
-#: src/msgcat.c:407 src/msgcomm.c:398
+#: src/msgcat.c:408 src/msgcomm.c:399
#, c-format
msgid ""
" -<, --less-than=NUMBER print messages with less than this many\n"
@@ -1215,7 +1220,7 @@ msgstr ""
" -<, --less-than=ŠTEVILO izpiši sporočila z manj kot ŠTEVILO definicij\n"
" (privzeta vrednost je neskončno)\n"
-#: src/msgcat.c:410
+#: src/msgcat.c:411
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1224,7 +1229,7 @@ msgstr ""
" ->, --more-than=ŠTEVILO izpiši sporočila z več kot ŠTEVILO definicij\n"
" (privzeta vrednost je 1)\n"
-#: src/msgcat.c:413 src/msgcomm.c:404
+#: src/msgcat.c:414 src/msgcomm.c:405
#, c-format
msgid ""
" -u, --unique shorthand for --less-than=2, requests\n"
@@ -1233,14 +1238,14 @@ msgstr ""
" -u, --unique okrajšava za --less-than=2, izpišemo samo\n"
" enolično definirana sporočila\n"
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739
-#: src/msgmerge.c:557
+#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input skladnja vhodnih datotek je javanska .properties\n"
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741
-#: src/msgmerge.c:559
+#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1249,12 +1254,12 @@ msgstr ""
" --stringtable-input skladnja vhodnih datotek je NeXTstep/GNUstep \n"
" .strings\n"
-#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377
+#: src/msgcat.c:428 src/msgconv.c:337 src/msguniq.c:378
#, c-format
msgid " -t, --to-code=NAME encoding for output\n"
msgstr " -t, --to-code=NABOR nabor znakov izhodne datoteke\n"
-#: src/msgcat.c:429 src/msguniq.c:379
+#: src/msgcat.c:430 src/msguniq.c:380
#, c-format
msgid ""
" --use-first use first available translation for each\n"
@@ -1263,27 +1268,27 @@ msgstr ""
" --use-first uporabimo prvi prevod sporočila, na katerega\n"
" naletimo; ne združujemo več prevodov\n"
-#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=KATALOG nastavi polje 'Language' v zaglavju\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:361
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "vhodni datoteki nista podani"
-#: src/msgcmp.c:194 src/msgmerge.c:366
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "potrebni sta natančno dve vhodni datoteki"
-#: src/msgcmp.c:213 src/msgmerge.c:480
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Uporaba: %s [IZBIRA] def.po ref.po\n"
@@ -1315,17 +1320,17 @@ msgstr " def.po prevodi\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot sklici na vire\n"
-#: src/msgcmp.c:239 src/msgmerge.c:546
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Modifikatorji delovanja:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:548
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain ref.po uporabimo na vseh domenah iz def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:550
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching ne uporabljamo ohlapnega ujemanja\n"
@@ -1350,17 +1355,17 @@ msgstr "to sporočilo ni prevedeno"
msgid "this message needs to be reviewed by the translator"
msgstr "to sporočilo mora pregledati prevajalec"
-#: src/msgcmp.c:369 src/msgmerge.c:1500
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "to sporočilo je uporabljeno, a ne definirano..."
-#: src/msgcmp.c:372 src/msgmerge.c:1503
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...a ta definicija je podobna"
-#: src/msgcmp.c:377 src/msgmerge.c:1531
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
@@ -1370,7 +1375,7 @@ msgstr "to sporočilo je uporabljeno, a ne definirano v %s"
msgid "warning: this message is not used"
msgstr "opozorilo: to sporočilo ni uporabljeno"
-#: src/msgcmp.c:553 src/msgfmt.c:545
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1379,12 +1384,12 @@ msgstr[1] "%d kritična napaka"
msgstr[2] "%d kritični napaki"
msgstr[3] "%d kritične napake"
-#: src/msgcomm.c:315
+#: src/msgcomm.c:316
#, c-format
msgid "at least two files must be specified"
msgstr "podani morata biti vsaj dve datoteki"
-#: src/msgcomm.c:363
+#: src/msgcomm.c:364
#, c-format, no-wrap
msgid ""
"Find messages which are common to two or more of the specified PO files.\n"
@@ -1403,7 +1408,7 @@ msgstr ""
"pri izvlačenju se ohranijo samo iz prve datoteke PO, ki jih definira. Položaji\n"
"nizov v datotekah se ohranijo iz vseh datotek PO.\n"
-#: src/msgcomm.c:401
+#: src/msgcomm.c:402
#, c-format
msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
@@ -1412,65 +1417,65 @@ msgstr ""
" ->, --more-than=ŠTEVILO izpiši sporočila z več kot ŠTEVILO definicij\n"
" (privzeta vrednost je 1)\n"
-#: src/msgcomm.c:451 src/xgettext.c:981
+#: src/msgcomm.c:452 src/xgettext.c:1004
#, c-format
msgid " --omit-header don't write header with 'msgid \"\"' entry\n"
msgstr " --omit-header brez glave z vnosom »msgid \"\"«\n"
-#: src/msgconv.c:306
+#: src/msgconv.c:311
#, c-format
msgid "Converts a translation catalog to a different character encoding.\n"
msgstr "Pretvarjanje kataloga sporočil v drug kodni nabor.\n"
-#: src/msgconv.c:330
+#: src/msgconv.c:335
#, c-format
msgid "Conversion target:\n"
msgstr "Cilj pretvorbe:\n"
-#: src/msgconv.c:334
+#: src/msgconv.c:339
#, c-format
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Privzeta vrednost je kodni nabor izbrane krajevne nastavitve.\n"
-#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent izpis datoteke PO z zamiki\n"
-#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603
-#: src/msgmerge.c:581
+#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location brez vrstic »#: datoteka:vrstica« v izpisu\n"
-#: src/msgconv.c:362 src/msgen.c:357 src/msgfilter.c:458 src/msggrep.c:605
-#: src/msgmerge.c:583
+#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
+#: src/msgmerge.c:601
#, c-format
-msgid " --add-location preserve '#: filename:line' lines (default)\n"
-msgstr " --add-location z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
+msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
+msgstr " -n, --add-location z vrsticami »#: datoteka:vrstica« v izpisu (privzeto)\n"
-#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607
-#: src/msgmerge.c:585
+#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict izpis v strogi obliki Uniforum brez razširitev\n"
-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649
+#: src/msgen.c:258 src/msgfmt.c:433 src/xgettext.c:661
#, c-format
msgid "no input file given"
msgstr "vhodna datoteka ni podana"
-#: src/msgen.c:253
+#: src/msgen.c:263
#, c-format
msgid "exactly one input file required"
msgstr "zahtevana je natančno ena vhodna datoteka"
-#: src/msgen.c:298
+#: src/msgen.c:304
#, c-format
msgid "Usage: %s [OPTION] INPUTFILE\n"
msgstr "Uporaba: %s [IZBIRA] VHODNA_DATOTEKA\n"
-#: src/msgen.c:303
+#: src/msgen.c:309
#, c-format, no-wrap
msgid ""
"Creates an English translation catalog. The input file is the last\n"
@@ -1483,7 +1488,7 @@ msgstr ""
"ukazom xgettext). Neprevedenim sporočilom se pripiše prevod, enak izvirniku\n"
"msgid.\n"
-#: src/msgen.c:315
+#: src/msgen.c:321
#, c-format
msgid " INPUTFILE input PO or POT file\n"
msgstr " VHODNA_DATOTEKA vhodna datoteka PO\n"
@@ -1521,7 +1526,7 @@ msgstr ""
"Poseben vgrajen ukaz »0« izpiše prevod in izpis zaključi z znakom s kodo nič.\n"
"Izhod ukaza \"msgexec 0\" je primeren kot vhod za ukaz \"xargs -0\".\n"
-#: src/msgexec.c:281 src/msgfilter.c:401
+#: src/msgexec.c:281 src/msgfilter.c:420
#, c-format
msgid " -i, --input=INPUTFILE input PO file\n"
msgstr " -i, --input=DATOTEKA vhodna datoteka PO\n"
@@ -1531,27 +1536,27 @@ msgstr " -i, --input=DATOTEKA vhodna datoteka PO\n"
msgid "write to stdout failed"
msgstr "izpis na standardni izhod neuspešen"
-#: src/msgfilter.c:289
+#: src/msgfilter.c:298
#, c-format
msgid "missing filter name"
msgstr "manjka ime filtra"
-#: src/msgfilter.c:313
+#: src/msgfilter.c:318
#, c-format
msgid "at least one sed script must be specified"
msgstr "podan mora biti vsaj en skript v sed"
-#: src/msgfilter.c:388
+#: src/msgfilter.c:407
#, c-format
msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
msgstr "Uporaba: %s [IZBIRA] FILTER [IZBIRA-FILTRA]\n"
-#: src/msgfilter.c:392
+#: src/msgfilter.c:411
#, c-format
msgid "Applies a filter to all translations of a translation catalog.\n"
msgstr "Na vsakem prevodu iz kataloga uporabimo dani filter.\n"
-#: src/msgfilter.c:416
+#: src/msgfilter.c:435
#, c-format
msgid ""
"The FILTER can be any program that reads a translation from standard input\n"
@@ -1560,17 +1565,17 @@ msgstr ""
"FILTER je lahko ime kateregakoli programa, ki prebere prevod s standardnega\n"
"vhoda in izpiše spremnjen prevod na standardni izhod.\n"
-#: src/msgfilter.c:421
+#: src/msgfilter.c:440
#, c-format
msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
msgstr "Uporabne IZBIRE FILTRA, kadar je FILTER »sed«:\n"
-#: src/msgfilter.c:423
+#: src/msgfilter.c:442
#, c-format
msgid " -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n"
msgstr " -e, --expression=SKRIPT dodaj SKRIPT med ukaze, ki se izvedejo\n"
-#: src/msgfilter.c:425
+#: src/msgfilter.c:444
#, c-format
msgid ""
" -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the commands\n"
@@ -1579,70 +1584,91 @@ msgstr ""
" -f, --file=SKRIPTNA_DATOTEKA dodaj vsebino SKRIPTNE DATOTEKE med ukaze,\n"
" ki se izvedejo\n"
-#: src/msgfilter.c:428
+#: src/msgfilter.c:447
#, c-format
msgid " -n, --quiet, --silent suppress automatic printing of pattern space\n"
msgstr " -n, --quiet, --silent brez samodejnega izpisa prostora vzorcev\n"
-#: src/msgfilter.c:446 src/msggrep.c:595
+#: src/msgfilter.c:465 src/msggrep.c:600
#, c-format
msgid " --no-escape do not use C escapes in output (default)\n"
msgstr " --no-escape brez ubežnih sekvenc v skladnji jezika C (privzeto)\n"
-#: src/msgfilter.c:452 src/msggrep.c:601
+#: src/msgfilter.c:471 src/msggrep.c:606
#, c-format
msgid " --indent indented output style\n"
msgstr " --indent izpis datoteke PO z zamiki\n"
-#: src/msgfilter.c:454
+#: src/msgfilter.c:473
#, c-format
msgid " --keep-header keep header entry unmodified, don't filter it\n"
msgstr " --keep-header ohrani glavo nespremenjeno, ne filtriraj je\n"
-#: src/msgfmt.c:304
+#: src/msgfmt.c:345
#, c-format
msgid "the argument to %s should be a single punctuation character"
msgstr "argument %s mora biti eno samo ločilo"
-#: src/msgfmt.c:351
+#: src/msgfmt.c:392
#, c-format
msgid "invalid endianness: %s"
msgstr "neveljaven vrstni red bajtov: %s"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605
+#: src/msgfmt.c:422 src/msgunfmt.c:268 src/xgettext.c:621
msgid "Ulrich Drepper"
msgstr "Ulrich Drepper"
-#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330
+#: src/msgfmt.c:439
+#, c-format
+msgid "no input file should be given if %s and %s are specified"
+msgstr "vhodna datoteka ne sme biti podana ob izbirah %s ali %s"
+
+#: src/msgfmt.c:484 src/msgfmt.c:506 src/msgfmt.c:528 src/msgunfmt.c:330
#: src/msgunfmt.c:353
#, c-format
msgid "%s requires a \"-d directory\" specification"
msgstr "%s zahteva določitev \"-d directory\""
-#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346
+#: src/msgfmt.c:499 src/msgfmt.c:521 src/msgfmt.c:556 src/msgunfmt.c:323
+#: src/msgunfmt.c:346
#, c-format
msgid "%s requires a \"-l locale\" specification"
-msgstr "%s zahteva določitev \"-l locale\""
+msgstr "%s zahteva določitev »-l locale«"
+
+#: src/msgfmt.c:538
+#, c-format
+msgid "%s requires a \"--template template\" specification"
+msgstr "%s zahteva določitev »--template vzorec«"
+
+#: src/msgfmt.c:545
+#, c-format
+msgid "%s requires a \"-o file\" specification"
+msgstr "%s zahteva določitev »-o datoteka«"
+
+#: src/msgfmt.c:551
+#, c-format
+msgid "%s and %s are mutually exclusive in %s"
+msgstr "%s in %s se medsebojno izključujeta v %s"
-#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368
+#: src/msgfmt.c:565 src/msgunfmt.c:362 src/msgunfmt.c:368
#, c-format
msgid "%s is only valid with %s or %s"
msgstr "%s je veljavno edino z %s ali %s"
-#: src/msgfmt.c:484 src/msgfmt.c:490
+#: src/msgfmt.c:571 src/msgfmt.c:577
#, c-format
msgid "%s is only valid with %s, %s or %s"
msgstr "%s je veljavno edino z %s, %s ali %s"
#. TRANSLATORS: The prefix before a statistics message. The argument
#. is a file name or a comma separated list of file names.
-#: src/msgfmt.c:620
+#: src/msgfmt.c:740
#, c-format
msgid "%s: "
msgstr "%s: "
-#: src/msgfmt.c:624
+#: src/msgfmt.c:744
#, c-format
msgid "%d translated message"
msgid_plural "%d translated messages"
@@ -1651,7 +1677,7 @@ msgstr[1] "%d prevedeno sporočilo"
msgstr[2] "%d prevedeni sporočili"
msgstr[3] "%d prevedena sporočila"
-#: src/msgfmt.c:629
+#: src/msgfmt.c:749
#, c-format
msgid ", %d fuzzy translation"
msgid_plural ", %d fuzzy translations"
@@ -1660,7 +1686,7 @@ msgstr[1] ", %d ohlapni prevod"
msgstr[2] ", %d ohlapna prevoda"
msgstr[3] ", %d ohlapni prevodi"
-#: src/msgfmt.c:634
+#: src/msgfmt.c:754
#, c-format
msgid ", %d untranslated message"
msgid_plural ", %d untranslated messages"
@@ -1669,17 +1695,17 @@ msgstr[1] ", %d neprevedeno sporočilo"
msgstr[2] ", %d neprevedeni sporočili"
msgstr[3] ", %d neprevedena sporočila"
-#: src/msgfmt.c:654
+#: src/msgfmt.c:774
#, c-format
msgid "Usage: %s [OPTION] filename.po ...\n"
msgstr "Uporaba: %s [IZBIRA] datoteka.po ...\n"
-#: src/msgfmt.c:658
+#: src/msgfmt.c:778
#, c-format
msgid "Generate binary message catalog from textual translation description.\n"
msgstr "Besedilni opis prevodov pretvorimo v binarni katalog sporočil.\n"
-#: src/msgfmt.c:663 src/xgettext.c:841
+#: src/msgfmt.c:783 src/xgettext.c:864
#, c-format, no-wrap
msgid ""
"Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1688,80 +1714,90 @@ msgstr ""
"Če je pri dolgi obliki izbire naveden obvezen argument, je ta obvezen\n"
"tudi za kratko obliko. Enako za neobvezne argumente.\n"
-#: src/msgfmt.c:670
+#: src/msgfmt.c:790
#, c-format
msgid " filename.po ... input files\n"
msgstr " datoteka.po ... vhodne datoteke\n"
-#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Način delovanja:\n"
-#: src/msgfmt.c:679
+#: src/msgfmt.c:799
#, c-format
msgid " -j, --java Java mode: generate a Java ResourceBundle class\n"
msgstr ""
" -j, --java javanski način: ustvarimo javanski razred\n"
" ResourceBundle\n"
-#: src/msgfmt.c:681
+#: src/msgfmt.c:801
#, c-format
msgid " --java2 like --java, and assume Java2 (JDK 1.2 or higher)\n"
msgstr " --java2 kot --java, privzeta je java2 (JDK 1.2 ali več)\n"
-#: src/msgfmt.c:683
+#: src/msgfmt.c:803
#, c-format
msgid " --csharp C# mode: generate a .NET .dll file\n"
msgstr " --csharp način C#: ustvarimo .NET-datoteko .dll\n"
-#: src/msgfmt.c:685
+#: src/msgfmt.c:805
#, c-format
msgid " --csharp-resources C# resources mode: generate a .NET .resources file\n"
msgstr " --csharp-resources način C#: ustvarimo .NET-datoteko z viri\n"
-#: src/msgfmt.c:687
+#: src/msgfmt.c:807
#, c-format
msgid " --tcl Tcl mode: generate a tcl/msgcat .msg file\n"
msgstr " --tcl način tcl: ustvarimo datoteko tcl/msgcat .msg\n"
-#: src/msgfmt.c:689
+#: src/msgfmt.c:809
#, c-format
msgid " --qt Qt mode: generate a Qt .qm file\n"
msgstr " --qt način Qt: ustvarimo datoteko .qm za Qt\n"
-#: src/msgfmt.c:696
+#: src/msgfmt.c:811
+#, c-format
+msgid " --desktop Desktop Entry mode: generate a .desktop file\n"
+msgstr " --desktop način Desktop Entry: ustvarimo datoteko .desktop\n"
+
+#: src/msgfmt.c:818
#, c-format
msgid " --strict enable strict Uniforum mode\n"
msgstr " --strict izpis v strogi obliki Uniforum brez razširitev GNU\n"
-#: src/msgfmt.c:698 src/xgettext.c:865
+#: src/msgfmt.c:820 src/xgettext.c:888
#, c-format
msgid "If output file is -, output is written to standard output.\n"
msgstr "Če je izhodna datoteka enaka -, se rezultat izpiše na standardni izhod.\n"
-#: src/msgfmt.c:701
+#: src/msgfmt.c:823
#, c-format
msgid "Output file location in Java mode:\n"
msgstr "Izbira izhodne datoteke v javanskem načinu:\n"
-#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:825 src/msgfmt.c:841 src/msgunfmt.c:458 src/msgunfmt.c:469
#, c-format
msgid " -r, --resource=RESOURCE resource name\n"
msgstr " -r, --resource=SREDSTVO ime sredstva\n"
-#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460
-#: src/msgunfmt.c:471 src/msgunfmt.c:481
+#: src/msgfmt.c:827 src/msgfmt.c:843 src/msgfmt.c:853 src/msgfmt.c:863
+#: src/msgunfmt.c:460 src/msgunfmt.c:471 src/msgunfmt.c:481
#, c-format
msgid " -l, --locale=LOCALE locale name, either language or language_COUNTRY\n"
msgstr " -l, --locale=JJ_DD jezikovno okolje (jezik ali jezik_država)\n"
-#: src/msgfmt.c:707
+#: src/msgfmt.c:829
+#, c-format
+msgid " --source produce a .java file, instead of a .class file\n"
+msgstr " --source namesto datoteke .class izdelaj datoteko .java\n"
+
+#: src/msgfmt.c:831
#, c-format
msgid " -d DIRECTORY base directory of classes directory hierarchy\n"
msgstr " -d IMENIK korenski imenik hierarhije razredov\n"
-#: src/msgfmt.c:709
+#: src/msgfmt.c:833
#, c-format
msgid ""
"The class name is determined by appending the locale name to the resource name,\n"
@@ -1772,17 +1808,17 @@ msgstr ""
"pridá ime jezikovnega okolja. Izbira -d je obvezna. Razred se zapiše v podani\n"
"imenik.\n"
-#: src/msgfmt.c:715
+#: src/msgfmt.c:839
#, c-format
msgid "Output file location in C# mode:\n"
msgstr "Položaj izhodne datoteke v načinu C#:\n"
-#: src/msgfmt.c:721 src/msgunfmt.c:473
+#: src/msgfmt.c:845 src/msgunfmt.c:473
#, c-format
msgid " -d DIRECTORY base directory for locale dependent .dll files\n"
msgstr " -d IMENIK korenski imenik za krajevno odvisne datoteke .dll\n"
-#: src/msgfmt.c:723
+#: src/msgfmt.c:847
#, c-format
msgid ""
"The -l and -d options are mandatory. The .dll file is written in a\n"
@@ -1791,29 +1827,62 @@ msgstr ""
"Izbiri -l in -d sta obvezni. Datoteka .dll se zapiše v podimenik podanega\n"
"imenika; ime podimenika ustreza oznaki izbrane krajevne prilagoditve.\n"
-#: src/msgfmt.c:727
+#: src/msgfmt.c:851
#, c-format
msgid "Output file location in Tcl mode:\n"
msgstr "Izbira izhodne datoteke v načinu tcl:\n"
-#: src/msgfmt.c:731 src/msgunfmt.c:483
+#: src/msgfmt.c:855 src/msgunfmt.c:483
#, c-format
msgid " -d DIRECTORY base directory of .msg message catalogs\n"
msgstr " -d IMENIK korenski imenik hierarhije razredov\n"
-#: src/msgfmt.c:733
+#: src/msgfmt.c:857
#, c-format
msgid ""
"The -l and -d options are mandatory. The .msg file is written in the\n"
"specified directory.\n"
msgstr "Izbiri -l in -d sta obvezni. Datoteka .msg se zapiše v podani imenik.\n"
-#: src/msgfmt.c:745 src/xgettext.c:882
+#: src/msgfmt.c:861
+#, c-format
+msgid "Desktop Entry mode options:\n"
+msgstr "Izbire načina Desktop Entry:\n"
+
+#: src/msgfmt.c:867
+#, c-format
+msgid " --template=TEMPLATE a .desktop file used as a template\n"
+msgstr " --template=VZOREC datoteka .desktop uporabljena kot vzorec\n"
+
+#: src/msgfmt.c:869
+#, c-format
+msgid " -d DIRECTORY base directory of .po files\n"
+msgstr " -d IMENIK korenski imenik datotek .po\n"
+
+#: src/msgfmt.c:871 src/xgettext.c:934
+#, c-format
+msgid ""
+" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
+" -k, --keyword do not to use default keywords\n"
+msgstr ""
+" -kBESEDA, --keyword=BESEDA uporabi BESEDO kot dodatno ključo besedo\n"
+" -k, --keyword[=BESEDA] ne uporabljaj privzetih ključnih besed\n"
+
+#: src/msgfmt.c:874
+#, c-format
+msgid ""
+"The -l, -o, and --template options are mandatory. If -D is specified, input\n"
+"files are read from the directory instead of the command line arguments.\n"
+msgstr ""
+"Izbire -l, -o in --template so obvezne. Če je določen -D, se vhodne datoteke\n"
+"berejo iz navedenega imenika namesto iz argumentov ukazne vrstice.\n"
+
+#: src/msgfmt.c:886 src/xgettext.c:905
#, c-format
msgid "Input file interpretation:\n"
msgstr "Interpretacija vhodne datoteke:\n"
-#: src/msgfmt.c:747
+#: src/msgfmt.c:888
#, c-format
msgid ""
" -c, --check perform all the checks implied by\n"
@@ -1822,17 +1891,17 @@ msgstr ""
" -c, --check opravimo vse preizkuse, določene z izbiramo\n"
" --check-format, --check-header, --check-domain\n"
-#: src/msgfmt.c:750
+#: src/msgfmt.c:891
#, c-format
msgid " --check-format check language dependent format strings\n"
msgstr " --check-format preverimo od jezika odvisne formatne nize\n"
-#: src/msgfmt.c:752
+#: src/msgfmt.c:893
#, c-format
msgid " --check-header verify presence and contents of the header entry\n"
msgstr " --check-header preverimo obstoj in vsebino glave\n"
-#: src/msgfmt.c:754
+#: src/msgfmt.c:895
#, c-format
msgid ""
" --check-domain check for conflicts between domain directives\n"
@@ -1841,12 +1910,12 @@ msgstr ""
" --check-domain preverimo morebitna nesoglasja med direktivo\n"
" domene in izbiro --output-file\n"
-#: src/msgfmt.c:757
+#: src/msgfmt.c:898
#, c-format
msgid " -C, --check-compatibility check that GNU msgfmt behaves like X/Open msgfmt\n"
msgstr " -C, --check-compatibility preverimo združljivost GNU gettext z X/Open msgfmt\n"
-#: src/msgfmt.c:759
+#: src/msgfmt.c:900
#, c-format
msgid ""
" --check-accelerators[=CHAR] check presence of keyboard accelerators for\n"
@@ -1855,17 +1924,17 @@ msgstr ""
" --check-accelerators[=ZNAK] preverimo, ali obstajajo bližnjice za\n"
" menujske izbire\n"
-#: src/msgfmt.c:762
+#: src/msgfmt.c:903
#, c-format
msgid " -f, --use-fuzzy use fuzzy entries in output\n"
msgstr " -f, --use-fuzzy uporabimo ohlapne samodejno prevedene prevode\n"
-#: src/msgfmt.c:767
+#: src/msgfmt.c:908
#, c-format
msgid " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n"
msgstr " -a, --alignment=ŠTEVILO poravnava nizov na dano ŠTEVILO bajtov (privzeto %d)\n"
-#: src/msgfmt.c:769
+#: src/msgfmt.c:910
#, c-format
msgid ""
" --endianness=BYTEORDER write out 32-bit numbers in the given byte order\n"
@@ -1875,89 +1944,99 @@ msgstr ""
" bajtov (big ali little, odvisno od strojnega\n"
" okolja)\n"
-#: src/msgfmt.c:772
+#: src/msgfmt.c:913
#, c-format
msgid " --no-hash binary file will not include the hash table\n"
msgstr " --no-hash binarni katalog sporočil bo brez razpršene tabele\n"
-#: src/msgfmt.c:781
+#: src/msgfmt.c:922
#, c-format
msgid " --statistics print statistics about translations\n"
msgstr " --statistics s statistiko glede prevodov\n"
-#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose z dodatnimi sporočili med izvajanjem\n"
-#: src/msgfmt.c:897
+#: src/msgfmt.c:1037
#, c-format
msgid "warning: PO file header missing or invalid\n"
msgstr "opozorilo: glava datoteke PO ni veljavna ali pa manjka\n"
-#: src/msgfmt.c:900
+#: src/msgfmt.c:1040
#, c-format
msgid "warning: charset conversion will not work\n"
msgstr "opozorilo: pretvorba v navedeni nabor znakov ne bo delovala\n"
-#: src/msgfmt.c:910
+#: src/msgfmt.c:1050
#, c-format
msgid "warning: PO file header fuzzy\n"
msgstr "opozorilo: glava datoteke PO ni razberljiva\n"
-#: src/msgfmt.c:912
+#: src/msgfmt.c:1052
#, c-format
msgid "warning: older versions of msgfmt will give an error on this\n"
msgstr "opozorilo: starejše izdaje msgfmt bodo pri tem javile napako\n"
-#: src/msgfmt.c:936
+#: src/msgfmt.c:1076
#, c-format
msgid "domain name \"%s\" not suitable as file name"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke"
-#: src/msgfmt.c:941
+#: src/msgfmt.c:1081
#, c-format
msgid "domain name \"%s\" not suitable as file name: will use prefix"
msgstr "ime domene \"%s\" ni primerno kot ime datoteke: uporabimo predpono"
-#: src/msgfmt.c:955
+#: src/msgfmt.c:1095
#, c-format
msgid "'domain %s' directive ignored"
msgstr "direktiva »domain %s« ni bila upoštevana"
-#: src/msgfmt.c:1015
+#: src/msgfmt.c:1155
#, c-format
msgid "empty 'msgstr' entry ignored"
msgstr "prazno polje »msgstr« ni bilo upoštevano"
-#: src/msgfmt.c:1016
+#: src/msgfmt.c:1156
#, c-format
msgid "fuzzy 'msgstr' entry ignored"
msgstr "ohlapni vnos za polje »msgstr« ni bil upoštevan"
-#: src/msgfmt.c:1065
+#: src/msgfmt.c:1205
#, c-format
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: opozorilo: vhodna datoteka vsebuje ohlapne (fuzzy) prevode"
+#: src/msgfmt.c:1323
+#, c-format
+msgid "%s does not exist"
+msgstr "%s ne obstaja"
+
+#: src/msgfmt.c:1334
+#, c-format
+msgid "%s exists but cannot read"
+msgstr "%s obstaja, vendar se ne da prebrati"
+
#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
-#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
#: src/x-ycp.c:91
#, c-format
msgid "error while reading \"%s\""
msgstr "napaka pri branju \"%s\""
-#: src/msggrep.c:496
+#: src/msggrep.c:501
#, c-format
msgid "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been specified"
msgstr "izbire »%c« ni moč uporabiti, preden je izbrano »J«, »K«, »T«, »C« ali »X«"
-#: src/msggrep.c:516
+#: src/msggrep.c:521
#, c-format, no-wrap
msgid ""
"Extracts all messages of a translation catalog that match a given pattern\n"
@@ -1966,7 +2045,7 @@ msgstr ""
"Izvlečemo vsa sporočila iz kataloga prevodov, ki ustrezajo danemu vzorcu ali\n"
"pripadajo dani izvorni datoteki.\n"
-#: src/msggrep.c:542
+#: src/msggrep.c:547
#, c-format, no-wrap
msgid ""
"Message selection:\n"
@@ -2047,24 +2126,24 @@ msgstr ""
" -v, --invert-match izpiši le sporočila, ki ne ustrezajo nobenemu\n"
" od podanih kriterijev\n"
-#: src/msggrep.c:597
+#: src/msggrep.c:602
#, c-format
msgid " --escape use C escapes in output, no extended chars\n"
msgstr ""
" --escape z ubežnimi sekvencami v skladnji C, brez \n"
" razširjenega nabora znakov\n"
-#: src/msggrep.c:618
+#: src/msggrep.c:623
#, c-format
msgid " --sort-output generate sorted output\n"
msgstr " --sort-output izhod abecedno urejen po sporočilih\n"
-#: src/msggrep.c:620
+#: src/msggrep.c:625
#, c-format
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file izhod abecedno urejen po izvornih datotekah\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2074,7 +2153,7 @@ msgstr ""
"spremenljivko LANG, kot je opisano v datoteki ABOUT-NLS.\n"
"Brez tega ne morete preizkusiti vaših prevodov.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2085,12 +2164,12 @@ msgstr ""
"Prosim, izberite jezikovno okolje z izbiro --locale, ali pa\n"
"določite izhodno datoteko PO z izbiro --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Ustvarjena datoteka %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2099,12 +2178,12 @@ msgstr ""
"Ustvarimo novo datoteko PO in metainformacije dopolnimo z vrednostmi iz\n"
"uporabnikovega jezikovnega okolja.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=DATOTEKA vhodna datoteka POT\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2113,12 +2192,12 @@ msgstr ""
"Če vhodna datoteka ni podana, poskusimo najti datoteko POT v trenutnem imeniku.\n"
"Če je enaka -, se bere standardni vhod.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=DATOTEKA izhod zapisujemo v navedeno DATOTEKO\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2128,17 +2207,17 @@ msgstr ""
"nastavitev uporabnikovega jezikovnega okolja. Če je kot izhodna datoteka \n"
"podan -, se rezultat izpiše na standardni izhod.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=JJ_DD določitev ciljnega jezikovnega okolja\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator privzamemo, da je datoteka PO samodejno ustvarjena\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2146,12 +2225,12 @@ msgstr ""
"Našli smo več kot eno datoteko .pot.\n"
"Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "napaka pri branju trenutnega imenika"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2159,14 +2238,14 @@ msgstr ""
"V trenutnem imeniku ni najti nobene datoteke .pot.\n"
"Prosim, določite vhodno datoteko .pot z izbiro --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "podproces %s neuspešen z izhodno kodo %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2179,7 +2258,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Slovenski prevodi paketa %s"
@@ -2211,7 +2290,7 @@ msgstr "ciljni nabor \"%s\" ni prenosljivo ime kodnega nabora."
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:3051
+#: src/xgettext.c:544 src/xgettext.c:3418
#, c-format
msgid "warning: "
msgstr "opozorilo: "
@@ -2424,17 +2503,17 @@ msgstr "rokovanje z množinskimi oblikami je razširitev GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "v msgstr manjka oznaka bližnjice »%c«"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "v msgstr je preveč oznak bližnjic »%c«"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "polje »%s« v glavi ima še vedno začetne privzete vrednosti\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "v glavi manjka polje »%s«\n"
@@ -2454,7 +2533,7 @@ msgid "input file doesn't contain a header entry with a charset specification"
msgstr "v vhodni datoteki manjka glava z določilom kodnega nabora"
#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
-#: src/x-python.c:665 src/xgettext.c:708
+#: src/x-python.c:665 src/xgettext.c:720
#, c-format
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does not support this conversion."
msgstr "Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), ta pa ne podpira te pretvorbe."
@@ -2465,21 +2544,21 @@ msgid "Conversion from \"%s\" to \"%s\" introduces duplicates: some different ms
msgstr "Pretvorba iz »%s« v »%s« privede do podvojevanje: nekateri različni ključi msgid postanejo enaki."
#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
-#: src/xgettext.c:715
+#: src/xgettext.c:727
#, c-format
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Pretvorba iz »%s« v »%s« ni mogoča. %s kliče iconv(), vendar ta izvod programa ni preveden za uporabo iconv()."
-#: src/msgmerge.c:383 src/msgmerge.c:389
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s je veljavno edino z %s"
-#: src/msgmerge.c:448
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "vrsta varnostne kopije"
-#: src/msgmerge.c:485
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2502,17 +2581,17 @@ msgstr ""
"pa bodo strojno ustvarjeni komentarji in podatki o številki vrstice. Kjer\n"
"natančnega prevoda ni, se uporabi ohlapni (fuzzy) algoritem.\n"
-#: src/msgmerge.c:502
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po prevodi\n"
-#: src/msgmerge.c:504
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot sklici na vire\n"
-#: src/msgmerge.c:508
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2521,7 +2600,7 @@ msgstr ""
" -C, --compendium=DATOTEKA dodatna knjižnica s prevodi sporočil; navedemo\n"
" lahko več kot eno\n"
-#: src/msgmerge.c:514
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2530,27 +2609,27 @@ msgstr ""
" -U, --update posodobi def.po,\n"
" če je def.po že posodobljen, ne stori nič\n"
-#: src/msgmerge.c:526
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Mesto izhodne datoteke v posodobitvenem načinu:\n"
-#: src/msgmerge.c:528
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Rezultat se zapiše nazaj v datoteko def.po.\n"
-#: src/msgmerge.c:530
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=TIP izdelamo varnostno kopijo datoteke def.po\n"
-#: src/msgmerge.c:532
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " -S, --suffix=PRIPONA pripona varnostne kopije naj bo PRIPONA\n"
-#: src/msgmerge.c:534
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2568,7 +2647,7 @@ msgstr ""
" sicer enostavne\n"
" simple, never vedno enostavne varnostne kopije\n"
-#: src/msgmerge.c:541
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2577,32 +2656,32 @@ msgstr ""
"Varnostna kopija ima pripono »~«, razen če ni z izbiro --suffix ali\n"
"spremenljivko SIMPLE_BACKUP_SUFFIX nastavljeno drugače. \n"
-#: src/msgmerge.c:552
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous obdržimo prejšnja polja msgid prevedenih sporočil\n"
-#: src/msgmerge.c:609 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent brez kazalnika poteka\n"
-#: src/msgmerge.c:1604
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "pri tem sporočilu bi morale biti določene množinske oblike"
-#: src/msgmerge.c:1627
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "pri tem sporočilu ne bi smele biti določene množinske oblike"
-#: src/msgmerge.c:2030
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sPrebrano %ld starih + %ld referenčnih, združenih %ld, ohlapnih %ld, manjkajočih %ld, opuščenih %ld.\n"
-#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2700,7 +2779,7 @@ msgstr " -i, --indent izpis datoteke PO z zamiki\n"
msgid " --strict write strict uniforum style\n"
msgstr " --strict izpis v strogi obliki Uniforum, brez razširitev\n"
-#: src/msguniq.c:330
+#: src/msguniq.c:331
#, c-format, no-wrap
msgid ""
"Unifies duplicate translations in a translation catalog.\n"
@@ -2721,12 +2800,12 @@ msgstr ""
"ohranijo le komentarji prvega prevoda. Ohranijo se vsi podatki o mestu\n"
"sporočila v izvorni datoteki. Z izbiro --unique se podvojena sporočila zavržejo.\n"
-#: src/msguniq.c:363
+#: src/msguniq.c:364
#, c-format
msgid " -d, --repeated print only duplicates\n"
msgstr " -d, --repeated izpišemo le podvojena sporočila\n"
-#: src/msguniq.c:365
+#: src/msguniq.c:366
#, c-format
msgid " -u, --unique print only unique messages, discard duplicates\n"
msgstr ""
@@ -2794,27 +2873,27 @@ msgstr ""
msgid "inconsistent use of #~"
msgstr "neskladna raba #~"
-#: src/po-gram-gen.y:240
+#: src/po-gram-gen.y:243
#, c-format
msgid "missing 'msgstr[]' section"
msgstr "manjkajoč razdelek »msgstr[]«"
-#: src/po-gram-gen.y:249
+#: src/po-gram-gen.y:252
#, c-format
msgid "missing 'msgid_plural' section"
msgstr "manjkajoč razdelek »msgid_plural«"
-#: src/po-gram-gen.y:257
+#: src/po-gram-gen.y:260
#, c-format
msgid "missing 'msgstr' section"
msgstr "manjkajoč razdelek »msgstr«"
-#: src/po-gram-gen.y:396
+#: src/po-gram-gen.y:399
#, c-format
msgid "first plural form has nonzero index"
msgstr "prva množinska oblika ima indeks različen od nič"
-#: src/po-gram-gen.y:398
+#: src/po-gram-gen.y:401
#, c-format
msgid "plural form has wrong index"
msgstr "množinska oblika ima napačen indeks"
@@ -2824,7 +2903,7 @@ msgstr "množinska oblika ima napačen indeks"
msgid "too many errors, aborting"
msgstr "preveč napak, nadaljevanje ni možno"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "neveljavno večzložno zaporedje"
@@ -2868,16 +2947,16 @@ msgstr "znak za konec vrstice sredi niza"
msgid "context separator <EOT> within string"
msgstr "razmejilnik konteksta <EOT> znotraj niza"
-#: src/read-catalog.c:332 src/xgettext.c:1023
+#: src/read-catalog.c:318 src/xgettext.c:1046
#, c-format
msgid "this file may not contain domain directives"
msgstr "ta datoteka morda ne vsebuje direktiv domene"
-#: src/read-catalog.c:377
+#: src/read-catalog.c:363
msgid "duplicate message definition"
msgstr "podvojena definicija sporočila"
-#: src/read-catalog.c:379
+#: src/read-catalog.c:365
msgid "this is the location of the first definition"
msgstr "to je kraj prve definicije"
@@ -3055,17 +3134,17 @@ msgstr "prevajanje razreda C# neuspešno, poskusite z --verbose"
msgid "compilation of C# class failed"
msgstr "prevajanje razreda C# neuspešno"
-#: src/write-java.c:1080
+#: src/write-java.c:1091
#, c-format
msgid "not a valid Java class name: %s"
msgstr "ni veljavno javansko ime razreda: %s"
-#: src/write-java.c:1165
+#: src/write-java.c:1210
#, c-format
msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
msgstr "prevajanje javanskega razreda neuspešno, uporabite --verbose ali nastavite $JAVAC"
-#: src/write-java.c:1168
+#: src/write-java.c:1213
#, c-format
msgid "compilation of Java class failed, please try to set $JAVAC"
msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
@@ -3075,12 +3154,16 @@ msgstr "prevajanje javanskega razreda neuspešno, poskusite nastaviti $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "napaka pri odpiranju \"%s\" za pisanje"
-#: src/write-po.c:803
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "nepopolno večbajtno zaporedje"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "internacionalizirana sporočila ne smejo vsebovati ubežne sekvence »\\%c«"
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3093,7 +3176,7 @@ msgstr ""
"vi. Razmislite o uporabi sporočil v naboru znakov ASCII.\n"
"%s\n"
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3171,7 +3254,7 @@ msgstr ""
"katalog sporočil vsebuje množinske oblike, vendar katalog sporočil TCL\n"
"ne podpira množinskih oblik\n"
-#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128
+#: src/x-awk.c:341 src/x-javascript.c:795 src/x-python.c:931
#, c-format
msgid "%s:%d: warning: unterminated string"
msgstr "%s:%d: opozorilo: nezaključen niz"
@@ -3181,17 +3264,22 @@ msgstr "%s:%d: opozorilo: nezaključen niz"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: opozorilo: nezaključen regularni izraz"
-#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:762
+#: src/x-c.c:1052
+#, c-format
+msgid "warning: invalid Unicode character"
+msgstr "opozorilo: neveljavni unikodni znak"
+
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: opozorilo: nezaključena znakovna konstanta"
-#: src/x-c.c:1247 src/x-vala.c:832
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: opozorilo: nezaključen niz"
-#: src/x-csharp.c:224 src/xgettext.c:2055
+#: src/x-csharp.c:224 src/xgettext.c:2106
msgid "Please specify the source encoding through --from-code."
msgstr "Prosim, določite vhodni nabor znakov z izbiro --from-code."
@@ -3245,7 +3333,7 @@ msgstr ""
"%s:%d: Neveljavno večbajtno zaporedje.\n"
"Prosim, določite vhodni nabor znakov z izbiro --from-code.\n"
-#: src/x-csharp.c:1390 src/x-python.c:1335
+#: src/x-csharp.c:1390 src/x-python.c:1138
#, c-format
msgid "%s:%d: warning: invalid Unicode character"
msgstr "%s:%d: opozorilo: neveljavni unikodni znak"
@@ -3265,22 +3353,22 @@ msgstr "%s:%d: opozorilo: zaklepaj »)« na mestu, kjer pričakujemo zaviti zakl
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: opozorilo: zaviti zaklepaj »}« na mestu, kjer pričakujemo zaklepaj »)«"
-#: src/x-glade.c:561
+#: src/x-glade.c:295
#, c-format
msgid "Missing context for the string extracted from '%s' element"
msgstr "Manjkajoči kontekst za niz, izvlečen iz elementa »%s«"
-#: src/x-glade.c:686
+#: src/x-glade.c:417
#, c-format
msgid "The root element <%s> is not allowed in a valid Glade file"
msgstr "Krovni element <%s> ni dovoljen v veljavni datoteki glade"
-#: src/x-glade.c:841 src/x-glade.c:848
+#: src/x-glade.c:572 src/x-glade.c:579
#, c-format
msgid "%s:%lu:%lu: %s"
msgstr "%s:%lu:%lu: %s"
-#: src/x-glade.c:875
+#: src/x-glade.c:606
#, c-format
msgid ""
"Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3343,11 +3431,21 @@ msgstr ""
"%s:%d: Neveljavno večbajtno zaporedje.\n"
"Prosim, določite vhodni nabor znakov z izbiro --from-code\n"
-#: src/x-javascript.c:1147
+#: src/x-javascript.c:954
#, c-format
msgid "%s:%d: warning: RegExp literal terminated too early"
msgstr "%s:%d: opozorilo: RegExp literal prekinjen predčasno"
+#: src/x-javascript.c:1055
+#, c-format
+msgid "%s:%d: warning: %s is not allowed"
+msgstr "%s:%d: opozorilo: %s ni dovoljen"
+
+#: src/x-javascript.c:1069
+#, c-format
+msgid "%s:%d: warning: unterminated XML markup"
+msgstr "%s:%d: opozorilo: nezaključena značka XML"
+
#: src/x-perl.c:308
#, c-format
msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
@@ -3471,52 +3569,57 @@ msgstr "%s:%d: niz ni veljaven izraz"
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
msgstr "%s:%lu: opozorilo: skladnja $\"...\" je odsvetovana iz varnostnih razlogov, uporabite raje eval_gettext"
-#: src/x-vala.c:558
+#: src/x-vala.c:413
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: opozorilo: regularni izraz prekinjen predčasno"
-#: src/xgettext.c:636
+#: src/xgettext.c:545
+#, c-format
+msgid "'%s' is not a valid encoding name. Using ASCII as fallback.\n"
+msgstr "»%s« ni veljavno ime kodiranja. Namesto tega bo uporabljen ASCII.\n"
+
+#: src/xgettext.c:648
#, c-format
msgid "--join-existing cannot be used when output is written to stdout"
msgstr "pri izpisu na standardni izhod ne moremo uporabiti --join-existing"
-#: src/xgettext.c:641
+#: src/xgettext.c:653
#, c-format
msgid "xgettext cannot work without keywords to look for"
msgstr "xgettext ne deluje brez ključnih besed, ki naj jih išče"
-#: src/xgettext.c:785
+#: src/xgettext.c:808
#, c-format
msgid "warning: file '%s' extension '%s' is unknown; will try C"
msgstr "opozorilo: vrsta datoteka »%s« s pripono »%s« ni prepoznana; poskušamo C"
-#: src/xgettext.c:836
+#: src/xgettext.c:859
#, c-format
msgid "Extract translatable strings from given input files.\n"
msgstr "Iz vhodnih datotek izvlečemo prevedljive nize znakov.\n"
-#: src/xgettext.c:859
+#: src/xgettext.c:882
#, c-format
msgid " -d, --default-domain=NAME use NAME.po for output (instead of messages.po)\n"
msgstr " -d, --default-domain=DOMENA namesto messages.po je privzeta DOMENA.po\n"
-#: src/xgettext.c:861
+#: src/xgettext.c:884
#, c-format
msgid " -o, --output=FILE write output to specified file\n"
msgstr " -o, --output-file=DATOTEKA izhod zapisujemo v navedeno DATOTEKO\n"
-#: src/xgettext.c:863
+#: src/xgettext.c:886
#, c-format
msgid " -p, --output-dir=DIR output files will be placed in directory DIR\n"
msgstr " -p, --output-dir=IMENIK izhodne datoteke pišemo v navedeni IMENIK\n"
-#: src/xgettext.c:868
+#: src/xgettext.c:891
#, c-format
msgid "Choice of input file language:\n"
msgstr "Izbira vhodnega jezika:\n"
-#: src/xgettext.c:870
+#: src/xgettext.c:893
#, c-format
msgid ""
" -L, --language=NAME recognise the specified language\n"
@@ -3524,50 +3627,50 @@ msgid ""
" EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
" JavaProperties, C#, awk, YCP, Tcl, Perl, PHP,\n"
" GCC-source, NXStringTable, RST, Glade, Lua,\n"
-" JavaScript, Vala)\n"
+" JavaScript, Vala, Desktop)\n"
msgstr ""
" -L, --language=JEZIK obravnavaj vhodno datoteko v danem JEZIKU\n"
" (C, C++, predmetni C, PO, ukazna lupina,\n"
" python, lisp, emacs lisp, librep, scheme,\n"
" smalltalk, java, JavaProperties, C#, awk,\n"
" YCP, TCL, perl, PHP, GCC-vir, NXStringTable,\n"
-" RST, glade, lua, javascript, vala)\n"
+" RST, glade, lua, javascript, vala, desktop)\n"
-#: src/xgettext.c:877
+#: src/xgettext.c:900
#, c-format
msgid " -C, --c++ shorthand for --language=C++\n"
-msgstr " -C, --c++ okrajšava za --language=C++\n"
+msgstr " -C, --c++ okrajšava za --language=C++\n"
-#: src/xgettext.c:879
+#: src/xgettext.c:902
#, c-format
msgid "By default the language is guessed depending on the input file name extension.\n"
msgstr "Privzeto se jezik poskusi uganiti iz pripone vhodne datoteke.\n"
-#: src/xgettext.c:884
+#: src/xgettext.c:907
#, c-format
msgid ""
" --from-code=NAME encoding of input files\n"
" (except for Python, Tcl, Glade)\n"
msgstr ""
-" --from-code=NABOR nabor znakov vhodnih datotek\n"
-" (razen za Python, Tcl in Glade)\n"
+" --from-code=NABOR nabor znakov vhodnih datotek\n"
+" (razen za Python, Tcl in Glade)\n"
-#: src/xgettext.c:887
+#: src/xgettext.c:910
#, c-format
msgid "By default the input files are assumed to be in ASCII.\n"
msgstr "Privzeti nabor znakov vhodnih datotek je ASCII.\n"
-#: src/xgettext.c:892
+#: src/xgettext.c:915
#, c-format
msgid " -j, --join-existing join messages with existing file\n"
-msgstr " -j, --join-existing združi sporočila z obstoječo datoteko\n"
+msgstr " -j, --join-existing združi sporočila z obstoječo datoteko\n"
-#: src/xgettext.c:894
+#: src/xgettext.c:917
#, c-format
msgid " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n"
msgstr " -x, --exclude-file=DATOTEKA.po vnosov iz navedene DATOTEKE ne izvlečemo\n"
-#: src/xgettext.c:896
+#: src/xgettext.c:919
#, c-format
msgid ""
" -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n"
@@ -3581,17 +3684,17 @@ msgstr ""
" -c, --add-comments postavi vse komentarje pred vrsticami s \n"
" ključnimi besedami v izhodno datoteko\n"
-#: src/xgettext.c:902
+#: src/xgettext.c:925
#, c-format
msgid "Language specific options:\n"
msgstr "Izbire, specifične za jezik:\n"
-#: src/xgettext.c:904
+#: src/xgettext.c:927
#, c-format
msgid " -a, --extract-all extract all strings\n"
-msgstr " -a, --extract-all iz datotek potegnemo vse nize\n"
+msgstr " -a, --extract-all iz datotek potegnemo vse nize\n"
-#: src/xgettext.c:906 src/xgettext.c:914
+#: src/xgettext.c:929
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3604,16 +3707,20 @@ msgstr ""
" C#, awk, TCL, perl, PHP, GCC-vir, glade, lua,\n"
" javascript, vala)\n"
-#: src/xgettext.c:911
+#: src/xgettext.c:937
#, c-format
msgid ""
-" -kWORD, --keyword=WORD look for WORD as an additional keyword\n"
-" -k, --keyword do not to use default keywords\n"
+" (only languages C, C++, ObjectiveC, Shell,\n"
+" Python, Lisp, EmacsLisp, librep, Scheme, Java,\n"
+" C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+" Lua, JavaScript, Vala, Desktop)\n"
msgstr ""
-" -kBESEDA, --keyword=BESEDA uporabi BESEDO kot dodatno ključo besedo\n"
-" -k, --keyword[=BESEDA] ne uporabljaj privzetih ključnih besed\n"
+" (samo jeziki C, C++, predmetni C, ukazna lupina,\n"
+" python, lisp, emacs lisp, librep, scheme, java,\n"
+" C#, awk, TCL, perl, PHP, GCC-vir, glade, lua,\n"
+" javascript, vala, desktop)\n"
-#: src/xgettext.c:919
+#: src/xgettext.c:942
#, c-format
msgid ""
" --flag=WORD:ARG:FLAG additional flag for strings inside the argument\n"
@@ -3622,7 +3729,7 @@ msgstr ""
" --flag=BESEDA:ARG:STIKALO dodatno stikalo za nize znotraj argumenta\n"
" številka ARG ključne besede BESEDA\n"
-#: src/xgettext.c:922
+#: src/xgettext.c:945
#, c-format
msgid ""
" (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3635,127 +3742,127 @@ msgstr ""
" C#, awk, YCP, TCL, perl, PHP, GCC-vir, lua,\n"
" javascript, vala)\n"
-#: src/xgettext.c:927
+#: src/xgettext.c:950
#, c-format
msgid " -T, --trigraphs understand ANSI C trigraphs for input\n"
msgstr " -T, --trigraphs razumi trigrafe ANSI C na vhodu\n"
-#: src/xgettext.c:929
+#: src/xgettext.c:952
#, c-format
msgid " (only languages C, C++, ObjectiveC)\n"
msgstr " (samo jeziki C, C++ in predmetni C)\n"
-#: src/xgettext.c:931
+#: src/xgettext.c:954
#, c-format
msgid " --qt recognize Qt format strings\n"
msgstr " --qt prepoznaj oblikovne nize Qt\n"
-#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941
+#: src/xgettext.c:956 src/xgettext.c:960 src/xgettext.c:964
#, c-format
msgid " (only language C++)\n"
msgstr " (samo jezik C++)\n"
-#: src/xgettext.c:935
+#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
msgstr " --kde prepoznaj oblikovne nize KDE 4\n"
-#: src/xgettext.c:939
+#: src/xgettext.c:962
#, c-format
msgid " --boost recognize Boost format strings\n"
msgstr " --boost prepoznaj oblikovne nize Boost\n"
-#: src/xgettext.c:943
+#: src/xgettext.c:966
#, c-format
msgid " --debug more detailed formatstring recognition result\n"
msgstr ""
" --debug bolj razčlenjen rezultat razpoznave\n"
" oblikovnega niza\n"
-#: src/xgettext.c:968
+#: src/xgettext.c:991
#, c-format
msgid " --properties-output write out a Java .properties file\n"
msgstr " --properties-output zapiši javansko datoteko .properties\n"
-#: src/xgettext.c:983
+#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
msgstr " --copyright-holder=NIZ v izhodu nastavimo nosilca avtorskih pravic na NIZ\n"
-#: src/xgettext.c:985
+#: src/xgettext.c:1008
#, c-format
msgid " --foreign-user omit FSF copyright in output for foreign user\n"
msgstr " --foreign-user brez copyrighta FSF v izpisu za tuje uporabnike\n"
-#: src/xgettext.c:987
+#: src/xgettext.c:1010
#, c-format
msgid " --package-name=PACKAGE set package name in output\n"
msgstr " --package-name=PAKET nastavi ime PAKETA na izhodu\n"
-#: src/xgettext.c:989
+#: src/xgettext.c:1012
#, c-format
msgid " --package-version=VERSION set package version in output\n"
msgstr " --package-version=NIZ v izhodu nastavimo različico paketa na NIZ\n"
-#: src/xgettext.c:991
+#: src/xgettext.c:1014
#, c-format
msgid " --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr " --msgid-bugs-address=EPOŠTA@NASLOV naslov za sporočila o napakah msgid\n"
-#: src/xgettext.c:993
+#: src/xgettext.c:1016
#, c-format
msgid ""
" -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for msgstr\n"
" values\n"
msgstr " -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot predpono za msgstr\n"
-#: src/xgettext.c:996
+#: src/xgettext.c:1019
#, c-format
msgid ""
" -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for msgstr\n"
" values\n"
msgstr " -m[NIZ], --msgstr-prefix[=NIZ] uporabi NIZ ali \"\" kot pripono za msgstr\n"
-#: src/xgettext.c:1817
+#: src/xgettext.c:1840
#, c-format
msgid "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %s"
msgstr "Argument --flag nima skladnje <ključna-beseda>:<št-arg>:[pass-]<stikalo>: %s"
-#: src/xgettext.c:1916
+#: src/xgettext.c:1965
msgid "standard input"
msgstr "standardni vhod"
-#: src/xgettext.c:2020
+#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
msgstr "Ne-ASCII znak pri %s%s."
-#: src/xgettext.c:2024
+#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
msgstr "Ne-ASCII komentar pri ali okoli %s%s."
-#: src/xgettext.c:2029
+#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
msgstr "Ne-ASCII niz pri %s%s."
-#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230
+#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
#, c-format
msgid "%s%s: warning: "
msgstr "%s%s: opozorilo: "
-#: src/xgettext.c:2138
+#: src/xgettext.c:2189
#, c-format
msgid "Although being used in a format string position, the %s is not a valid %s format string. Reason: %s\n"
msgstr "Čeprav je uporabljen na mestu oblikovnega niza, %s ni veljaven oblikovni niz %s. Razlog: %s\n"
-#: src/xgettext.c:2139
+#: src/xgettext.c:2190
#, c-format
msgid "Although declared as such, the %s is not a valid %s format string. Reason: %s\n"
msgstr "Čeprav je deklariran kot tak, %s ni veljaven oblikovni niz za %s. Razlog: %s\n"
-#: src/xgettext.c:2170
+#: src/xgettext.c:2221
#, c-format
msgid ""
"'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3768,7 +3875,7 @@ msgstr ""
"Prosimo, razmislite o uporabi oblikovnega niza s poimenovanimi argumenti\n"
"ter preslikave namesto n-terčka argumentov.\n"
-#: src/xgettext.c:2232
+#: src/xgettext.c:2283
msgid ""
"Empty msgid. It is reserved by GNU gettext:\n"
"gettext(\"\") returns the header entry with\n"
@@ -3778,27 +3885,27 @@ msgstr ""
"gettext(\"\") vrne glavo z metapodatki, ne pa\n"
"praznega niza.\n"
-#: src/xgettext.c:2869
+#: src/xgettext.c:2979
#, c-format
msgid "ambiguous argument specification for keyword '%.*s'"
msgstr "dvoumno določen argument za ključno besede »%.*s«"
-#: src/xgettext.c:2896
+#: src/xgettext.c:3006
#, c-format
msgid "warning: missing context for keyword '%.*s'"
msgstr "opozorilo: manjkajoči kontekst za ključno besedo »%.*s«"
-#: src/xgettext.c:2921
+#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
msgstr "opozorilo: manjkajoči kontekst za množinski argument ključne besede »%.*s«"
-#: src/xgettext.c:2942
+#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "neujemanje kontekstov med edninsko in množinsko obliko"
-#: src/xgettext.c:3052
+#: src/xgettext.c:3419
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
@@ -3810,7 +3917,7 @@ msgstr ""
"spremenljivko MSGID_BUGS_ADDRESS tam, sicer pa \n"
"z izbiro --msgid-bugs-address v ukazni vrstici.\n"
-#: src/xgettext.c:3267
+#: src/xgettext.c:3638
#, c-format
msgid "language '%s' unknown"
msgstr "jezik »%s« ni poznan"
diff --git a/gettext-tools/po/sr.po b/gettext-tools/po/sr.po
index 27eb443..83af897 100644
--- a/gettext-tools/po/sr.po
+++ b/gettext-tools/po/sr.po
@@ -1,14 +1,14 @@
# Serbian translation of gettext-tools, 2003—2014.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
# This file is distributed under the same license as the gettext package.
# Danilo Segan <dsegan@gmx.net>, 2003—2004.
# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools-0.19-rc1\n"
+"Project-Id-Version: gettext-tools-0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-12 21:59+0200\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-24 09:49+0200\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <(nothing)>\n"
"Language: sr\n"
@@ -16,7 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -32,22 +31,22 @@ msgstr "нејасан аргумент „%s“ за „%s“"
msgid "Valid arguments are:"
msgstr "Исправни аргументи су:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "не могу да пронађем привремени директоријум, покушавам да подесим „$TMPDIR“"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "не могу да направим привремени директоријум користећи шаблон „%s“"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "не могу да уклоним привремену датотеку „%s“"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "не могу да уклоним привремени директоријум „%s“"
@@ -56,38 +55,38 @@ msgstr "не могу да уклоним привремени директор
msgid "write error"
msgstr "грешка писања"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "причувавам овлашћења за %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "грешка приликом отварања „%s“ за читање"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "не могу да отворим датотеку резерве „%s“ за упис"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "грешка читања „%s“"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "грешка писања „%s“"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "грешка након читања „%s“"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -104,12 +103,12 @@ msgstr "нисам нашао Ц# преводиоца, покушајте да
msgid "C# virtual machine not found, try installing pnet"
msgstr "нисам нашао Ц# виртуелну машину, покушајте да инсталирате пнет"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Непозната грешка система"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -171,31 +170,31 @@ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: опција „-W %s“ захтева аргумент\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "неисправан аргумент издања_извора за преведи_јава_разред"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "неисправан аргумент издања_мете за преведи_јава_разред"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "нисам успео да направим „%s“"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "грешка приликом писања датотеке „%s“"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Нисам нашао Јава преводиоца, покушајте да инсталирате гцј или поставите „$JAVAC“"
@@ -205,15 +204,15 @@ msgstr "Нисам нашао Јава преводиоца, покушајте
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Нисам нашао виртуелну машину Јаве, покушајте да инсталирате гиј или да поставите „$JAVA“"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "У/И грешка %s потпроцеса"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "меморија је потрошена"
@@ -224,7 +223,7 @@ msgid "creation of threads failed"
msgstr "стварање нити није успело"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "писање у %s потпроцес није успело"
@@ -284,8 +283,8 @@ msgid "setting permissions for %s"
msgstr "подешавам овлашћења за %s"
#
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "не могу да направим спојку"
@@ -703,10 +702,10 @@ msgstr "У смерници број %u, знак „%c“ не представ
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Знак којим се завршава смерница број %u није цифра између 1 и 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -720,58 +719,58 @@ msgstr ""
"Ово је слободан софтвер: слободни сте да га мењате и расподељујете.\n"
"Не постоји НИКАКВА ГАРАНЦИЈА, у оквирима дозвољеним законом.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Написао је %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Бруно Хејбл"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "превише аргумената"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Пробајте „%s --help“ за више података.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Употреба: %s [ОПЦИЈА]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Испишите назив рачунара.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Запис излаза:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short кратак назив рачунара\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -780,33 +779,33 @@ msgstr ""
" -f, --fqdn, --long дуги назив рачунара, садржи пуни назив домена\n"
" и надимке\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адресе за назив рачунара\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Обавештајни излаз:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help приказује ову помоћ и излази\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -816,30 +815,31 @@ msgstr " -V, --version исписује податке о изд
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Грешке пријавите на <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "не могу да добавим назив рачунара"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "дозвољена је само једна улазна датотека"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s и %s се међусобно искључују"
@@ -860,7 +860,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -868,7 +868,7 @@ msgstr "Обавезни аргументи за дуге опције су та
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -881,7 +881,7 @@ msgstr " УЛАЗНАДАТОТЕКА улазна по датот
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -895,7 +895,7 @@ msgstr "Ако није дата улазна датотека или ако ј
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -903,13 +903,13 @@ msgstr "Место излазне датотеке:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=ДАТОТЕКА исписује излаз у наведену датотеку\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1020,20 +1020,20 @@ msgstr " --obsolete исто што и --only-obsolete --cl
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Склоп улазне датотеке:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input улазна датотека је у склопу „Јава .properties“\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1042,15 +1042,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Појединости излаза:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1063,28 +1063,28 @@ msgstr ""
" „auto“ (самостално), или „html“.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=ИЗГЛЕДДАТОТЕКЕ наводи датотеку правила ЦСС изгледа за --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape не користи Ц знаке промене реда у излазу (задато)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
msgstr " -E, --escape користи Ц знаке промене реда у излазу, без проширених знакова\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1115,29 +1115,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict исписује .по датотеку изричито складну са Унифорумом\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output исписује датотеку „Јава .properties“\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output исписује датотеку „NeXTstep/GNUstep .strings“\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=БРОЈ поставља ширину излазне странице\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1147,14 +1147,14 @@ msgstr ""
" излазне странице, на неколико редова\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output ствара уређени излаз\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1236,13 +1236,13 @@ msgstr ""
" штампање само јединствених порука\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input улазне датотеке су у синтакси „Јава .properties“\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1265,27 +1265,27 @@ msgstr ""
" --use-first користи први доступни превод за сваку поруку,\n"
" не спаја више превода\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=НАЗИВКАТАЛОГА поставља поље „Language“ (језик) у заглављу\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Питер Милер"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "нема улазних датотека"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "потребне су тачно 2 улазне датотеке"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Употреба: %s [МОГУЋНОСТ] деф.po реф.pot\n"
@@ -1317,17 +1317,17 @@ msgstr " def.po преводи\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot упуте на изворе\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Измењивачи рада:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain примењује реф.pot на сваки домен у деф.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching не користи нејасно поклапање\n"
@@ -1352,17 +1352,17 @@ msgstr "ова порука није преведена"
msgid "this message needs to be reviewed by the translator"
msgstr "ову поруку би преводилац требао да прегледа"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "ова порука се користи али није одређена..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...али ова одредница је слична"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "ова порука се користи али није одређена у „%s“"
@@ -1372,7 +1372,7 @@ msgstr "ова порука се користи али није одређена
msgid "warning: this message is not used"
msgstr "упозорење: ова порука се не користи"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1434,25 +1434,25 @@ msgstr "Мета претварања:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Задато кодирање је кодирање текућег локалитета.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent увучени изглед излаза\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location избацује редове „#: датотека:ред“\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location чува редове „#: датотека:ред“ (основно)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict изричито Униорумски стил излаза\n"
@@ -1713,7 +1713,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " датотека.po ... улазне датотеке\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Начин рада:\n"
@@ -1947,7 +1947,7 @@ msgstr " --no-hash бинарна датотека не
msgid " --statistics print statistics about translations\n"
msgstr " --statistics исписује статистику о преводима\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose повећава ниво опширности\n"
@@ -2002,12 +2002,12 @@ msgstr "нејасан „msgstr“ унос је занемарен"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: упозорење: изворна датотека садржи нејасан превод"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "Не постоји „%s“"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "„%s“ постоји али је не могу прочитати"
@@ -2128,7 +2128,7 @@ msgstr " --sort-output ствара уређени излаз\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file ређа излаз према месту датотеке\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2138,7 +2138,7 @@ msgstr ""
"окружења „LANG“, како је описано у датотеци „ABOUT-NLS“. Ово је\n"
"неопходно ради испробавања ваших превода.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2149,12 +2149,12 @@ msgstr ""
"Наведите локалитет помоћу опције --locale или \n"
"излазну ПО датотеку помоћу опције --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Направио је %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2163,12 +2163,12 @@ msgstr ""
"Стварам нову ПО датотеку, постављајући мета податке помоћу вредности из\n"
"корисничког окружења.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=УЛАЗНАДАТОТЕКА улазна ПОТ датотека\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2177,12 +2177,12 @@ msgstr ""
"Уколико улазна датотека није дата, текући директоријум се претражује за\n"
"ПОТ датотеком. Уколико је „-“, чита се стандардни улаз.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=ДАТОТЕКА исписује излаз у наведену ПО датотеку\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2192,17 +2192,17 @@ msgstr ""
"подешавања корисничког локалитета. Ако је „-“, резултат се исписује на\n"
"стандардни излаз.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=ЈЈ_ДД поставља одредишни локалитет\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator претпоставља да је ПО датотека самоизграђена\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2210,12 +2210,12 @@ msgstr ""
"Нађох више од једне .пот датотеке.\n"
"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "грешка читања текућег директоријума"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2223,14 +2223,14 @@ msgstr ""
"Не нађох .пот датотеку у текућем директоријуму.\n"
"Наведите улазну .пот датотеку помоћу опције „--input“.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s: потпроцес није успео са излазном шифром %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2243,7 +2243,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Преводи на српски језик за пакет „%s“"
@@ -2472,17 +2472,17 @@ msgstr "баратање множинама је проширење Гнуово
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "У мсгстр недостаје ознака пречице тастатуре „%c“"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "У мсгстр има превише ознака пречица тастатуре „%c“"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "поље заглавља „%s“ и даље садржи почетну задату вредност\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "у заглављу недостаје поље заглавља „%s“\n"
@@ -2516,18 +2516,18 @@ msgstr "Претварање из „%s“ у „%s“ уводи понавља
#: src/xgettext.c:727
#, c-format
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
-msgstr "Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је изграђено без иконв()-еа."
+msgstr "Не могу да претворим из „%s“ у „%s“. %s се ослања на иконв(). Ово издање је изграђено без иконв()-а."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s је исправно само са %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "врста резерве"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2550,17 +2550,17 @@ msgstr ""
"примедбе и положаји у датотекама. Када нема тачног поклапања, користи се\n"
"нејасно поклапање ради добијања бољих резултата.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po преводи који упућују на старе изворе\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot упуте на нове изворе\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2569,7 +2569,7 @@ msgstr ""
" -C, --compendium=ДАТОТЕКА додатна библиотека превода порука, може се\n"
" навести више пута\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2578,27 +2578,27 @@ msgstr ""
" -U, --update освежава деф.по,\n"
" не ради ништа ако је деф.по већ освежена\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Путања излазне датотеке у режиму освежавања:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Резултат се уписује назад у деф.по.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=УПРАВЉАЊЕ прави резерву за деф.по\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=СУФИКС мења уобичајени суфикс за резерве\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2615,7 +2615,7 @@ msgstr ""
" existing, nil побројане ако већ постоје побројане резерве, иначе обичне\n"
" simple, never увек прави обичне резерве\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2624,32 +2624,32 @@ msgstr ""
"Суфикс за резерве је „~“, осим ако је постављен помоћу „--suffix“ или променљивом\n"
"окружења „SIMPLE_BACKUP_SUFFIX“.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous задржава претходне мсгид-се преведених порука\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent потискује указиваче напредовања\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "ова порука треба да одреди облике множине"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "ова порука не треба да одреди облике множине"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sПрочитах %ld старих + %ld упутних, спојених %ld, нејасних %ld, недостајућих %ld, превазиђених %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2868,7 +2868,7 @@ msgstr "облик множине има погрешан индекс"
msgid "too many errors, aborting"
msgstr "превише грешака, прекидам"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "неисправан низ мултибајтова"
@@ -3119,12 +3119,16 @@ msgstr "изграђивање разреда Јаве није успело, п
msgid "error while opening \"%s\" for writing"
msgstr "грешка приликом отварања „%s“ за писање"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "непотпун низ мултибајтова"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "интернационализоване поруке не треба да садрже „\\%c“ низове за крај реда"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3137,7 +3141,7 @@ msgstr ""
"другачије од вашег. Пробајте да користите чисти АСКРИ мсгцтхт.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3225,17 +3229,17 @@ msgstr "%s:%d: упозорење: неокончана ниска"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: упозорење: неокончани регуларни израз"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
-msgstr "упозорење: неисправан знак Уникода "
+msgstr "упозорење: неисправан знак Уникода"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: упозорење: константа знака није окончана"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: упозорење: литерал ниске није окончан"
@@ -3726,7 +3730,7 @@ msgstr " (само језик Ц++)\n"
#: src/xgettext.c:958
#, c-format
msgid " --kde recognize KDE 4 format strings\n"
-msgstr " --qt препознаје ниске записа КДЕ-а 4\n"
+msgstr " --kde препознаје ниске записа КДЕ-а 4\n"
#: src/xgettext.c:962
#, c-format
diff --git a/gettext-tools/po/sv.po b/gettext-tools/po/sv.po
index dc3d047..3fd64ea 100644
--- a/gettext-tools/po/sv.po
+++ b/gettext-tools/po/sv.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-17 09:18+0200\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-17 22:56+0200\n"
"Last-Translator: Jan Djärv <jan.h.d@swipnet.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -31,22 +31,22 @@ msgstr "tvetydigt argument %s för %s"
msgid "Valid arguments are:"
msgstr "Giltiga argument är:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "kan inte hitta en temporärkatalog, försök sätta $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "kan inte skapa temporärkatalog med mall \"%s\""
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "kan inte ta bort temporärfil %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "kan inte ta bort temporärkatalog %s"
@@ -55,38 +55,38 @@ msgstr "kan inte ta bort temporärkatalog %s"
msgid "write error"
msgstr "skrivfel"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "bevarar rättigheter för %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "fel uppstod när %s öppnades för läsning"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "kan inte öppna säkerhetskopiefil %s för skrivning"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "fel uppstod då %s lästes"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "fel vid skrivning till %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "fel efter %s lästes"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -103,12 +103,12 @@ msgstr "Kompilator för C# hittades inte, försök installera pnet"
msgid "C# virtual machine not found, try installing pnet"
msgstr "Virtuell maskin för C# hittades inte, försök installera pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Okänt systemfel"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -170,31 +170,31 @@ msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: flaggan \"-W %s\" kräver ett argument\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "ogiltigt värde på argumentet source_version till compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "ogiltigt värde på argumentet target_version till compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "misslyckades med att skapa \"%s\""
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "fel vid skrivning till filen \"%s\""
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC"
@@ -204,15 +204,15 @@ msgstr "Javakompilator hittades inte, försök installera gcj eller sätt $JAVAC
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Virtuell Javamaskin hittades inte, försök installera gij eller sätt $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "I/O-fel i %s-barnprocess"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "minnet slut"
@@ -223,7 +223,7 @@ msgid "creation of threads failed"
msgstr "skapa trådar misslyckades"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "skrivning till %s-barnprocess misslyckades"
@@ -282,8 +282,8 @@ msgstr "\""
msgid "setting permissions for %s"
msgstr "sätter rättigheter för %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "kan inte skapa rör"
@@ -702,10 +702,10 @@ msgstr "I direktiv nummer %u är tecknet \"%c\" inte en siffra mellan 1 och 9."
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Tecknet som avslutar direktiv nummer %u är inte en siffra mellan 1 och 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -719,58 +719,58 @@ msgstr ""
"Detta program är fri programvara. Du kan modifiera och distribuera den.\n"
"Det finns inte NÅGON SOM HELST GARANTI, till den grad som lagen tillåter.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Skrivet av %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "för många argument"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Försök med \"%s --help\" för mer information.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Användning: %s [FLAGGA]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Visa maskinens värdnamn.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Resultatformat:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short kort värdnamn\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -779,33 +779,33 @@ msgstr ""
" -f, --fqdn, --long långt värdnamn, innehåller hela domännamnet\n"
" och alias\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address adresser för värdnamnet\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Informativ utskrift:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help visa denna hjälptext och avsluta\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -815,32 +815,33 @@ msgstr " -V, --version visa versionsinformation och avsluta\n"
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"Rapportera fel till <bug-gnu-gettext@gnu.org>.\n"
"Rapportera fel och synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "kunde inte hämta värdnamn"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "högst en infil tillåten"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s och %s är ömsesidigt uteslutande"
@@ -861,7 +862,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -869,7 +870,7 @@ msgstr "Obligatoriska argument för långa flaggor är obligatoriska även för
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -882,7 +883,7 @@ msgstr " INFIL PO-infil\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -896,7 +897,7 @@ msgstr "Om ingen infil är given eller om den är - läses standard in.\n"
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -904,13 +905,13 @@ msgstr "Plats för utfil:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=FIL skriv resultat till angiven fil\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1019,35 +1020,35 @@ msgstr " --obsolete samma som --only-obsolete --clear-obsolete
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Syntax på infil:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input infil har \"Java .properties\"-syntax\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input infil har NeXTstep/GNUstep \".strings\"-syntax\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Resultatdetaljer:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1060,14 +1061,14 @@ msgstr ""
" eller \"html\".\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=STILMALL ange CSS stillmallsfil för --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1076,7 +1077,7 @@ msgstr ""
" (normalläge)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1085,7 +1086,7 @@ msgstr ""
" inte \\v eller \\a\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1116,29 +1117,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict strikt Uniforum-format på resultatet\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output skriv en \"Java .properties\"-fil\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output skriv en NeXTstep/GNUstep \".strings\"-fil\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=ANTAL välj antal kolumner i resultatet\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1148,14 +1149,14 @@ msgstr ""
" resultatets kolumnantal i flera rader\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output sortera resultatet\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1238,13 +1239,13 @@ msgstr ""
" endast unika meddelanden skrivs\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input infiler har \"Java .properties\"-syntax\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1265,27 +1266,27 @@ msgstr ""
" --use-first använd först hittade översättning för varje\n"
" meddelande, slå inte ihop översättningar\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=KATALOGNAMN sätt \"Language\"-fältet i huvudet\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "inga infiler givna"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "exakt 2 infiler krävs"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Användning: %s [FLAGGA] def.po ref.pot\n"
@@ -1318,17 +1319,17 @@ msgstr " def.po översättningar\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot referenser till källkod\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Bearbetningsvarianter:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain tillämpa ref.pot till alla domäner i def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching använd inte luddig jämförelse\n"
@@ -1353,17 +1354,17 @@ msgstr "detta meddelande är oöversatt"
msgid "this message needs to be reviewed by the translator"
msgstr "detta meddelande behöver granskas av översättaren"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "detta meddelande används men är inte definierat..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...men denna definition är likartad"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "detta meddelande används men är inte definierat i %s"
@@ -1373,7 +1374,7 @@ msgstr "detta meddelande används men är inte definierat i %s"
msgid "warning: this message is not used"
msgstr "varning: detta meddelande används inte"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1435,25 +1436,25 @@ msgstr "Konverteringsmål:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Standardvärde är nuvarande lokals kodning.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent indentera resultatet\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location skriv inte rader med \"#: filnamn:rad\"\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location bevara rader med \"#: filnamn:rad\" (normalläge)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict strikt Uniforum-format på resultatet\n"
@@ -1714,7 +1715,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " filnamn.po ... infiler\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Körläge:\n"
@@ -1950,7 +1951,7 @@ msgstr " --no-hash binärfil innehåller inte hashtabellen\n"
msgid " --statistics print statistics about translations\n"
msgstr " --statistics skriv ut statistik om översättningarna\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose öka mängden information i meddelanden\n"
@@ -2005,12 +2006,12 @@ msgstr "luddig \"msgstr\"-rad ignorerad"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: varning: källfilen innehåller luddiga översättningar"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s finns inte"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s finns men kan inte läsas"
@@ -2134,7 +2135,7 @@ msgstr " --sort-output sortera resultatet\n"
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sortera resultatet efter filposition\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2144,7 +2145,7 @@ msgstr ""
"LANG såsom beskrivs i filen ABOUT-NLS. Detta är nödvändigt för att\n"
"du ska kunna testa dina översättningar.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2155,12 +2156,12 @@ msgstr ""
"Ange lokal med flaggan --locale eller\n"
".po-utfilen med flaggan --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Skapade %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2169,12 +2170,12 @@ msgstr ""
"Skapar en ny PO-fil och initierar metainformation med värden från\n"
"användarens miljövariabler.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=INFIL POT-infil\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2183,12 +2184,12 @@ msgstr ""
"Om ingen infil ges söks POT-filen i aktuell katalog.\n"
"Om den är - läses standard in.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=FIL skriv resultatet till den givna PO-filen\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2197,17 +2198,17 @@ msgstr ""
"Om ingen utfil ges beror den på flaggan --locale eller användarens\n"
"lokalinställning. Om den är - skrivs resultatet till standard ut.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC sätt mållokal\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator antag att PO-filen är automatgenererad\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2215,12 +2216,12 @@ msgstr ""
"Hittade fler än en .pot-fil.\n"
"Ange .pot-infil med flaggan --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "fel vid läsning av aktuell katalog"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2228,14 +2229,14 @@ msgstr ""
"Hittade ingen .pot-fil i aktuell katalog.\n"
"Ange .pot-infil med flaggan --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "%s-barnprocess terminerade med slutstatus %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2248,7 +2249,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Svenska översättningar för paket %s"
@@ -2476,17 +2477,17 @@ msgstr "hantering av plural är en utökning i GNU gettext"
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "msgstr saknar märket \"%c\" för tangentkortkommandon"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr har för många märken \"%c\" för tangentkortkommandon"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "huvudrad \"%s\" har kvar initialt standardvärde\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "huvudrad \"%s\" saknas i huvudet\n"
@@ -2526,16 +2527,16 @@ msgstr ""
"Kan inte konvertera från \"%s\" till \"%s\". %s beror på iconv().\n"
"Denna version byggdes utan iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s är endast giltig med %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "säkerhetskopieringstyp"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2558,17 +2559,17 @@ msgstr ""
"dock bevaras punktkommentarer och filpositioner. Om en exakt likhet\n"
"inte kan hittas används luddig jämförelse för att ge bättre resultat.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po översättningar som refererar till gamla källkoden\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot referenser till den nya källkoden\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2577,7 +2578,7 @@ msgstr ""
" -C, --compendium=FIL ytterligare kataloger med översättningar,\n"
" kan anges flera gånger\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2586,27 +2587,27 @@ msgstr ""
" -U, --update uppdatera def.po,\n"
" gör ingenting om def.po redan är aktuell\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Plats för utfil i uppdateringsläge:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Resultatet skrivs tillbaka till def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=KONTROLL gör en säkerhetskopia av def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=SUFFIX använd ett annat suffix än det vanliga\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2623,7 +2624,7 @@ msgstr ""
" existing, nil numrerade säkerhetskopior om det finns sådana, enkla annars\n"
" simple, never gör alltid enkla säkerhetskopior\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2632,32 +2633,32 @@ msgstr ""
"Suffix för säkerhetskopior är \"~\", om den inte sätts med --suffix eller\n"
"miljövariabeln SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous behåll föregående \"msgid\" för översatta meddelanden\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent visa inte förloppsindikatorer\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "detta meddelande ska definiera pluralformer"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "detta meddelande ska inte definiera pluralformer"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sLäste %ld gamla + %ld referenser, %ld sammanslagna, %ld luddiga, %ld saknade, %ld föråldrade.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2878,7 +2879,7 @@ msgstr "pluralform har fel index"
msgid "too many errors, aborting"
msgstr "för många fel, avbryter körningen"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "ogiltig flerbytesekvens"
@@ -3132,12 +3133,16 @@ msgstr "kompilering av Javaklass misslyckades, försök sätta $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "fel uppstod när \"%s\" öppnades för skrivning"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "ofullständig flerbytesekvens"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "internationaliserade meddelanden bör inte ha kontrollsekvensen \"\\%c\""
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3150,7 +3155,7 @@ msgstr ""
"teckenuppsättning än du. Försök använda en ren ASCII-msgctxt istället.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3238,17 +3243,17 @@ msgstr "%s:%d: varning: oavslutad sträng"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: varning: oavslutat reguljärt uttryck"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "varning: ogiltigt Unicodetecken"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: varning: oavslutad teckenkonstant"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: varning: oavslutad sträng"
diff --git a/gettext-tools/po/uk.po b/gettext-tools/po/uk.po
index 9bdea19..6b953a1 100644
--- a/gettext-tools/po/uk.po
+++ b/gettext-tools/po/uk.po
@@ -6,10 +6,10 @@
# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2013, 2014.
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.3\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-10 17:41+0300\n"
+"POT-Creation-Date: 2014-10-16 15:04+0900\n"
+"PO-Revision-Date: 2014-10-17 22:18+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
"Language: uk\n"
@@ -33,22 +33,22 @@ msgstr "неоднозначний аргумент %s для %s"
msgid "Valid arguments are:"
msgstr "Допустимі аргументи:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "не вдається знайти тимчасовий каталог, встановіть змінну $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "не вдається створити тимчасовий каталог при використанні шаблону «%s»"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "не вдається видалити тимчасовий файл «%s»"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "не вдається видалити тимчасовий каталог «%s»"
@@ -57,38 +57,38 @@ msgstr "не вдається видалити тимчасовий катало
msgid "write error"
msgstr "помилка запису"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "збереження прав доступу для %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "помилка при відкриванні «%s» для читання"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "не вдається відкрити резервний файл «%s» для запису"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "помилка читання «%s»"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "помилка запису «%s»"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "помилка після читання «%s»"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -105,12 +105,12 @@ msgstr "Компілятор C# не знайдено, спробуйте вст
msgid "C# virtual machine not found, try installing pnet"
msgstr "Не знайдено віртуальну машину pnet, спробуйте встановити pnet"
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Невідома системна помилка"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -172,31 +172,31 @@ msgstr "%s: додавання аргументів до параметра «-W
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: до параметра «-W %s» слід додати аргумент\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "некоректний аргумент source_version для compile_java_class"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "некоректний аргумент target_version для compile_java_class"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "не вдається створити «%s»"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "помилка запису файлу «%s»"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Компілятор Java не знайдено, встановіть gcj або встановіть змінну $JAVAC"
@@ -206,15 +206,15 @@ msgstr "Компілятор Java не знайдено, встановіть gc
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Не знайдено віртуальну машину Java, встановіть gij або встановіть змінну $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "помилка вводу-виводу у дочірньому процесі %s"
#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "пам'ять вичерпано"
@@ -225,7 +225,7 @@ msgid "creation of threads failed"
msgstr "спроба створення потоків обробки зазнала невдачі"
#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "не вдається записати у дочірній процес %s"
@@ -284,8 +284,8 @@ msgstr "'"
msgid "setting permissions for %s"
msgstr "встановлення прав доступу для %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "не вдається створити канал"
@@ -703,10 +703,10 @@ msgstr "У директиві з номером %u символ «%c» не є
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Символ, що завершує директиву з номером %u, не є цифрою від 1 до 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -720,58 +720,58 @@ msgstr ""
"Це вільне програмне забезпечення: ви можете вільно змінювати і поширювати його.\n"
"Вам не надається ЖОДНИХ ГАРАНТІЙ, окрім гарантій передбачених законодавством.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
msgstr "Автор програми %s.\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "надто багато аргументів"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Віддайте команду «%s --help», щоб дізнатися більше.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Використання: %s [ПАРАМЕТР]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "Вивести назву системи.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Формат виводу:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short коротка назва вузла\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -780,33 +780,33 @@ msgstr ""
" -f, --fqdn, --long довга назва вузла, включає повну доменну назву\n"
" та псевдоніми\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address адреси системи\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Інформативний вивід:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help вивести цю довідку та вийти\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -816,30 +816,31 @@ msgstr " -V, --version вивести інформацію про
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr "Про помилки повідомляйте на <bug-gnu-gettext@gnu.org>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "не вдається отримати назву системи"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "допускається максимум один вхідний файл"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s та %s є взаємовиключними"
@@ -860,7 +861,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -868,7 +869,7 @@ msgstr "Аргументи, обов'язкові для довгих ключі
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -881,7 +882,7 @@ msgstr " ВХІДНИЙ_ФАЙЛ вхідний файл PO\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -895,7 +896,7 @@ msgstr "Якщо вхідний файл не вказаний, або якщо
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -903,13 +904,13 @@ msgstr "Розташування файлу виводу:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=ФАЙЛ записати вивід у вказаний файл\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -1020,35 +1021,35 @@ msgstr " --obsolete синонім для --only-obsolete --cl
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Синтаксис вхідного файлу:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr " -P, --properties-input вхідний файл має синтаксис Java .properties\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr " --stringtable-input вхідний файл має синтаксис NeXTstep/GNUstep .strings\n"
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Подробиці виводу:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1060,14 +1061,14 @@ msgstr ""
" УМОВА може мати значення «always», «never», «auto» або «html».\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr " --style=ФАЙЛ_СТИЛЮ вказати файл правил стилю CSS для --color\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
@@ -1076,7 +1077,7 @@ msgstr ""
" мови C (типово)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1085,7 +1086,7 @@ msgstr ""
" мови C, без розширених символів\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1116,29 +1117,29 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict записувати файл .po, точно відповідний Uniforum\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output записати файл Java .properties\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr " --stringtable-output записати файл NeXTstep/GNUstep .strings\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
msgstr " -w, --width=NUMBER встановити ширину сторінки виводу\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1148,14 +1149,14 @@ msgstr ""
" повідомлень, що довші за ширину сторінки\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output сортувати вивід\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1240,13 +1241,13 @@ msgstr ""
" виводити лише унікальні повідомлення\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr " -P, --properties-input вхідні файли мають синтаксис Java .properties\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1270,27 +1271,27 @@ msgstr ""
" кожного повідомлення, не об'єднувати декілька\n"
" перекладів\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=НАЗВА_КАТАЛОГУ встановити значення поля «Language» у записі заголовка\n"
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "не вказані вхідні файли"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "потрібно рівно 2 вхідні файли"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Використання: %s [ПАРАМЕТР] def.po ref.pot\n"
@@ -1322,17 +1323,17 @@ msgstr " def.po переклад\n"
msgid " ref.pot references to the sources\n"
msgstr " ref.pot посилання на джерело\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Модифікатори режиму роботи:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain застосувати ref.pot до кожного домену з def.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching не використовувати неточну відповідність\n"
@@ -1357,17 +1358,17 @@ msgstr "це повідомлення не перекладене"
msgid "this message needs to be reviewed by the translator"
msgstr "це повідомлення повинен перевірити перекладач"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "це повідомлення використовується програмою, але не було визначено..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...проте це визначення є подібним"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "це повідомлення використовується, але не було визначене у %s"
@@ -1377,7 +1378,7 @@ msgstr "це повідомлення використовується, але
msgid "warning: this message is not used"
msgstr "попередження: це повідомлення не використовується"
-#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1443
+#: src/msgcmp.c:553 src/msgfmt.c:652 src/msgfmt.c:1446
#, c-format
msgid "found %d fatal error"
msgid_plural "found %d fatal errors"
@@ -1441,25 +1442,25 @@ msgstr "Результат перетворення:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Типовим кодуванням є кодування поточної локалі.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent стиль виводу з відступами\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location не виводити '#: filename:line' рядки\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location зберігати рядки «#: назва файла:рядок» (типова поведінка)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict стиль виводу Uniforum\n"
@@ -1718,7 +1719,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " назва_файлу.po ... вхідні файли\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Режим роботи:\n"
@@ -1952,7 +1953,7 @@ msgstr " --no-hash двійковий файл не буде
msgid " --statistics print statistics about translations\n"
msgstr " --statistics вивести статистику про переклад\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose збільшити рівень докладності виводу\n"
@@ -2007,12 +2008,12 @@ msgstr "елемент з нечітким перекладом «msgstr» пр
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: попередження: вихідний файл містить нечіткий переклад"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s не існує"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "%s існує, але непридатний до читання"
@@ -2133,7 +2134,7 @@ msgstr " --sort-output сортувати інформацію,
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file сортувати за розташуванням у файлах\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2143,7 +2144,7 @@ msgstr ""
"змінну середовища LANG, як описано у файлі ABOUT-NLS. Це необхідно,\n"
"щоб ви мали змогу перевірити ваш переклад.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2154,24 +2155,24 @@ msgstr ""
"Вкажіть локаль у параметрі --locale, або вкажіть файл .po\n"
"виводу у параметрі --output-file.\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Створено %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
"user's environment.\n"
msgstr "Створює новий файл PO, метаінформація ініціалізується з середовища користувача.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=ВХІДНИЙ_ФАЙЛ вхідний POT файл\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2180,12 +2181,12 @@ msgstr ""
"Якщо не вказано вхідний файл, POT файл шукається у поточному каталозі.\n"
"Якщо вказано -, файл читається зі стандартного вводу.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=ФАЙЛ записати вивід у вказаний файл PO\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2194,17 +2195,17 @@ msgstr ""
"Якщо не вказано вхідний файл, назва залежить від параметру --locale або локалі\n"
"користувача. Якщо вказано знак -, результат виводиться у стандартний вивід.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=LL_CC встановити цільову локаль\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator вважати, що файл PO створений автоматично\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2212,12 +2213,12 @@ msgstr ""
"Знайдено більш ніж один .pot файл.\n"
"Вкажіть вхідний .pot файл у параметрі --input.\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "помилка при читанні поточного каталогу"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2225,14 +2226,14 @@ msgstr ""
"Не знайдено .pot файл у поточному каталозі.\n"
"Вкажіть вхідний .pot файл у параметрі --input.\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "процес-нащадок %s завершився аварійно з кодом %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2246,7 +2247,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Переклад українською для пакету %s"
@@ -2475,17 +2476,17 @@ msgstr "обробка множинних форм є розширенням GNU
msgid "msgstr lacks the keyboard accelerator mark '%c'"
msgstr "у msgstr відсутній символ клавішного акселератора «%c»"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
msgstr "msgstr містить надто багато символів клавішних акселераторів «%c»"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
msgstr "поле заголовка «%s» все ще містить початкове типове значення\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "у заголовку немає поля «%s»\n"
@@ -2521,16 +2522,16 @@ msgstr "Перетворення з «%s» у «%s» призводить до
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Не вдається перетворити з «%s» у «%s». %s використовує iconv(). Ця версія скомпільована без iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s є допустимим лише разом з %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "тип резервної копії"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2553,17 +2554,17 @@ msgstr ""
"у файл будуть збережені. Якщо неможливо знайти точну відповідність,\n"
"для отримання кращого результату використовується неточна відповідність.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " def.po переклади з посиланнями на старий код\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " ref.pot посилання на новий код\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
@@ -2572,7 +2573,7 @@ msgstr ""
" -C, --compendium=ФАЙЛ додаткова бібліотека перекладів повідомлень,\n"
" може бути вказано більш ніж один раз\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2581,27 +2582,27 @@ msgstr ""
" -U, --update оновити def.po,\n"
" нічого не робить, якщо def.po вже оновлений\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Розташування файлу виводу у режимі оновлення:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Результат записується назад у def.po.\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=КОНТРОЛЬ зробити резервну копію def.po\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=СУФІКС перевизначити звичайний суфікс резервної копії\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2618,7 +2619,7 @@ msgstr ""
" existing, nil нумеровані, якщо є нумеровані резервні копії, інакше - прості\n"
" simple, never завжди використовувати прості резервні копії\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2627,32 +2628,32 @@ msgstr ""
"Суфіксом резервної копії є «~», якщо він не перевизначений параметром --suffix\n"
"або змінною середовища SIMPLE_BACKUP_SUFFIX.\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous зберегти попередні msgid перекладених повідомлень\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent не виводити індикатор поступу\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "це повідомлення повинно визначати множинні форми"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "це повідомлення не повинно визначати множинні форми"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sПрочитано %ld старих + %ld посилань, об'єднано %ld, неточних %ld, відсутніх %ld, застарілих %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2872,7 +2873,7 @@ msgstr "множинна форма має неправильний індекс
msgid "too many errors, aborting"
msgstr "надто багато помилок, виконання перервано"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "неправильна мультибайтна послідовність"
@@ -3123,12 +3124,16 @@ msgstr "помилка при компіляції класу Java, спробу
msgid "error while opening \"%s\" for writing"
msgstr "помилка при відкриванні «%s» для запису"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "незавершена мультибайтна послідовність"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "інтернаціоналізовані повідомлення не повинні містити керівну послідовність «\\%c»"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3141,7 +3146,7 @@ msgstr ""
"вашого кодування символів. Використовуйте лише ASCII символи у msgctxt.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3228,17 +3233,17 @@ msgstr "%s:%d: попередження: незавершений рядок"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: попередження: незавершений регулярний вираз"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "попередження: некоректний символ Unicode"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1297 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:630
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: попередження: незавершена символьна константа"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1348 src/x-vala.c:755
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: попередження: незавершений символьний літерал"
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index aecce4f..c7e1b15 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gettext-tools 0.19-rc1\n"
+"Project-Id-Version: gettext-tools 0.19.4-rc1\n"
"Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2014-05-10 13:37+0900\n"
-"PO-Revision-Date: 2014-05-11 07:45+0700\n"
+"POT-Creation-Date: 2014-12-10 13:21+0900\n"
+"PO-Revision-Date: 2014-12-11 08:25+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"Language: vi\n"
@@ -19,8 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.5\n"
#: gnulib-lib/argmatch.c:133
#, c-format
@@ -36,22 +34,22 @@ msgstr "đối số “%s” cho “%s” chưa rõ ràng"
msgid "Valid arguments are:"
msgstr "Các đối số hợp lệ là:"
-#: gnulib-lib/clean-temp.c:332
+#: gnulib-lib/clean-temp.c:325
#, c-format
msgid "cannot find a temporary directory, try setting $TMPDIR"
msgstr "không tìm thấy thư mục tạm thời, hãy thử đặt biến $TMPDIR"
-#: gnulib-lib/clean-temp.c:346
+#: gnulib-lib/clean-temp.c:339
#, c-format
msgid "cannot create a temporary directory using template \"%s\""
msgstr "không thể tạo thư mục tạm thời bằng cách dùng mẫu “%s”"
-#: gnulib-lib/clean-temp.c:442
+#: gnulib-lib/clean-temp.c:435
#, c-format
msgid "cannot remove temporary file %s"
msgstr "không thể xóa bỏ tập tin tạm thời %s"
-#: gnulib-lib/clean-temp.c:457
+#: gnulib-lib/clean-temp.c:450
#, c-format
msgid "cannot remove temporary directory %s"
msgstr "không thể xóa bỏ thư mục tạm thời %s"
@@ -60,38 +58,38 @@ msgstr "không thể xóa bỏ thư mục tạm thời %s"
msgid "write error"
msgstr "lỗi ghi"
-#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:212
#, c-format
msgid "preserving permissions for %s"
msgstr "đang bảo tồn quyền hạn cho %s"
-#: gnulib-lib/copy-file.c:194
+#: gnulib-lib/copy-file.c:189
#, c-format
msgid "error while opening %s for reading"
msgstr "gặp lỗi khi mở %s để đọc"
-#: gnulib-lib/copy-file.c:198
+#: gnulib-lib/copy-file.c:193
#, c-format
msgid "cannot open backup file %s for writing"
msgstr "không thể mở tập tin sao lưu %s để ghi"
-#: gnulib-lib/copy-file.c:202
+#: gnulib-lib/copy-file.c:197
#, c-format
msgid "error reading %s"
msgstr "lỗi đọc %s"
-#: gnulib-lib/copy-file.c:206
+#: gnulib-lib/copy-file.c:201
#, c-format
msgid "error writing %s"
msgstr "lỗi ghi %s"
-#: gnulib-lib/copy-file.c:210
+#: gnulib-lib/copy-file.c:205
#, c-format
msgid "error after reading %s"
msgstr "gặp lỗi sau khi đọc %s"
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
-#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:898
+#: src/msginit.c:973 src/msginit.c:1133 src/msginit.c:1232
#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73
#: src/read-tcl.c:110 src/write-resources.c:77
#, c-format
@@ -106,14 +104,14 @@ msgstr "Không tìm thấy trình biên dịch C#, hãy thử cài đặt pnet."
#: gnulib-lib/csharpexec.c:343
#, c-format
msgid "C# virtual machine not found, try installing pnet"
-msgstr "Không tìm thấy cơ chế ảo C#, hãy thử cài đặt pnet."
+msgstr "Không tìm thấy máy ảo C#, hãy thử cài đặt pnet."
-#: gnulib-lib/error.c:188
+#: gnulib-lib/error.c:191
msgid "Unknown system error"
msgstr "Lỗi hệ thống không rõ"
-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
-#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/execute.c:191 gnulib-lib/execute.c:264
+#: gnulib-lib/spawn-pipe.c:236 gnulib-lib/spawn-pipe.c:350
#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356
#, c-format
msgid "%s subprocess failed"
@@ -175,31 +173,31 @@ msgstr "%s: tùy chọn “-W %s” không cho phép đối số\n"
msgid "%s: option '-W %s' requires an argument\n"
msgstr "%s: tùy chọn “-W %s” yêu cầu một đối số\n"
-#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
-#: gnulib-lib/javacomp.c:156
+#: gnulib-lib/javacomp.c:121 gnulib-lib/javacomp.c:135
+#: gnulib-lib/javacomp.c:151
#, c-format
msgid "invalid source_version argument to compile_java_class"
msgstr "đối số “source_version” (phiên bản nguồn) không hợp lệ đối với “compile_java_class” (biên dịch lớp Java)"
-#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
+#: gnulib-lib/javacomp.c:166 gnulib-lib/javacomp.c:187
#, c-format
msgid "invalid target_version argument to compile_java_class"
msgstr "đối số “target_version” (phiên bản đích) không hợp lệ đối với “compile_java_class” (biên dịch lớp Java)"
-#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1140
+#: gnulib-lib/javacomp.c:498 src/write-csharp.c:739 src/write-java.c:1140
#: src/write-java.c:1148 src/write-java.c:1176 src/write-java.c:1188
#, c-format
msgid "failed to create \"%s\""
msgstr "gặp lỗi khi tạo “%s”"
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
+#: gnulib-lib/javacomp.c:505 src/write-catalog.c:255 src/write-catalog.c:319
#: src/write-csharp.c:748 src/write-java.c:1156 src/write-java.c:1197
#: src/write-mo.c:811 src/write-qt.c:748 src/write-tcl.c:222
#, c-format
msgid "error while writing \"%s\" file"
msgstr "gặp lỗi khi ghi tập tin “%s”"
-#: gnulib-lib/javacomp.c:2343
+#: gnulib-lib/javacomp.c:2338
#, c-format
msgid "Java compiler not found, try installing gcj or set $JAVAC"
msgstr "Không tìm thấy trình biên dịch Java, hãy thử cài đặt gcj hoặc đặt $JAVAC"
@@ -209,15 +207,15 @@ msgstr "Không tìm thấy trình biên dịch Java, hãy thử cài đặt gcj
msgid "Java virtual machine not found, try installing gij or set $JAVA"
msgstr "Không tìm thấy cơ chế ảo Java, hãy thử cài đặt gcj hoặc đặt $JAVA"
-#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980
-#: src/msginit.c:1140
+#: gnulib-lib/javaversion.c:84 src/msginit.c:906 src/msginit.c:981
+#: src/msginit.c:1141
#, c-format
msgid "%s subprocess I/O error"
msgstr "%s lỗi V/R tiến trình con"
-#: gnulib-lib/obstack.c:416 gnulib-lib/obstack.c:418 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:37
#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:548 libgettextpo/gettext-po.c:1326
#, c-format
msgid "memory exhausted"
msgstr "cạn bộ nhớ"
@@ -227,13 +225,13 @@ msgstr "cạn bộ nhớ"
msgid "creation of threads failed"
msgstr "việc tạo tuyến trình gặp lỗi"
-#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
-#: src/msgexec.c:389
+#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:381
+#: src/msgexec.c:405
#, c-format
msgid "write to %s subprocess failed"
msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
-#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:424
#, c-format
msgid "read from %s subprocess failed"
msgstr "gặp lỗi khi đọc từ tiến trình con %s"
@@ -243,12 +241,12 @@ msgstr "gặp lỗi khi đọc từ tiến trình con %s"
msgid "cannot set up nonblocking I/O to %s subprocess"
msgstr "không thể cài đặt V/R không chặn đối với tiến trình con %s"
-#: gnulib-lib/pipe-filter-ii.c:329
+#: gnulib-lib/pipe-filter-ii.c:336
#, c-format
msgid "communication with %s subprocess failed"
msgstr "gặp lỗi khi liên lạc với tiến trình con %s"
-#: gnulib-lib/pipe-filter-ii.c:449
+#: gnulib-lib/pipe-filter-ii.c:456
#, c-format
msgid "%s subprocess terminated with exit code %d"
msgstr "tiến trình con %s đã kết thúc với mã thoát %d"
@@ -285,10 +283,10 @@ msgstr "”"
#: gnulib-lib/set-acl.c:46
#, c-format
msgid "setting permissions for %s"
-msgstr "đang thiết lập quyền hạn cho %s"
+msgstr "đang đặt quyền hạn cho %s"
-#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
-#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#: gnulib-lib/spawn-pipe.c:142 gnulib-lib/spawn-pipe.c:145
+#: gnulib-lib/spawn-pipe.c:266 gnulib-lib/spawn-pipe.c:269
#, c-format
msgid "cannot create pipe"
msgstr "không thể tạo ống dẫn"
@@ -315,7 +313,7 @@ msgid "%s subprocess got fatal signal %d"
msgstr "%s tiến trình con nhận được tín hiệu nghiêm trọng %d"
#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
-#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
+#: src/read-mo.c:258 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1974
#: src/xgettext.c:1987 src/xgettext.c:1997
#, c-format
msgid "error while opening \"%s\" for reading"
@@ -365,7 +363,7 @@ msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” không phải l
#: src/format-c.c:39
#, c-format
msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” không có “>” đi theo. "
+msgstr "Trong chỉ thị số %u, thẻ bài nằm sau “<” mà không có “>” đi theo. "
#: src/format-c.c:42 src/format-gfc-internal.c:289
#, c-format
@@ -704,10 +702,10 @@ msgstr "Trong chỉ thị số %u, ký tự “%c” không phải chữ số n
msgid "The character that terminates the directive number %u is not a digit between 1 and 9."
msgstr "Ký tự kết thúc chỉ thị số %u không phải chữ số nằm giữa 1 và 9."
-#: src/hostname.c:178 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
+#: src/hostname.c:180 src/msgattrib.c:355 src/msgcat.c:294 src/msgcmp.c:172
#: src/msgcomm.c:285 src/msgconv.c:244 src/msgen.c:241 src/msgexec.c:180
-#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:268
-#: src/msgmerge.c:353 src/msgunfmt.c:262 src/msguniq.c:264
+#: src/msgfilter.c:282 src/msgfmt.c:416 src/msggrep.c:419 src/msginit.c:269
+#: src/msgmerge.c:356 src/msgunfmt.c:262 src/msguniq.c:264
#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:615
#, c-format, no-wrap
msgid ""
@@ -721,10 +719,10 @@ msgstr ""
"Đây là phần mềm tự do: bạn có quyền thay đổi và phát hành lại nó.\n"
"KHÔNG CÓ BẢO HÀNH GÌ CẢ, với điều kiện được pháp luật cho phép.\n"
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgcmp.c:178
#: src/msgcomm.c:291 src/msgconv.c:250 src/msgen.c:247 src/msgexec.c:186
-#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:274
-#: src/msgmerge.c:359 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
+#: src/msgfilter.c:288 src/msgfmt.c:422 src/msggrep.c:425 src/msginit.c:275
+#: src/msgmerge.c:362 src/msgunfmt.c:268 src/msguniq.c:270 src/urlget.c:149
#: src/xgettext.c:621
#, c-format
msgid "Written by %s.\n"
@@ -732,48 +730,48 @@ msgstr "Viết bởi %s.\n"
# Name: don't translate / Tên: đừng dịch
#. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
+#: src/hostname.c:186 src/msgattrib.c:361 src/msgcat.c:300 src/msgconv.c:250
#: src/msgen.c:247 src/msgexec.c:186 src/msgfilter.c:288 src/msggrep.c:425
-#: src/msginit.c:274 src/msguniq.c:270 src/recode-sr-latin.c:121
+#: src/msginit.c:275 src/msguniq.c:270 src/recode-sr-latin.c:121
#: src/urlget.c:149
msgid "Bruno Haible"
msgstr "Bruno Haible"
-#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130
+#: src/hostname.c:196 src/msginit.c:285 src/recode-sr-latin.c:130
#, c-format
msgid "too many arguments"
msgstr "quá nhiều đối số"
-#: src/hostname.c:207 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
+#: src/hostname.c:209 src/msgattrib.c:417 src/msgcat.c:363 src/msgcmp.c:209
#: src/msgcomm.c:355 src/msgconv.c:303 src/msgen.c:300 src/msgexec.c:253
-#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:358
-#: src/msgmerge.c:481 src/msgunfmt.c:423 src/msguniq.c:322
+#: src/msgfilter.c:403 src/msgfmt.c:770 src/msggrep.c:512 src/msginit.c:359
+#: src/msgmerge.c:494 src/msgunfmt.c:423 src/msguniq.c:322
#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:851
#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr "Hãy thử lệnh “%s --help” (trợ giúp) để xem thông tin thêm.\n"
+msgstr "Hãy thử lệnh “%s --help” để xem thông tin thêm.\n"
-#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
+#: src/hostname.c:213 src/msginit.c:363 src/recode-sr-latin.c:148
#, c-format, no-wrap
msgid "Usage: %s [OPTION]\n"
msgstr "Cách dùng: %s [TÙY CHỌN]\n"
-#: src/hostname.c:215
+#: src/hostname.c:217
#, c-format
msgid "Print the machine's hostname.\n"
msgstr "In ra tên máy của máy tính này.\n"
-#: src/hostname.c:218
+#: src/hostname.c:220
#, c-format
msgid "Output format:\n"
msgstr "Định dạng xuất ra:\n"
-#: src/hostname.c:220
+#: src/hostname.c:222
#, c-format
msgid " -s, --short short host name\n"
msgstr " -s, --short tên máy ngắn\n"
-#: src/hostname.c:222
+#: src/hostname.c:224
#, c-format
msgid ""
" -f, --fqdn, --long long host name, includes fully qualified domain\n"
@@ -782,33 +780,33 @@ msgstr ""
" -f, --fqdn, --long tên máy dài, gồm tên miền đầy đủ,\n"
" và biệt hiệu\n"
-#: src/hostname.c:225
+#: src/hostname.c:227
#, c-format
msgid " -i, --ip-address addresses for the hostname\n"
msgstr " -i, --ip-address các địa chỉ cho tên máy đó\n"
-#: src/hostname.c:228 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
+#: src/hostname.c:230 src/msgattrib.c:534 src/msgcat.c:469 src/msgcmp.c:258
#: src/msgcomm.c:455 src/msgconv.c:385 src/msgen.c:381 src/msgexec.c:295
-#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:420
-#: src/msgmerge.c:606 src/msgunfmt.c:527 src/msguniq.c:417
+#: src/msgfilter.c:495 src/msgfmt.c:916 src/msggrep.c:628 src/msginit.c:421
+#: src/msgmerge.c:619 src/msgunfmt.c:527 src/msguniq.c:417
#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1023
#, c-format, no-wrap
msgid "Informative output:\n"
msgstr "Kết xuất thông tin:\n"
-#: src/hostname.c:230 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
+#: src/hostname.c:232 src/msgattrib.c:536 src/msgcat.c:471 src/msgcmp.c:260
#: src/msgcomm.c:457 src/msgconv.c:387 src/msgen.c:383 src/msgexec.c:297
-#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:422
-#: src/msgmerge.c:608 src/msgunfmt.c:529 src/msguniq.c:419
+#: src/msgfilter.c:497 src/msgfmt.c:918 src/msggrep.c:630 src/msginit.c:423
+#: src/msgmerge.c:621 src/msgunfmt.c:529 src/msguniq.c:419
#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1025
#, c-format, no-wrap
msgid " -h, --help display this help and exit\n"
msgstr " -h, --help hiện trợ giúp này rồi thoát\n"
-#: src/hostname.c:232 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
+#: src/hostname.c:234 src/msgattrib.c:538 src/msgcat.c:473 src/msgcmp.c:262
#: src/msgcomm.c:459 src/msgconv.c:389 src/msgen.c:385 src/msgexec.c:299
-#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:424
-#: src/msgmerge.c:610 src/msgunfmt.c:531 src/msguniq.c:421
+#: src/msgfilter.c:499 src/msgfmt.c:920 src/msggrep.c:632 src/msginit.c:425
+#: src/msgmerge.c:623 src/msgunfmt.c:531 src/msguniq.c:421
#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1027
#, c-format, no-wrap
msgid " -V, --version output version information and exit\n"
@@ -818,32 +816,33 @@ msgstr " -V, --version xuất thông tin phiên bản rồi thoá
#. for this package. Please add _another line_ saying
#. "Report translation bugs to <...>\n" with the address for translation
#. bugs (typically your translation team's web or email address).
-#: src/hostname.c:239 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
+#: src/hostname.c:241 src/msgattrib.c:545 src/msgcat.c:480 src/msgcmp.c:269
#: src/msgcomm.c:466 src/msgconv.c:396 src/msgen.c:392 src/msgexec.c:306
-#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:431
-#: src/msgmerge.c:621 src/msgunfmt.c:540 src/msguniq.c:428
+#: src/msgfilter.c:506 src/msgfmt.c:931 src/msggrep.c:639 src/msginit.c:432
+#: src/msgmerge.c:634 src/msgunfmt.c:540 src/msguniq.c:428
#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1034
msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
msgstr ""
"Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
"Hãy thông báo lỗi dịch nào cho <http://translationproject.org/team/vi.html>.\n"
-#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
+#: src/hostname.c:257 src/hostname.c:263 src/hostname.c:270
#, c-format
msgid "could not get host name"
msgstr "không thể lấy tên máy"
#: src/msgattrib.c:376 src/msgconv.c:265 src/msgexec.c:152 src/msgfilter.c:194
-#: src/msggrep.c:440 src/msginit.c:197 src/msguniq.c:285
+#: src/msggrep.c:440 src/msginit.c:198 src/msguniq.c:285
#, c-format
msgid "at most one input file allowed"
msgstr "cho phép nhiều nhất một tập tin đầu vào"
#: src/msgattrib.c:382 src/msgcat.c:316 src/msgcomm.c:301 src/msgconv.c:271
#: src/msgen.c:269 src/msgfilter.c:303 src/msgfmt.c:470 src/msgfmt.c:478
-#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:384
-#: src/msgmerge.c:405 src/msgunfmt.c:299 src/msguniq.c:291 src/xgettext.c:631
-#: src/xgettext.c:638 src/xgettext.c:641 src/xgettext.c:644
+#: src/msgfmt.c:493 src/msgfmt.c:515 src/msggrep.c:446 src/msgmerge.c:387
+#: src/msgmerge.c:392 src/msgmerge.c:397 src/msgmerge.c:418 src/msgunfmt.c:299
+#: src/msguniq.c:291 src/xgettext.c:631 src/xgettext.c:638 src/xgettext.c:641
+#: src/xgettext.c:644
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s và %s loại từ lẫn nhau"
@@ -864,7 +863,7 @@ msgstr ""
#: src/msgattrib.c:430 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375
#: src/msgconv.c:315 src/msgen.c:316 src/msgexec.c:276 src/msgfilter.c:415
-#: src/msggrep.c:526 src/msginit.c:372 src/msgmerge.c:502 src/msgunfmt.c:435
+#: src/msggrep.c:526 src/msginit.c:373 src/msgmerge.c:515 src/msgunfmt.c:435
#: src/msguniq.c:342
#, c-format
msgid "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -872,7 +871,7 @@ msgstr "Tất cả đối số bắt buộc phải có với tùy chọn dài c
#: src/msgattrib.c:433 src/msgcat.c:387 src/msgcmp.c:230 src/msgcomm.c:378
#: src/msgconv.c:318 src/msgen.c:319 src/msgexec.c:279 src/msgfilter.c:418
-#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:375 src/msgmerge.c:505
+#: src/msgfmt.c:788 src/msggrep.c:529 src/msginit.c:376 src/msgmerge.c:518
#: src/msgunfmt.c:449 src/msguniq.c:345 src/xgettext.c:869
#, c-format
msgid "Input file location:\n"
@@ -885,7 +884,7 @@ msgstr " TẬP_TIN_ĐẦU_VÀO tập tin PO đầu vào\n"
#: src/msgattrib.c:437 src/msgcat.c:393 src/msgcmp.c:236 src/msgcomm.c:384
#: src/msgconv.c:322 src/msgen.c:323 src/msgexec.c:283 src/msgfilter.c:422
-#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:511 src/msguniq.c:349
+#: src/msgfmt.c:792 src/msggrep.c:533 src/msgmerge.c:524 src/msguniq.c:349
#: src/xgettext.c:875
#, c-format
msgid " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n"
@@ -901,7 +900,7 @@ msgstr "Không đưa ra tập tin đầu vào, hay nó là “-” thì đọc
#: src/msgattrib.c:442 src/msgcat.c:398 src/msgcomm.c:389 src/msgconv.c:327
#: src/msgen.c:328 src/msgfilter.c:427 src/msgfmt.c:814 src/msggrep.c:538
-#: src/msginit.c:383 src/msgmerge.c:523 src/msgunfmt.c:489 src/msguniq.c:354
+#: src/msginit.c:384 src/msgmerge.c:536 src/msgunfmt.c:489 src/msguniq.c:354
#: src/xgettext.c:880
#, c-format
msgid "Output file location:\n"
@@ -909,13 +908,13 @@ msgstr "Vị trí tập tin đầu ra:\n"
#: src/msgattrib.c:444 src/msgcat.c:400 src/msgcomm.c:391 src/msgconv.c:329
#: src/msgen.c:330 src/msgfilter.c:429 src/msgfmt.c:816 src/msgfmt.c:865
-#: src/msggrep.c:540 src/msgmerge.c:525 src/msgunfmt.c:491 src/msguniq.c:356
+#: src/msggrep.c:540 src/msgmerge.c:538 src/msgunfmt.c:491 src/msguniq.c:356
#, c-format
msgid " -o, --output-file=FILE write output to specified file\n"
msgstr " -o, --output-file=TẬP_TIN ghi kết xuất vào TẬP TIN này\n"
#: src/msgattrib.c:446 src/msgcat.c:402 src/msgcomm.c:393 src/msgconv.c:331
-#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:527
+#: src/msgen.c:332 src/msgfilter.c:431 src/msggrep.c:542 src/msgmerge.c:540
#: src/msgunfmt.c:493 src/msguniq.c:358
#, c-format
msgid ""
@@ -967,7 +966,7 @@ msgstr " --only-obsolete giữ các chuỗi đã cũ (có dấu #~)
#: src/msgattrib.c:465
#, c-format
msgid "Attribute manipulation:\n"
-msgstr "Thao tác thuộc tính:\n"
+msgstr "Thao tác với các thuộc tính:\n"
#: src/msgattrib.c:467
#, c-format
@@ -1007,7 +1006,7 @@ msgstr " --clear-previous lại bỏ “previous msgid” ra khỏi
#, c-format
msgid " --empty when removing 'fuzzy', also set msgstr empty\n"
msgstr ""
-" --empty khi loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
+" --empty khi loại bỏ các chuỗi được đánh dấu là “fuzzy”\n"
" (tạm dịch), xóa trống chuỗi này\n"
#: src/msgattrib.c:482
@@ -1036,14 +1035,14 @@ msgstr " --obsolete tương đương với “--only-obsolete
#: src/msgattrib.c:491 src/msgcat.c:418 src/msgcmp.c:250 src/msgcomm.c:409
#: src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:288 src/msgfilter.c:450
-#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:391 src/msgmerge.c:560
+#: src/msgfmt.c:878 src/msggrep.c:585 src/msginit.c:392 src/msgmerge.c:573
#: src/msguniq.c:369
#, c-format
msgid "Input file syntax:\n"
msgstr "Cú pháp tập tin đầu vào:\n"
#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:290
-#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:393 src/msguniq.c:371
+#: src/msgfilter.c:452 src/msggrep.c:587 src/msginit.c:394 src/msguniq.c:371
#, c-format
msgid " -P, --properties-input input file is in Java .properties syntax\n"
msgstr ""
@@ -1051,7 +1050,7 @@ msgstr ""
" (thuộc tính) của Java\n"
#: src/msgattrib.c:495 src/msgconv.c:346 src/msgen.c:340 src/msgexec.c:292
-#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:395 src/msguniq.c:373
+#: src/msgfilter.c:454 src/msggrep.c:589 src/msginit.c:396 src/msguniq.c:373
#, c-format
msgid " --stringtable-input input file is in NeXTstep/GNUstep .strings syntax\n"
msgstr ""
@@ -1060,15 +1059,15 @@ msgstr ""
#: src/msgattrib.c:498 src/msgcat.c:426 src/msgcomm.c:417 src/msgconv.c:349
#: src/msgen.c:343 src/msgfilter.c:457 src/msgfmt.c:906 src/msggrep.c:592
-#: src/msginit.c:398 src/msgmerge.c:568 src/msgunfmt.c:497 src/msguniq.c:376
+#: src/msginit.c:399 src/msgmerge.c:581 src/msgunfmt.c:497 src/msguniq.c:376
#: src/xgettext.c:969
#, c-format
msgid "Output details:\n"
msgstr "Chi tiết kết xuất:\n"
#: src/msgattrib.c:500 src/msgcat.c:435 src/msgcomm.c:419 src/msgconv.c:351
-#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:404
-#: src/msgmerge.c:572 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
+#: src/msgen.c:347 src/msgfilter.c:459 src/msggrep.c:594 src/msginit.c:405
+#: src/msgmerge.c:585 src/msgunfmt.c:499 src/msguniq.c:383 src/xgettext.c:971
#, c-format
msgid ""
" --color use colors and other text attributes always\n"
@@ -1079,14 +1078,14 @@ msgstr ""
" bản khác\n"
" --color=KHI dùng màu sắc và các thuộc tính khác cho văn bản\n"
" KHI nào:\n"
-" • always luôn luôn\n"
-" • never không bao giờ\n"
-" • auto tự động\n"
-" • html HTML.\n"
+" * always luôn luôn\n"
+" * never không bao giờ\n"
+" * auto tự động\n"
+" * html HTML.\n"
#: src/msgattrib.c:504 src/msgcat.c:439 src/msgcomm.c:423 src/msgconv.c:355
-#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:408
-#: src/msgmerge.c:576 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
+#: src/msgen.c:351 src/msgfilter.c:463 src/msggrep.c:598 src/msginit.c:409
+#: src/msgmerge.c:589 src/msgunfmt.c:503 src/msguniq.c:387 src/xgettext.c:975
#, c-format
msgid " --style=STYLEFILE specify CSS style rule file for --color\n"
msgstr ""
@@ -1094,14 +1093,14 @@ msgstr ""
" --color (màu)\n"
#: src/msgattrib.c:506 src/msgcat.c:441 src/msgcomm.c:425 src/msgconv.c:357
-#: src/msgen.c:353 src/msgmerge.c:578 src/msgunfmt.c:505 src/msguniq.c:389
+#: src/msgen.c:353 src/msgmerge.c:591 src/msgunfmt.c:505 src/msguniq.c:389
#: src/xgettext.c:977
#, c-format
msgid " -e, --no-escape do not use C escapes in output (default)\n"
msgstr " -e, --no-escape không dùng ký tự thoát C trong kết xuất (mặc định)\n"
#: src/msgattrib.c:508 src/msgcat.c:443 src/msgcomm.c:427 src/msgconv.c:359
-#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:580 src/msgunfmt.c:507
+#: src/msgen.c:355 src/msgfilter.c:467 src/msgmerge.c:593 src/msgunfmt.c:507
#: src/msguniq.c:391 src/xgettext.c:979
#, c-format
msgid " -E, --escape use C escapes in output, no extended chars\n"
@@ -1110,7 +1109,7 @@ msgstr ""
" không dùng ký tự mở rộng\n"
#: src/msgattrib.c:510 src/msgcat.c:445 src/msgcomm.c:429 src/msgconv.c:361
-#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:582
+#: src/msgen.c:357 src/msgfilter.c:469 src/msggrep.c:604 src/msgmerge.c:595
#: src/msgunfmt.c:509 src/msguniq.c:393 src/xgettext.c:981
#, c-format
msgid " --force-po write PO file even if empty\n"
@@ -1143,15 +1142,15 @@ msgid " --strict write out strict Uniforum conforming .po fi
msgstr " --strict xuất tập tin PO tùy theo Uniforum chính xác\n"
#: src/msgattrib.c:520 src/msgcat.c:455 src/msgcomm.c:439 src/msgconv.c:371
-#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:410
-#: src/msgmerge.c:592 src/msgunfmt.c:515 src/msguniq.c:403
+#: src/msgen.c:367 src/msgfilter.c:481 src/msggrep.c:614 src/msginit.c:411
+#: src/msgmerge.c:605 src/msgunfmt.c:515 src/msguniq.c:403
#, c-format
msgid " -p, --properties-output write out a Java .properties file\n"
msgstr " -p, --properties-output xuất tập tin .properties (thuộc tính) kiểu Java\n"
#: src/msgattrib.c:522 src/msgcat.c:457 src/msgcomm.c:441 src/msgconv.c:373
-#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:412
-#: src/msgmerge.c:594 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
+#: src/msgen.c:369 src/msgfilter.c:483 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:607 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:993
#, c-format
msgid " --stringtable-output write out a NeXTstep/GNUstep .strings file\n"
msgstr ""
@@ -1159,15 +1158,15 @@ msgstr ""
" kiểu NeXTstep/GNUstep\n"
#: src/msgattrib.c:524 src/msgcat.c:459 src/msgcomm.c:443 src/msgconv.c:375
-#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:414
-#: src/msgmerge.c:596 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
+#: src/msgen.c:371 src/msgfilter.c:485 src/msggrep.c:618 src/msginit.c:415
+#: src/msgmerge.c:609 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:995
#, c-format
msgid " -w, --width=NUMBER set output page width\n"
-msgstr " -w, --width=SỐ đặt chiều rộng của trang kết xuất\n"
+msgstr " -w, --width=SỐ đặt chiều rộng của trang kết xuất\n"
#: src/msgattrib.c:526 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:377
-#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:416
-#: src/msgmerge.c:598 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
+#: src/msgen.c:373 src/msgfilter.c:487 src/msggrep.c:620 src/msginit.c:417
+#: src/msgmerge.c:611 src/msgunfmt.c:521 src/msguniq.c:409 src/xgettext.c:997
#, c-format
msgid ""
" --no-wrap do not break long message lines, longer than\n"
@@ -1177,14 +1176,14 @@ msgstr ""
" chiều rộng trang kết xuất\n"
#: src/msgattrib.c:529 src/msgcat.c:464 src/msgcomm.c:448 src/msgconv.c:380
-#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:601 src/msgunfmt.c:524
+#: src/msgen.c:376 src/msgfilter.c:490 src/msgmerge.c:614 src/msgunfmt.c:524
#: src/msguniq.c:412 src/xgettext.c:1000
#, c-format
msgid " -s, --sort-output generate sorted output\n"
msgstr " -s, --sort-output tạo ra kết xuất được sắp xếp\n"
#: src/msgattrib.c:531 src/msgcat.c:466 src/msgcomm.c:450 src/msgconv.c:382
-#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:603 src/msguniq.c:414
+#: src/msgen.c:378 src/msgfilter.c:492 src/msgmerge.c:616 src/msguniq.c:414
#: src/xgettext.c:1002
#, c-format
msgid " -F, --sort-by-file sort output by file location\n"
@@ -1247,7 +1246,7 @@ msgid ""
" -<, --less-than=NUMBER print messages with less than this many\n"
" definitions, defaults to infinite if not set\n"
msgstr ""
-" -<, --less-than=SỐ in ra các chuỗi có ít hơn SỐ các lời\n"
+" -<, --less-than=SỐ in ra các chuỗi có ít hơn SỐ các lời\n"
" định nghĩa; không bật thì mặc định là vô hạn\n"
#: src/msgcat.c:411
@@ -1256,7 +1255,7 @@ msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 0 if not set\n"
msgstr ""
-" ->, --more-than=SỐ in ra các chuỗi có nhiều hơn SỐ các lời\n"
+" ->, --more-than=SỐ in ra các chuỗi có nhiều hơn SỐ các lời\n"
" định nghĩa; không bật thì mặc định là 0\n"
#: src/msgcat.c:414 src/msgcomm.c:405
@@ -1269,7 +1268,7 @@ msgstr ""
" yêu cầu in ra chỉ những chuỗi duy nhất\n"
#: src/msgcat.c:420 src/msgcmp.c:252 src/msgcomm.c:411 src/msgfmt.c:880
-#: src/msgmerge.c:562
+#: src/msgmerge.c:575
#, c-format
msgid " -P, --properties-input input files are in Java .properties syntax\n"
msgstr ""
@@ -1277,7 +1276,7 @@ msgstr ""
" (thuộc tính) của Java\n"
#: src/msgcat.c:422 src/msgcmp.c:254 src/msgcomm.c:413 src/msgfmt.c:882
-#: src/msgmerge.c:564
+#: src/msgmerge.c:577
#, c-format
msgid ""
" --stringtable-input input files are in NeXTstep/GNUstep .strings\n"
@@ -1300,28 +1299,28 @@ msgstr ""
" --use-first dùng bản dịch đầu tiên cho mỗi chuỗi,\n"
" không trộn nhiều bản dịch\n"
-#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:570
+#: src/msgcat.c:433 src/msgen.c:345 src/msgmerge.c:583
#, c-format
msgid " --lang=CATALOGNAME set 'Language' field in the header entry\n"
msgstr " --lang=TÊN_PHÂN_LOẠI đặt trường “Language” (Ngôn ngữ) trong phần đầu\n"
# Name: don't translate / Tên: đừng dịch
#. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:359
+#: src/msgcmp.c:178 src/msgcomm.c:291 src/msgmerge.c:362
msgid "Peter Miller"
msgstr "Peter Miller"
-#: src/msgcmp.c:189 src/msgmerge.c:370
+#: src/msgcmp.c:189 src/msgmerge.c:373
#, c-format
msgid "no input files given"
msgstr "chưa đưa ra tập tin đầu vào"
-#: src/msgcmp.c:194 src/msgmerge.c:375
+#: src/msgcmp.c:194 src/msgmerge.c:378
#, c-format
msgid "exactly 2 input files required"
msgstr "cần chính xác 2 tập tin đầu vào"
-#: src/msgcmp.c:213 src/msgmerge.c:485
+#: src/msgcmp.c:213 src/msgmerge.c:498
#, c-format
msgid "Usage: %s [OPTION] def.po ref.pot\n"
msgstr "Cách dùng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
@@ -1354,17 +1353,17 @@ msgstr " cũ.po bản dịch cũ\n"
msgid " ref.pot references to the sources\n"
msgstr " mới.pot mẫu dùng để tham chiếu (được tạo bởi xgettext)\n"
-#: src/msgcmp.c:239 src/msgmerge.c:551
+#: src/msgcmp.c:239 src/msgmerge.c:564
#, c-format
msgid "Operation modifiers:\n"
msgstr "Sửa đổi thao tác:\n"
-#: src/msgcmp.c:241 src/msgmerge.c:553
+#: src/msgcmp.c:241 src/msgmerge.c:566
#, c-format
msgid " -m, --multi-domain apply ref.pot to each of the domains in def.po\n"
msgstr " -m, --multi-domain áp dụng tập tin mới.pot vào mỗi miền nằm trong tập tin cũ.po\n"
-#: src/msgcmp.c:243 src/msgmerge.c:555
+#: src/msgcmp.c:243 src/msgmerge.c:568
#, c-format
msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n"
msgstr " -N, --no-fuzzy-matching không dùng khả năng khớp mờ (fuzzy)\n"
@@ -1389,17 +1388,17 @@ msgstr "chuỗi này chưa được dịch"
msgid "this message needs to be reviewed by the translator"
msgstr "chuỗi này cần phải được xem xét lại bởi dịch giả"
-#: src/msgcmp.c:369 src/msgmerge.c:1505
+#: src/msgcmp.c:369 src/msgmerge.c:1518
#, c-format
msgid "this message is used but not defined..."
msgstr "chuỗi này được dùng nhưng còn chưa được định nghĩa..."
-#: src/msgcmp.c:372 src/msgmerge.c:1508
+#: src/msgcmp.c:372 src/msgmerge.c:1521
#, c-format
msgid "...but this definition is similar"
msgstr "...nhưng mà định nghĩa này vẫn tương tự"
-#: src/msgcmp.c:377 src/msgmerge.c:1536
+#: src/msgcmp.c:377 src/msgmerge.c:1549
#, c-format
msgid "this message is used but not defined in %s"
msgstr "chuỗi này được dùng còn chưa được định nghĩa trong %s"
@@ -1447,7 +1446,7 @@ msgid ""
" ->, --more-than=NUMBER print messages with more than this many\n"
" definitions, defaults to 1 if not set\n"
msgstr ""
-" ->, --more-than=SỐ in các chuỗi chứa nhiều định nghĩa hơn\n"
+" ->, --more-than=SỐ in các chuỗi chứa nhiều định nghĩa hơn\n"
" SỐ này; không bật thì mặc định là 1\n"
#: src/msgcomm.c:452 src/xgettext.c:1004
@@ -1470,25 +1469,25 @@ msgstr "Đích chuyển đổi:\n"
msgid "The default encoding is the current locale's encoding.\n"
msgstr "Mã ký tự mặc định theo bảng mã ký tự của miền địa phương hiện có.\n"
-#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:584
+#: src/msgconv.c:363 src/msgen.c:359 src/msgmerge.c:597
#, c-format
msgid " -i, --indent indented output style\n"
msgstr " -i, --indent thụt lề cho kết xuất\n"
#: src/msgconv.c:365 src/msgen.c:361 src/msgfilter.c:475 src/msggrep.c:608
-#: src/msgmerge.c:586
+#: src/msgmerge.c:599
#, c-format
msgid " --no-location suppress '#: filename:line' lines\n"
msgstr " --no-location thu hồi dòng kiểu “#: tên_tập_tin:số_dòng”\n"
#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:477 src/msggrep.c:610
-#: src/msgmerge.c:588
+#: src/msgmerge.c:601
#, c-format
msgid " -n, --add-location preserve '#: filename:line' lines (default)\n"
msgstr " -n, --add-location giữ lại dòng “#: tên_tập_tin:số_dòng” (mặc định)\n"
#: src/msgconv.c:369 src/msgen.c:365 src/msgfilter.c:479 src/msggrep.c:612
-#: src/msgmerge.c:590
+#: src/msgmerge.c:603
#, c-format
msgid " --strict strict Uniforum output style\n"
msgstr " --strict xuất dữ liệu kiểu Uniforum chính xác\n"
@@ -1749,7 +1748,7 @@ msgstr ""
msgid " filename.po ... input files\n"
msgstr " tên_tập_tin.po ... những tập tin đầu vào\n"
-#: src/msgfmt.c:797 src/msgmerge.c:517 src/msgunfmt.c:438 src/xgettext.c:913
+#: src/msgfmt.c:797 src/msgmerge.c:530 src/msgunfmt.c:438 src/xgettext.c:913
#, c-format
msgid "Operation mode:\n"
msgstr "Chế độ thao tác:\n"
@@ -2001,7 +2000,7 @@ msgstr " --no-hash tập tin nhị phân sẽ không chứa b
msgid " --statistics print statistics about translations\n"
msgstr " --statistics in ra thống kê về các chuỗi dịch\n"
-#: src/msgfmt.c:924 src/msgmerge.c:612 src/msgunfmt.c:533
+#: src/msgfmt.c:924 src/msgmerge.c:625 src/msgunfmt.c:533
#, c-format
msgid " -v, --verbose increase verbosity level\n"
msgstr " -v, --verbose gia tăng mức chi tiết\n"
@@ -2056,20 +2055,20 @@ msgstr "chuỗi “msgstr” tạm dịch bị bỏ qua"
msgid "%s: warning: source file contains fuzzy translation"
msgstr "%s: cảnh báo: tập tin nguồn chứa chuỗi tạm dịch"
-#: src/msgfmt.c:1306
+#: src/msgfmt.c:1323
#, c-format
msgid "%s does not exist"
msgstr "%s không tồn tại"
-#: src/msgfmt.c:1316
+#: src/msgfmt.c:1334
#, c-format
msgid "%s exists but cannot read"
msgstr "có %s nhưng không thể đọc nó"
-#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
+#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:87
#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
#: src/x-c.c:486 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:565
-#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-java.c:181 src/x-javascript.c:171 src/x-librep.c:147 src/x-lisp.c:212
#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:176
@@ -2192,7 +2191,7 @@ msgstr " --sort-output tạo ra kết xuất được sắp xếp
msgid " --sort-by-file sort output by file location\n"
msgstr " --sort-by-file sắp xếp kết xuất theo vị trí của tập tin\n"
-#: src/msginit.c:297
+#: src/msginit.c:298
msgid ""
"You are in a language indifferent environment. Please set\n"
"your LANG environment variable, as described in the ABOUT-NLS\n"
@@ -2203,7 +2202,7 @@ msgstr ""
"ABOUT-NLS (giới thiệu về NLS). Việc đặt ngôn ngữ chính\n"
"cần thiết để thử ra bản dịch.\n"
-#: src/msginit.c:321
+#: src/msginit.c:322
#, c-format
msgid ""
"Output file %s already exists.\n"
@@ -2214,12 +2213,12 @@ msgstr ""
"Hãy đưa ra miền địa phương bằng tùy chọn “--locale”\n"
"hoặc đưa ra tập tin PO xuất bằng tùy chọn “--output-file”\n"
-#: src/msginit.c:347
+#: src/msginit.c:348
#, c-format
msgid "Created %s.\n"
msgstr "Đã tạo %s.\n"
-#: src/msginit.c:367
+#: src/msginit.c:368
#, c-format, no-wrap
msgid ""
"Creates a new PO file, initializing the meta information with values from the\n"
@@ -2228,12 +2227,12 @@ msgstr ""
"Tạo một tập tin PO mới, cũng khởi động siêu thông tin bằng giá trị từ\n"
"môi trường riêng của người dùng.\n"
-#: src/msginit.c:377
+#: src/msginit.c:378
#, c-format
msgid " -i, --input=INPUTFILE input POT file\n"
msgstr " -i, --input=TẬP_TIN_ĐẦU_VÀO tập tin dạng POT đầu vào\n"
-#: src/msginit.c:379
+#: src/msginit.c:380
#, c-format
msgid ""
"If no input file is given, the current directory is searched for the POT file.\n"
@@ -2242,12 +2241,12 @@ msgstr ""
"Không đưa ra tập tin đầu vào thì thư mục hiện thời được quét tìm tập tin POT.\n"
"Tập tin đầu vào là “-” thì đọc đầu vào tiêu chuẩn.\n"
-#: src/msginit.c:385
+#: src/msginit.c:386
#, c-format
msgid " -o, --output-file=FILE write output to specified PO file\n"
msgstr " -o, --output-file=TẬP_TIN ghi kết xuất vào tập tin PO này\n"
-#: src/msginit.c:387
+#: src/msginit.c:388
#, c-format
msgid ""
"If no output file is given, it depends on the --locale option or the user's\n"
@@ -2257,17 +2256,17 @@ msgstr ""
"(miền địa phương) hoặc vào thiết lập miền địa phương của người dùng.\n"
"Nếu tập tin xuất là “-” thì kết quả được ghi vào đầu ra tiêu chuẩn.\n"
-#: src/msginit.c:400
+#: src/msginit.c:401
#, c-format
msgid " -l, --locale=LL_CC set target locale\n"
msgstr " -l, --locale=NN_QQ đặt miền địa phương đích (v.d. vi_VN)\n"
-#: src/msginit.c:402
+#: src/msginit.c:403
#, c-format
msgid " --no-translator assume the PO file is automatically generated\n"
msgstr " --no-translator coi là tập tin PO được tự động tạo ra\n"
-#: src/msginit.c:468
+#: src/msginit.c:469
msgid ""
"Found more than one .pot file.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2275,12 +2274,12 @@ msgstr ""
"Tìm thấy nhiều tập tin dạng .pot.\n"
"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input” (đầu vào)\n"
-#: src/msginit.c:476 src/msginit.c:481
+#: src/msginit.c:477 src/msginit.c:482
#, c-format
msgid "error reading current directory"
msgstr "gặp lỗi khi đọc thư mục hiện thời"
-#: src/msginit.c:489
+#: src/msginit.c:490
msgid ""
"Found no .pot file in the current directory.\n"
"Please specify the input .pot file through the --input option.\n"
@@ -2288,14 +2287,14 @@ msgstr ""
"Không tìm thấy tập tin dạng .pot trong thư mục hiện thời.\n"
"Hãy đưa ra tập tin .pot đầu vào, bằng tùy chọn “--input”\n"
-#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248
+#: src/msginit.c:919 src/msginit.c:994 src/msginit.c:1154 src/msginit.c:1249
#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84
#: src/read-tcl.c:127 src/write-resources.c:104
#, c-format
msgid "%s subprocess failed with exit code %d"
msgstr "tiến trình con %s bị lỗi với mã thoát %d"
-#: src/msginit.c:1118
+#: src/msginit.c:1119
msgid ""
"The new message catalog should contain your email address, so that users can\n"
"give you feedback about the translations, and so that maintainers can contact\n"
@@ -2308,7 +2307,7 @@ msgstr ""
#. TRANSLATORS: "English" needs to be replaced by your language.
#. For example in it.po write "Traduzioni italiani ...",
#. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1534
+#: src/msginit.c:1535
#, c-format
msgid "English translations for %s package"
msgstr "Bản dịch Tiếng Việt dành cho gói %s"
@@ -2340,7 +2339,7 @@ msgstr "bộ ký tự đích “%s” không phải tên bảng mã khả chuy
#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
-#: src/xgettext.c:544 src/xgettext.c:3418
+#: src/xgettext.c:544 src/xgettext.c:3426
#, c-format
msgid "warning: "
msgstr "cảnh báo: "
@@ -2537,19 +2536,19 @@ msgstr "khả năng xử lý dạng thức số nhiều là một phần mở r
#: src/msgl-check.c:729
#, c-format
msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "chuỗi dịch msgstr còn thiếu ký tự phím tắt “%c”"
+msgstr "chuỗi dịch msgstr còn thiếu ký tự gia tốc “%c”"
-#: src/msgl-check.c:739
+#: src/msgl-check.c:740
#, c-format
msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "chuỗi dịch msgstr có quá nhiều ký tự phím tắt “%c”"
+msgstr "chuỗi dịch msgstr có quá nhiều ký tự gia tốc “%c”"
-#: src/msgl-check.c:801
+#: src/msgl-check.c:814
#, c-format
msgid "header field '%s' still has the initial default value\n"
-msgstr "trường “%s” ở phần vẫn có giá trị khởi tạo mặc định (sửa đi)\n"
+msgstr "trường “%s” ở phần vẫn có giá trị khởi tạo mặc định\n"
-#: src/msgl-check.c:816
+#: src/msgl-check.c:831
#, c-format
msgid "header field '%s' missing in header\n"
msgstr "trường “%s” còn thiếu trong phần đầu\n"
@@ -2585,16 +2584,16 @@ msgstr "Việc chuyển đổi từ “%s” sang “%s” giới thiệu một
msgid "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was built without iconv()."
msgstr "Không thể chuyển đổi từ “%s” sang “%s”. %s phụ thuộc vào iconv() nhưng phiên bản này đã được xây dựng không có iconv()."
-#: src/msgmerge.c:392 src/msgmerge.c:398
+#: src/msgmerge.c:405 src/msgmerge.c:411
#, c-format
msgid "%s is only valid with %s"
msgstr "%s chỉ hợp lệ với %s"
-#: src/msgmerge.c:453
+#: src/msgmerge.c:466
msgid "backup type"
msgstr "kiểu sao lưu"
-#: src/msgmerge.c:490
+#: src/msgmerge.c:503
#, c-format, no-wrap
msgid ""
"Merges two Uniforum style .po files together. The def.po file is an\n"
@@ -2618,26 +2617,26 @@ msgstr ""
"Khi không tìm thấy chuỗi dịch khớp chính xác, khả năng khớp mờ được dùng\n"
"để cung cấp kết quả hữu ích hơn.\n"
-#: src/msgmerge.c:507
+#: src/msgmerge.c:520
#, c-format
msgid " def.po translations referring to old sources\n"
msgstr " cũ.po chuỗi dịch tham chiếu đến nguồn cũ\n"
-#: src/msgmerge.c:509
+#: src/msgmerge.c:522
#, c-format
msgid " ref.pot references to new sources\n"
msgstr " mới.pot tham chiếu đến nguồn mới\n"
-#: src/msgmerge.c:513
+#: src/msgmerge.c:526
#, c-format
msgid ""
" -C, --compendium=FILE additional library of message translations,\n"
" may be specified more than once\n"
msgstr ""
" -C, --compendium=TẬP_TIN tập hợp chuỗi dịch thêm, cũng có thể được xác định\n"
-" nhiều lần (bản trích yếu)\n"
+" nhiều lần (bản trích yếu)\n"
-#: src/msgmerge.c:519
+#: src/msgmerge.c:532
#, c-format
msgid ""
" -U, --update update def.po,\n"
@@ -2646,27 +2645,27 @@ msgstr ""
" -U, --update cập nhật tập tin cũ.po ; không làm gì\n"
" nếu nó đã cập nhật rồi\n"
-#: src/msgmerge.c:531
+#: src/msgmerge.c:544
#, c-format
msgid "Output file location in update mode:\n"
msgstr "Vị trí của tập tin xuất trong chế độ cập nhật:\n"
-#: src/msgmerge.c:533
+#: src/msgmerge.c:546
#, c-format
msgid "The result is written back to def.po.\n"
msgstr "Kết quả được ghi về tập tin cũ.po\n"
-#: src/msgmerge.c:535
+#: src/msgmerge.c:548
#, c-format
msgid " --backup=CONTROL make a backup of def.po\n"
msgstr " --backup=ĐIỀU_KHIỂN sao lưu tập tin cũ.po (_sao lưu_)\n"
-#: src/msgmerge.c:537
+#: src/msgmerge.c:550
#, c-format
msgid " --suffix=SUFFIX override the usual backup suffix\n"
msgstr " --suffix=HẬU_TỐ có quyền cao hơn hậu tố sao lưu bình thường\n"
-#: src/msgmerge.c:539
+#: src/msgmerge.c:552
#, c-format
msgid ""
"The version control method may be selected via the --backup option or through\n"
@@ -2689,7 +2688,7 @@ msgstr ""
" simple, never luôn luôn tạo bản sao lưu đơn giản\n"
"(đơn giản, không bao giờ)\n"
-#: src/msgmerge.c:546
+#: src/msgmerge.c:559
#, c-format
msgid ""
"The backup suffix is '~', unless set with --suffix or the SIMPLE_BACKUP_SUFFIX\n"
@@ -2698,32 +2697,32 @@ msgstr ""
"Hậu tố sao lưu là “~” trừ khi được đặt bằng tùy chọn “--suffix” (hậu tố)\n"
"hoặc bằng biến môi trường “SIMPLE_BACKUP_SUFFIX” (hậu tố sao lưu đơn giản).\n"
-#: src/msgmerge.c:557
+#: src/msgmerge.c:570
#, c-format
msgid " --previous keep previous msgids of translated messages\n"
msgstr " --previous giữ lại các chuỗi gốc msgid cũ của chuỗi đã dịch\n"
-#: src/msgmerge.c:614 src/urlget.c:192
+#: src/msgmerge.c:627 src/urlget.c:192
#, c-format
msgid " -q, --quiet, --silent suppress progress indicators\n"
msgstr " -q, --quiet, --silent không hiển thị tiến trình\n"
-#: src/msgmerge.c:1609
+#: src/msgmerge.c:1622
#, c-format
msgid "this message should define plural forms"
msgstr "chuỗi này nên dùng ở dạng thức số nhiều"
-#: src/msgmerge.c:1632
+#: src/msgmerge.c:1645
#, c-format
msgid "this message should not define plural forms"
msgstr "chuỗi này không nên dùng ở dạng thức số nhiều"
-#: src/msgmerge.c:2035
+#: src/msgmerge.c:2048
#, c-format
msgid "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, obsolete %ld.\n"
msgstr "%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, tạm dịch %ld, thiếu %ld, không dùng nữa %ld.\n"
-#: src/msgmerge.c:2043 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
+#: src/msgmerge.c:2056 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395
#: src/urlget.c:437
#, c-format
msgid " done.\n"
@@ -2958,7 +2957,7 @@ msgstr "dạng thức số nhiều có chỉ số không đúng"
msgid "too many errors, aborting"
msgstr "quá nhiều lỗi nên hủy bỏ"
-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:941
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:812 src/write-po.c:950
#, c-format
msgid "invalid multibyte sequence"
msgstr "chuỗi nối tiếp đa byte không hợp lệ"
@@ -3015,22 +3014,22 @@ msgstr "chuỗi gốc bị trùng lặp"
msgid "this is the location of the first definition"
msgstr "đây là vị trí của chuỗi nơi nó lần đầu được định nghĩa"
-#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
+#: src/read-mo.c:107 src/read-mo.c:129 src/read-mo.c:177 src/read-mo.c:205
#, c-format
msgid "file \"%s\" is truncated"
msgstr "tập tin “%s” bị cắt ngắn"
-#: src/read-mo.c:129
+#: src/read-mo.c:132
#, c-format
msgid "file \"%s\" contains a not NUL terminated string"
msgstr "tập tin “%s” chứa một chuỗi không phải được kết thúc bằng NUL"
-#: src/read-mo.c:165 src/read-mo.c:274
+#: src/read-mo.c:169 src/read-mo.c:280
#, c-format
msgid "file \"%s\" is not in GNU .mo format"
msgstr "tập tin “%s” không phải có định dạng .mo của GNU"
-#: src/read-mo.c:178
+#: src/read-mo.c:183
#, c-format
msgid "file \"%s\" contains a not NUL terminated string, at %s"
msgstr "tập tin “%s” chứa một chuỗi không được kết thúc bằng NUL, tại %s"
@@ -3114,7 +3113,7 @@ msgid ""
"the locally accessible FILE is used instead.\n"
msgstr ""
"Lấy và xuất nội dung của địa chỉ Mạng (URL).\n"
-"URL không thể tới được thì TẬP_TIN được dùng thay thế.\n"
+"URL không thể truy cập được thì TẬP_TIN được dùng thay thế.\n"
#: src/urlget.c:228
#, c-format
@@ -3178,17 +3177,17 @@ msgstr "đầu ra tiêu chuẩn"
#: src/write-csharp.c:703
#, c-format
msgid "failed to create directory \"%s\""
-msgstr "lỗi tạo thư mục “%s”"
+msgstr "gặp lỗi khi tạo thư mục “%s”"
#: src/write-csharp.c:766
#, c-format
msgid "compilation of C# class failed, please try --verbose"
-msgstr "lỗi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xuất chi tiết)"
+msgstr "gặp lỗi khi biên dịch lớp C#, hãy thử tùy chọn “--verbose” (xuất chi tiết)"
#: src/write-csharp.c:768
#, c-format
msgid "compilation of C# class failed"
-msgstr "lỗi biên dịch lớp C#"
+msgstr "gặp lỗi khi biên dịch lớp C#"
#: src/write-java.c:1091
#, c-format
@@ -3210,12 +3209,16 @@ msgstr "lỗi biên dịch lớp Java, hãy thử đặt biến $JAVAC"
msgid "error while opening \"%s\" for writing"
msgstr "gặp lỗi khi mở “%s” để ghi"
-#: src/write-po.c:875
+#: src/write-po.c:821
+msgid "incomplete multibyte sequence"
+msgstr "chuỗi nối tiếp đa byte không hợp lệ"
+
+#: src/write-po.c:884
#, c-format
msgid "internationalized messages should not contain the '\\%c' escape sequence"
msgstr "chuỗi đã quốc tế hóa không nên chứa dãy thoát “\\%c”"
-#: src/write-po.c:1326 src/write-po.c:1455
+#: src/write-po.c:1335 src/write-po.c:1459
#, c-format
msgid ""
"The following msgctxt contains non-ASCII characters.\n"
@@ -3228,7 +3231,7 @@ msgstr ""
"Đề nghị bạn nhập chuỗi ngữ cảnh msgctxt hoàn toàn ASCII thay thế.\n"
"%s\n"
-#: src/write-po.c:1338 src/write-po.c:1467
+#: src/write-po.c:1347 src/write-po.c:1471
#, c-format
msgid ""
"The following msgid contains non-ASCII characters.\n"
@@ -3323,17 +3326,17 @@ msgstr "%s:%d: cảnh báo: chuỗi chưa được kết thúc"
msgid "%s:%d: warning: unterminated regular expression"
msgstr "%s:%d: cảnh báo: biểu thức chính quy chưa được kết thúc"
-#: src/x-c.c:1051
+#: src/x-c.c:1052
#, c-format
msgid "warning: invalid Unicode character"
msgstr "cảnh báo: ký tự Unicode không hợp lệ"
-#: src/x-c.c:1294 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:628
+#: src/x-c.c:1344 src/x-csharp.c:1509 src/x-java.c:872 src/x-vala.c:619
#, c-format
msgid "%s:%d: warning: unterminated character constant"
msgstr "%s:%d: cảnh báo: hằng ký tự chưa được kết thúc"
-#: src/x-c.c:1345 src/x-vala.c:752
+#: src/x-c.c:1390 src/x-c.c:1430 src/x-vala.c:729
#, c-format
msgid "%s:%d: warning: unterminated string literal"
msgstr "%s:%d: cảnh báo: kiểu chuỗi văn chưa được kết thúc"
@@ -3402,12 +3405,12 @@ msgstr "%s:%d: cảnh báo: ký tự Unicode không hợp lệ"
msgid "%s:%d: warning: unterminated string constant"
msgstr "%s:%d: cảnh báo: hằng chuỗi chưa được kết thúc"
-#: src/x-csharp.c:2020 src/x-java.c:1369
+#: src/x-csharp.c:2018 src/x-java.c:1369
#, c-format
msgid "%s:%d: warning: ')' found where '}' was expected"
msgstr "%s:%d: cảnh báo: gặp dấu ngoặc đóng “)” ở nơi cần dấu ngoặc móc đóng “}”"
-#: src/x-csharp.c:2054 src/x-java.c:1403
+#: src/x-csharp.c:2052 src/x-java.c:1403
#, c-format
msgid "%s:%d: warning: '}' found where ')' was expected"
msgstr "%s:%d: cảnh báo: gặp dấu ngoặc móc đóng “}” ở nơi cần dấu ngoặc đóng “)”"
@@ -3435,7 +3438,7 @@ msgid ""
"This version was built without expat.\n"
msgstr ""
"Ngôn ngữ “glade” không được hỗ trợ. %s phụ thuộc vào expat.\n"
-"Phiên bản này đã được xây dựng không có expat.\n"
+"Phiên bản này đã đ������ợc xây dựng không có expat.\n"
#: src/x-java.c:494
#, c-format
@@ -3550,7 +3553,7 @@ msgid ""
"Please specify the source encoding through --from-code or through a comment\n"
"as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
-"Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (mã từ),\n"
+"Hãy đưa ra bảng mã ký tự nguồn bằng tùy chọn “--from-code” (từ mã),\n"
"hoặc bằng ghi chú như được ghi rõ trong tài liệu:\n"
"http://www.python.org/peps/pep-0263.html.\n"
@@ -3562,7 +3565,7 @@ msgid ""
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
"%s:%d: chuỗi đa byte không hợp lệ.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
+"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
"hoặc bằng ghi chú như được chỉ ra trong tài liệu:\n"
"http://www.python.org/peps/pep-0263.html.\n"
@@ -3574,7 +3577,7 @@ msgid ""
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
"%s:%d: chuỗi đa byte dài chưa hoàn thành.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
+"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
"hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
"http://www.python.org/peps/pep-0263.html.\n"
@@ -3586,7 +3589,7 @@ msgid ""
"comment as specified in http://www.python.org/peps/pep-0263.html.\n"
msgstr ""
"%s:%d: chuỗi đa byte chưa hoàn thành ở kết thúc tập tin.\n"
-"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (mã từ),\n"
+"Hãy đưa ra bảng mã ký tự nguồn đúng bằng tùy chọn “--from-code” (từ mã),\n"
"hoặc thông qua ghi chú như được định nghĩa trong tài liệu:\n"
"http://www.python.org/peps/pep-0263.html.\n"
@@ -3637,9 +3640,9 @@ msgstr "%s:%d: dạng thức chuỗi không hợp lệ"
#: src/x-sh.c:1074
#, c-format
msgid "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; use eval_gettext instead"
-msgstr "%s:%lu: cảnh báo: cú pháp $\"...\" bị phản đối vì lý do bảo mật; hãy dùng eval_gettext thay thế."
+msgstr "%s:%lu: cảnh báo: cú pháp $\"...\" đã lạc hậu vì lý do bảo mật; hãy dùng eval_gettext thay thế."
-#: src/x-vala.c:413
+#: src/x-vala.c:414
#, c-format
msgid "%s:%d: warning: regular expression literal terminated too early"
msgstr "%s:%d: cảnh báo: gặp kết thúc biểu thức chính quy quá sớm"
@@ -3673,7 +3676,7 @@ msgstr "Trích các chuỗi có thể dịch ra những tập tin đầu vào đ
#, c-format
msgid " -d, --default-domain=NAME use NAME.po for output (instead of messages.po)\n"
msgstr ""
-" -d, --default-domain=TÊN dùng tập tin TÊN này như là kết xuất\n"
+" -d, --default-domain=TÊN dùng tập tin TÊN này làm kết xuất\n"
" (thay cho messages.po)\n"
#: src/xgettext.c:884
@@ -3751,9 +3754,9 @@ msgid ""
" in output file\n"
msgstr ""
" -cTHẺ, --add-comments=THẺ để vào tập tin kết xuất các khối ghi chú\n"
-" bắt đầu với thẻ này và nằm trước dòng từ khoá\n"
+" bắt đầu với thẻ này và nằm trước dòng từ khoá\n"
" -c, --add-comments để vào tập tin kết xuất các khối ghi chú nằm\n"
-" trước dòng từ khoá\n"
+" trước dòng từ khoá\n"
#: src/xgettext.c:925
#, c-format
@@ -3858,13 +3861,13 @@ msgstr ""
#: src/xgettext.c:1006
#, c-format
msgid " --copyright-holder=STRING set copyright holder in output\n"
-msgstr " --copyright-holder=CHUỖI đặt người giữ tác quyền trong kết xuất\n"
+msgstr " --copyright-holder=CHUỖI đặt người giữ tác quyền trong kết xuất\n"
#: src/xgettext.c:1008
#, c-format
msgid " --foreign-user omit FSF copyright in output for foreign user\n"
msgstr ""
-" --foreign-user thiếu bản quyền Tổ Chức Phần Mềm Tự Do\n"
+" --foreign-user bỏ phần bản quyền Tổ Chức Phần Mềm Tự Do\n"
" trong kết xuất cho người dùng nước ngoài\n"
#: src/xgettext.c:1010
@@ -3881,8 +3884,8 @@ msgstr " --package-version=PHIÊN_BẢN đặt phiên bản của gói tron
#, c-format
msgid " --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n"
msgstr ""
-" --msgid-bugs-address=ĐỊA_CHỈ_THƯ\n"
-" đặt địa chỉ thông báo lỗi trong chuỗi gốc msgid\n"
+" --msgid-bugs-address=ĐỊA_CHỈ@THƯ\n"
+" đặt địa chỉ thông báo lỗi chuỗi gốc msgid\n"
#: src/xgettext.c:1016
#, c-format
@@ -3914,17 +3917,17 @@ msgstr "đầu vào tiêu chuẩn"
#: src/xgettext.c:2071
#, c-format
msgid "Non-ASCII character at %s%s."
-msgstr "Gặp một ký tự khác ASCII tại %s%s."
+msgstr "Gặp một ký tự không phải ASCII tại %s%s."
#: src/xgettext.c:2075
#, c-format
msgid "Non-ASCII comment at or before %s%s."
-msgstr "Gặp một ghi chú khác ASCII nằm tại hay trước %s%s."
+msgstr "Gặp một ghi chú không phải ASCII nằm tại hay trước %s%s."
#: src/xgettext.c:2080
#, c-format
msgid "Non-ASCII string at %s%s."
-msgstr "Gặp một chuỗi khác ASCII tại %s%s."
+msgstr "Gặp một chuỗi không phải ASCII tại %s%s."
#: src/xgettext.c:2186 src/xgettext.c:2219 src/xgettext.c:2281
#, c-format
@@ -3979,26 +3982,26 @@ msgstr "cảnh báo: thiếu ngữ cảnh cho từ khoá “%.*s”"
#: src/xgettext.c:3031
#, c-format
msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "cảnh báo: thiếu ngữ cảnh cho đối số ở số nhiều của từ khoá “%.*s”"
+msgstr "cảnh báo: thiếu ngữ cảnh cho đối số ở dạng thức số nhiều của từ khoá “%.*s”"
#: src/xgettext.c:3052
#, c-format
msgid "context mismatch between singular and plural form"
msgstr "ngữ cảnh xung đột giữa dạng số ít và số nhiều"
-#: src/xgettext.c:3419
+#: src/xgettext.c:3427
msgid ""
"The option --msgid-bugs-address was not specified.\n"
"If you are using a 'Makevars' file, please specify\n"
"the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
"specify an --msgid-bugs-address command line option.\n"
msgstr ""
-"Chưa đưa ra tùy chọn “--msgid-bugs-address” (địa chỉ lỗi msgid).\n"
+"Chưa đưa ra tùy chọn “--msgid-bugs-address” (địa chỉ báo lỗi msgid).\n"
"Nếu bạn đang dùng tập tin kiểu “Makevars”,\n"
"hãy chỉ định biến MSGID_BUGS_ADDRESS trong đó;\n"
"không thì đưa ra tùy chọn dòng lệnh “--msgid-bugs-address”.\n"
-#: src/xgettext.c:3638
+#: src/xgettext.c:3646
#, c-format
msgid "language '%s' unknown"
msgstr "không nhận ra ngôn ngữ “%s”"
@@ -4011,4 +4014,4 @@ msgstr "<không_tên>"
#~ msgstr "trường phần đầu “%s” nên bắt đầu tại đầu dòng\n"
#~ msgid "some header fields still have the initial default value\n"
-#~ msgstr "một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu (sửa đi)\n"
+#~ msgstr "một số trường phần đầu vẫn còn chứa giá tri mặc định ban đầu\n"