Updated translations.

13 files changed, 6709 insertions, 6325 deletions

diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog
index e36f521..516e941 100644
--- a/gettext-runtime/po/ChangeLog
+++ b/gettext-runtime/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-19  Bruno Haible  <bruno@clisp.org>
+
+	* ko.po: Update from Changwoo Ryu <cwryu@debian.org>.
+
 2009-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* Makevars (MSGMERGE_OPTIONS): New variable.
diff --git a/gettext-runtime/po/ko.po b/gettext-runtime/po/ko.po
index e9f88bb..b8bb347 100644
--- a/gettext-runtime/po/ko.po
+++ b/gettext-runtime/po/ko.po
@@ -1,104 +1,111 @@
-# GNU gettext-runtime�� �ѱ��� �޽���
-# Copyright (C) 1996, 1997, 2001, 2002, 2003 Free Software Foundation, Inc.
+# GNU gettext-runtime의 한국어 메시지
+# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2006, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+#
 # Bang Jun-Young <bangjy@geocities.com>, 1995-1997.
-# Changwoo Ryu <cwryu@debian.org>, 2001-2006.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2006, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-runtime 0.15-pre5\n"
+"Project-Id-Version: GNU gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
-"PO-Revision-Date: 2006-07-02 00:43+0900\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-10 21:59+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-KR\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "���� ����"
+msgstr "쓰기 오류"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
-msgstr "�� �� ���� �ý��� ����"
+msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+msgstr "%s: `%s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' �ɼ��� �μ��� �ʿ��մϴ�\n"
+msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `--%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `%c%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: �߸��� �ɼ� -- %c\n"
+msgstr "%s: 잘못된 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: �������� �ɼ� -- %c\n"
+msgstr "%s: 부적절한 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: �� �ɼ��� �μ��� �ʿ��մϴ� -- %c\n"
+msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
 #: gnulib-lib/xmalloc.c:37
 #, c-format
 msgid "memory exhausted"
-msgstr "�޸𸮰� �ٴڳ����ϴ�"
+msgstr "메모리가 바닥났습니다"
 
 #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123
-#, c-format, no-wrap
+#, c-format, no-wrap, fuzzy
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"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/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129
 #, c-format
 msgid "Written by %s.\n"
-msgstr "%s��(��) ��������ϴ�.\n"
+msgstr "%s이(가) 만들었습니다.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/envsubst.c:118
@@ -108,52 +115,52 @@ msgstr "Bruno Haible"
 #: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141
 #, c-format
 msgid "too many arguments"
-msgstr "�μ��� �ʹ� ����"
+msgstr "인수가 너무 많음"
 
 #: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153
 #, c-format
 msgid "missing arguments"
-msgstr "��� ������"
+msgstr "인수가 빠졌음"
 
 #: src/envsubst.c:171 src/gettext.c:238 src/ngettext.c:207
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "�� ���� ������ ������ `%s --help' �Ͻʽÿ�\n"
+msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
 
 #: src/envsubst.c:176
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
-msgstr "����: %s [<�ɼ�>] [<��-����>]\n"
+msgstr "사용법: %s [<옵션>] [<쉘-형식>]\n"
 
 #: src/envsubst.c:181
 #, c-format, no-wrap
 msgid "Substitutes the values of environment variables.\n"
-msgstr "ȯ�� ���� ���� ġȯ�մϴ�.\n"
+msgstr "환경 변수 값을 치환합니다.\n"
 
 #: src/envsubst.c:185
 #, c-format, no-wrap
 msgid "Operation mode:\n"
-msgstr "���� ���:\n"
+msgstr "동작 모드:\n"
 
 #: src/envsubst.c:188
 #, c-format, no-wrap
 msgid "  -v, --variables             output the variables occurring in SHELL-FORMAT\n"
-msgstr "  -v, --variables             <��-����>�� ������ ������ ����մϴ�\n"
+msgstr "  -v, --variables             <쉘-형식>에 나오는 변수를 출력합니다\n"
 
 #: src/envsubst.c:192
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "���� ���:\n"
+msgstr "정보 출력:\n"
 
 #: src/envsubst.c:195
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  �� ������ ǥ���ϰ� �����ϴ�\n"
+msgstr "  -h, --help                  이 도움말을 표시하고 끝납니다\n"
 
 #: src/envsubst.c:198
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               ���� ������ ǥ���ϰ� �����ϴ�\n"
+msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
 
 #: src/envsubst.c:202
 #, c-format, no-wrap
@@ -165,10 +172,10 @@ msgid ""
 "substituted; otherwise all environment variables references occurring in\n"
 "standard input are substituted.\n"
 msgstr ""
-"�Ϲ� ���� ��忡����, ǥ�� �Է��� ǥ�� ������� �����մϴ�. �� ��, $���� Ȥ��\n"
-"${����} ������ ȯ�� ������ �ش�Ǵ� ȯ�� ���� ������ ġȯ�մϴ�.  ����\n"
-"<��-����>�� ����, <��-����>���� ����� ȯ�� ������ ġȯ�մϴ�; <��-����>��\n"
-"���� ������ ǥ�� �Է��� ��� ȯ�� ������ ġȯ�մϴ�.\n"
+"일반 동작 모드에서는, 표준 입력을 표준 출력으로 복사합니다. 이 때, $변수 혹은\n"
+"${변수} 형식의 환경 변수는 해당되는 환경 변수 값으로 치환합니다.  만약\n"
+"<쉘-형식>을 쓰면, <쉘-형식>에서 사용한 환경 변수만 치환합니다; <쉘-형식>을\n"
+"쓰지 않으면 표준 입력의 모든 환경 변수를 치환합니다.\n"
 
 #: src/envsubst.c:211
 #, c-format, no-wrap
@@ -176,8 +183,8 @@ msgid ""
 "When --variables is used, standard input is ignored, and the output consists\n"
 "of the environment variables that are referenced in SHELL-FORMAT, one per line.\n"
 msgstr ""
-"--variables �ɼ��� ����ϸ�, ǥ�� �Է��� �����ϰ�, <��-����>�� ������ ȯ�� ������\n"
-"�� �ٿ� �ϳ��� ����մϴ�.\n"
+"--variables 옵션을 사용하면, 표준 입력을 무시하고, <쉘-형식>에 참조된 환경 변수를\n"
+"한 줄에 하나씩 출력합니다.\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. for this package.  Please add _another line_ saying
@@ -185,16 +192,16 @@ msgstr ""
 #. bugs (typically your translation team's web or email address).
 #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "<bug-gnu-gettext@gnu.org>�� �������� �˷� �ֽʽÿ�.\n"
+msgstr "<bug-gnu-gettext@gnu.org>로 문제점을 알려 주십시오.\n"
 
 #: src/envsubst.c:442
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "\"%s\"��(��) �д� ���� ���� �߻�"
+msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
 #: src/envsubst.c:443
 msgid "standard input"
-msgstr "ǥ�� �Է�"
+msgstr "표준 입력"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/gettext.c:139 src/ngettext.c:129
@@ -207,13 +214,13 @@ msgid ""
 "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
 "or:    %s [OPTION] -s [MSGID]...\n"
 msgstr ""
-"����: %s [<�ɼ�>] [[<TEXTDOMAIN>] <MSGID>]\n"
-"Ȥ��:   %s [<�ɼ�>] -s [<MSGID>]...\n"
+"사용법: %s [<옵션>] [[<TEXTDOMAIN>] <MSGID>]\n"
+"혹은:   %s [<옵션>] -s [<MSGID>]...\n"
 
 #: src/gettext.c:249
 #, c-format, no-wrap
 msgid "Display native language translation of a textual message.\n"
-msgstr "�־��� �޼����� ���� ������ �������� ǥ���մϴ�.\n"
+msgstr "주어진 메시지에 대한 고유어 번역문을 표시합니다.\n"
 
 #: src/gettext.c:253
 #, c-format, no-wrap
@@ -227,14 +234,14 @@ msgid ""
 "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
 "                            to MSGID from TEXTDOMAIN\n"
 msgstr ""
-"  -d, --domain=<TEXTDOMAIN> ������ �޽����� <TEXTDOMAIN>���� �ҷ��ɴϴ�\n"
-"  -e                        ��� �̽������� ���ڿ��� Ȯ���� ������ �մϴ�\n"
-"  -E                        (ȣȯ���� ���� ���õ�)\n"
-"  -h, --help                �� ������ �����ְ� �����մϴ�\n"
-"  -n                        ����ٴ� �ٹٲ� ���ڸ� �����մϴ�\n"
-"  -V, --version             ���� ������ ǥ���ϰ� �����մϴ�\n"
-"  [<TEXTDOMAIN>] <MSGID>    <MSGID>�� �����ϴ� ������ �޽����� <TEXTDOMAIN>����\n"
-"                            �ҷ��ɴϴ�\n"
+"  -d, --domain=<TEXTDOMAIN> 번역된 메시지를 <TEXTDOMAIN>에서 불러옵니다\n"
+"  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
+"  -E                        (호환성을 위해 무시됨)\n"
+"  -h, --help                이 도움말을 보여주고 종료합니다\n"
+"  -n                        따라붙는 줄바꿈 문자를 제거합니다\n"
+"  -V, --version             버전 정보를 표시하고 종료합니다\n"
+"  [<TEXTDOMAIN>] <MSGID>    <MSGID>에 대응하는 번역된 메시지를 <TEXTDOMAIN>에서\n"
+"                            불러옵니다\n"
 
 #: src/gettext.c:264
 #, c-format, no-wrap
@@ -248,19 +255,19 @@ msgid ""
 "found in the selected catalog are translated.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"<TEXTDOMAIN> ���ڰ� �־����� ������, �������� TEXTDOMAIN \n"
-"ȯ�� ������ �����˴ϴ�.  �޽��� ����� �Ϲ����� ���丮�� \n"
-"���ٸ�, ȯ�� ���� TEXTDOMAINDIR�� �ٸ� ��ġ�� ������ �� \n"
-"�ֽ��ϴ�.\n"
-"-s �ɼ��� ���̸� ���α׷��� `echo' ����ó�� �����մϴ�. �׷��� \n"
-"�ܼ��� �μ��� ǥ����¿� ���������� �ʽ��ϴ�.  ��ſ� ������ \n"
-"��Ͽ��� �����Ǿ� �ִ� �޽������� ��µ˴ϴ�.\n"
-"�⺻ Ž�� ���丮: %s\n"
+"<TEXTDOMAIN> 인자가 주어지지 않으면, 도메인은 TEXTDOMAIN \n"
+"환경 변수로 결정됩니다.  메시지 목록이 일반적인 디렉터리에 \n"
+"없다면, 환경 변수 TEXTDOMAINDIR로 다른 위치를 지정할 수 \n"
+"있습니다.\n"
+"-s 옵션이 쓰이면 프로그램은 `echo' 명령처럼 동작합니다. 그러나 \n"
+"단순히 인수를 표준출력에 복사하지는 않습니다.  대신에 지정한 \n"
+"목록에서 번역되어 있는 메시지만이 출력됩니다.\n"
+"기본 탐색 디렉터리: %s\n"
 
 #: src/ngettext.c:212
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
-msgstr "����: %s [<�ɼ�>] [<TEXTDOMAIN>] <MSGID> <MSGID-PLURAL> <����>\n"
+msgstr "사용법: %s [<옵션>] [<TEXTDOMAIN>] <MSGID> <MSGID-PLURAL> <개수>\n"
 
 #: src/ngettext.c:217
 #, c-format, no-wrap
@@ -268,8 +275,8 @@ msgid ""
 "Display native language translation of a textual message whose grammatical\n"
 "form depends on a number.\n"
 msgstr ""
-"���ڿ� ���� ������ �޶�����, �־��� �޼����� ���� ������ ��������\n"
-"ǥ���մϴ�.\n"
+"숫자에 따라 문법이 달라지는, 주어진 메시지에 대한 고유어 번역문을\n"
+"표시합니다.\n"
 
 #: src/ngettext.c:222
 #, c-format, no-wrap
@@ -283,14 +290,14 @@ msgid ""
 "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL (plural)\n"
 "  COUNT                     choose singular/plural form based on this value\n"
 msgstr ""
-"  -d, --domain=TEXTDOMAIN   ������ �޽����� TEXTDOMAIN���� �ҷ��ɴϴ�\n"
-"  -e                        ��� �̽������� ���ڿ��� Ȯ���� ������ �մϴ�\n"
-"  -E                        (ȣȯ���� ���� ���õ�)\n"
-"  -h, --help                �� ������ �����ְ� �����ϴ�\n"
-"  -V, --version             ���� ������ ǥ���ϰ� �����ϴ�\n"
-"  [TEXTDOMAIN]              ������ �޽����� TEXTDOMAIN���� �ҷ��ɴϴ�\n"
-"  MSGID MSGID-������        MSGID(�ܼ�) / MSGID-������(����)�� �����մϴ�\n"
-"  ����                      �� ���� ���� �ܼ�/������ �����մϴ�\n"
+"  -d, --domain=TEXTDOMAIN   번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
+"  -e                        몇몇 이스케이프 문자열의 확장을 가능케 합니다\n"
+"  -E                        (호환성을 위해 무시됨)\n"
+"  -h, --help                이 도움말을 보여주고 끝납니다\n"
+"  -V, --version             버전 정보를 표시하고 끝납니다\n"
+"  [TEXTDOMAIN]              번역된 메시지를 TEXTDOMAIN에서 불러옵니다\n"
+"  MSGID MSGID-복수형        MSGID(단수) / MSGID-복수형(복수)을 번역합니다\n"
+"  개수                      이 값에 따라 단수/복수를 결정합니다\n"
 
 #: src/ngettext.c:233
 #, c-format, no-wrap
@@ -301,11 +308,11 @@ msgid ""
 "variable TEXTDOMAINDIR.\n"
 "Standard search directory: %s\n"
 msgstr ""
-"TEXTDOMAIN �Ű������� �־����� ������ �������� TEXTDOMAIN ȯ�� �����κ���\n"
-"�����˴ϴ�.  �޽��� ����� �Ϲ����� ���丮�� ���� ������ ȯ�� ����\n"
-"TEXTDOMAINDIR�� �ٸ� ��ġ�� ������ �� �ֽ��ϴ�.\n"
+"TEXTDOMAIN 매개변수가 주어지지 않으면 도메인은 TEXTDOMAIN 환경 변수로부터\n"
+"결정됩니다.  메시지 목록이 일반적인 디렉터리에 있지 않으면 환경 변수\n"
+"TEXTDOMAINDIR로 다른 위치를 지정할 수 있습니다.\n"
 "\n"
-"ǥ�� Ž�� ���丮: %s\n"
+"표준 탐색 디렉터리: %s\n"
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -315,6 +322,6 @@ msgstr ""
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "�� ���α׷��� ���� ����Ʈ�����Դϴ�.  ���� ������ �ҽ��� �����Ͻʽÿ�. ��"
-#~ "ǰ��\n"
-#~ "�̳� Ư�� ������ ���� ���ռ��� ����Ͽ�, ��� ������ ���� �ʽ��ϴ�.\n"
+#~ "이 프로그램은 자유 소프트웨어입니다.  복사 조건은 소스를 참조하십시오. 상"
+#~ "품성\n"
+#~ "이나 특정 목적에 대한 적합성을 비롯하여, 어떠한 보증도 하지 않습니다.\n"
diff --git a/gettext-runtime/po/vi.po b/gettext-runtime/po/vi.po
index 69bf98f..e10e17a 100644
--- a/gettext-runtime/po/vi.po
+++ b/gettext-runtime/po/vi.po
@@ -1,82 +1,84 @@
 # Vietnamese Translation for Gettext Runtime.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-runtime 0.16.2-pre5\n"
+"Project-Id-Version: gettext-runtime 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:22+0100\n"
-"PO-Revision-Date: 2007-10-17 16:23+0930\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-09-24 22:39+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần đến đối số\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận diện tùy chọn « --%s »\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận diện tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: không cho phép tùy chọn « -- %c »\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ « -- %c »\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần đến đối số « -- %c »\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
@@ -320,15 +322,3 @@ msgstr ""
 "phân loại thông điệp trong thư mục bình thường, vị trí khác có thể được\n"
 "xác định bằng biến môi trường TEXTDOMAINDIR (thư mục của miền văn bản).\n"
 "Thư mục tìm kiếm chuẩn: %s\n"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Tác quyền © %s của Tổ chức Phần mềm Tự do.\n"
-#~ "Đây là phần mềm này tự do ; xem mã nguồn để tìm điều kiện sao chép.\n"
-#~ "KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý\n"
-#~ "KHẢ NĂNG BÁN HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"
diff --git a/gettext-tools/examples/po/vi.po b/gettext-tools/examples/po/vi.po
index 11a8ccd..c9ac68a 100644
--- a/gettext-tools/examples/po/vi.po
+++ b/gettext-tools/examples/po/vi.po
@@ -1,22 +1,23 @@
 # Vietnamese Translation for Gettext Examples.
-# Copyright © 2005 Yoyodyne, Inc.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+# Copyright © 2009 Yoyodyne, Inc. (msgids)
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-examples 0.16.2-pre5\n"
+"Project-Id-Version: gettext-examples 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 "POT-Creation-Date: 2009-08-16 12:22+0200\n"
-"PO-Revision-Date: 2007-10-17 16:27+0930\n"
+"PO-Revision-Date: 2009-09-24 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com> \n"
-"Language: \n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: hello-c/hello.c:30 hello-c-gnome/hello.c:46 hello-c++/hello.cc:39
 #: hello-c++-qt/hello.cc:45 hello-c++-kde/hellowindow.cc:42
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog
index 40447f9..b14a6a3 100644
--- a/gettext-tools/po/ChangeLog
+++ b/gettext-tools/po/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-19  Bruno Haible  <bruno@clisp.org>
+
+	* fi.po: Update from Lauri Nurmi <lanurmi@iki.fi>.
+	* id.po: Update from Arif E. Nugroho <arif_endro@yahoo.com>.
+	* ko.po: Update from Changwoo Ryu <cwryu@debian.org>.
+	* nl.po: Update from Benno Schulenberg <benno@vertaalt.nl> and
+	Erwin Poeze <erwin.poeze@gmail.com>.
+	* nn.po: Update from Eirik U. Birkeland <eirbir@gmail.com>.
+	* ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
+	* zh_CN.po: Update from Ji ZhengYu <zhengyuji@gmail.com>.
+
 2009-08-16  Bruno Haible  <bruno@clisp.org>
 
 	* Makevars (MSGMERGE_OPTIONS): New variable.
diff --git a/gettext-tools/po/fi.po b/gettext-tools/po/fi.po
index 726d02b..f9ba489 100644
--- a/gettext-tools/po/fi.po
+++ b/gettext-tools/po/fi.po
@@ -1,30 +1,34 @@
 # Finnish translations for GNU Gettext package.
-# Copyright � 2002 Free Software Foundation, Inc.
-# Sami J. Laine <sami.laine@iki.fi>, 2002
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the gettext package.
+# Copyright © 2002, 2009 Free Software Foundation, Inc.
 # Sami J. Laine <sami.laine@iki.fi>, 2002
+# Lauri Nurmi <lanurmi@iki.fi>, 2009
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext 0.11.2\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 2002-06-05 18:06+0200\n"
-"Last-Translator: Sami J. Laine <sami.laine@iki.fi>\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-06-06 20:36+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/argmatch.c:133
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "virheellinen argumentti `%s' `%s':lle"
+msgstr "virheellinen argumentti %s %s:lle"
 
+# Vähän huono käyttää taivutuspäätettä, mutta jälkimmäinen %s voinee
+# viitata moneenkin asiaan.
 #: gnulib-lib/argmatch.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "moniselitteinen argumentti `%s' `%s':lle"
+msgstr "moniselitteinen argumentti %s %s:lle"
 
 #: gnulib-lib/argmatch.c:153
 #, c-format
@@ -42,9 +46,9 @@ msgid "cannot create a temporary directory using template \"%s\""
 msgstr "ei voi luoda putkea"
 
 #: gnulib-lib/clean-temp.c:443
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove temporary file %s"
-msgstr "ei voi luoda putkea"
+msgstr "väliaikaistiedostoa %s ei voi poistaa"
 
 #: gnulib-lib/clean-temp.c:458
 #, c-format
@@ -53,123 +57,122 @@ msgstr ""
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr ""
+msgstr "kirjoitusvirhe"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
-msgstr "virhe avattaessa \"%s\" lukemista varten"
+msgstr "virhe avattaessa tiedostoa ”%s” lukemista varten"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
-msgstr "ei voida avata varmuuskopiotiedostoa \"%s\" kirjoittamista varten"
+msgstr "ei voida avata varmuuskopiotiedostoa ”%s” kirjoittamista varten"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
-msgstr "virhe luettaessa \"%s\""
+msgstr "virhe luettaessa tiedostoa ”%s”"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
-msgstr "virhe kirjoitettaessa \"%s\""
+msgstr "virhe kirjoitettaessa tiedostoa ”%s”"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
-msgstr "virhe \"%s\" lukemisen j�lkeen"
+msgstr "virhe tiedoston ”%s” lukemisen jälkeen"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
-msgstr ""
+msgstr "fdopen() epäonnistui"
 
-#: gnulib-lib/csharpcomp.c:570
-#, fuzzy, c-format
+#: gnulib-lib/csharpcomp.c:571
+#, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "Java-k��nt�j�� ei l�ytynyt, yrit� gcj:n asentamista tai aseta $JAVAC"
+msgstr "C#-kääntäjää ei löytynyt, yritä asentaa pnet"
 
 #: gnulib-lib/csharpexec.c:343
-#, fuzzy, c-format
+#, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
-"Java virtuaalikonetta ei l�ytynyt, yrit� gij:n asentamista tai aseta $JAVA"
+msgstr "C#-virtuaalikonetta ei löytynyt, yritä asentaa pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
-msgstr "Tuntematon j�rjestelm�n virhe"
+msgstr "Tuntematon järjestelmän virhe"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "%s aliprosessi ep�onnistui"
+msgstr "%s aliprosessi epäonnistui"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valitsin `%s' on moniselitteinen\n"
+msgstr "%s: valitsin ”%s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valitsin `--%s' ei salli argumenttia\n"
+msgstr "%s: valitsin ”--%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valitsin `%c%s' ei salli argumenttia\n"
+msgstr "%s: valitsin ”%c%s” ei salli argumenttia\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valitsin `%s' vaatii argumentin\n"
+msgstr "%s: valitsin ”%s” vaatii argumentin\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: tuntematon valitsin `--%s'\n"
+msgstr "%s: tuntematon valitsin ”--%s”\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: tuntematon valitsin `%c%s'\n"
+msgstr "%s: tuntematon valitsin ”%c%s”\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: virheellinen valitsin -- %c\n"
+msgstr "%s: virheellinen valitsin – %c\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: virheellinen valitsin -- %c\n"
+msgstr "%s: virheellinen valitsin – %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valitsin vaatii argumentin -- %c\n"
+msgstr "%s: valitsin vaatii argumentin – %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valitsin `-W %s' on moniselitteinen\n"
+msgstr "%s: valitsin ”-W %s” on moniselitteinen\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valitsin `-W %s' ei salli argumenttia\n"
+msgstr "%s: valitsin ”-W %s” ei salli argumenttia\n"
 
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
@@ -188,39 +191,38 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, fuzzy, c-format
 msgid "error while writing \"%s\" file"
-msgstr "virhe kirjoitettaessa \"%s\""
+msgstr "virhe kirjoitettaessa ”%s”"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
-msgstr "Java-k��nt�j�� ei l�ytynyt, yrit� gcj:n asentamista tai aseta $JAVAC"
+msgstr "Java-kääntäjää ei löytynyt, yritä asentaa gcj tai aseta $JAVAC"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr ""
-"Java virtuaalikonetta ei l�ytynyt, yrit� gij:n asentamista tai aseta $JAVA"
+msgstr "Java-virtuaalikonetta ei löytynyt, yritä asentaa gij tai aseta $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, fuzzy, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s aliprosessi"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "muisti loppu"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "ei voi luoda putkea"
@@ -238,72 +240,71 @@ msgstr "ei voi luoda putkea"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr ""
+msgstr "”"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:47
-#, fuzzy, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "%s aliprosessi ep�onnistui"
+msgstr "”"
 
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "ei voi luoda putkea"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s aliprosessi"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s aliprosessi vastaanotti fataalin signaalin %d"
 
-#: src/format.c:143
+#: src/format.c:148
 #, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "muotom��rittely� argumentille %u ei ole olemassa 'msgid':lle '%s':ss�"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr "muotomäärittelyä argumentille %u ei ole olemassa 'msgid':lle '%s':ssä"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "muotom��rittely argumentille %u ei ole '%s':ss�"
+msgstr "muotomäärittely argumentille %u ei ole '%s':ssä"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
-"muotom��rittelyiden m��r� 'msgid':ss� ja '%s':ss� argumentille %u ei ole sama"
+"muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä argumentille %u ei ole sama"
 
 #: src/format-boost.c:449
 #, c-format
@@ -327,10 +328,10 @@ msgstr ""
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
-msgstr "muotom��rittelyiden m��r� 'msgid':ss� ja '%s':ss� ei t�sm��"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
+msgstr "muotomäärittelyiden määrä 'msgid':ssä ja '%s':ssä ei täsmää"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
@@ -369,48 +370,48 @@ msgstr ""
 msgid "The string contains a lone '}' after directive number %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr ""
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
 
-#: src/format-gcc-internal.c:671
+#: src/format-gcc-internal.c:677
 #, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr ""
 
-#: src/format-gcc-internal.c:674
+#: src/format-gcc-internal.c:680
 #, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 #: src/format-invalid.h:22
@@ -500,23 +501,22 @@ msgid ""
 msgstr ""
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
-msgstr "muotom��rittely argumentille {%u}, kuten '%s':ss�, ei ole 'msgid':ss�"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr "muotomäärittely argumentille {%u}, kuten '%s':ssä, ei ole 'msgid':ssä"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "muotom��rittely argumentille {%u} ei ole '%s':ss�"
+msgstr "muotomäärittely argumentille {%u} ei ole '%s':ssä"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
-"muotom��rittelyt 'msgid':ss� ja '%s':ss� argumentille {%u} eiv�t ole samat"
+"muotomäärittelyt 'msgid':ssä ja '%s':ssä argumentille {%u} eivät ole samat"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -529,11 +529,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -580,15 +580,15 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr ""
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr "muotom��rittelyt 'msgid' ja '%s' eiv�t ole yhdenmukaiset"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
+msgstr "muotomäärittelyt 'msgid' ja '%s' eivät ole yhdenmukaiset"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
-"muotom��rittelyt '%s':ss� eiv�t ole 'msgid':n muotom��rittelyiden osajoukko"
+"muotomäärittelyt '%s':ssä eivät ole 'msgid':n muotomäärittelyiden osajoukko"
 
 #: src/format-perl.c:433
 #, c-format
@@ -597,59 +597,56 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "muotom��rittely� argumentille '%s' ei l�yty '%s':st�"
+msgstr "muotomäärittelyä argumentille '%s' ei löyty '%s':stä"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"muotom��rittelyt 'mdgid':ss� edellytt�v�t kartoitusta, m��rittelyt '%s':ss� "
-"edellytt�v�t "
+"muotomäärittelyt 'mdgid':ssä edellyttävät kartoitusta, määrittelyt '%s':ssä "
+"edellyttävät "
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"muotom��rittelyt 'msgid':ss' edellytt�v�t j�rjestetty� joukkoa, m��rittelyt "
-"'%s':ss' edellytt�v�t "
+"muotomäärittelyt 'msgid':ss' edellyttävät järjestettyä joukkoa, määrittelyt "
+"'%s':ss' edellyttävät "
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
-msgstr "muotom��rittely� argumentille '%s', kuten '%s':ss�, ei l�ydy "
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr "muotomäärittelyä argumentille '%s', kuten '%s':ssä, ei löydy "
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
-"muotom��rittely 'msgid':ss� ja '%s':ss� argumentille '%s' eiv�t ole samat"
+"muotomäärittely 'msgid':ssä ja '%s':ssä argumentille '%s' eivät ole samat"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -686,11 +683,12 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+# Käännetty M. Välimäen GPLv3-käännöksestä vihjeitä katsoen.
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -698,52 +696,56 @@ msgid ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Tekijänoikeudet © %s Free Software Foundation, Inc.\n"
+"Lisenssi GPLv3+: GNU GPL versio 3 tai myöhempi <http://gnu.org/licenses/gpl.html>\n"
+"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:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, 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:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr ""
+msgstr "Bruno Haible"
 
 #: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
 msgstr "liian monta argumenttia"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Yrit� `%s --help' saadaksesi lis�� tietoja.\n"
+msgstr "Komento ”%s --help” antaa lisää tietoja.\n"
 
 #: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "K�ytt�: %s [VALITSIN]\n"
+msgstr "Käyttö: %s [VALITSIN]\n"
 
 #: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "Tulosta laitteen is�nt�nimi.\n"
+msgstr "Näytä laitteen konenimi.\n"
 
 #: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr ""
+msgstr "Tulosteen muoto:\n"
 
 #: src/hostname.c:220
 #, c-format
@@ -758,78 +760,77 @@ msgid ""
 "                                name, and aliases\n"
 msgstr ""
 "Tulostuksen muoto:\n"
-"  -s, --short           lyhyt is�nt�nimi\n"
-"  -f, --fqdn, --long    pitk� is�nt�nimi, sis�lt�� t�yden domain-nimen ja\n"
-"                        sen mahdolliset lis�nimet\n"
-"  -i, --ip-address      osoitteet is�nt�nimelle\n"
+"  -s, --short           lyhyt isäntänimi\n"
+"  -f, --fqdn, --long    pitkä isäntänimi, sisältää täyden domain-nimen ja\n"
+"                        sen mahdolliset lisänimet\n"
+"  -i, --ip-address      osoitteet isäntänimelle\n"
 
 #: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr ""
+msgstr "Selittävä tuloste:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr ""
+msgstr "  -h, --help                  näytä tämä ohje ja poistu\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
-#, fuzzy, c-format, no-wrap
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
+#, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr ""
-"Tietoja antavat tulosteet:\n"
-"  -h, --help                  n�ytt�� t�m�n ohjeen ja lopettaa suorituksen\n"
-"  -V, --version               n�ytt�� ohjelmiston version ja lopettaa\n"
-"                              suorituksen\n"
+msgstr "  -V, --version               tulosta ohjelman versiotiedot ja poistu\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
+msgstr ""
+"Ilmoita ohjelmiston vioista osoitteeseen <bug-gnu-gettext@gnu.org>.\n"
+"Ilmoita suomennoksen vioista listalle <translation-team-fi@lists.sourceforge."
+"net>.\n"
 
 #: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr "ei saatu is�nt�nime�"
+msgstr "ei saatu isäntänimeä"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
-msgstr "enint��n yksi sy�tetiedosto on sallittu"
+msgstr "enintään yksi syötetiedosto on sallittu"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
@@ -837,7 +838,7 @@ msgstr "%s ja %s ovat toisensa poissulkevia"
 #: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]\n"
 
 #: src/msgattrib.c:400
 #, c-format, no-wrap
@@ -846,19 +847,20 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
+"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr ""
@@ -868,38 +870,38 @@ msgstr ""
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -907,7 +909,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -952,12 +954,12 @@ msgstr ""
 #: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr ""
+msgstr "      --set-fuzzy             aseta kaikki viestit vajaiksi\n"
 
 #: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
-msgstr ""
+msgstr "      --clear-fuzzy           aseta kaikki viestit epävajaiksi\n"
 
 #: src/msgattrib.c:445
 #, c-format
@@ -999,142 +1001,142 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
-msgstr ""
+msgstr "Syötetiedoston syntaksi:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
-msgstr ""
+msgstr "Tulosteen yksityiskohdat:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
-#, fuzzy, c-format
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
+#, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] [SYÖTETIEDOSTO]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1148,71 +1150,77 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr ""
+msgstr "  SYÖTETIEDOSTO ...           syötetiedostot\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr ""
+msgstr "Jos syötetiedosto on -, luetaan vakiosyötettä.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1221,32 +1229,32 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
-msgstr ""
+msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, c-format
 msgid "no input files given"
-msgstr ""
+msgstr "syötetiedostoja ei annettu"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
-msgstr ""
+msgstr "tarvitaan täsmälleen kaksi syötetiedostoa"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
-#, fuzzy, c-format
+#: src/msgcmp.c:213 src/msgmerge.c:468
+#, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "K�ytt�: %s [VALITSIN]\n"
+msgstr "Käyttö: %s [VALITSIN] tiedosto.po referenssi.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1257,79 +1265,84 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr ""
+msgstr "tämä viesti on kääntämättä"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
 msgstr ""
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
 msgstr ""
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr ""
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr ""
+msgstr "varoitus: tätä viestiä ei käytetä"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d vakava virhe"
+msgstr[1] "%d vakavaa virhettä"
 
 #: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
-msgstr ""
+msgstr "on annettava vähintään kaksi tiedostoa"
 
 #: src/msgcomm.c:351
 #, c-format, no-wrap
@@ -1351,7 +1364,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1372,46 +1385,46 @@ msgstr ""
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
-msgstr ""
+msgstr "syötetiedostoa ei annettu"
 
-#: src/msgen.c:233
-#, fuzzy, c-format
+#: src/msgen.c:241
+#, c-format
 msgid "exactly one input file required"
-msgstr "enint��n yksi sy�tetiedosto on sallittu"
+msgstr "tarvitaan täsmälleen yksi syötetiedosto"
 
-#: src/msgen.c:274
-#, fuzzy, c-format
+#: src/msgen.c:286
+#, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] SYÖTETIEDOSTO\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1420,22 +1433,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr ""
+msgstr "puuttuva komento"
 
-#: src/msgexec.c:240
-#, fuzzy, c-format
+#: src/msgexec.c:257
+#, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] KOMENTO [KOMENNON VALITSIN]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1445,67 +1458,72 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
+"Erityinen sisäinen komento nimeltä ”0” tulostaa käännöksen ja nollatavun.\n"
+"”msgexec 0”:n tuloste kelpaa syötteeksi ”xargs -0”:lle.\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr ""
+msgstr "  -i, --input=SYÖTETIED       syöte-PO-tiedosto\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr ""
+msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, fuzzy, c-format
 msgid "write to %s subprocess failed"
-msgstr "%s aliprosessi ep�onnistui"
+msgstr "%s aliprosessi epäonnistui"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, fuzzy, c-format
 msgid "missing filter name"
-msgstr "ei riitt�v�sti argumentteja"
+msgstr "ei riittävästi argumentteja"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
-#, fuzzy, c-format
+#: src/msgfilter.c:376
+#, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] SUODATIN [SUODATTIMEN VALITSIN]\n"
 
-#: src/msgfilter.c:399
-#, c-format
+#: src/msgfilter.c:380
+#, fuzzy, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
+msgstr "Soveltaa suodatinta kaikkiin käännösluettelon käännöksiin.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
+"SUODATIN voi olla mikä tahansa ohjelma, joka lukee käännöksen "
+"vakiosyötteestä\n"
+"ja kirjoittaa muutetun käännöksen vakiotulosteeseen.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1513,210 +1531,197 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, fuzzy, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s aliprosessi ep�onnistui"
-
-#: src/msgfilter.c:695
-#, fuzzy, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s aliprosessi ep�onnistui"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
-msgstr ""
+msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, fuzzy, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "virheellinen argumentti `%s' `%s':lle"
+msgstr "virheellinen argumentti ”%s” ”%s”:lle"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, fuzzy, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "virheellinen argumentti `%s' `%s':lle"
+msgstr "virheellinen argumentti ”%s” ”%s”:lle"
+
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d käännetty viesti"
+msgstr[1] "%d käännettyä viestiä"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ", %d vajaa käännös"
+msgstr[1] ", %d vajaata käännöstä"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] ", %d kääntämätön viesti"
+msgstr[1] ", %d kääntämätöntä viestiä"
 
-#: src/msgfmt.c:629
-#, fuzzy, c-format
+#: src/msgfmt.c:650
+#, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "K�ytt�: %s [VALITSIN]\n"
+msgstr "Käyttö: %s [VALITSIN] tiedosto.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
+"Luo binäärimuotoisia viestiluetteloita tekstimuotoisesta "
+"käännöskuvauksesta.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
+"Pitkien valitsinten pakolliset argumentit ovat pakollisia myös lyhyille.\n"
+"Valinnaiset argumentit vastaavasti.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr ""
+msgstr "  tiedosto.po ...             syötetiedostot\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
-msgstr ""
+msgstr "Toimintatila:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr ""
+msgstr "      --qt                    Qt-tila: luo Qt:n .qm-tiedosto\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr ""
+msgstr "Jos tulostiedosto on -, tuloste kirjoitetaan vakiotulosteeseen.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
 msgstr ""
+"  -l, --locale=MAA-ASETUSTO   maa-asetuston nimi, joko kieli tai kieli_MAA\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1725,48 +1730,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr ""
+msgstr "Syötetiedoston tulkinta:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1774,33 +1779,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1808,93 +1813,93 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr ""
+msgstr "  -f, --use-fuzzy             käytä vajavuusmerkintöjä tulosteessa\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr ""
+msgstr "varoitus: PO-tiedoston otsake puuttuu tai on virheellinen\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr ""
+msgstr "varoitus: merkistömuunnos ei tule toimimaan\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr ""
+msgstr "varoitus: PO-tiedoston otsake on merkitty vajaaksi\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr ""
+msgstr "varoitus: msgfmt:n vanhat versiot antavat tästä virheen\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr ""
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
-msgstr ""
+msgstr "tyhjä ”msgstr”-merkintä jätetty huomioimatta"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
-msgstr ""
+msgstr "vajaa ”msgstr”-merkintä jätetty huomioimatta"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr ""
+msgstr "%s: varoitus: lähdetiedosto sisältää vajaan käännöksen"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
-#, fuzzy, c-format
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
+#, c-format
 msgid "error while reading \"%s\""
-msgstr "virhe luettaessa \"%s\""
+msgstr "virhe luettaessa tiedostoa ”%s”"
 
 #: src/msggrep.c:484
 #, c-format
@@ -1959,7 +1964,7 @@ msgstr ""
 #: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr ""
+msgstr "      --sort-output           tuota lajiteltu tuloste\n"
 
 #: src/msggrep.c:602
 #, c-format
@@ -2046,14 +2051,14 @@ msgid ""
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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
 #, fuzzy, c-format
 msgid "%s subprocess failed with exit code %d"
-msgstr "%s aliprosessi ep�onnistui"
+msgstr "%s aliprosessi epäonnistui"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2065,54 +2070,56 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
-msgstr ""
+msgstr "Suomenkielinen käännös %s-paketille"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
-msgstr ""
+msgstr "varoitus: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
+"Syötetiedosto sisältää viestejä eri merkistöissä, mm. UTF-8:na.\n"
+"Muunnetaan tuloste UTF-8:ksi.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2121,7 +2128,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2130,7 +2137,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2139,12 +2146,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2152,7 +2159,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2161,7 +2168,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2169,185 +2176,187 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr ""
+msgstr "monikkolauseke voi palauttaa negatiivisia arvoja"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr ""
+msgstr "nplurals = %lu, mutta monikkolauseke voi palauttaa jopa arvon %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr ""
+msgstr "monikkolauseke voi aiheuttaa jaon nollalla"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr ""
+msgstr "monikkolauseke voi aiheuttaa kokonaisluvun ylivuodon"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
+"monikkolauseke voi aiheuttaa aritmeettisia poikkeuksia, mahdollisesti jaon "
+"nollalla"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr ""
+msgstr "virheellinen nplurals-arvo"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr ""
+msgstr "virheellinen monikkolauseke"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
-msgstr ""
+msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mutta joillakin viesteillä on vain yksi monikkomuoto"
+msgstr[1] "mutta joillakin viesteillä on vain %lu monikkomuotoa"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "mutta joillakin viesteillä on yksi monikkomuoto"
+msgstr[1] "mutta joillakin viesteillä on %lu monikkomuotoa"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr ""
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr ""
+msgstr "monikkomuotojen käsittely on GNU gettext -laajennos"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, c-format
-msgid "headerfield `%s' missing in header\n"
+msgid "header field `%s' missing in header\n"
 msgstr ""
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr ""
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr ""
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr ""
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "kenttä ”%s” on edelleen oletusarvossaan\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "virhe avattaessa \"%s\" lukemista varten"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr ""
+msgstr "syötetiedosto ei sisällä merkistön määrittelevää otsakeriviä"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2361,51 +2370,51 @@ msgid ""
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:490
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:492
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:516
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:518
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2417,7 +2426,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2425,42 +2434,39 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, c-format
 msgid "this message should define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, c-format
 msgid "this message should not define plural forms"
 msgstr ""
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
-msgstr ""
+msgstr " valmis.\n"
 
 #: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, fuzzy, c-format
@@ -2468,14 +2474,15 @@ msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s ja %s ovat toisensa poissulkevia"
 
 #: src/msgunfmt.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] [TIEDOSTO]...\n"
 
 #: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
+"Muunna binäärimuotoinen viestiluettelo Uniforum-tyyliseksi .po-tiedostoksi.\n"
 
 #: src/msgunfmt.c:428
 #, c-format
@@ -2579,10 +2586,10 @@ msgid ""
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
-msgstr ""
+msgstr "<vakiosyöte>"
 
 #: src/po-charset.c:489
 #, c-format
@@ -2603,6 +2610,8 @@ msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
+"GNU libiconvin asennus ja GNU gettextin uudelleenasennus\n"
+"sen jälkeen korjaisi tämän ongelman.\n"
 
 #: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
@@ -2633,17 +2642,17 @@ msgstr ""
 #: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
-msgstr ""
+msgstr "puuttuva ”msgid_plural[]”-osio"
 
 #: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
-msgstr ""
+msgstr "puuttuva ”msgid_plural”-osio"
 
 #: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
-msgstr ""
+msgstr "puuttuva ”msgstr”-osio"
 
 #: src/po-gram-gen.y:396
 #, c-format
@@ -2655,67 +2664,67 @@ msgstr ""
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr ""
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
-msgstr ""
+msgstr "tiedoston loppu merkkijonon sisällä"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr ""
+msgstr "rivinvaihto merkkijonon sisällä"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr ""
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr ""
+msgstr "kaksinkertainen viestimäärittely"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
-msgstr ""
+msgstr "ensimmäinen määrittely täällä"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
@@ -2730,7 +2739,7 @@ msgstr ""
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr ""
+msgstr "tiedosto ”%s” ei ole GNU:n .mo-muodossa"
 
 #: src/read-mo.c:178
 #, c-format
@@ -2743,15 +2752,15 @@ msgstr ""
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
-msgstr ""
+msgstr "varoitus: päättämätön merkkijono"
 
 #: src/read-stringtable.c:810
 msgid "warning: syntax error"
-msgstr ""
+msgstr "varoitus: syntaksivirhe"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
-msgstr ""
+msgstr "varoitus: päättämätön avain/arvo-pari"
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
@@ -2762,9 +2771,9 @@ msgid "warning: syntax error, expected '=' or ';' after string"
 msgstr ""
 
 #: src/recode-sr-latin.c:116
-#, fuzzy, c-format
+#, c-format
 msgid "Written by %s and %s.\n"
-msgstr "Kirjoittanut %s\n"
+msgstr "Kirjoittaneet %s ja %s.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -2772,7 +2781,7 @@ msgstr "Kirjoittanut %s\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr ""
+msgstr "Danilo Šegan"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
@@ -2794,29 +2803,44 @@ msgstr ""
 #: src/recode-sr-latin.c:366
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "virhe avattaessa \"%s\" lukemista varten"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
-#: src/urlget.c:146
-#, fuzzy, c-format
+#: src/urlget.c:159
+#, c-format
 msgid "expected two arguments"
-msgstr "liian monta argumenttia"
+msgstr "odotettiin kahta argumenttia"
 
-#: src/urlget.c:163
-#, fuzzy, c-format
+#: src/urlget.c:176
+#, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "K�ytt�: %s [VALITSIN] [SY�TETIEDOSTO]\n"
+msgstr "Käyttö: %s [VALITSIN] URL TIEDOSTO\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
-#, fuzzy, c-format
+#: src/urlget.c:234
+#, c-format
 msgid "error writing stdout"
-msgstr "virhe kirjoitettaessa \"%s\""
+msgstr "virhe kirjoitettaessa vakiotulosteeseen"
+
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
@@ -2849,14 +2873,14 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, fuzzy, c-format
 msgid "cannot create output file \"%s\""
 msgstr "ei voi luoda putkea"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr ""
+msgstr "vakiotuloste"
 
 #: src/write-csharp.c:688
 #, c-format
@@ -2869,9 +2893,9 @@ msgid "compilation of C# class failed, please try --verbose"
 msgstr ""
 
 #: src/write-csharp.c:753
-#, fuzzy, c-format
+#, c-format
 msgid "compilation of C# class failed"
-msgstr "%s aliprosessi ep�onnistui"
+msgstr "C#-luokan kääntäminen epäonnistui"
 
 #: src/write-java.c:975
 #, c-format
@@ -2891,15 +2915,15 @@ msgstr ""
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "virhe avattaessa \"%s\" lukemista varten"
+msgstr "virhe avattaessa ”%s” lukemista varten"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2908,7 +2932,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2925,8 +2949,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -2941,15 +2965,15 @@ msgstr ""
 #: src/write-resources.c:94
 #, fuzzy, c-format
 msgid "error while writing to %s subprocess"
-msgstr "virhe kirjoitettaessa \"%s\""
+msgstr "virhe kirjoitettaessa ”%s”"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -2967,154 +2991,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr ""
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr ""
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr ""
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr ""
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr ""
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr ""
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s: virheellinen valitsin -- %c\n"
+msgstr "%s: virheellinen valitsin – %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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 ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3122,7 +3141,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3130,7 +3149,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3138,7 +3157,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3146,7 +3165,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3154,77 +3173,77 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3236,58 +3255,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:827
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
-msgstr ""
+msgstr "Kielikohtaiset valitsimet:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3296,14 +3318,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:841
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3311,7 +3333,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3320,119 +3342,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:915
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:918
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1927
 #, c-format
-msgid "%s%s: warning: "
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
+#, c-format
+msgid "%s%s: warning: "
+msgstr "%s%s: varoitus: "
+
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3441,34 +3480,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, fuzzy, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, fuzzy, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, fuzzy, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "moniselitteinen argumentti `%s' `%s':lle"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3476,14 +3515,252 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
-msgstr ""
+msgstr "kieli ”%s” on tuntematon"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr ""
+msgstr "<nimetön>"
+
+#, fuzzy
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "%s aliprosessi epäonnistui"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Ei vielä toteutettu."
+
+#, fuzzy
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s aliprosessi epäonnistui"
+
+#, fuzzy
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s aliprosessi epäonnistui"
+
+#~ msgid "missing arguments"
+#~ msgstr "ei riittävästi argumentteja"
+
+#~ msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n"
+#~ msgstr "Käyttö: %s [VALITSIN] [SHELL-MUOTO]\n"
+
+#~ msgid "Substitutes the values of environment variables.\n"
+#~ msgstr "Korvaa ympäristömuuttujien arvot.\n"
+
+#~ msgid ""
+#~ "  -v, --variables             output the variables occurring in SHELL-"
+#~ "FORMAT\n"
+#~ msgstr ""
+#~ "  -v, --variables             tulostaa SHELL-MUODOSSA ilmenevät "
+#~ "muuttujat\n"
+
+#~ msgid ""
+#~ "In normal operation mode, standard input is copied to standard output,\n"
+#~ "with references to environment variables of the form $VARIABLE or "
+#~ "${VARIABLE}\n"
+#~ "being replaced with the corresponding values.  If a SHELL-FORMAT is "
+#~ "given,\n"
+#~ "only those environment variables that are referenced in SHELL-FORMAT are\n"
+#~ "substituted; otherwise all environment variables references occurring in\n"
+#~ "standard input are substituted.\n"
+#~ msgstr ""
+#~ "Tavallisessa toimintatilassa vakiosyöte kopioidaan vakiotulosteeseen\n"
+#~ "siten, että viittaukset ympäristömuuttujiin, muodossa $MUUTTUJA tai\n"
+#~ "${MUUTTUJA}, korvataan vastaavilla arvoilla. Mikäli SHELL-MUOTO\n"
+#~ "annetaan, vain ne ympäristömuuttujat korvataan, joihin viitataan\n"
+#~ "SHELL-MUODOssa. Muussa tapauksessa kaikki vakiosyötteessä esiintyvät\n"
+#~ "ympäristömuuttujat korvataan.\n"
+
+#~ msgid ""
+#~ "When --variables is used, standard input is ignored, and the output "
+#~ "consists\n"
+#~ "of the environment variables that are referenced in SHELL-FORMAT, one per "
+#~ "line.\n"
+#~ msgstr ""
+#~ "Valitsinta --variables käytettäessä vakiosyöte jätetään huomiotta ja\n"
+#~ "tuloste muodostuu ympäristömuuttujista, yksi kutakin riviä kohti,\n"
+#~ "joihin viitataan SHELL-MUODOssa.\n"
+
+#~ msgid ""
+#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
+#~ "or:    %s [OPTION] -s [MSGID]...\n"
+#~ msgstr ""
+#~ "Käyttö: %s [VALITSIN] [[KÄÄNNÖSJOUKKO] VIESTI-ID]\n"
+#~ "tai:    %s [VALITSIN] -s [VIESTI-ID]...\n"
+
+#~ msgid "Display native language translation of a textual message.\n"
+#~ msgstr "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille.\n"
+
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -n                        suppress trailing newline\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
+#~ "                            to MSGID from TEXTDOMAIN\n"
+#~ msgstr ""
+#~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
+#~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
+#~ "  -E                        (jätetään huomiotta yhteensopivuuden vuoksi)\n"
+#~ "  -h, --help                näytä tämä ohje ja poistu\n"
+#~ "  -n                        jättää pois rivinvaihdon rivin lopusta\n"
+#~ "  -V, --version             näyttää ohjelmiston versiotiedot ja lopettaa\n"
+#~ "                            suorituksen\n"
+#~ "  [KÄÄNNÖSJOUKKO] VIESTI-ID  etsii käännetyn viestin, joka vastaa VIESTI-"
+#~ "ID:tä\n"
+#~ "                            KÄÄNNÖSJOUKOSSA\n"
+
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "When used with the -s option the program behaves like the `echo' "
+#~ "command.\n"
+#~ "But it does not simply copy its arguments to stdout.  Instead those "
+#~ "messages\n"
+#~ "found in the selected catalog are translated.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
+#~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
+#~ "jalla TEXTDOMAINDIR.\n"
+#~ "Valitsimen -s kanssa ohjelma toimii kuten ”echo”-komento.\n"
+#~ "Ohjelma ei kuitenkaan vain kopioi argumenttejaan vakiotulosteeseen, vaan\n"
+#~ "valitusta viestiluettelosta löydetyt viestit näytetään käännettyinä.\n"
+#~ "Perushakemisto, josta haku suoritetaan: %s\n"
+
+#~ msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n"
+#~ msgstr ""
+#~ "Käyttö: %s [VALITSIN] [KÄÄNNÖSJOUKKO] VIESTI-ID VIESTI-ID-MONIKKO MÄÄRÄ\n"
+
+#~ msgid ""
+#~ "Display native language translation of a textual message whose "
+#~ "grammatical\n"
+#~ "form depends on a number.\n"
+#~ msgstr ""
+#~ "Näyttää kotoistetun käännöksen tekstimuotoiselle viestille, jonka muoto\n"
+#~ "riippuu lukuarvosta.\n"
+
+#~ msgid ""
+#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
+#~ "  -e                        enable expansion of some escape sequences\n"
+#~ "  -E                        (ignored for compatibility)\n"
+#~ "  -h, --help                display this help and exit\n"
+#~ "  -V, --version             display version information and exit\n"
+#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
+#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
+#~ "(plural)\n"
+#~ "  COUNT                     choose singular/plural form based on this "
+#~ "value\n"
+#~ msgstr ""
+#~ "  -d, --domain=KÄÄNNÖSJOUKKO hae käännetyt viestit KÄÄNNÖSJOUKOSTA\n"
+#~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
+#~ "  -h, --help                näytä tämä ohje ja poistu\n"
+#~ "  -V, --version             näytä versiotiedot ja poistu\n"
+#~ "  [KÄÄNNÖSJOUKKO]           hae käännetty sanoma KÄÄNNÖSJOUKOSTA\n"
+#~ "  VIESTI-ID VIESTI-ID-MON   käännä VIESTI-ID (yksikkö) / VIESTI-ID-MON "
+#~ "(monikko)\n"
+#~ "  MÄÄRÄ                     valitse yksikkö-/monikkomuoto tämän arvon\n"
+#~ "                              perusteella\n"
+
+#~ msgid ""
+#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
+#~ "the\n"
+#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
+#~ "the\n"
+#~ "regular directory, another location can be specified with the "
+#~ "environment\n"
+#~ "variable TEXTDOMAINDIR.\n"
+#~ "Standard search directory: %s\n"
+#~ msgstr ""
+#~ "Jos KÄÄNNÖSJOUKKO-parametria ei anneta, joukko päätellään TEXTDOMAIN-\n"
+#~ "ympäristömuuttujan perusteella. Jos viestiluettelo ei ole tavanomaisessa\n"
+#~ "hakemistossa, vaihtoehtoinen sijainti voidaan määritellä "
+#~ "ympäristömuuttu-\n"
+#~ "jalla TEXTDOMAINDIR.\n"
+#~ "Perushakemisto, josta haku suoritetaan: %s\n"
+
+#~ msgid "Try `getopt --help' for more information.\n"
+#~ msgstr "Komento ”getopt --help” antaa lisää tietoa.\n"
+
+#~ msgid "empty long option after -l or --long argument"
+#~ msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
+
+#~ msgid "unknown shell after -s or --shell argument"
+#~ msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
+
+#~ msgid "Usage: getopt optstring parameters\n"
+#~ msgstr "Käyttö: getopt valitsinmerkkijono parametrit\n"
+
+#~ msgid "       getopt [options] [--] optstring parameters\n"
+#~ msgstr "       getopt [valitsimet] [--] valitsinmerkkijono parametrit\n"
+
+#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
+#~ msgstr ""
+#~ "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
+#~ "[--]\n"
+
+#~ msgid "              parameters\n"
+#~ msgstr "              parametrit\n"
+
+#~ msgid ""
+#~ "  -a, --alternative            Allow long options starting with single -\n"
+#~ msgstr ""
+#~ "  -a, --alternative            Salli pitkien valitsimien alkaminen "
+#~ "yhdellä -:lla\n"
+
+#~ msgid "  -h, --help                   This small usage guide\n"
+#~ msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
+
+#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
+#~ msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
+
+#~ msgid ""
+#~ "  -n, --name=progname          The name under which errors are reported\n"
+#~ msgstr ""
+#~ "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden "
+#~ "yhteydessä\n"
+
+#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
+#~ msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
+
+#~ msgid ""
+#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
+#~ msgstr ""
+#~ "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
+
+#~ msgid "  -Q, --quiet-output           No normal output\n"
+#~ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
+
+#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
+#~ msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
+
+#~ msgid "  -T, --test                   Test for getopt(1) version\n"
+#~ msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
+
+#~ msgid "  -u, --unqote                 Do not quote the output\n"
+#~ msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
+
+#~ msgid "  -V, --version                Output version information\n"
+#~ msgstr "  -V, --version                Näytä versiotiedot\n"
+
+#~ msgid "missing optstring argument"
+#~ msgstr "puuttuva valitsinmerkkijonon argumentti"
+
+#~ msgid "getopt (enhanced) 1.1.4\n"
+#~ msgstr "getopt (parannettu) 1.1.4\n"
+
+#~ msgid "internal error, contact the author."
+#~ msgstr "sisäinen virhe, ota yhteyttä tekijään."
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -3493,15 +3770,15 @@ msgstr ""
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "T�m� on vapaa ohjelmisto; kts. l�hdekoodi kopioinnin ehdoille. "
+#~ "Tämä on vapaa ohjelmisto; kts. lähdekoodi kopioinnin ehdoille. "
 #~ "Ohjelmisolle\n"
-#~ "EI my�nnet� takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
+#~ "EI myönnetä takuuta; ei edes KAUPATTAVUUDELLE tai SOVELTUVUUDELLE "
 #~ "TIETTYYN\n"
 #~ "tarkoitukseen.\n"
 
 #, fuzzy
 #~ msgid "write to grep subprocess failed"
-#~ msgstr "%s aliprosessi ep�onnistui"
+#~ msgstr "%s aliprosessi epäonnistui"
 
 #, fuzzy
 #~ msgid ""
@@ -3510,9 +3787,9 @@ msgstr ""
 #~ "  -V, --version                  output version information and exit\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  n�ytt�� t�m�n ohjeen ja lopettaa "
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               n�ytt�� ohjelmiston version ja lopettaa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
 #~ "                              suorituksen\n"
 
 #, fuzzy
@@ -3524,9 +3801,9 @@ msgstr ""
 #~ "  -v, --verbose               increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  n�ytt�� t�m�n ohjeen ja lopettaa "
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               n�ytt�� ohjelmiston version ja lopettaa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
 #~ "                              suorituksen\n"
 
 #, fuzzy
@@ -3538,9 +3815,9 @@ msgstr ""
 #~ "  -q, --quiet, --silent       suppress progress indicators\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  n�ytt�� t�m�n ohjeen ja lopettaa "
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               n�ytt�� ohjelmiston version ja lopettaa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
 #~ "                              suorituksen\n"
 
 #, fuzzy
@@ -3551,38 +3828,7 @@ msgstr ""
 #~ "  -v, --verbose            increase verbosity level\n"
 #~ msgstr ""
 #~ "Tietoja antavat tulosteet:\n"
-#~ "  -h, --help                  n�ytt�� t�m�n ohjeen ja lopettaa "
+#~ "  -h, --help                  näyttää tämän ohjeen ja lopettaa "
 #~ "suorituksen\n"
-#~ "  -V, --version               n�ytt�� ohjelmiston version ja lopettaa\n"
+#~ "  -V, --version               näyttää ohjelmiston version ja lopettaa\n"
 #~ "                              suorituksen\n"
-
-#~ msgid ""
-#~ "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n"
-#~ "or:    %s [OPTION] -s [MSGID]...\n"
-#~ msgstr ""
-#~ "K�ytt�: %s [VALITSIN]�[[TEXTDOMAIN] MSGID]\n"
-#~ "tai:    %s [VALITSIN] -s [MSGID]...\n"
-
-#~ msgid "Display native language translation of a textual message.\n"
-#~ msgstr "N�yt� kansallinen k��nn�s tekstimuotoiselle viestille.\n"
-
-#~ msgid ""
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
-#~ "  -e                        enable expansion of some escape sequences\n"
-#~ "  -E                        (ignored for compatibility)\n"
-#~ "  -h, --help                display this help and exit\n"
-#~ "  -n                        suppress trailing newline\n"
-#~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN] MSGID        retrieve translated message corresponding\n"
-#~ "                            to MSGID from TEXTDOMAIN\n"
-#~ msgstr ""
-#~ "  -d, --domain=TEXTDOMAIN   etsi k��nnetyt viestit TEXTDOMAIN:sta\n"
-#~ "  -e                        salli joidenkin lainauskoodien laajentaminen\n"
-#~ "  -E                        (j�tet��n huomiotta yhteensopivuuden vuoksi)\n"
-#~ "  -h, --help                n�ytt�� t�m�n ohjeen ja lopettaa suorituksen\n"
-#~ "  -n                        j�tt�� pois rivinvaihdon rivin lopusta\n"
-#~ "  -V, --version             n�ytt�� ohjelmiston versiotiedot ja lopettaa\n"
-#~ "                            suorituksen\n"
-#~ "  [TEXTDOMAIN] MSGID        etsii k��nnetyn viestin, joka vastaa MSGID:"
-#~ "t�\n"
-#~ "                            TEXTDOMAIN:ssa\n"
diff --git a/gettext-tools/po/id.po b/gettext-tools/po/id.po
index 330b150..24fbd7a 100644
--- a/gettext-tools/po/id.po
+++ b/gettext-tools/po/id.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-12-08 12:26+0100\n"
-"PO-Revision-Date: 2008-12-31 23:30+0700\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-11 11:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "Language: id\n"
@@ -59,37 +59,37 @@ msgstr "tidak dapat menghapus direktori sementara %s"
 msgid "write error"
 msgstr "tulis error"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1799 src/xgettext.c:1812
-#: src/xgettext.c:1822
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "error ketika membuka \"%s\" untuk dibaca"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "tidak dapat membuka berkas backup \"%s\" untuk ditulis"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:228
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "error ketika membaca \"%s\""
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "error ketika menulis \"%s\""
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:238
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "error setelah membaca \"%s\""
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:845
-#: src/msginit.c:920 src/msginit.c:1080 src/msginit.c:1179
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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,70 +106,70 @@ msgstr "C# kompiler tidak ditemukan, coba pasang pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# mesin maya tidak ditemukan, coba pasang pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "Sistem error tidak diketahui"
 
-#: gnulib-lib/execute.c:197 gnulib-lib/execute.c:270 gnulib-lib/pipe.c:241
-#: gnulib-lib/pipe.c:356 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s subproses gagal"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opsi `%s' rancu\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opsi `--%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:588 gnulib-lib/getopt.c:593
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opsi `%c%s' tidak membolehkan argumen\n"
 
-#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:655 gnulib-lib/getopt.c:971
-#: gnulib-lib/getopt.c:990
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opsi `%s' membutuhkan sebuah argumen\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opsi tidak diketahui `--%s'\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opsi tidak diketahui `%c%s'\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opsi tidak legal -- %c\n"
 
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opsi tidak valid -- %c\n"
 
-#: gnulib-lib/getopt.c:823 gnulib-lib/getopt.c:839 gnulib-lib/getopt.c:1043
-#: gnulib-lib/getopt.c:1061
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opsi membutuhkan sebuah argumen -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opsi `-W %s' rancu\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opsi `-W %s' tidak membolehkan sebuah argumen\n"
@@ -208,21 +208,21 @@ msgstr "Kompiler java tidak ditemukan, coba pasang gcj atau set $JAVAC"
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr "Mesin maya java tidak ditemukan, coba pasang gij atau set $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:853 src/msginit.c:928
-#: src/msginit.c:1088
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s subproses I/O error"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
 #: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:587 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "kehabisan memori"
 
-#: gnulib-lib/pipe.c:148 gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:271
-#: gnulib-lib/pipe.c:275
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "tidak dapat membuat pipe"
@@ -240,30 +240,30 @@ msgstr "tidak dapat membuat pipe"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:266
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:267
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle gagal dengan kode error 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle gagal"
 
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "tidak dapat membuat berkas output \"%s\""
+
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
@@ -275,38 +275,37 @@ msgstr "%s subproses"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s subproses mendapatkan sinyal fatal %d"
 
-#: src/format.c:144
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' bukan sebuah valid %s format string, tidak seperti 'msgid'. Alasan: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "sebuah spesifikasi format untuk argumen %u, seperti dalam '%s', tidak ada "
 "dalam 'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:637 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "sebuah spesifikasi format untuk argumen %u tidak ada dalam '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:657
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:525 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "spesifikasi format dalam 'msgid' dan '%s' untuk argumen %u tidak sama"
 
 #: src/format-boost.c:449
@@ -336,9 +335,9 @@ msgstr ""
 "String yang mereferensi ke argumen nomor %u tetapi mengabaikan argumen nomor "
 "%u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:513
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "jumlah spesifikasi format dalam 'msgid' dan '%s' tidak cocok"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -423,14 +422,14 @@ msgstr "Dalam direktif nomor %u, spesifikasi presisi tidak valid."
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "Dalam direktif nomor %u, simbol tidak diijinkan sebelum '%c'."
 
-#: src/format-gcc-internal.c:675
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid'menggunakan %%m tetapi '%s' tidak"
 
-#: src/format-gcc-internal.c:678
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid'tidak digunakan %%m tetapi '%s' menggunakan %%m"
 
 #: src/format-invalid.h:22
@@ -537,23 +536,22 @@ msgstr ""
 "diikuti dengan '<', '#' atau '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "sebuah spesifikasi format untuk argumen {%u}, seperti dalam '%s', tidak ada "
 "dalam 'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "sebuah spesifikasi format untuk argumen {%u} tidak ada dalam '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "spesifikasi format dalam 'msgid' dan '%s' untuk argumen {%u} tidak sama"
 
@@ -629,13 +627,13 @@ msgstr ""
 "String mereferensikan ke beberapa argumen dalam cara yang tidak komptibel."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "spesifikasi format dalam `msgid' dan `%s' tidak sesuai"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "spesifikasi format dalam '%s' bukan sebuah subset dari itu dalam 'msgid'"
 
@@ -648,7 +646,7 @@ msgstr ""
 "Dalam direktif nomor %u, ukuran penspesifikasi tidak kompatibel dengan "
 "penspesifkasi konversi '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:470 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "spesifikasi format untuk argumen '%s' tidak ada dalam '%s'"
@@ -669,44 +667,41 @@ msgstr ""
 "kompatibel."
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "spesifikasi format dalam 'msgid' diduga sebuah pemetaan, baik dalam '%s' "
 "diduga sebuah tuple"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "spesifikasi format dalam 'msgid' diduga sebuah tuple, baik dalam '%s' diduga "
 "sebuah pemetaan"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "spesifikasi format untuk argumen '%s', seperti dalam '%s', tidak ada dalam "
 "'msgid'"
 
-#: src/format-python.c:493
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "spesifikasi format dalam 'msgid' dan '%s' untuk argumen '%s' tidak sama"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "'msgid' sebuah format string sederhana, tetapi '%s' bukan: ini berisi sebuah "
 "tanda 'L' atau sebuah nomor argumen double-digit"
@@ -755,10 +750,10 @@ msgstr ""
 "9."
 
 #: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:179
-#: src/msgfilter.c:282 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
 #: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:531
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -772,17 +767,17 @@ msgstr ""
 "TIDAK ADA GARANSI, sampai batas yang diijinkan oleh hukum yang berlaku.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:185
-#: src/msgfilter.c:288 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
 #: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:537
+#: src/xgettext.c:538
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Ditulis oleh %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:185 src/msgfilter.c:288 src/msggrep.c:404
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
@@ -794,10 +789,10 @@ msgid "too many arguments"
 msgstr "terlalu banyak argumen"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:249
-#: src/msgfilter.c:393 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
 #: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:759
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
@@ -805,7 +800,7 @@ msgstr "Coba `%s --help' untuk informasi lebih jauh.\n"
 #: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "Penggunaan: %s [OPSI]\n"
+msgstr "Penggunaan: %s [PILIHAN]\n"
 
 #: src/hostname.c:215
 #, c-format
@@ -839,28 +834,28 @@ msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            alamat untuk hostname\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:291
-#: src/msgfilter.c:479 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
 #: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:921
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Keluaran informatif:\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:293
-#: src/msgfilter.c:481 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
 #: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:923
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  tampilkan bantuan ini dan keluar\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:295
-#: src/msgfilter.c:483 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
 #: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:925
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
@@ -870,10 +865,10 @@ msgstr "  -V, --version               keluarkan informasi versi dan keluar\n"
 #. "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:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:302
-#: src/msgfilter.c:490 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
 #: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:932
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 
@@ -882,7 +877,7 @@ msgstr "Laporkan bugs ke <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "tidak dapat mendapatkan nama host"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:212
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
@@ -890,12 +885,12 @@ msgstr "di paling tidak satu berkas masukan diijinkan"
 
 #: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:303 src/msgfilter.c:307
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
 #: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
 #: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:547 src/xgettext.c:551 src/xgettext.c:558 src/xgettext.c:561
-#: src/xgettext.c:564
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s dan %s adalah mutually exclusive"
@@ -903,7 +898,7 @@ msgstr "%s dan %s adalah mutually exclusive"
 #: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "Penggunaan: %s [OPSI] [BERKAS MASUKAN]\n"
+msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]\n"
 
 #: src/msgattrib.c:400
 #, c-format, no-wrap
@@ -915,7 +910,7 @@ msgstr ""
 "dan manipulasi atribut.\n"
 
 #: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:272 src/msgfilter.c:405
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
 #: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
@@ -924,9 +919,9 @@ msgid ""
 msgstr "Argumen wajib untuk opsi panjang juga wajib untuk opsi pendek juga.\n"
 
 #: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:275 src/msgfilter.c:408
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:777
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr "Lokasi berkas masukan:\n"
@@ -937,9 +932,9 @@ msgid "  INPUTFILE                   input PO file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO\n"
 
 #: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:279 src/msgfilter.c:412
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:783
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -947,7 +942,7 @@ msgstr ""
 "  -D, --directory=DIREKTORI   tambahkan DIREKTORI ke daftar pencarian "
 "masukan berkas\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:281 src/msgfilter.c:414
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
@@ -956,15 +951,15 @@ msgstr ""
 "masukan yang dibaca.\n"
 
 #: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:417 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
 #: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:788
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr "Lokasi berkas keluaran:\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:419 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
 #: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
@@ -973,7 +968,7 @@ msgstr ""
 "dispesifikasikan\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:421 src/msggrep.c:525 src/msgmerge.c:510
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -1088,15 +1083,15 @@ msgstr ""
 "obsolete\n"
 
 #: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:284 src/msgfilter.c:440
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Sintaks berkas masukan:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:286
-#: src/msgfilter.c:442 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1104,8 +1099,8 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam .properties "
 "sintaks Java\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:288
-#: src/msgfilter.c:444 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1115,16 +1110,16 @@ msgstr ""
 "NexTstep/GNUstep\n"
 
 #: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:447 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
 #: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:873
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
 msgstr "Detil keluaran:\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
 #: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:875
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1132,8 +1127,8 @@ msgstr ""
 "  -e, --no-escape             jangan gunakan C escape dalam keluaran (baku)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:451 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:877
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1142,28 +1137,28 @@ msgstr ""
 "karakter ekstensi\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:453 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:879
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              tulis berkas PO walaupun itu kosong\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:881
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                tulis berkas .po menggunakan gaya teridentasi\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:883
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           jangan tulis '#: nama berkas:baris' baris\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:885
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1171,7 +1166,7 @@ msgstr ""
 "  -n, --add-location          hasilkan '#: nama berkas:baris' baris (baku)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:887
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1179,15 +1174,15 @@ msgstr ""
 "      --strict                tulis strict Uniforum konform berkas .po\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:465 src/msggrep.c:591 src/msginit.c:392
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
 #: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     tulis sebuah berkas .properties Java\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:467 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:891
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1195,15 +1190,15 @@ msgstr ""
 "      --stringtable-output    tulis sebuah .string berkas NeXTstep/GNUstep\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:469 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:893
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=ANGKA           set keluaran lebar halaman\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:471 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:895
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1215,15 +1210,15 @@ msgstr ""
 "beris\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:474 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:898
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           hasilkan keluaran terurut\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:476 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:900
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1235,10 +1230,10 @@ msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 "kriteria pemilihan yang dispesifikasikan tidak memungkinkan (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:763
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "Penggunaan: %s [OPSI] [BERKAS MASUKAN]...\n"
+msgstr "Penggunaan: %s [PILIHAN] [BERKAS MASUKAN]...\n"
 
 #: src/msgcat.c:371
 #, c-format, no-wrap
@@ -1254,28 +1249,28 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 "Potong dan gabungkan berkas PO yang dispesifikasikan.\n"
-"Temukan pesan yang umum di antara dua/lebih file PO yang dispesifikasikan.\n"
+"Temukan pesan yang umum di antara dua/lebih berkas PO yang dispesifikasikan.\n"
 "Dengan menggunakan pilihan --more-than, kesamaan umum dapat diminta sebelum\n"
 "pesan dicetak. Sebaliknya, pilihan --less-than dapat digunakan untuk \n"
 "menspesifikasikan kesamaan yang kurang sebelum pesan dicetak (misal \n"
 "--less-than=2 akan mencetak pesan-pesan unik). Terjemahan, komentar dan\n"
-"komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
-"mendefinisikan mereka. Posisi file dari seluruh file PO akan dijaga.\n"
+"komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
+"mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan dijaga.\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:779
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  BERKAS MASUKAN ...          berkas masukan\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:781
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=BERKAS     dapatkan daftar dari berkas masukan dari "
 "BERKAS\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:649
-#: src/xgettext.c:785
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Jika berkas masukan adalah -, standar masukan dibaca.\n"
@@ -1308,7 +1303,7 @@ msgstr ""
 "  -u, --unique                kependekan untuk --less-than=2, diminta\n"
 "                              hanya pesan unik untuk ditampilkan\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
 #: src/msgmerge.c:545
 #, c-format
 msgid ""
@@ -1317,7 +1312,7 @@ msgstr ""
 "  -P, --properties-input      berkas masukan berada dalam sintaks ."
 "properties Java\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
 #: src/msgmerge.c:547
 #, c-format
 msgid ""
@@ -1383,12 +1378,12 @@ msgstr "tidak ada berkas masukan yang diberikan"
 #: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "dibutuhkan tepat 2 file input"
+msgstr "dibutuhkan tepat 2 berkas input"
 
 #: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Penggunaan: %s [OPSI] def.po ref.pot\n"
+msgstr "Penggunaan: %s [PILIHAN] def.po ref.pot\n"
 
 #: src/msgcmp.c:218
 #, c-format, no-wrap
@@ -1400,9 +1395,9 @@ msgid ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
-"Membandingkan dua gaya Uniforum file .po untuk memeriksa keduanya mengandung\n"
-"string msgid yang sama. File def.po adalah file PO terjemahan terdahulu. File\n"
-"ref.po adalah file PO terbaru (diciptakan biasanya oleh xgettext). Hal ini\n"
+"Membandingkan dua gaya Uniforum berkas .po untuk memeriksa keduanya mengandung\n"
+"string msgid yang sama. File def.po adalah berkas PO terjemahan terdahulu. File\n"
+"ref.po adalah berkas PO terbaru (diciptakan biasanya oleh xgettext). Hal ini\n"
 "berguna untuk memeriksa bahwa anda telah menerjemahkan setiap pesan dalam\n"
 "program anda. Bilamana tidak ditemukan kecocokan yang tepat, digunakan fuzzy\n"
 "matching untuk menghasilkan diagnostik yang lebih baik.\n"
@@ -1501,13 +1496,13 @@ msgid ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"Temukan pesan yang umum di antara dua/lebih file PO yang dispesifikasikan.\n"
+"Temukan pesan yang umum di antara dua/lebih berkas PO yang dispesifikasikan.\n"
 "Dengan menggunakan pilihan --more-than, kesamaan umum dapat diminta sebelum\n"
 "pesan dicetak. Sebaliknya, pilihan --less-than dapat digunakan untuk \n"
 "menspesifikasikan kesamaan yang kurang sebelum pesan dicetak (misal \n"
 "--less-than=2 akan mencetak pesan-pesan unik). Terjemahan, komentar dan\n"
-"komentar ekstraksi akan dijaga, tetapi hanya dari file PO pertama yang\n"
-"mendefinisikan mereka. Posisi file dari seluruh file PO akan diakumulasikan.\n"
+"komentar ekstraksi akan dijaga, tetapi hanya dari berkas PO pertama yang\n"
+"mendefinisikan mereka. Posisi berkas dari seluruh berkas PO akan diakumulasikan.\n"
 
 #: src/msgcomm.c:389
 #, c-format
@@ -1518,7 +1513,7 @@ msgstr ""
 "  ->, --more-than=ANGKA       tampilkan pesan dengan lebih dari definisi\n"
 "                              ini, baku ke 1 jika tidak diset\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:902
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1547,13 +1542,13 @@ msgstr "Pengkodean baku adalah pengkodean lokal sekarang.\n"
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                gaya keluaran terindentasi\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:459 src/msggrep.c:585
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
 #: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           tekan '#: nama berkas:baris' baris\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:461 src/msggrep.c:587
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
 #: src/msgmerge.c:565
 #, c-format
 msgid ""
@@ -1561,13 +1556,13 @@ msgid ""
 msgstr ""
 "      --add-location          simpan '#: nama berkas: baris' baris (baku)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:463 src/msggrep.c:589
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
 #: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                gaya keluaran Uniforum strict\n"
 
-#: src/msgen.c:236 src/msgfmt.c:381 src/xgettext.c:581
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "tidak ada berkas masukan yang diberikan"
@@ -1580,7 +1575,7 @@ msgstr "tepatnya sebuah berkas masukan dibutuhkan"
 #: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Penggunaan: %s [OPSI] BERKAS MASUKAN\n"
+msgstr "Penggunaan: %s [PILIHAN] BERKAS MASUKAN\n"
 
 #: src/msgen.c:291
 #, c-format, no-wrap
@@ -1600,17 +1595,17 @@ msgstr ""
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  BERKAS MASUKAN              berkas masukan PO atau POT\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "hilang nama perintah"
 
-#: src/msgexec.c:253
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "Penggunaan: %s [OPSI] PERINTAH [OPSI-PERINTAH]\n"
+msgstr "Penggunaan: %s [PILIHAN] PERINTAH [PILIHAN-PERINTAH]\n"
 
-#: src/msgexec.c:258
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1625,7 +1620,7 @@ msgstr ""
 "menjadi keluaran msgexec. msgexec mengembalikan kode yang maksimal kode kembali\n"
 "ke seluruh pemanggilan.\n"
 
-#: src/msgexec.c:267
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1634,44 +1629,44 @@ msgstr ""
 "Sebuah perintah bawaan dipanggil '0' mengeluarkan terjemahan, diikuti oleh sebuah\n"
 "null byte. Keluaran dari \"msgexec 0\" cocok sebagai sebuah masukan untuk \"xargs -0\".\n"
 
-#: src/msgexec.c:277 src/msgfilter.c:410
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=BERKAS MASUKAN  masukan berkas PO\n"
 
-#: src/msgexec.c:341
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "penulisan ke stdout gagal"
 
-#: src/msgexec.c:374 src/msgfilter.c:666
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "tulis ke %s subproses gagal"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
 msgstr "hilang nama penyaring"
 
-#: src/msgfilter.c:322
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "paling tidak sebuah script sed harus dispesifikasikan"
 
-#: src/msgfilter.c:397
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "Penggunaan: %s [OPSI] PENYARING [OPSI-PENYARING]\n"
+msgstr "Penggunaan: %s [PILIHAN] PENYARING [PILIHAN-PENYARING]\n"
 
-#: src/msgfilter.c:401
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 "Mengaplikasikan sebuah penyaring ke seluruh terjemahan dari sebuah katalog "
 "terjemahan.\n"
 
-#: src/msgfilter.c:425
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1681,19 +1676,19 @@ msgstr ""
 "standar masukan\n"
 "dan menulis sebuah terjemahan termodifikasi ke standar keluaran.\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Sangat berguna FILTER-OPTIONs ketika PENYARING adalah 'sed':\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 "  -e, --expression=SCRIPT     tambahkan SCRIPT ke perintah yang dijalankan\n"
 
-#: src/msgfilter.c:434
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1703,14 +1698,14 @@ msgstr ""
 "  -f, --file=SCRIPTFILE       tambahkan isi dari SCRIPTFILE ke perintah\n"
 "                                untuk dijalankan\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       tekan pencetakan otomatis dari ruang pola\n"
 
-#: src/msgfilter.c:449 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1718,12 +1713,12 @@ msgstr ""
 "      --no-escape             jangan gunakan C escapes dalam keluaran "
 "(baku)\n"
 
-#: src/msgfilter.c:455 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "     --indent                 gaya keluaran terindentasi\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1731,99 +1726,81 @@ msgstr ""
 "      --keep-header           simpan masukan header tidak termodifikasi, "
 "janya saring itu\n"
 
-#: src/msgfilter.c:589
-#, c-format
-msgid "Not yet implemented."
-msgstr "Belum terimplementasi."
-
-#: src/msgfilter.c:618
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
-
-#: src/msgfilter.c:646
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "komunikasi dengan %s subproses gagal"
-
-#: src/msgfilter.c:697
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "baca dari %s subproses gagal"
-
-#: src/msgfilter.c:714
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s subproses berakhir dengan kode keluar %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "argumen ke %s seharusnya berupa sebuah karakter punctuation tunggal"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "endianness tidak valid: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:537
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-d direktori\""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s membutuhkan sebuah spesifikasi \"-l lokal\""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s hanya valid dengan %s atau %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s hanya valid dengan %s, %s atau %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d pesan diterjemahkan"
 msgstr[1] "%d pesan diterjemahkan"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d terjemahan fuzzy"
 msgstr[1] ", %d terjemahan fuzzy"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d pesan belum diterjemahkan"
 msgstr[1] ", %d pesan belum diterjemahkan"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "Penggunaan: %s [OPSI] nama-berkas.po ...\n"
+msgstr "Penggunaan: %s [PILIHAN] nama-berkas.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Hasilkan katalog pesan binari dari deskripsi tekstual terjemahan.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:772
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1832,17 +1809,17 @@ msgstr ""
 "Argumen wajib ke opsi panjang juga wajib untuk opsi pendek juga.\n"
 "Sama untuk opsional argumen.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  nama-berkas.po ...           berkas masukan\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:820
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Mode operasi:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1851,7 +1828,7 @@ msgstr ""
 "  -j, --java                  Mode: java menghasilkan sebuah class Java "
 "ResourceBundle\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1860,13 +1837,13 @@ msgstr ""
 "      --java2                 seperti --java, dan asumsikan Java2 (JDK 1.2 "
 "atau lebih tinggi)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                C# mode: hasilkan sebuah berkas .dll .NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1875,38 +1852,38 @@ msgstr ""
 "      --csharp-resources      mode resources C#: hasilkan sbeuah berkas ."
 "resources .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   mode Tcl: hasilkan sebuah .tcl/msgcat\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    mode Qt: hasilkan sebuah berkas Qt .qm\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                aktifkan mode strict Uniforum\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:796
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Jika keluaran berkas adalah -, keluaran ditulis ke standar keluaran.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Lokasi berkas keluaran dalam mode Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     nama resource\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1915,14 +1892,14 @@ msgid ""
 msgstr ""
 "  -l, --locale=LOKAL          nama lokal, baik bahasa atau bahasa_NEGARA\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIREKTORI                basis direktori dari struktur direktori kelas\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1934,12 +1911,12 @@ msgstr ""
 "dipisahkan dengan sebuah garis bawah. Opsi -d wajib. Kelas ditulis dibawah\n"
 "direktoris yang dispesifikasikan.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1948,7 +1925,7 @@ msgstr ""
 "  -d DIREKTORI                basis direktori untuk lokal dependen berkas ."
 "dll\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1957,18 +1934,18 @@ msgstr ""
 "Opsi -l dan -d wajib. Berkas .dll ditulis dalam sebuah subdirektori\n"
 "dari direktori yang dispesifikasikan yang namanya tergantung dari lokal.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Lokasi keluaran berkas dalam mode Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIREKTORI                basis direktori dari katalog pesan .msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1977,12 +1954,12 @@ msgstr ""
 "Opsi -l dan -d wajib. Berkas .msg ditulis dalam direktori yang "
 "dispesifikasikan.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:812
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Interpretasi masukan berkas:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1994,13 +1971,13 @@ msgstr ""
 "                                --check-format, --check-header, --check-"
 "domain\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          periksa format string tergantung bahasa\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2009,7 +1986,7 @@ msgstr ""
 "      --check-header          verifikasi keberadaan dan isi dari masukan "
 "header\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2019,7 +1996,7 @@ msgstr ""
 "domain\n"
 "                               dan opsi --output-file\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2028,7 +2005,7 @@ msgstr ""
 "  -C, --check-compatibility   periksa GNU msgfmt berlaku seperti X/Open "
 "msgfmt\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2038,19 +2015,19 @@ msgstr ""
 "      --check-accelerators[=CHAR]  periksa keberadaan dari akselerator\n"
 "                                keyboard untuk item menu\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             gunakan masukan fuzzy dalam keluaran\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=JUMLAH       align string ke JUMLAH bytes (baku: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2058,75 +2035,75 @@ msgstr ""
 "      --no-hash               berkas binari tidak akan dimasukan dalam tabel "
 "hash\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            tampilkan statistik mengenai terjemahan\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               naikan tingkat keramaian\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "peringatan: header berkas PO hilang atau tidak valid\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "peringatan: konversi set karakter tidak akan bekerja\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "peringatan: header berkas PO fuzzy\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "peringatan: versi lebih lama dari msgfmt akan memberikan sebuah error "
 "disini\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "nama domain \"%s\" tidak sesuai dengan nama file"
+msgstr "nama domain \"%s\" tidak sesuai dengan nama berkas"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
-"nama domain \"%s\" tidak sesuai dengan nama file: akan menggunakan prefix"
+"nama domain \"%s\" tidak sesuai dengan nama berkas: akan menggunakan prefix"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "direktif `domain %s' diabaikan"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "masukan `msgstr' kosong diabaikan"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "masukan fuzzy `msgstr' diabaikan"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: peringatan: file source mengandung terjemahan fuzzy"
+msgstr "%s: peringatan: berkas sumber mengandung terjemahan fuzzy"
 
 #: src/msggrep.c:255 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:454 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:603
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:225
-#: src/x-perl.c:300 src/x-perl.c:393 src/x-php.c:163 src/x-python.c:174
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
 #: 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-ycp.c:91
 #, c-format
@@ -2347,14 +2324,14 @@ msgstr ""
 "Tidak ditemukan berkas .pot dalam direktori ini.\n"
 "Mohon spesifikasikan berkas masukan .pot melalui opsi --input.\n"
 
-#: src/msginit.c:866 src/msginit.c:941 src/msginit.c:1101 src/msginit.c:1196
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
 #: 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 subproses gagal dengan kode keluar %d"
 
-#: src/msginit.c:1066
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2370,18 +2347,18 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1482
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
 msgstr "Terjemahan bahasa inggris untuk paket %s"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 "set karakter saat ini \"%s\" bukan sebuah nama pengkodean yang portabel"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "dua set karakter berbeda \"%s\" dan \"%s\" dalam berkas masukan"
@@ -2403,14 +2380,14 @@ msgstr ""
 "domain \"%s\" dalam berkas masukan `%s' tidak berisi sebuah masukan header "
 "dengan sebuah spesifikasi set karakter"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "target set karakter \"%s\" bukan sebuah nama pengkodean yang portabel."
 
-#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2886
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr "peringatan: "
@@ -2452,7 +2429,7 @@ msgstr ""
 "pastikan mereka dalam pengkodean UTF-8 sejak awal, jadi telah berada dalam.\n"
 "berkas sumber kode anda.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2465,12 +2442,12 @@ msgstr ""
 "Keluaran dari '%s' mungkin tidak benar.\n"
 "Solusi yang memungkinkan diantaranya:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- Set LC_ALL ke sebuah lokal dengan pengkodean %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2481,7 +2458,7 @@ msgstr ""
 "  kemudian aplikasikan '%s,\n"
 "  kemudian konversi kembali ke %s menggunakan 'msgconv'.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2494,7 +2471,7 @@ msgstr ""
 "  kemudian aplikasikan '%s,\n"
 "  kemudian konversikan kembali ke %s menggunakan 'msgconv'.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2645,24 +2622,24 @@ msgstr "beberapa field header masih memiliki nilai baku awal\n"
 msgid "header field `%s' still has the initial default value\n"
 msgstr "beberapa field header masih memiliki nilai baku awal\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: masukan tidak valid dalam pengkodean \"%s\""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: error ketika mengubah dari pengkodean \"%s\" ke pengkodean \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 "berkas masukan tidak berisi sebuah masukan header dengan sebuah spesifikasi "
 "set karakter"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:620 src/xgettext.c:639
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2671,7 +2648,7 @@ msgstr ""
 "Tidak dapat mengubah dari \"%s\" ke \"%s\". %s mengandalkan iconv(), dan "
 "iconv() tidak mendukung konversi ini."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2680,8 +2657,8 @@ msgstr ""
 "Pengubahan dari \"%s\" ke \"%s\" menghadirkan duplikasi: beberapa msgids "
 "berbeda menjadi sama."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:627
-#: src/xgettext.c:646
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2712,14 +2689,14 @@ msgid ""
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Gabungkan dua file .po bergaya Uniforum. File def.po adalah file PO dengan\n"
-"terjemahan terdahulu yang akan digantikan oleh file yang baru tercipta selama\n"
+"Gabungkan dua berkas .po bergaya Uniforum. File def.po adalah berkas PO dengan\n"
+"terjemahan terdahulu yang akan digantikan oleh berkas yang baru tercipta selama\n"
 "mereka masih sesuai; komentar akan disimpan, tetapi komentar ekstrak dan posisi\n"
-"file akan dihapus. File ref.po adalah file PO terakhir (biasa dibuat oleh\n"
-"xgettext), terjemahan atau komentar dalam file akan dihapus, namun komentar\n"
-"titik dan posisi file akan disimpan. Ketika tidak ditemukan kecocokan, \n"
+"berkas akan dihapus. File ref.po adalah berkas PO terakhir (biasa dibuat oleh\n"
+"xgettext), terjemahan atau komentar dalam berkas akan dihapus, namun komentar\n"
+"titik dan posisi berkas akan disimpan. Ketika tidak ditemukan kecocokan, \n"
 "digunakan fuzzy matching untuk memberi hasil yang lebih baik. Hasilnya ditulis\n"
-"ke stdout kecuali diberikan sebuah output file.\n"
+"ke stdout kecuali diberikan sebuah output berkas.\n"
 
 #: src/msgmerge.c:490
 #, c-format
@@ -2846,7 +2823,7 @@ msgstr "%s dan nama berkas eksplisit adalah mutually exclusive"
 #: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Penggunaan: %s [OPSI] [BERKAS]...\n"
+msgstr "Penggunaan: %s [PILIHAN] [BERKAS]...\n"
 
 #: src/msgunfmt.c:419
 #, c-format
@@ -3070,7 +3047,7 @@ msgstr "bentuk plural memiliki indeks salah"
 msgid "too many errors, aborting"
 msgstr "terlalu banyak kesalahan, membatalkan"
 
-#: 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:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "urutan multibyte tidak valid"
@@ -3114,7 +3091,7 @@ msgstr "akhir-dari-baris dalam string"
 msgid "context separator <EOT> within string"
 msgstr "konteks pemisah <EOT> dalam string"
 
-#: src/read-catalog.c:332 src/xgettext.c:944
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "berkas ini tidak boleh mengandung direktif domain"
@@ -3216,7 +3193,7 @@ msgstr "diduga dua argumen"
 #: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "Penggunaan: %s [OPSI] URL BERKAS\n"
+msgstr "Penggunaan: %s [PILIHAN] URL BERKAS\n"
 
 #: src/urlget.c:181
 #, c-format, no-wrap
@@ -3293,7 +3270,7 @@ msgstr ""
 #: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "tidak dapat membuat file output \"%s\""
+msgstr "tidak dapat membuat berkas output \"%s\""
 
 #: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
@@ -3334,13 +3311,13 @@ msgstr "kompilasi dari kelas Java gagal, mohon coba set $JAVAC"
 msgid "error while opening \"%s\" for writing"
 msgstr "error ketika membuka \"%s\" untuk ditulis"
 
-#: src/write-po.c:803
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "Pesan internasionalisasi tidak boleh mengandung escape sequence `\\%c'"
 
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3354,7 +3331,7 @@ msgstr ""
 "berbeda dengan anda. Pertimbangkan menggunakan sebuah msgctxt ASCII murni.\n"
 "%s\n"
 
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3434,7 +3411,7 @@ msgstr ""
 "katalog pesan memiliki bentuk terjemahan plural\n"
 "tetapi format katalog pesan Tcl tidak mendukung penanganan plural\n"
 
-#: src/x-awk.c:341 src/x-python.c:1072
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: peringatan: string tidak terselesaikan"
@@ -3444,17 +3421,17 @@ msgstr "%s:%d: peringatan: string tidak terselesaikan"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: peringatan: ekspresi biasa tidak terselesaikan"
 
-#: src/x-c.c:1193 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: peringatan: karakter konstan yang unterminated"
 
-#: src/x-c.c:1217
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: peringatan: string literal yang unterminated"
 
-#: src/x-csharp.c:224 src/xgettext.c:1927
+#: src/x-csharp.c:224 src/xgettext.c:1962
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3511,7 +3488,7 @@ msgstr ""
 "%s:%d: Urutan multibyte tidak valid.\n"
 "Mohon spesifikasikan sumber pengkodean melalui --from-code.\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1279
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: peringatan: karakter Unicode tidak valid"
@@ -3531,12 +3508,12 @@ msgstr "%s:%d: peringatan: ')' ditemukan dimana '}' diduga"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: peringatan: '}' ditemukan dimana ')' diduga"
 
-#: src/x-glade.c:610 src/x-glade.c:617
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:644
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3550,38 +3527,38 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: peringatan: surrogate U+%04X sendiri"
 
-#: src/x-perl.c:306
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 "%s:%d: tidak dapat menemukan pengakhir string \"%s\" dimanapun sebelum EOF"
 
-#: src/x-perl.c:1039
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: hilan kurung kanan di \\x{ANGKA HEKSA}"
 
-#: src/x-perl.c:1159
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\l\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1179
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\u\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1213
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: variabel interpolasi tidak valid di \"%c\""
 
-#: src/x-perl.c:1226
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\L\") dari karakter 8bit \"%c\""
 
-#: src/x-perl.c:1243
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: interpolasi tidak valid (\"\\U\") dari karakter 8bit \"%c\""
@@ -3661,7 +3638,7 @@ msgstr ""
 "sebuah komentar\n"
 "seperti dispesifikasikan dalam http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:677
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Pengkodean \"%s\" tidak dikenal. Lebih baik melanjutkan dengan ASCII."
@@ -3690,28 +3667,28 @@ msgstr ""
 "%s:%lu: peringatan: sintaks $\"...\" telah ditinggalkan karena alasan "
 "keamanan; lebih baik gunakan eval_gettext"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing tidak dapat digunakan ketika output ditulis ke stdout"
 
-#: src/xgettext.c:573
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext tidak dapat bekerja tanpa kata kunci untuk dicari"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "peringatan: berkas `%s' ekstensi `%s' tidak dikenal; akan mencoba C"
 
-#: src/xgettext.c:767
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 "Ekstrak string yang dapat diterjemahkan dari masukan berkas yang diberikan.\n"
 
-#: src/xgettext.c:790
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3720,14 +3697,14 @@ msgstr ""
 "  -d, --default-domain=NAMA   gunakan NAMA.po untuk keluaran (daripada "
 "messages.po)\n"
 
-#: src/xgettext.c:792
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 "  -o, --output=BERKAS         tulis keluaran ke berkas yang "
 "dispesifikasikan\n"
 
-#: src/xgettext.c:794
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3735,12 +3712,12 @@ msgstr ""
 "  -p, --output-dir=DIR        keluarkan berkas akan ditempatkan dalam "
 "direktori DIR\n"
 
-#: src/xgettext.c:799
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Pilihan dari masukan bahasa berkas:\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3759,12 +3736,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:807
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   kependekan untuk --language=C++\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3772,7 +3749,7 @@ msgid ""
 msgstr ""
 "Secara baku bahasa ditebak tergantung dari ekstensi masukan nama berkas.\n"
 
-#: src/xgettext.c:814
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3781,24 +3758,24 @@ msgstr ""
 "      --from-code=NAMA        pengkodean dari berkas masukan\n"
 "                                (kecuali untuk Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Secara baku berkas masukan diasumsikan berada dalam ASCII.\n"
 
-#: src/xgettext.c:822
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         gabungkan pesan dengan berkas yang sudah ada\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=BERKAS.po masukan dari BERKAS.po tidak diekstraksi\n"
 
-#: src/xgettext.c:826
+#: src/xgettext.c:827
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3811,17 +3788,17 @@ msgstr ""
 "                               baris kata kunci yang mengawalinya) dalam "
 "berkas keluaran\n"
 
-#: src/xgettext.c:832
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Opsi spesifik untuk bahasa:\n"
 
-#: src/xgettext.c:834
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ekstrak seluruh string\n"
 
-#: src/xgettext.c:836 src/xgettext.c:843
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3834,7 +3811,7 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:840
+#: src/xgettext.c:841
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3844,7 +3821,7 @@ msgstr ""
 "                              KATA berarti tidak menggunakan kata kunci "
 "baku)\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3854,7 +3831,7 @@ msgstr ""
 "      --flag=WORD:ARG:FLAG    simbol tambahan untuk string didalam argumen\n"
 "                              nomor ARG dari kata kunci KATA\n"
 
-#: src/xgettext.c:850
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3867,56 +3844,56 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             pahami ANSI C trigraphs untuk masukan\n"
 
-#: src/xgettext.c:856
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (hanya bahasa C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:858
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    kenali format string Qt\n"
 
-#: src/xgettext.c:860 src/xgettext.c:864 src/xgettext.c:868
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (hanya bahasa C++)\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   kenali format string KDE 4\n"
 
-#: src/xgettext.c:866
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 kenali format string Boost\n"
 
-#: src/xgettext.c:870
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 "      --debug                 lebih detil hasil pengenalan format string\n"
 
-#: src/xgettext.c:889
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output     tulis keluar sebuah berkas .properties Java\n"
 
-#: src/xgettext.c:904
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=STRING  set pemegang hak cipta dalam keluaran\n"
 
-#: src/xgettext.c:906
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3924,17 +3901,17 @@ msgstr ""
 "      --foreign-user          abaikan FSF hak cipta dalam keluaran untuk "
 "pengguna luar negri\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PAKET    set nama paket dalam keluaran\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSI    set versi paket dalam keluaran\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -3942,7 +3919,7 @@ msgstr ""
 "      --msgid-bugs-address=EMAIL@ALAMAT   set alamat laporan untuk msgid "
 "bugs\n"
 
-#: src/xgettext.c:914
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3952,7 +3929,7 @@ msgstr ""
 "  -m, --msgstr-prefix[=STRING]  gunakan STRING atau \"\" sebagai awalan "
 "untuk masukan msgstr\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:918
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3962,7 +3939,7 @@ msgstr ""
 "  -M, --msgstr-suffix[=STRING]  gunakan STRING atau \"\" sebagai akhiran "
 "untuk masukan msgstr\n"
 
-#: src/xgettext.c:1691
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
@@ -3971,31 +3948,31 @@ msgstr ""
 "Sebuah argumen --flag tidak memiliki <keyword>:<argnum>:[pass-]<flag> "
 "sintaks: %s"
 
-#: src/xgettext.c:1790
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr "standard input"
 
-#: src/xgettext.c:1892
+#: src/xgettext.c:1927
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1896
+#: src/xgettext.c:1931
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1901
+#: src/xgettext.c:1936
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2001 src/xgettext.c:2034 src/xgettext.c:2095
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: peringatan: "
 
-#: src/xgettext.c:2004
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4004,7 +3981,7 @@ msgstr ""
 "Walaupun telah digunakan dalam sebuah posisi format string, %s bukan sebuah "
 "format string %s valid. Karena: %s\n"
 
-#: src/xgettext.c:2005
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
@@ -4013,7 +3990,7 @@ msgstr ""
 "Walaupun dideklarasikan seperti itu, %s bukan sebuah format string %s yang "
 "valid. Karena: %s\n"
 
-#: src/xgettext.c:2036
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4028,7 +4005,7 @@ msgstr ""
 "bernama,\n"
 "dan sebuah pemetaan daripada sebuah tuple untuk argumen.\n"
 
-#: src/xgettext.c:2097
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4038,27 +4015,27 @@ msgstr ""
 "gettext(\"\") mengembalikan masukan header dengan\n"
 "informasi meta, bukan string kosong.\n"
 
-#: src/xgettext.c:2723
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "spesifikasi argumen ambigu untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2750
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk kata kunci '%.*s'"
 
-#: src/xgettext.c:2775
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "peringatan: hilang konteks untuk argumen plural dari kata kunci '%.*s'"
 
-#: src/xgettext.c:2796
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "konteks tidak cocok diantara bentuk singular dan plural"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4070,7 +4047,7 @@ msgstr ""
 "variabel MSGID_BUGS_ADDRESS disana; jika tidak mohon spesifikasikan\n"
 "sebuah opsi baris perintah --msgid-bugs-address.\n"
 
-#: src/xgettext.c:3095
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr "bahasa `%s' tidak dikenal"
@@ -4079,6 +4056,24 @@ msgstr "bahasa `%s' tidak dikenal"
 msgid "<unnamed>"
 msgstr "<tidak bernama>"
 
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle gagal dengan kode error 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Belum terimplementasi."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "tidak dapat mengkonfigurasikan nonblocking I/O ke %s subproses"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "komunikasi dengan %s subproses gagal"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "baca dari %s subproses gagal"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s subproses berakhir dengan kode keluar %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "field `%s' masih memiliki nilai baku awal\n"
 
diff --git a/gettext-tools/po/ja.po b/gettext-tools/po/ja.po
index 9c211ea..aedf886 100644
--- a/gettext-tools/po/ja.po
+++ b/gettext-tools/po/ja.po
@@ -1,15 +1,17 @@
 # Translation of `gettext-tools' messages to Japanese.
-# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-# Masahito Yamaga <ma@yama-ga.com>, 2007.
+# Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Masahito Yamaga <ma@yama-ga.com>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext-tools 0.16\n"
+"Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 2007-06-13 23:39+0900\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-10 22:38+0900\n"
 "Last-Translator: Masahito Yamaga <ma@yama-ga.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,44 +56,44 @@ msgstr "����ǥ��쥯�ȥ� %s �����Ǥ��ޤ���"
 msgid "write error"
 msgstr "�񤭹��ߥ��顼"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "\"%s\" ���ɤ߹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "�Хå����åץե����� \"%s\" ��񤭹����Ѥ˳������Ȥ��Ǥ��ޤ���"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "\"%s\" ��񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "\"%s\" ���ɤ߹������˥��顼��ȯ�����ޤ���"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
 msgstr "fdopen() ����"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C# ����ѥ��餬���Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
@@ -101,70 +103,70 @@ msgstr "C# ����ѥ��餬���Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "C# ���ۥޥ��󤬸��Ĥ���ޤ���. pnet �򥤥󥹥ȡ��뤷�ƤߤƤ�������"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "̤�ΤΥ����ƥ२�顼"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s ���֥ץ����������Ԥ��ޤ���"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ���ץ���� `%s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� `--%s' �ˤϰ����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� `%c%s' �ˤϰ����Ϥ���ޤ���\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ���ץ���� `%s' �ˤϰ�����ɬ�פǤ�\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ���ץ���� `--%s' ��ǧ������ޤ���\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ���ץ���� `%c%s' ��ǧ������ޤ���\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: �����ʥ��ץ���� -- %c\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵���ʥ��ץ���� -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ������ɬ�פʥ��ץ���� -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ���ץ���� `-W %s' ��ۣ��Ǥ�\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� `-W %s' �ˤϰ����Ϥ���ޤ���\n"
@@ -186,14 +188,14 @@ msgstr "compile_java_class ���Ф���̵���� target_version ����"
 msgid "failed to create \"%s\""
 msgstr "\"%s\" �������˼��Ԥ��ޤ���"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 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:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -207,21 +209,21 @@ msgstr ""
 "Java ���ۥޥ��󤬸��Ĥ���ޤ���. gij �򥤥󥹥ȡ��뤹�뤫 $JAVA �����ꤷ�Ƥ�"
 "������"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s ���֥ץ����������ϥ��顼"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "�����Ȥ��̤����ޤ���"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "�ѥ��פ��뤳�Ȥ��Ǥ��ޤ���"
@@ -239,70 +241,69 @@ msgstr "�ѥ��פ��뤳�Ȥ��Ǥ��ޤ���"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "���顼������ 0x%08x �� DuplicateHandle ����"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle ����"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "���ϥե����� \"%s\" ���뤳�Ȥ��Ǥ��ޤ���"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s ���֥ץ�����"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s ���֥ץ���������̿Ū�ʥ����ʥ� %d ��������ޤ���"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "'%s' �� 'msgid' �Ȱ�ä������� %s ������ʸ����ǤϤ���ޤ���. ��ͳ: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "���� %u ���Ф�������λ��꤬ '%s' �Τ褦�� 'msgid' ��¸�ߤ��ޤ���"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "���� %u ���Ф�������λ��꤬ '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "���� %2$u ���Ф��� 'msgid' �� '%1$s' �Ǥη����λ��꤬Ʊ���ǤϤ���ޤ���"
 
@@ -330,9 +331,9 @@ msgstr "̿���ֹ� %u �Ǥ�, '<' �θ�Υȡ�����θ�� '>' ����뤳�ȤϤ���ޤ���."
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "ʸ����ϰ����ֹ� %u �򻲾Ȥ��Ƥ��ޤ��������ֹ� %u ��̵�뤷�Ƥ��ޤ�."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "`msgid' �� `%s' �ǻ��ꤷ�������ο�����äƤ��ޤ���"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -372,48 +373,48 @@ msgstr "ʸ�����̿������椫��ϤޤäƤ��ޤ�: '}' �� '{' �����פ��Ƥ��ޤ���."
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "ʸ����̿���ֹ� %u �Τ��Ȥ��Ĥ��Ƥ��ʤ� '}' ��ޤ�Ǥ��ޤ�."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "̿���ֹ� %u �Ǥ�, ���Υե饰���Ȥ߹�碌��̵���Ǥ�."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������٤���뤳�ȤϤ���ޤ���."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "̿���ֹ� %u �Ǥ�, ���٤ΰ����ͤ� %u ���������ʤ��ƤϤʤ�ޤ���."
 
-#: src/format-gcc-internal.c:396
-#, fuzzy, c-format
+#: src/format-gcc-internal.c:398
+#, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
-msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������٤���뤳�ȤϤ���ޤ���."
+msgstr "̿���ֹ� %u �Ǥ�, '%c' ���������ٻ��꤬��뤳�ȤϤ���ޤ���."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "̿���ֹ� %u �Ǥ�, ���ٻ����̵���Ǥ�."
+msgstr "̿���ֹ� %u �Ǥ�, �������ٻ����̵���Ǥ�."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "̿���ֹ� %u �Ǥ�, '%c' �����˥ե饰����뤳�ȤϤ���ޤ���."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' �� %%m �ϻȤ��ޤ��� '%s' �ϻȤ��ޤ���"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' �� %%m �ϻȤ��ޤ��� '%s' �ϻȤ��ޤ�"
 
 #: src/format-invalid.h:22
@@ -509,21 +510,20 @@ msgstr ""
 "��ޤ���."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "���� {%u} ���Ф�������λ��꤬ '%s' �Τ褦�� 'msgid' ��¸�ߤ��ޤ���"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "���� {%u} ���Ф�������λ��꤬ '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "'msgid' �� '%s' �Ǥΰ��� {%u} ���Ф�������λ��꤬Ʊ���ǤϤ���ޤ���"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -539,11 +539,11 @@ msgstr ""
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "̿���ֹ� %u �Ǥ�, ���ꤵ�줿�ѥ�᡼����¿�����ޤ�: �ѥ�᡼���Ϻ���Ǥ� %u "
 "�ĤǤ�."
@@ -591,13 +591,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "ʸ�������ߴ�����ˡ�ǰ����򻲾Ȥ��Ƥ��ޤ�."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "`msgid' �� `%s' �Ǥη����λ��꤬����������ޤ���"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "'%s' �Ǥη����λ��꤬ 'msgid' �ǤΥ��֥��åȤǤϤ���ޤ���"
 
 #: src/format-perl.c:433
@@ -607,57 +607,56 @@ msgid ""
 "conversion specifier '%c'."
 msgstr "̿���ֹ� %u �Ǥ�, ������������Ѵ����� '%c' �ȸߴ��ǤϤ���ޤ���."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "���� '%s' ���Ф���������꤬ '%s' ��¸�ߤ��ޤ���"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
 "ʸ�����, ̾���Τ��������, ̾���ʤ��ΰ�����, �ɤ���ΰ����⻲�Ȥ��Ƥ��ޤ�."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "ʸ�������ߴ�����ˡ�ǰ���̾ '%s' �򻲾Ȥ��Ƥ��ޤ�."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "'msgid' �Ǥη�������ϥޥåԥ󥰤Ǥ���, '%s' �Ǥϥ��ץ� (tuple) �Ǥ�"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "'msgid' �Ǥη�������ϥ��ץ� (tuple) �Ǥ���, '%s' �Ǥϥޥåԥ󥰤Ǥ�"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "���� '%s' ���Ф���������꤬ '%s' �Τ褦�� 'msgid' ��¸�ߤ��ޤ���"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "���� '%2$s' ���Ф��� 'msgid' �� '%1$s' �Ǥη������꤬Ʊ���ǤϤ���ޤ���"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
+"'msgid' ��ñ��ʥե����ޥå�ʸ����Ǥ���, '%s' �ϰ㤤�ޤ�. 'L' �ե饰�� 2���"
+"���Ͱ�����ޤߤޤ�"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -696,11 +695,11 @@ msgid ""
 "1 and 9."
 msgstr "̿���ֹ� %u �ν�üʸ���� 1 ���� 9 �δ֤ο����ǤϤ���ޤ���."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -708,21 +707,29 @@ msgid ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+"\n"
+"[������]\n"
+"����ϥե꡼�����եȥ������Ǥ��Τ��ѹ��Ⱥ����ۤϼ�ͳ�Ǥ�.\n"
+"������ˡΧ�������ϰϤ�̵�ݾڤǤ�.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, 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:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
@@ -731,11 +738,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "������¿�����ޤ�"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "���¿���ξ�������뤿��ˤ� `%s --help' �����Ϥ��Ƥ�������.\n"
@@ -776,29 +783,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            �ۥ���̾���Ф��륢�ɥ쥹\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "�������:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  ���Υإ�פ�ɽ�����ƽ�λ\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               �С����������ɽ�����ƽ�λ\n"
@@ -807,11 +814,11 @@ 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "�Х���ݡ��Ȥ� <bug-gnu-gettext@gnu.org> �ޤ�.\n"
 
@@ -820,20 +827,20 @@ msgstr "�Х���ݡ��Ȥ� <bug-gnu-gettext@gnu.org> �ޤ�.\n"
 msgid "could not get host name"
 msgstr "�ۥ���̾������Ǥ��ޤ���Ǥ���"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "���� 1�Ĥ����ϥե����뤬������ޤ�"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s �� %s ����ȿ�Ǥ�"
@@ -850,19 +857,19 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr "°���˽��ä��������������Υ�å����������̤�, °���򤦤ޤ����ޤ�.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr "���ϥե�����λ���:\n"
@@ -872,40 +879,40 @@ msgstr "���ϥե�����λ���:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INPUTFILE                   ���� PO �ե�����\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 "  -D, --directory=DIRECTORY   ���ϥե�����θ����ꥹ�Ȥ� DIRECTORY ���ɲ�\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr "���ϥե�����λ���:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=FILE      ���ꤷ���ե�����˽���\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -915,7 +922,7 @@ msgstr ""
 "���ϥե����뤬���ꤵ��ʤ�, �⤷���� - �ξ���ɸ����Ϥ˷�̤��񤭽Ф����"
 "��.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "����������:\n"
@@ -1013,23 +1020,23 @@ msgid ""
 msgstr ""
 "      --obsolete              --only-obsolete --clear-obsolete ��Ʊ��\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "���ϥե������ʸˡ:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1038,26 +1045,26 @@ msgstr ""
 "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
 "ˡ\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
 msgstr "���Ϥξܺ�:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "  -e, --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1065,68 +1072,68 @@ msgstr ""
 "  -E, --escape                ���Ϥ� C ����Υ��������פ�Ȥ�,\n"
 "                              ��ĥʸ����ޤ�ʤ�\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              ���Ǥ��äƤ� PO �ե������񤭽Ф�\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                ������������ .po �ե���������\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 "      --no-location           '#: �ե�����̾:���ֹ�' �ιԤ�񤭽Ф��ʤ�\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 "  -n, --add-location          '#: �ե�����̾:���ֹ�' �ιԤ����� (ɸ��)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 "      --strict                ��̩�� Uniforum ������ .po �ե���������\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     Java .properties �ե���������\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 "      --stringtable-output    NeXTstep/GNUstep .strings �ե���������\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=NUMBER          ���ϥڡ�������������\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1135,31 +1142,31 @@ msgstr ""
 "      --no-wrap               ���ϥڡ����������Ĺ����å������Ԥ���Ԥ���"
 "��\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           �����Ȥ��줿���Ϥ�����\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          �ե�����ǽ��Ϥ򥽡���\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "���ꤵ�줿������ (%d < n < %d) ���Բ�ǽ�Ǥ�"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "����ˡ: %s [���ץ����] [���ϥե�����]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1182,23 +1189,23 @@ msgstr ""
 "��������줿�ǽ�� PO �ե�����Τ�Τ����Τޤ޻Ĥ���ޤ�. �ޤ��ե�����ΰ���\n"
 "�����Ƥ� PO �ե����뤫�餽�Τޤ޻Ĥ���ޤ�.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INPUTFILE ...               ���ϥե�����\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=FILE       ���ϥե�����Υꥹ�Ȥ� FILE �������\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ�����Ϥ��ɤ߹��ޤ�ޤ�.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1207,7 +1214,7 @@ msgstr ""
 "  -<, --less-than=NUMBER      NUMBER ��꾯�ʤ��������������줿��å�����\n"
 "                              �����. ���ꤵ��ʤ�����ɸ���̵�¸�\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1216,7 +1223,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 0\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1225,15 +1232,15 @@ msgstr ""
 "  -u, --unique                --less-than=2 ��û�̷�. 1�Ĥ����ʤ���å�����\n"
 "                              �Τߤ�ɽ��\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      ���ϥե������ Java .properties ��ʸˡ\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1242,12 +1249,12 @@ msgstr ""
 "      --stringtable-input     ���ϥե������ NeXTstep/GNUstep .strings ��ʸ"
 "ˡ\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=NAME          ���ϤΥ��󥳡��ǥ���\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1256,7 +1263,13 @@ msgstr ""
 "      --use-first             �ơ��Υ�å������κǽ��ͭ����������Ȥ�\n"
 "                              ʣ����������ޡ������ʤ�\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1264,33 +1277,38 @@ msgid ""
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
+"      --color                 ��˥��顼��¾�Υƥ�����°����Ȥ�\n"
+"      --color=WHEN            WHEN �ʤ�Х��顼��¾�Υƥ�����°����Ȥ�.\n"
+"                              WHEN �� 'always', 'never', 'auto', �ޤ��� "
+"'html'.\n"
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
+"      --style=STYLEFILE       --color ���Ф��� CSS ��������롼������\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, c-format
 msgid "no input files given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "���Τ� 2�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "����ˡ: %s [���ץ����] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1308,22 +1326,22 @@ msgstr ""
 "���Τ˰��פ��Ƥ���Ľ꤬���Ĥ���ʤ�����, �����ޤ� (fuzzy) ������Ȥ���\n"
 "����ɤ����ǥ�å������������ޤ�.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  def.po                      ����\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  ref.pot                     �������ؤλ���\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "������:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1331,47 +1349,52 @@ msgid ""
 msgstr ""
 "  -m, --multi-domain          ref.pot �� def.po ��Υɥᥤ��γơ���Ŭ��\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     �����ޤ�������Ԥ�ʤ�\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             fuzzy (�����ޤ�) ���ܤ��θ\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr "      --use-untranslated      ̤�����Υ�å��������θ\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "���Υ�å�������̤�����Ǥ�"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "���Υ�å������������Ԥˤ���ӥ塼��ɬ�פǤ�"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "���Υ�å������ϻȤ��ޤ����������Ƥ��ޤ���..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...������������������Ƥ��ޤ�"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "���Υ�å������ϻȤ��ޤ��� %s �Ǥ��������Ƥ��ޤ���"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "�ٹ�: ���Υ�å������ϻȤ��ޤ���"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1411,7 +1434,7 @@ msgstr ""
 "  ->, --more-than=NUMBER      NUMBER ���¿��������줿��å����������\n"
 "                              ���ꤵ��ʤ�����ɸ��� 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1433,46 +1456,46 @@ msgstr "�Ѵ��о�:\n"
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr "ɸ��Υ��󥳡��ǥ��󥰤ϸ��ߤΥ�������Υ��󥳡��ǥ��󥰤Ǥ�.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                �������������\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           '#: filename:line' �ιԤ���Ϥ��ʤ�\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          '#: filename:line' �ιԤ��ݻ� (ɸ��)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                ��̩�� Uniforum ���Ϸ���\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "���ϥե����뤬���ꤵ��Ƥ��ޤ���"
 
-#: src/msgen.c:233
+#: src/msgen.c:241
 #, c-format
 msgid "exactly one input file required"
 msgstr "���Τ� 1�Ĥ����ϥե����뤬ɬ�פǤ�"
 
-#: src/msgen.c:274
+#: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "����ˡ: %s [���ץ����] INPUTFILE\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1484,22 +1507,22 @@ msgstr ""
 "PO �ƥ�ץ졼�ȥե����� (���̤� xgettext �ˤ�ä�����) �Ǥ�. ̤�����Υ���ȥ�\n"
 "�� msgid ��Ʊ�������˳�����Ƥ��ޤ�.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  INPUTFILE                   ���Ϥ��� PO �ޤ��� POT �ե�����\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "���ޥ��̾������ޤ���"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "����ˡ: %s [���ץ����] ���ޥ�� [���ޥ�ɥ��ץ����]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1514,7 +1537,7 @@ msgstr ""
 "���ν��Ϥ� msgexec �ν��Ϥˤʤ�ޤ�. msgexec �ν�λ�����ɤ���������Ƥ�\n"
 "�Ф��줿�ץ������ν�λ�����ɤκ����ͤˤʤ�ޤ�.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1523,42 +1546,42 @@ msgstr ""
 "'0' �Ȥ������̤��Ȥ߹��ߥ��ޥ�ɤϺǸ�˥̥�ʸ�����դ�����������Ϥ��ޤ�.\n"
 "\"msgexec 0\" �ν��Ϥ� \"xargs -0\" �ؤ����Ϥ�Ŭ���Ƥ��ޤ�.\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=INPUTFILE       ���Ϥ��� PO �ե�����\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "ɸ����Ϥؤν񤭽Ф������Ԥ��ޤ���"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "%s �ؽ񤭽Ф����֥ץ����������Ԥ��ޤ���"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
 msgstr "�ե��륿̾������ޤ���"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "���ʤ��Ȥ� 1�Ĥ� sed ������ץȤ���ꤷ�ʤ���Ф����ޤ���"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "����ˡ: %s [���ץ����] �ե��륿 [�ե��륿���ץ����]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "�����������������Ƥ������˥ե��륿��Ŭ��.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1568,18 +1591,18 @@ msgstr ""
 "��\n"
 "Ǥ�դΥץ���������ꤹ�뤳�Ȥ��Ǥ��ޤ�.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "FILTER �� 'sed' ��������� FILTER-OPTION:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=SCRIPT     �¹Ԥ���륳�ޥ�ɤ� SCRIPT ���ɲ�\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1588,120 +1611,102 @@ msgid ""
 msgstr ""
 "  -f, --file=SCRIPTFILE       SCRIPTFILE �����Ƥ�¹Ԥ���륳�ޥ�ɤ��ɲ�\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       �ѥ����󥹥ڡ����μ�ưŪ��ɽ��������\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 "      --no-escape             ���Ϥ� C ����Υ��������פ�Ȥ�ʤ� (ɸ��)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                �������������\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           �إå��Υ���ȥ�����������ݻ�\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "̤����."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s ���֥ץ������˥֥��å��󥰤��ʤ������Ϥ�����Ǥ��ޤ���"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s ���֥ץ������Ȥ��̿��˼���"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s ���֥ץ�����������ɤ߹��ߤ˼���"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s �ؤΰ�����ñ��ζ��ڤ�ʸ���Ǥ���٤��Ǥ�"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "̵���ʥ���ǥ�����: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s �ˤ� \"-d �ǥ��쥯�ȥ�\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s �ˤ� \"-l ��������\" �λ��꤬ɬ�פǤ�"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s �� %s �ޤ��� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s �� %s, %s �ޤ��� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d �Ĥ�������å�����"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d �Ĥ������������ޤ��Ǥ�"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d �Ĥ�̤���Υ�å�����"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "����ˡ: %s [���ץ����] filename.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "�Х��ʥ��å���������������ʸ�������ε��Ҥ�������.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1710,17 +1715,17 @@ msgstr ""
 "Ĺ�����ץ�����ɬ�ܤΰ�����û�����ץ����ˤ�ɬ�ܤǤ�.\n"
 "ɬ�ܤǤʤ�������Ʊ���Ǥ�.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  filename.po ...             ���ϥե�����\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr "���⡼��:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1728,7 +1733,7 @@ msgid ""
 msgstr ""
 "  -j, --java                  Java �⡼��: Java ResourceBundle ���饹������\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1736,12 +1741,12 @@ msgid ""
 msgstr ""
 "      --java2                 --java ��Ʊ���� Java2 (JDK 1.2 �ʹ�) ����\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# �⡼��: .NET .dll �ե����������\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1750,39 +1755,39 @@ msgstr ""
 "      --csharp-resources      C# resources �⡼��: .NET .resources �ե������"
 "����\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl                   Tcl �⡼��: tcl/msgcat .msg �ե����������\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt �⡼��: Qt .qm �ե����������\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                ��̩�� Uniforum �⡼�ɤ�ͭ����\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "���ϥե����뤬 - �ξ���ɸ����Ϥ˷�̤��񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Java �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=RESOURCE     �꥽����̾\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1791,14 +1796,14 @@ msgid ""
 msgstr ""
 "  -l, --locae=LOCALE          ��������̾. ����̾�⤷���� \"����̾_��̾\"\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 "  -d DIRECTORY                ���饹�ǥ��쥯�ȥ�γ��ؤδ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1812,12 +1817,12 @@ msgstr ""
 "��\n"
 "�񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "C# �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1826,7 +1831,7 @@ msgstr ""
 "  -d DIRECTORY                ���������¸�� .dll �ե�����δ��ܥǥ��쥯��"
 "��\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1835,18 +1840,18 @@ msgstr ""
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .dll �ե�����ϥ�������˰�¸����̾�������\n"
 "���ꤵ�줿�ǥ��쥯�ȥ�Υ��֥ǥ��쥯�ȥ�˽񤭽Ф���ޤ�.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Tcl �⡼�ɤˤ�������ϥե�����ξ��:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d DIRECTORY                .msg ��å��������������δ��ܥǥ��쥯�ȥ�\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1855,12 +1860,12 @@ msgstr ""
 "-l �� -d ���ץ�����ɬ�ܤǤ�. .msg �ե�����ϻ��ꤵ�줿�ǥ��쥯�ȥ�˽�\n"
 "�Ф���ޤ�.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "���ϥե�����β��:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1871,20 +1876,20 @@ msgstr ""
 "domain\n"
 "                              �ǻ��ꤵ������ƤΥ����å���Ԥʤ�\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 "      --check-format          ����˰�¸�����ե����ޥå�ʸ���������å�\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          �إå����ܤ�¸�ߤ����Ƥ��ǧ\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1893,7 +1898,7 @@ msgstr ""
 "      --check-domain          �ɥᥤ��̿��� --output-file ���ץ����δ֤�\n"
 "                              ̷�⤬�ʤ��������å�\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1901,7 +1906,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   GNU msgfmt �� X/Open msgfmt �Ȥθߴ������ǧ\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1910,93 +1915,93 @@ msgid ""
 msgstr ""
 "      --check-accelerators[=ʸ��]  ��˥塼���ܤؤΥ���������Ƥ�����å�\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             fuzzy (�����ޤ�) ���ܤ���Ϥ˻Ȥ�\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=NUMBER      ʸ����� NUMBER �Х��Ȥ�·���� (ɸ��: %d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 "      --no-hash               �Х��ʥ�ե�����ϥϥå���ơ��֥��ޤޤʤ�\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            �����˴ؤ������׾����ɽ��\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               ���ǥ�٥��夲��\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "�ٹ�: PO �ե�����Υإå����ʤ�, �⤷���������Ǥ�\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "�ٹ�: ʸ�����åȤ��Ѵ�����ǽ���ޤ���\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "�ٹ�: PO �ե�����إå��������ޤ��Ǥ�\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "�ٹ�: msgfmt �ΰ����ΥС������ǤϤ����ǥ��顼�ˤʤ�ޤ�\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "�ɥᥤ��̾ \"%s\" �ϥե�����̾�Ȥ���Ŭ�ڤǤϤ���ޤ���. ��Ƭ����Ȥ��ޤ�"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "`�ɥᥤ�� %s' ̿���̵�뤵��ޤ�"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "���� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "�����ޤ� (fuzzy) �� `msgstr' ����ȥ��̵�뤵��ޤ�"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: �ٹ�: �������ե�����ˤ����ޤ� (fuzzy) ������������ޤ�"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "\"%s\" ���ɤ߹�����˥��顼��ȯ�����ޤ���"
@@ -2206,14 +2211,14 @@ msgstr ""
 "�����ȥǥ��쥯�ȥ�� .pot �ե����뤬���Ĥ���ޤ���Ǥ���.\n"
 "--input ���ץ��������Ϥ��� .pot �ե��������ꤷ�Ƥ�������.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2230,28 +2235,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s �ѥå��������Ф������"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "���ߤ�ʸ�����å� \"%s\" �ϲ������Τ��륨�󥳡��ǥ���̾�ǤϤ���ޤ���"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "2�Ĥΰۤʤä�ʸ�����å� \"%s\" �� \"%s\" �����ϥե�����ˤ���ޤ�"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "���ϥե����� `%s' ��ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2260,20 +2265,20 @@ msgstr ""
 "���ϥե����� `%2$s' ��Υɥᥤ�� \"%1$s\" �ˤ�ʸ�����åȤ���ꤹ��إå�����"
 "������ޤ���"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 "�оݤȤʤ�ʸ�����å� \"%s\" �ϲ������Τ��륨�󥳡��ǥ���̾�ǤϤ���ޤ���"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr "�ٹ�: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2282,7 +2287,7 @@ msgstr ""
 "���ϥե�����ˤϰۤʤä����󥳡��ǥ��󥰤Υ�å��������ޤޤ�Ƥ��ޤ�.\n"
 "���Ϥ� UTF-8 ���Ѵ����ޤ�.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2296,7 +2301,7 @@ msgstr ""
 "�̤ν��ϥ��󥳡��ǥ��󥰤����򤹤���� --to-code ���ץ�����ȤäƤ�����"
 "��.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2311,7 +2316,7 @@ msgstr ""
 "�����������ɥե���������, UTF-8 �ǥ��󥳡��ɤ���Ƥ��뤳�Ȥ��ݾڤ��뤫\n"
 "�ɤ��餫�Ǥ�.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2324,12 +2329,12 @@ msgstr ""
 "'%s' �ν��Ϥ������ΤǤ����ǽ��������ޤ�.\n"
 "��ǽ�ʲ����:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- LC_ALL �򥨥󥳡��ǥ��� %s �Υ������������.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2340,7 +2345,7 @@ msgstr ""
 "  ���θ� '%s' ��Ŭ��.\n"
 "  ���� 'msgconv' ��Ȥä� %s ���᤹.\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2353,7 +2358,7 @@ msgstr ""
 "  ���θ� '%s' ��Ŭ��.\n"
 "  ���� 'msgconv' ��Ȥä� %s ���᤹.\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2364,73 +2369,73 @@ msgstr ""
 "'%s' �ν��Ϥ������ΤǤ����ǽ��������ޤ�.\n"
 "��ǽ�ʲ�����Ȥ��Ƥ� LC_ALL=C �����ꤷ�ޤ�.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "ʣ��ɽ��������ͤ����������ǽ��������ޤ�"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 "nplurals = %lu �Ǥ���ʣ��ɽ���� %lu ��Ʊ�����٤��ͤ����������ǽ��������ޤ�"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "ʣ��ɽ�����������򵯤�����ǽ��������ޤ�"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "ʣ��ɽ�����������դ�򵯤�����ǽ��������ޤ�"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr "ʣ��ɽ�����黻�㳰, �����餯�������򵯤�����ǽ��������ޤ�"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "%s �ˤȤä�ͭ����, ����ȤäƤߤƤ�������:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "��å���������������ʣ����������������ޤ�"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr "�������إå�����ȥ�� \"plural=EXPRESSION\" °��������ޤ���"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr "�������إå�����ȥ�� \"nplurals=INTEGER\" °��������ޤ���"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "������ nplurals ����"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "������ʣ�� (plural) ɽ��"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "�����������Ĥ��Υ�å������ˤ� %lu �Ĥ���ʣ����������ޤ�"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "�����������Ĥ��Υ�å������ˤ� %lu �Ĥ�ʣ����������ޤ�"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2438,86 +2443,86 @@ msgstr ""
 "��å��������������ˤ�ʣ����������������ޤ�. ������ \"Plural-Forms: "
 "nplurals=INTEGER; plural=EXPRESSION;\" �Ȥ����إå�����ȥ꤬����ޤ���"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "`msgid' �� `msgid_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "`msgid' �� `msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "`msgid' �� `msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǻϤޤäƤ��ޤ���"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "`msgid' �� `msgstr_plural' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "`msgid' �� `msgstr[%u]' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "`msgid' �� `msgstr' �Υ���ȥ꤬�ɤ���� '\\n' �ǽ���äƤ��ޤ���"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "ʣ����������� GNU gettext �γ�ĥ�Ǥ�"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "msgstr �ˤϥ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ���"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 "msgstr �ˤϤ��ޤ��¿���Υ����ܡ��ɥ�������졼���ε��� '%c' ������ޤ�"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "�إå����� `%s' ���إå�����ˤ���ޤ���\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "�إå����� `%s' �Ϲ�Ƭ�ˤʤ���Ф����ޤ���\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "�����Ĥ��Υإå����󤬽��ɸ���ͤΤޤޤǤ�\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "���� `%s' �����ɸ���ͤΤޤޤǤ�\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "�����Ĥ��Υإå����󤬽��ɸ���ͤΤޤޤǤ�\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: ���Ϥ� \"%s\" ���󥳡��ǥ��󥰤ˤ�����ͭ���ǤϤ���ޤ���"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr ""
 "%s: \"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��"
 "ȯ�����ޤ���"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "���ϥե������ʸ�����åȤ���ꤹ��إå����ܤ�����ޤ���"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
@@ -2526,7 +2531,7 @@ msgstr ""
 "\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ���,iconv"
 "() �Ϥ����Ѵ���������Ƥ��ޤ���."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
@@ -2535,8 +2540,8 @@ msgstr ""
 "\"%s\" ���� \"%s\" �ؤ��Ѵ�����ʣ, �����Ĥ��ΰۤʤä� msgid ���������ʤäƤ�"
 "�ޤ�."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2545,16 +2550,16 @@ msgstr ""
 "\"%s\" ���� \"%s\" ���Ѵ��Ǥ��ޤ���. %s �� iconv() �˰�¸���Ƥ��ޤ�.���ΥС�"
 "������ iconv() �ʤ��Ǻ���Ƥ��ޤ�."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s �� %s ��������ˤΤ�ͭ���Ǥ�"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
 msgstr "�Хå����åץ�����"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2576,17 +2581,17 @@ msgstr ""
 "�Ĥ���ޤ�. ���Τ˰��פ��Ƥ���Ľ꤬���Ĥ���ʤ�����, �����ޤ� (fuzzy)\n"
 "������Ȥ��Ȥ���ɤ���̤�����Ǥ��礦. \n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:490
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  def.po                      �Ť����������Ф��뻲������\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:492
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr "  ref.pot                     ���������������Ф��뻲��\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2595,7 +2600,7 @@ msgstr ""
 "  -C, --compendium=FILE       ��å������������ɲ�ʸ��\n"
 "                              1��ʾ���ꤵ����ǽ������\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2604,27 +2609,27 @@ msgstr ""
 "  -U, --update                def.po �򹹿�\n"
 "                              def.po �����˺ǿ��ǤǤ���в��⤷�ʤ�\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr "�����⡼�ɤǤν��ϥե�����ξ��:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:516
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "��̤� def.po �˽��ᤵ��ޤ�.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:518
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr "      --backup=CONTROL        def.po �ΥХå����åפ����\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr "      --suffix=SUFFIX         �̾�ΥХå����å�����������\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2644,7 +2649,7 @@ msgstr ""
 "��\n"
 "  simple, never   ���ñ������ΥХå����åפ����\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2654,34 +2659,29 @@ msgstr ""
 "--suffix ��Ķ��ѿ� SIMPLE_BACKUP_SUFFIX �����ꤵ��Ƥ��ʤ����,\n"
 "�Хå����å��������� `~' �Ǥ�.\n"
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     �����ޤ�������Ԥ�ʤ�\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 "      --previous              �������줿��å����������� msgid ��Ĥ�\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       �ʹԾ�����ɽ�����ʤ�\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, c-format
 msgid "this message should define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��Ǥ�"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "���Υ�å�������ʣ������������٤��ǤϤ���ޤ���"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2690,7 +2690,9 @@ msgstr ""
 "%s %ld(������) + %ld(����) ���ɤ߹��� (�ޡ��� %ld, �����ޤ� %ld, ���� %ld, ��"
 "�� %ld).\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " ��λ.\n"
 
@@ -2832,7 +2834,7 @@ msgid ""
 msgstr ""
 "  -u, --unique                ͣ��Υ�å������Τߤ�ɽ����, ��ʣ��̵��\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<ɸ������>"
@@ -2918,65 +2920,65 @@ msgstr "�ǽ��ʣ�������󥼥��κ���������ޤ�"
 msgid "plural form has wrong index"
 msgstr "ʣ�����˴ְ�ä�����������ޤ�"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "���顼��¿�᤮��Τ�, �������Ǥ��ڤ�ޤ�"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "������ʣ���Х��ȤΥ�������"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "�ե����뽪ü���Դ�����ʣ���Х��ȤΥ�������"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "�������Դ�����ʣ���Х��ȤΥ�������"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv ���"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "������� \"%s\" ���Τ�ޤ���"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "���������楷������"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "ʸ������� end-of-file"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "ʸ������� end-of-line"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "ʸ�������ʸ̮���ѥ졼�� <EOT>"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "���Υե�����ϥɥᥤ��̿���ޤ�Ǥ��ʤ��褦�Ǥ�"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "��å���������Ť��������Ƥ��ޤ�"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "����Ϻǽ������ξ��Ǥ�"
 
@@ -3063,17 +3065,17 @@ msgstr ""
 "\"%s\" ���󥳡��ǥ��󥰤��� \"%s\" ���󥳡��ǥ��󥰤��Ѵ�����ݤ˥��顼��ȯ��"
 "���ޤ���"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "������ 2�ĤǤ�"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "����ˡ: %s [���ץ����] URL �ե�����\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3082,11 +3084,26 @@ msgstr ""
 "URL �����Ƥ���������Ϥ��ޤ�. �⤷���� URL �˥��������Ǥ��ʤ����,\n"
 "��������˥���������ǽ�� FILE ������˻Ȥ��ޤ�.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "ɸ����Ϥ˽񤭹�����˥��顼��ȯ�����ޤ���"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3129,12 +3146,12 @@ msgstr ""
 "��å��������������ˤ�ʣ����������������ޤ���, ���Ϸ����Ϥ�����������Ƥ�"
 "�ޤ���."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "���ϥե����� \"%s\" ���뤳�Ȥ��Ǥ��ޤ���"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "ɸ�����"
 
@@ -3149,9 +3166,9 @@ msgid "compilation of C# class failed, please try --verbose"
 msgstr "C# ���饹�Υ���ѥ���˼���. --verbose ���Ƥ�������"
 
 #: src/write-csharp.c:753
-#, fuzzy, c-format
+#, c-format
 msgid "compilation of C# class failed"
-msgstr "C# ���饹�Υ���ѥ���˼���. --verbose ���Ƥ�������"
+msgstr "C# ���饹�Υ���ѥ���˼���"
 
 #: src/write-java.c:975
 #, c-format
@@ -3165,17 +3182,16 @@ msgstr ""
 "Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
 
 #: src/write-java.c:1063
-#, fuzzy, c-format
+#, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"Java ���饹�Υ���ѥ���˼���. --verbose ���� $JAVAC �����ꤷ�Ƥ�������"
+msgstr "Java ���饹�Υ���ѥ���˼���. $JAVAC �����ꤷ�ƤߤƤ�������"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
 msgstr "\"%s\" �˽񤭹��⤦�Ȥ��ƥ��顼��ȯ�����ޤ���"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
@@ -3183,7 +3199,7 @@ msgstr ""
 "��ݲ����줿��å������� `\\%c' �Ȥ������������ץ������󥹤�ޤ�ǤϤ����ޤ�"
 "��"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3197,7 +3213,7 @@ msgstr ""
 "��Ƥ���Ƥ�������.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3221,8 +3237,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3247,7 +3263,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "%s ���֥ץ������ؤν񤭹�����˥��顼��ȯ�����ޤ���"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3255,7 +3271,7 @@ msgstr ""
 "��å��������������ˤ�ʸ̮��¸������������ޤ�.\n"
 "������ C# .resources ������ʸ̮��������Ƥ��ޤ���\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3279,36 +3295,34 @@ msgstr ""
 "��å��������������ˤ�ʣ����������������ޤ�.\n"
 "������ Tcl ��å�������������������ʣ�����ν�����������Ƥ��ޤ���\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: �ٹ�: ����ɽ���˽�ü������ޤ���"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: �ٹ�: ʸ������˽�ü������ޤ���"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "%s%s ���� ASCII ʸ����.\n"
 "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3317,7 +3331,7 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3326,7 +3340,7 @@ msgstr ""
 "%s:%d: Ĺ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3335,7 +3349,7 @@ msgstr ""
 "%s:%d: �ե�����κǸ���Դ����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3344,12 +3358,12 @@ msgstr ""
 "%s:%d: �����������ʥޥ���Х��ȥ�������.\n"
 "--from-code �����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: iconv ���"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3358,32 +3372,32 @@ msgstr ""
 "%s:%d: �����ʥޥ���Х��ȥ�������.\n"
 "--from-code �����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: �ٹ�: ������ Unicode ʸ��"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: �ٹ�: ʸ��������˽�ü������ޤ���"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: �ٹ�: '}' ������٤��Ȥ����� ')' ������ޤ�"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: �ٹ�: ')' ������٤��Ȥ����� '}' ������ޤ�"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3392,50 +3406,49 @@ msgstr ""
 "\"glade\" ����ϼ�������Ƥ��ޤ���. %s �� expat �˰�¸���ޤ�.\n"
 "���ΥС������� expat ��ޤޤ��˺���ޤ���.\n"
 
-#: src/x-java.c:492
-#, fuzzy, c-format
+#: src/x-java.c:494
+#, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: �ٹ�: ʸ����˽�ü������ޤ���"
+msgstr "%s:%d: �ٹ�: Ĺ������������ U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: EOF �����Τɤ��ˤ�ʸ����ü \"%s\" �����Ĥ���ޤ���"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: \\x{HEXNUMBER} �˱���̤�����ޤ���"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\l\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\u\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: \"%c\" ���������ѿ����"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\L\") 8bit ʸ�� \"%c\""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: ��������� (\"\\U\") 8bit ʸ�� \"%c\""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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 ""
@@ -3444,7 +3457,7 @@ msgstr ""
 "��\n"
 "�Ȥä����ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3456,7 +3469,7 @@ msgstr ""
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3468,7 +3481,7 @@ msgstr ""
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3480,7 +3493,7 @@ msgstr ""
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3492,7 +3505,7 @@ msgstr ""
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3504,27 +3517,27 @@ msgstr ""
 "��\n"
 "�Ȥä����������ϥ��󥳡��ǥ��󥰤���ꤷ�Ƥ�������.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "̤�ΤΥ��󥳡��ǥ��� \"%s\". ����� ASCII �Ȥ��ƿʤ�ޤ�."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ������ʸ�������"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: # �θ�˿���������ޤ���"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ������ʸ����ɽ��"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3533,27 +3546,27 @@ msgstr ""
 "%s:%lu: �ٹ�: ʸˡ $\"...\" �ϥ������ƥ������ͳ�ǿ侩����ޤ���. ����� "
 "eval_gettext ��ȤäƤ�������"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "--join-existing �Ͻ����褬ɸ����Ϥξ��ˤϻȤ��ޤ���"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext �ϸ������륭����ɤ��ʤ����ư���ޤ���"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "�ٹ�: �ե����� `%s' (��ĥ�� `%s') ��̤�Τη����ʤΤ� C ������ޤ�"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Ϳ����줿���ϥե����뤫��������ǽ��ʸ�������Ф��ޤ�.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3561,23 +3574,23 @@ msgid ""
 msgstr ""
 "  -d, --default-domain=NAME   ���Ϥ� NAME.po ����� (message.po ������)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=FILE           ���ꤵ�줿�ե�����˽���\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=DIR        �ǥ��쥯�ȥ� DIR �˥ե���������\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "���ϥե�������������:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3596,19 +3609,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ ��û�̷�\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "ɸ��Ǹ�������ϥե�����γ�ĥ�ҤǼ��̤���ޤ�.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3617,41 +3630,44 @@ msgstr ""
 "      --from-code=NAME           ���ϥե�����Υ��󥳡��ǥ���\n"
 "                                         (Python, Tcl, Glade �ʳ�)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "ɸ��Ǥ�, ���ϥե������ ASCII �Ȳ��ꤵ��ޤ�.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         ¸�ߤ���ե�����ȥ�å���������\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=FILE.po  FILE.po ����ι��ܤ���Ф���ʤ�\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:827
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=TAG]     TAG (�ޤ��ϥ�����ɹ�) ���դ���\n"
 "                               ��������ʬ����ϥե�����������\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr "������ꥪ�ץ����:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           ���Ƥ�ʸ��������\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3665,16 +3681,16 @@ msgstr ""
 "                                C#, awk. Tcl, Perl, PHP, GCC-source, Glade ��"
 "���)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:841
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=WORD]         ���륭����ɤλ��� (WORD �����ꤵ��\n"
 "                               �ʤ�����ɸ��Υ�����ɤϻȤ��ʤ�)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3685,7 +3701,7 @@ msgstr ""
 "����\n"
 "                              �ղåե饰\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3699,110 +3715,127 @@ msgstr ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC������ ����"
 "�Τ�)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             ���Ϥ��줿 ANSI C �ȥ饤����դ�ǧ��\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (C, C++, ObjectiveC �����)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    Qt ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (C++ �����)\n"
 
-#: src/xgettext.c:859
-#, fuzzy, c-format
+#: src/xgettext.c:863
+#, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    Qt ������ʸ�����ǧ��\n"
+msgstr "      --kde                   KDE 4 ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 Boost ������ʸ�����ǧ��\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 ���ܺ٤ʥե����ޥå�ʸ�����ǧ�����\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     Java .properties �ե���������\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 "      --foreign-user          ¾��Υ桼�������˽������ FSF ������ά\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
+msgstr "      --package-name=PACKAGE  �ѥå�����̾����Ϥ�����\n"
 
-#: src/xgettext.c:907
-#, fuzzy, c-format
+#: src/xgettext.c:911
+#, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --copyright-holder=STRING  �����ͭ�Ԥ���Ϥ�����\n"
+msgstr "      --package-version=VERSION  �ѥå������С���������Ϥ�����\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  msgid �ΥХ�����ѥ��ɥ쥹������\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=STRING]  msgstr ���ܤ���Ƭ���� STRING �� \"\" �����\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:918
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=STRING]  msgstr ���ܤ��������� STRING �� \"\" �����\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "--flag ������ <keyword>:<argnum>:[pass-]<flag> ʸˡ����äƤ��ޤ���: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr "ɸ������"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1927
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: �ٹ�: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3811,16 +3844,16 @@ msgstr ""
 "�ե����ޥå�ʸ����ΰ��֤ǻȤ��Ƥ��ޤ���, %s �������� %s �ե����ޥå�ʸ����"
 "�ǤϤ���ޤ���. ��ͳ: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "���Τ褦���������Ƥ��ޤ���, '%s' �������� %s ������ʸ����ǤϤ���ޤ���. ��"
 "ͳ: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3833,7 +3866,7 @@ msgstr ""
 "̾���դ������Τ���ե����ޥå�ʸ�����Ȥ�����, ��İ������Ф����� (tuple)\n"
 "������˥ޥåԥ󥰤�Ȥ����Ȥ�Ƥ���Ƥ�������.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3843,27 +3876,27 @@ msgstr ""
 "gettxt(\"\") �ϥ᥿������դ����إå�����ȥ���֤��ޤ���\n"
 "����ʸ������֤��ޤ���.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "������� '%.*s' ���Ф���������꤬ۣ��Ǥ�"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "�ٹ�: ������� '%.*s' ���Ф���ʸ̮������ޤ���"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "�ٹ�: ������� '%.*s' ��ʣ����������ʸ̮������ޤ���"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ʸ̮��ñ���Ϥ�ʣ�����ǰ��פ��ޤ���"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3875,7 +3908,7 @@ msgstr ""
 "��.\n"
 "�⤷����, ���ޥ�ɥ饤�󥪥ץ���� --msgid-bugs-address ����ꤷ�Ƥ�������.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr "���� `%s' ���Τ�ޤ���"
@@ -3884,38 +3917,23 @@ msgstr "���� `%s' ���Τ�ޤ���"
 msgid "<unnamed>"
 msgstr "<̾���ʤ�>"
 
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "%%%c �ؤ�ʣ����λ���"
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ "\n"
-#~ "[������]\n"
-#~ "����ϥե꡼�����եȥ������Ǥ�. ���ԡ��ξ��ˤĤ��Ƥϥ��������ɤߤ�����"
-#~ "��.\n"
-#~ "�Ծ����ڤ�������ŪŬ������ǡ���ˤ�餺, �����ʤ��ݾڤ⤢��ޤ���.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr ""
-#~ "��å��������������ˤ�ʸ̮�˰�¸��������������ޤ�.\n"
-#~ "������ C# .dll ������ʸ̮��������Ƥ��ޤ���\n"
-
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr ""
-#~ "��å��������������ˤ�ʸ̮�˰�¸��������������ޤ�.\n"
-#~ "������ Java ResourceBundle ������ʸ̮��������Ƥ��ޤ���\n"
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "���顼������ 0x%08x �� DuplicateHandle ����"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "̤����."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "%s ���֥ץ������˥֥��å��󥰤��ʤ������Ϥ�����Ǥ��ޤ���"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s ���֥ץ������Ȥ��̿��˼���"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s ���֥ץ�����������ɤ߹��ߤ˼���"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s ���֥ץ���������λ������ %d �ǽ�λ"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "���� `%s' �����ɸ���ͤΤޤޤǤ�\n"
diff --git a/gettext-tools/po/ko.po b/gettext-tools/po/ko.po
index ac769b1..5e8a7c4 100644
--- a/gettext-tools/po/ko.po
+++ b/gettext-tools/po/ko.po
@@ -1,229 +1,232 @@
 # gettext-tools
-# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+#
 # Bang Jun-Young <bangjy@geocities.com>, 1995-1997.
-# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007.
+# Changwoo Ryu <cwryu@debian.org>, 2001-2005, 2007, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.16\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 2007-06-13 21:37+0900\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-21 11:35+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-KR\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr "`%2$s'�� ���� ���� `%1$s'��(��) �߸��Ǿ����ϴ�"
+msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 잘못되었습니다"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr "`%2$s'�� ���� ���� `%1$s'��(��) �ָ��մϴ�"
+msgstr "`%2$s'에 대한 인자 `%1$s'이(가) 애매합니다"
 
 #: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
-msgstr "�ùٸ� ���ڴ� ������ �����ϴ�:"
+msgstr "올바른 인자는 다음과 같습니다:"
 
 #: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "�ӽ� ���丮�� �����ϴ�, $TMPDIR ȯ�溯���� �����Ͻʽÿ�"
+msgstr "임시 디렉터리가 없습니다, $TMPDIR 환경변수를 세팅하십시오"
 
 #: gnulib-lib/clean-temp.c:347
 #, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "Ʋ \"%s\"��(��) �̿��� �ӽ� ���丮�� ���� �� �����ϴ�"
+msgstr "틀 \"%s\"을(를) 이용해 임시 디렉터리를 만들 수 없습니다"
 
 #: gnulib-lib/clean-temp.c:443
 #, c-format
 msgid "cannot remove temporary file %s"
-msgstr "�ӽ� ���� %s��(��) ���� �� �����ϴ�"
+msgstr "임시 파일 %s을(를) 지울 수 없습니다"
 
 #: gnulib-lib/clean-temp.c:458
 #, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "�ӽ� ���丮 %s��(��) ���� �� �����ϴ�"
+msgstr "임시 디렉터리 %s을(를) 지울 수 없습니다"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr "���� ����"
+msgstr "쓰기 오류"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
-msgstr "�б� ���� \"%s\"��(��) ���� ���� ���� �߻�"
+msgstr "읽기 위해 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
-msgstr "��� ���� \"%s\"��(��) ���� ���� ���� ���߽��ϴ�"
+msgstr "백업 파일 \"%s\"을(를) 쓰기 위해 열지 못했습니다"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
-msgstr "\"%s\" ������ �д� ���� ���� �߻�"
+msgstr "\"%s\" 파일을 읽는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
-msgstr "\"%s\" ������ ���� ���� ���� �߻�"
+msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
-msgstr "\"%s\" ������ ���� �Ŀ� ���� �߻�"
+msgstr "\"%s\" 파일을 읽은 후에 오류 발생"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
-msgstr "fdopen()�� �����߽��ϴ�"
+msgstr "fdopen()이 실패했습니다"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr "C# �����Ϸ��� �����ϴ�.  pnet�� ��ġ�� ���ʽÿ�"
+msgstr "C# 컴파일러가 없습니다. pnet을 설치해 보십시오"
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr "C# �����谡 �����ϴ�.  pnet�� ��ġ�� ���ʽÿ�"
+msgstr "C# 가상기계가 없습니다. pnet을 설치해 보십시오"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
-msgstr "�� �� ���� �ý��� ����"
+msgstr "알 수 없는 시스템 오류"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr "%s �������μ����� �����߽��ϴ�"
+msgstr "%s 서브프로세스가 실패했습니다"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+msgstr "%s: `%s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: `--%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `--%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: `%c%s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `%c%s' 옵션은 인수를 허용하지 않습니다\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' �ɼ��� �μ��� �ʿ��մϴ�\n"
+msgstr "%s: `%s' 옵션은 인수가 필요합니다\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `--%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 `--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: �ν��� �� ���� �ɼ� `%c%s'\n"
+msgstr "%s: 인식할 수 없는 옵션 `%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: �߸��� �ɼ� -- %c\n"
+msgstr "%s: 잘못된 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: �������� �ɼ� -- %c\n"
+msgstr "%s: 부적절한 옵션 -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: �� �ɼ��� �μ��� �ʿ��մϴ� -- %c\n"
+msgstr "%s: 이 옵션은 인수가 필요합니다 -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s'��(��) ��ȣ�� �ɼ��Դϴ�\n"
+msgstr "%s: `-W %s'은(는) 모호한 옵션입니다\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' �ɼ��� �μ��� ������� �ʽ��ϴ�\n"
+msgstr "%s: `-W %s' 옵션은 인수를 허용하지 않습니다\n"
 
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr "compile_java_class�� ���� source_version ���ڰ� �߸��Ǿ����ϴ�"
+msgstr "compile_java_class에 대한 source_version 인자가 잘못되었습니다"
 
 #: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr "compile_java_class�� ���� target_version ���ڰ� �߸��Ǿ����ϴ�"
+msgstr "compile_java_class에 대한 target_version 인자가 잘못되었습니다"
 
 #: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
 #: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
-msgstr "\"%s\"��(��) ����� �� �����߽��ϴ�"
+msgstr "\"%s\"을(를) 만드는 데 실패했습니다"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 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\" ������ ���� ���� ���� �߻�"
+msgstr "\"%s\" 파일을 쓰는 동안 오류 발생"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
-"�ڹ� �����Ϸ��� �����ϴ�.  gcj�� ��ġ�ϰų� $JAVAC ȯ�溯���� �����Ͻʽÿ�"
+"자바 컴파일러가 없습니다. gcj를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
-"�ڹ� �����谡 �����ϴ�.  gij�� ��ġ�ϰų� $JAVAC ȯ�溯���� �����Ͻʽÿ�"
+"자바 가상기계가 없습니다. gij를 설치하거나 $JAVAC 환경변수를 세팅하십시오"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr "%s ��������� ����� ����"
+msgstr "%s 서브프로세스 입출력 오류"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr "�޸𸮰� �ٴڳ����ϴ�"
+msgstr "메모리가 바닥났습니다"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
-msgstr "�������� ���� �� �����ϴ�"
+msgstr "파이프를 만들 수 없습니다"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
@@ -238,78 +241,77 @@ msgstr "�������� ���� �� �����ϴ�"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "`"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle�� ���� �ڵ� 0x%08x������ �����߽��ϴ�"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr "_open_osfhandle ����"
+msgstr "_open_osfhandle 실패"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "출력 파일 \"%s\"을(를) 만들 수 없습니다"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr "%s ���������"
+msgstr "%s 서브프로세스"
 
-# fatal signal ���� ����
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+# fatal signal 번역 개선
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr "%s �������μ����� ġ������ �ñ׳� %d��(��) �޾ҽ��ϴ�"
+msgstr "%s 서브프로세스가 치명적인 시그널 %d을(를) 받았습니다"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
-"'msgid'�ʹ� �޸�, '%s'��(��) �ùٸ� %s ���� ���ڿ��� �ƴմϴ�. ����: %s"
+"'msgid'와는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "'%2$s' �ȿ� �ִ�, ���� %1$u�� ���� ���� ������ 'msgid'�� �����ϴ�"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr "'%2$s' 안에 있는, 인자 %1$u에 대한 서식 지정이 'msgid'에 없습니다"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "���� %u�� ���� ���� ������ '%s'�� �����ϴ�"
+msgstr "인자 %u에 대한 서식 지정이 '%s'에 없습니다"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "'msgid'�� '%s'�� ���� ���� %u�� ���� ���� ������ ���� �ʽ��ϴ�"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
+msgstr "'msgid'와 '%s'에 쓰인 인자 %u에 대한 서식 지정이 같지 않습니다"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr "������ %u���� |�� ���������� |�� ������ �ʽ��ϴ�."
+msgstr "지시자 %u번이 |로 시작하지만 |로 끝나지 않습니다."
 
 #: src/format-c.c:181
 #, c-format
@@ -317,157 +319,157 @@ msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"������ %u������, '<' ���� ��ū�� ������ �����ϴ� ��ũ�� �̸��� �ƴմϴ�. �ù�"
-"�� ��ũ�� �̸��� ISO C 99 ���� 7.8.1�� ���ŵǾ� �ֽ��ϴ�."
+"지시자 %u번에서, '<' 뒤의 토큰이 포맷을 지정하는 매크로 이름이 아닙니다. 올바"
+"른 매크로 이름은 ISO C 99 섹션 7.8.1에 열거되어 있습니다."
 
 #: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
-msgstr "������ %u������, '<' ���� ��ū ������ '>'�� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, '<' 뒤의 토큰 다음에 '>'가 오지 않습니다."
 
 #: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
-msgstr "���ڿ��� ���� ��ȣ  %u��(��) ���������� ���� ��ȣ %u��(��) �����մϴ�."
+msgstr "문자열이 인자 번호  %u을(를) 참조하지만 인자 번호 %u을(를) 무시합니다."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
-msgstr "'msgid'�� '%s'�� ���� ���� �������� ������ ��ġ���� �ʽ��ϴ�"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
+msgstr "'msgid'와 '%s'에 쓰인 서식 지정자의 개수가 일치하지 않습니다"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "������ %u������, '{' ������ ���� ��ȣ�� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, '{' 다음에 인자 번호가 오지 않습니다."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr "������ %u������, ���� ������ ','�� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, 숫자 다음에 ','가 오지 않습니다."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
-"���ڿ��� ������ �߰����� �����ϴ�: ¦�� �´� '}'�� ���� '{'�� �߰��߽��ϴ�."
+"문자열이 지시자 중간에서 끝납니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
-msgstr "������ %u���� '}'�� �ƴ϶� �߸��� '%c' ���ڷ� �����ϴ�."
+msgstr "지시자 %u번이 '}'가 아니라 잘못된 '%c' 문자로 끝납니다."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr "������ %u���� '}'�� �ƴ϶� �߸��� ���ڷ� �����ϴ�."
+msgstr "지시자 %u번이 '}'가 아니라 잘못된 문자로 끝납니다."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
-"������ �߰����� ���ڿ��� �����մϴ�: ¦�� �´� '}'�� ���� '{'�� �߰��߽��ϴ�."
+"지시자 중간에서 문자열이 시작합니다: 짝이 맞는 '}'가 없는 '{'를 발견했습니다."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr "���ڿ��� ������ %u�� �ڿ� '}'�� ��� �ֽ��ϴ�."
+msgstr "문자열에 지시자 %u번 뒤에 '}'가 들어 있습니다."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr "������ %u������, �÷��� ������ �߸��Ǿ����ϴ�."
+msgstr "지시자 %u번에서, 플래그 조합이 잘못되었습니다."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr "������ %u������, '%c' �տ��� ��ȿ���ڸ� ������ �� �����ϴ�."
+msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자가 올 수 없습니다."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
-msgstr "������ %u������, ��ȿ���ڿ� ���� ���� ������ %u��(��) ���ƾ� �մϴ�."
+msgstr "지시자 %u번에서, 유효숫자에 대해 인자 개수가 %u와(과) 같아야 합니다."
 
-#: src/format-gcc-internal.c:396
-#, fuzzy, c-format
+#: src/format-gcc-internal.c:398
+#, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
-msgstr "������ %u������, '%c' �տ��� ��ȿ���ڸ� ������ �� �����ϴ�."
+msgstr "지시자 %u번에서, '%c' 앞에는 유효숫자를 지정할 수 없습니다."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr "������ %u������, ��ȿ���� ������ �߸��Ǿ����ϴ�."
+msgstr "지시자 %u번에서, 유효숫자 지정이 잘못되었습니다."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr "������ %u������, '%c' �տ��� �÷��׸� �� �� �����ϴ�."
+msgstr "지시자 %u번에서, '%c' 앞에는 플래그를 쓸 수 없습니다."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
-msgstr "'msgid'�� %%m�� ��������� '%s'��(��) ������� �ʽ��ϴ�"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr "'msgid'가 %%m 포맷을 사용하지만 '%s'은(는) 사용하지 않습니다"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
-msgstr "'msgid'�� %%m�� ������� ������ '%s'��(��) %%m�� ����մϴ�"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr "'msgid'가 %%m 포맷을 사용하지 않지만 '%s'은(는) %%m 포맷을 사용합니다"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr "������ �߰����� ���ڿ��� �����ϴ�."
+msgstr "지시자 중간에서 문자열이 끝납니다."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
-"���ڿ��� ������ ���� ��ȣ�� ���� ����� �̸����� �����ϴ� ��� �� ������ ����"
-"�� �����մϴ�."
+"문자열이 인자의 절대 번호를 통한 방법과 이름없이 지정하는 방법 두 가지로 인자"
+"를 참조합니다."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr "������ %u������, ���� ��ȣ 0�� 1 �̻��� ������ �ƴմϴ�."
+msgstr "지시자 %u번에서, 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:30
 #, c-format
 msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
-msgstr "������ %u������, �ʺ��� ���� ��ȣ 0�� 1 �̻��� ������ �ƴմϴ�."
+msgstr "지시자 %u번에서, 너비의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:32
 #, c-format
 msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
-msgstr "������ %u������, ���е��� ���� ��ȣ 0�� 1 �̻��� ������ �ƴմϴ�."
+msgstr "지시자 %u번에서, 정밀도의 인자 번호 0이 1 이상의 정수가 아닙니다."
 
 #: src/format-invalid.h:36
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
-msgstr "������ %u������, '%c' ���ڴ� �ùٸ� ��ȯ �����ڰ� �ƴմϴ�."
+msgstr "지시자 %u번에서, '%c' 문자는 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:37
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
-msgstr "������ %u���� ����ġ�� ���ڰ� �ùٸ� ��ȯ �����ڰ� �ƴմϴ�."
+msgstr "지시자 %u번을 끝마치는 문자가 올바른 변환 지정자가 아닙니다."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr "���ڿ����� ȣȯ���� �ʴ� ������� ���� ��ȣ %u��(��) �����մϴ�."
+msgstr "문자열에서 호환되지 않는 방법으로 인자 번호 %u을(를) 참조합니다."
 
 #: src/format-java.c:240
 #, c-format
@@ -475,19 +477,19 @@ msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
-"������ %u������, ���깮�ڿ� \"%s\"��(��) �ùٸ� ��¥/�ð� ��Ÿ���� �ƴմϴ�."
+"지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 날짜/시각 스타일이 아닙니다."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr "������ %u������, \"%s\" ������ ��ǥ�� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, \"%s\" 다음에 쉼표가 오지 않습니다."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
-"������ %u������, ���깮�ڿ� \"%s\"��(��) �ùٸ� ���� ��Ÿ���� �ƴմϴ�."
+"지시자 %u번에서, 서브문자열 \"%s\"은(는) 올바른 숫자 스타일이 아닙니다."
 
 #: src/format-java.c:323
 #, c-format
@@ -495,13 +497,13 @@ msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
-"������ %u������, ���� ��ȣ ������ ��ǥ�� \"%s\", \"%s\", \"%s\", \"%s\"���� "
-"�ϳ��� ���� �ʽ��ϴ�."
+"지시자 %u번에서, 인자 번호 다음에 쉼표와 \"%s\", \"%s\", \"%s\", \"%s\"중의 "
+"하나가 오지 않습니다."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr "������ %u������, ���� ������ ���ڰ� ��� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, 선택 지정에 숫자가 들어 있지 않습니다."
 
 #: src/format-java.c:583
 #, c-format
@@ -509,26 +511,25 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"������ %u������, ���� ������ ���� ������ '<', '#', Ȥ�� '%s'��(��) ���� �ʽ�"
-"�ϴ�."
+"지시자 %u번에서, 선택 지정에 숫자 다음에 '<', '#', 혹은 '%s'이(가) 오지 않습"
+"니다."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
-msgstr "'%2$s' �ȿ� �ִ�, ���� {%1$u}�� ���� ���� ������ 'msgid'�� �����ϴ�"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr "'%2$s' 안에 있는, 인자 {%1$u}에 대한 서식 지정이 'msgid'에 없습니다"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "���� {%u}�� ���� ���� ������ '%s'�� �����ϴ�"
+msgstr "인자 {%u}에 대한 서식 지정이 '%s'에 없습니다"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-msgstr "���� {%2$u}�� ���� 'msgid'�� '%1$s'�� ���� ������ ���� �ʽ��ϴ�"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr "인자 {%2$u}에 대한 'msgid'와 '%1$s'의 서식 지정이 같지 않습니다"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -537,45 +538,45 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"������ %u������, �Ķ���� %u��(��) '%s' Ÿ��������, '%s' Ÿ���̾�� �մϴ�."
+"지시자 %u번에서, 파라미터 %u은(는) '%s' 타입이지만, '%s' 타입이어야 합니다."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
-"������ %u������, �Ű������� �ʹ� �����ϴ�; �ִ� %u���� �Ű������� �� �� �ֽ�"
-"�ϴ�."
+"지시자 %u번에서, 매개변수가 너무 많습니다; 최대 %u개의 매개변수만 올 수 있습"
+"니다."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr "������ %u������, '%c' ������ ���ڰ� ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, '%c' 다음에 숫자가 오지 않습니다."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr "������ %u������, ���� %d��(��) 0���� �۽��ϴ�."
+msgstr "지시자 %u번에서, 인자 %d이(가) 0보다 작습니다."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr "���ڿ��� ~/.../ �������� �߰����� �����ϴ�."
+msgstr "문자열이 ~/.../ 지시자의 중간에서 끝납니다."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr "'~%c'�� ¦�� �´� '~%c'��(��) �����ϴ�."
+msgstr "'~%c'에 짝이 맞는 '~%c'이(가) 없습니다."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr "������ %u������, @�� : �����ڰ� ��� ��� �ֽ��ϴ�."
+msgstr "지시자 %u번에서, @와 : 변경자가 모두 들어 있습니다."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -583,130 +584,129 @@ msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"������ %u������, '~:[' ������ �;� �ϴ� '~;'�� ���е� �� ���� ���� ���� �ʽ�"
-"�ϴ�."
+"지시자 %u번에서, '~:[' 다음에 와야 하는 '~;'로 구분된 두 개의 절이 오지 않습"
+"니다."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr "������ %u������, '~;'�� �߸��� ��ġ�� ���������ϴ�."
+msgstr "지시자 %u번에서, '~;'이 잘못된 위치에 쓰여졌습니다."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr "���ڿ��� ȣȯ���� �ʴ� ������� ���ڸ� �����մϴ�."
+msgstr "문자열이 호환되지 않는 방법으로 인자를 참조합니다."
 
-# ���⼭ equivalent�� ���� �ؼ���?
+# 여기서 equivalent에 대한 해석은?
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr "'msgid'�� '%s'�� ���� ������ �������� �ʽ��ϴ�"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
+msgstr "'msgid'와 '%s'의 서식 지정이 동등하지 않습니다"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "'%s' �ȿ� �ִ� ���� ������ 'msgid'�� �����ϴ�"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgstr "'%s' 안에 있는 서식 지정이 'msgid'에 없습니다"
 
 #: src/format-perl.c:433
 #, c-format
 msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
-msgstr "������ %u������, ũ�� ������ '%c' ��ȯ ������ ȣȯ���� �ʽ��ϴ�."
+msgstr "지시자 %u번에서, 크기 지정은 '%c' 변환 지정과 호환되지 않습니다."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "���� '%s'�� ���� ���� ������ '%s'�� �����ϴ�"
+msgstr "인자 '%s'에 대한 서식 지정이 '%s'에 없습니다"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
-"���ڿ��� ���� �̸��� ���� ����� �̸����� �����ϴ� ��� �� ������ ���ڸ� ����"
-"�մϴ�."
+"문자열이 인자 이름을 통한 방법과 이름없이 지정하는 방법 두 가지로 인자를 참조"
+"합니다."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
-msgstr "���ڿ��� ȣȯ���� �ʴ� ������� '%s'(��)��� �̸��� ���ڸ� �����մϴ�."
+msgstr "문자열이 호환되지 않는 방법으로 '%s'(이)라는 이름의 인자를 참조합니다."
 
-# mapping�� tuple: python ����Ÿ ����
-#: src/format-python.c:419
-#, c-format
+# mapping과 tuple: python 데이타 구조
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
-msgstr "'msgid'�� ���� �����ڴ� ������ �ʿ��ѵ�, '%s'���� ������ �ʿ��մϴ�"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
+msgstr "'msgid'의 서식 지정자는 매핑이 필요한데, '%s'에는 터플이 필요합니다"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
-msgstr "'msgid'�� ���� �����ڴ� ������ �ʿ��ѵ�, '%s'���� ������ �ʿ��մϴ�"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
+msgstr "'msgid'의 서식 지정자는 터플이 필요한데, '%s'에는 매핑이 필요합니다"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
-msgstr "'%2$s' �ȿ� �ִ�, ���� '%1$s'�� ���� ���� ������ 'msgid'�� �����ϴ�"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
+msgstr "'%2$s' 안에 있는, 인자 '%1$s'에 대한 서식 지정이 'msgid'에 없습니다"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
-msgstr "���� '%s'�� ���� 'msgid'�� '%s'�� ���� ������ ���� �ʽ��ϴ�"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
+msgstr "인자 '%s'에 대한 'msgid'와 '%s'의 서식 지정이 같지 않습니다"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
+"'msgid'는 간단한 형식 문자열이지만 '%s' 문자열은 아닙니다: 'L' 플래그가 들어 "
+"있거나 인자 번호가 두 자리로 들어 있습니다."
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
-msgstr "���ڿ��� ASCII�� �ƴ� �̸����� �� ������ �����մϴ�."
+msgstr "문자열이 ASCII가 아닌 이름으로 쉘 변수를 참조합니다."
 
 #: src/format-sh.c:81
 msgid ""
 "The string refers to a shell variable with complex shell brace syntax. This "
 "syntax is unsupported here due to security reasons."
 msgstr ""
-"���ڿ��� ������ �� �߰�ȣ �������� �� ������ �����մϴ�. �� ������ ���Ȼ��� "
-"���������� �������� �ʽ��ϴ�."
+"문자열이 복잡한 쉘 중괄호 문법으로 쉘 변수를 참조합니다. 이 문법은 보안상의 "
+"이유때문에 지원하지 않습니다."
 
 #: src/format-sh.c:83
 msgid ""
 "The string refers to a shell variable whose value may be different inside "
 "shell functions."
-msgstr "���ڿ��� �� �Լ� �ȿ��� �ٸ� ���� �ִ� �� ������ �����մϴ�."
+msgstr "문자열이 쉘 함수 안에서 다를 수도 있는 쉘 변수를 참조합니다."
 
 #: src/format-sh.c:85
 msgid "The string refers to a shell variable with an empty name."
-msgstr "���ڿ��� �� �̸��� �� ������ �����մϴ�."
+msgstr "문자열이 빈 이름의 쉘 변수를 참조합니다."
 
 #: src/format-ycp.c:90
 #, c-format
 msgid ""
 "In the directive number %u, the character '%c' is not a digit between 1 and "
 "9."
-msgstr "������ %u������, ���� '%c'��(��) 1�� 9 ������ ���ڰ� �ƴմϴ�."
+msgstr "지시자 %u번에서, 문자 '%c'이(가) 1과 9 사이의 숫자가 아닙니다."
 
 #: src/format-ycp.c:91
 #, c-format
 msgid ""
 "The character that terminates the directive number %u is not a digit between "
 "1 and 9."
-msgstr "������ %u���� ����ġ�� ���ڰ� 1�� 9 ������ ���ڰ� �ƴմϴ�."
+msgstr "지시자 %u번을 끝마치는 문자가 1과 9 사이의 숫자가 아닙니다."
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -714,57 +714,61 @@ msgid ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+"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:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, c-format
 msgid "Written by %s.\n"
-msgstr "%s��(��) ��������ϴ�.\n"
+msgstr "%s이(가) 만들었습니다.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr "���� ���̺� (Bruno Haible)"
+msgstr "브루노 헤이블 (Bruno Haible)"
 
 #: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
 #, c-format
 msgid "too many arguments"
-msgstr "�μ��� �ʹ� ����"
+msgstr "인수가 너무 많음"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "�� ���� ������ ������ `%s --help' �Ͻʽÿ�.\n"
+msgstr "더 많은 정보를 보려면 `%s --help' 하십시오.\n"
 
 #: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr "����: %s [<�ɼ�>]\n"
+msgstr "사용법: %s [<옵션>]\n"
 
 #: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr "�� ����� ȣ��Ʈ�̸��� ǥ���մϴ�.\n"
+msgstr "이 기계의 호스트이름을 표시합니다.\n"
 
 #: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr "��� ����:\n"
+msgstr "출력 형식:\n"
 
 #: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr "  -s, --short           ª�� ȣ��Ʈ�̸�\n"
+msgstr "  -s, --short           짧은 호스트이름\n"
 
 #: src/hostname.c:222
 #, c-format
@@ -773,80 +777,80 @@ msgid ""
 "domain\n"
 "                                name, and aliases\n"
 msgstr ""
-"  -f, --fqdn, --long    �� ȣ��Ʈ�̸�, ���� ���� �������̸�(Fully Qualified\n"
-"                          Domain Name) �� ����(alias)���� ��� ����\n"
+"  -f, --fqdn, --long    긴 호스트이름, 완전 공인 도메인이름(Fully Qualified\n"
+"                          Domain Name) 및 별명(alias)들을 모두 포함\n"
 
 #: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr "  -i, --ip-address      ȣ��Ʈ�̸��� ���� �ּ�\n"
+msgstr "  -i, --ip-address      호스트이름에 대한 주소\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr "���� ���:\n"
+msgstr "정보 출력:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr "  -h, --help                  �� ������ �����ְ� �����ϴ�\n"
+msgstr "  -h, --help                  이 도움말을 보여주고 끝납니다\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr "  -V, --version               ���� ������ ǥ���ϰ� �����ϴ�\n"
+msgstr "  -V, --version               버전 정보를 표시하고 끝납니다\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
-msgstr "<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
 #, c-format
 msgid "could not get host name"
-msgstr "ȣ��Ʈ�̸��� �˾Ƴ� �� �����ϴ�"
+msgstr "호스트이름을 알아낼 수 없습니다"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
-msgstr "�ִ� �� ���� �Է����ϸ��� ���˴ϴ�"
+msgstr "최대 한 개의 입력파일만이 허용됩니다"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s��(��) %s��(��) ���� ��Ÿ���Դϴ�"
+msgstr "%s과(와) %s은(는) 서로 배타적입니다"
 
 #: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr "����: %s [�ɼ�] [�Է�����]\n"
+msgstr "사용법: %s [옵션] [입력파일]\n"
 
 #: src/msgattrib.c:400
 #, c-format, no-wrap
@@ -854,141 +858,140 @@ msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
-"���� �޼������� �� �Ӽ��� ���� �ɷ�����, �� �Ӽ��� �����մϴ�.\n"
+"번역 메시지들을 그 속성에 따라 걸러내고, 그 속성을 조작합니다.\n"
 "\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
-msgstr "�� �ɼǿ��� �� �ʿ��� �μ��� ª�� �ɼǿ��� �� �ʿ��մϴ�.\n"
+msgstr "긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
-msgstr "�Է� ���� ��ġ:\n"
+msgstr "입력 파일 위치:\n"
 
 #: src/msgattrib.c:409 src/msgconv.c:303 src/msggrep.c:514 src/msguniq.c:334
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
-msgstr "  <�Է�����>                     �Է� PO ����\n"
+msgstr "  <입력파일>                     입력 PO 파일\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
-"  -D, --directory=<���丮>     �Է� ���� Ž�� ���ܿ� <���丮>�� ���մ�"
-"��\n"
+"  -D, --directory=<디렉터리>  입력 파일 탐색 명단에 <디렉터리>를 추가합니다\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
-msgstr "�Է� ������ �־����� �ʰų� \"-\"�̸�, ǥ�� �Է¿��� �н��ϴ�.\n"
+msgstr "입력 파일이 주어지지 않거나 \"-\"이면, 표준 입력에서 읽습니다.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
-msgstr "��� ���� ��ġ:\n"
+msgstr "출력 파일 위치:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
-msgstr "  -o, --output-file=<����>   ������ ���Ϸ� ����մϴ�\n"
+msgstr "  -o, --output-file=<파일>   지정한 파일로 출력합니다\n"
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
 "The results are written to standard output if no output file is specified\n"
 "or if it is -.\n"
 msgstr ""
-"���� ��� ������ �������� �ʾҰų� \"-\"�� ���, ������� ǥ�� ������� \n"
-"����մϴ�.\n"
+"만약 출력 파일이 지정되지 않았거나 \"-\"인 경우, 결과물을 표준 출력으로 \n"
+"출력합니다.\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
-msgstr "�޼��� ����:\n"
+msgstr "메시지 선택:\n"
 
 #: src/msgattrib.c:426
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
-"      --translated            �����Ǿ����� �� �ΰ�, �������� �ʾ����� �����"
-"��\n"
+"      --translated            번역되었으면 놔 두고, 번역되지 않았으면 지웁니"
+"다\n"
 
 #: src/msgattrib.c:428
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
-"      --untranslated          �������� �ʾ����� �� �ΰ�, �����Ǿ����� �����"
-"��\n"
+"      --untranslated          번역되지 않았으면 놔 두고, 번역되었으면 지웁니"
+"다\n"
 
 #: src/msgattrib.c:430
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
-msgstr "      --no-fuzzy              'fuzzy'�� ǥ�õ� �޼����� ����ϴ�\n"
+msgstr "      --no-fuzzy              'fuzzy'로 표시된 메시지를 지웁니다\n"
 
 #: src/msgattrib.c:432
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
-msgstr "      --only-fuzzy            'fuzzy'�� ǥ�õ� �޼����� �� �Ӵϴ�\n"
+msgstr "      --only-fuzzy            'fuzzy'로 표시된 메시지를 놔 둡니다\n"
 
 #: src/msgattrib.c:434
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
-msgstr "      --no-obsolete           ������ #~ �޼����� ����ϴ�\n"
+msgstr "      --no-obsolete           없어진 #~ 메시지를 지웁니다\n"
 
 #: src/msgattrib.c:436
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
-msgstr "      --only-obsolete         ������ #~ �޼����� �� �Ӵϴ�\n"
+msgstr "      --only-obsolete         없어진 #~ 메시지를 놔 둡니다\n"
 
 #: src/msgattrib.c:439
 #, c-format
 msgid "Attribute manipulation:\n"
-msgstr "�Ӽ� ����:\n"
+msgstr "속성 조작:\n"
 
 #: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             ��� �޼����� 'fuzzy'�� ����ϴ�\n"
+msgstr "      --set-fuzzy             모든 메시지를 'fuzzy'로 만듭니다\n"
 
 #: src/msgattrib.c:443
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
-"      --clear-fuzzy           ��� �޼����� 'fuzzy'�� �ƴϵ��� ����ϴ�\n"
+"      --clear-fuzzy           모든 메시지를 'fuzzy'가 아니도록 만듭니다\n"
 
 #: src/msgattrib.c:445
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
-msgstr "      --set-obsolete          ��� �޼����� ���� �޼����� ����ϴ�\n"
+msgstr "      --set-obsolete          모든 메시지를 없는 메시지로 만듭니다\n"
 
 #: src/msgattrib.c:447
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
-"      --clear-obsolete        ��� �޼����� ���� �޼����� �ƴϵ��� ����ϴ�\n"
+"      --clear-obsolete        모든 메시지를 없는 메시지가 아니도록 만듭니다\n"
 
 #: src/msgattrib.c:449
 #, c-format
@@ -996,185 +999,184 @@ msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
-"      --clear-previous        ��� �޼������� \"������ msgid\"�� ����ϴ�\n"
+"      --clear-previous        모든 메시지에서 \"이전의 msgid\"를 지웁니다\n"
 
 #: src/msgattrib.c:451
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
-"      --only-file=<����>.po   <����>.po�� ��� �ִ� �׸� �����մϴ�\n"
+"      --only-file=<파일>.po   <파일>.po에 들어 있는 항목만 조작합니다\n"
 
 #: src/msgattrib.c:453
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
-"      --ignore-file=<����>.po <����>.po�� ��� ���� ���� �׸� �����մϴ�\n"
+"      --ignore-file=<파일>.po <파일>.po에 들어 있지 않은 항목만 조작합니다\n"
 
 #: src/msgattrib.c:455
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
-"      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"�� �����մϴ�\n"
+"      --fuzzy                 \"--only-fuzzy --clear-fuzzy\"와 동일합니다\n"
 
 #: src/msgattrib.c:457
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
-"      --obsolete              \"--only-obsolete --clear-obsolete\"�� �����մ�"
-"��\n"
+"      --obsolete              \"--only-obsolete --clear-obsolete\"와 동일합니"
+"다\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
-msgstr "�Է� ���� ����:\n"
+msgstr "입력 파일 문법:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      �Է� ������ �ڹ� .properties �������� �Ǿ� �ֽ�"
-"�ϴ�\n"
+"  -P, --properties-input      입력 파일이 자바 .properties 문법입니다\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
-"      --stringtable-input      �Է� ������ NeXTstep/GNUstep .strings �����Դ�"
-"��\n"
+"      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
+"다\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
-msgstr "��� ��:\n"
+msgstr "출력 상세:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"  -e, --no-escape             ��¿� C �̽��������� ���� �ʽ��ϴ� (�⺻��)\n"
+"  -e, --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"  -E, --escape                ��¿� C �̽��������� ���� Ȯ�� ���ڸ� ���� ��"
-"���ϴ�\n"
+"  -E, --escape                출력에 C 이스케이프를 쓰고 확장 문자를 쓰지 않"
+"습니다\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
-msgstr "      --force-po              ��� �ִ� �����̶� PO ���Ϸ� ���ϴ�\n"
+msgstr "      --force-po              비어 있는 파일이라도 PO 파일로 씁니다\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
-msgstr "  -i, --indent                �鿩����� ��Ÿ�Ϸ� .po ������ ���ϴ�\n"
+msgstr "  -i, --indent                들여쓰기된 스타일로 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
-"      --no-location           '#: �����̸�:�ٹ�ȣ' ���� ���� �ʽ��ϴ�\n"
+"      --no-location           '#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
-"  -n, --add-location          '#: �����̸�:�ٹ�ȣ' ���� ����ϴ� (�⺻��)\n"
+"  -n, --add-location          '#: 파일이름:줄번호' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
-"      --strict                �����ϰ� ���������� ������ .po ������ ���ϴ�\n"
+"      --strict                엄격하게 유니포럼을 따르는 .po 파일을 씁니다\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
-msgstr "  -p, --properties-output     �ڹ� .properties ������ ���ϴ�\n"
+msgstr "  -p, --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
-"      --stringtable-input      NeXTstep/GNUstep .strings ������ ���ϴ�\n"
+"      --stringtable-output     NeXTstep/GNUstep .strings 파일을 씁니다\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
-msgstr "  -w, --width=<����>          ��� �������� �ʺ� �����մϴ�\n"
+msgstr "  -w, --width=<숫자>          출력 페이지의 너비를 지정합니다\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, 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               ��� ������ ������ �� �޼��� ������ ���� �ٷ�\n"
-"                              �ڸ��� �ʽ��ϴ�.\n"
+"      --no-wrap               출력 페이지 폭보다 긴 메시지 라인을 여러 줄로\n"
+"                              자르지 않습니다.\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
-msgstr "  -s, --sort-output           ���ĵ� ����� ����� ���ϴ�\n"
+msgstr "  -s, --sort-output           정렬된 출력을 만들어 냅니다\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
-msgstr "  -F, --sort-by-file          ���� ��ġ�� ���� ����� �����մϴ�\n"
+msgstr "  -F, --sort-by-file          파일 위치에 따라 출력을 정렬합니다\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
-msgstr "�Ұ����� ���� ������ �����Ͽ����ϴ� (%d < n < %d)"
+msgstr "불가능한 선택 조건을 지정하였습니다 (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr "����: %s [<�ɼ�>] [<�Է�����>]...\n"
+msgstr "사용법: %s [<옵션>] [<입력파일>]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1187,93 +1189,99 @@ msgid ""
 "is specified, they will be taken from the first PO file to define them.\n"
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
-"������ PO ���ϵ��� �����ϰ� ��Ĩ�ϴ�.\n"
-"�� �� Ȥ�� �� �̻��� PO ���Ͽ��� ���������� ��� �ִ� �޼����� \n"
-"ã���ϴ�.  --more-than �ɼ��� ����ϸ� ���� �޼����� ���� �޼����� \n"
-"��µ� ���Դϴ�.  �� �ݴ��, --less-than �ɼ��� ���� �޼����� �� \n"
-"���� �޼������� ��µǰ� �˴ϴ� (���� ��� --less-than�� ������ \n"
-"�޼������� ����մϴ�).  ������, �ּ����� �ҽ����� ����� �ּ����� \n"
-"��� ������ ��������, --user-first �ɼ��� ����ϸ� �� �޼����� \n"
-"��Ÿ���� ���� ù ��° PO ���Ͽ� ��� �ִ�  ��� PO ���Ͽ��� ���� \n"
-"��ġ�� �״�� ������ ���Դϴ�.\n"
+"지정한 PO 파일들을 연결하고 합칩니다.\n"
+"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 \n"
+"찾습니다. --more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 \n"
+"출력될 것입니다. 그 반대로, --less-than 옵션은 같은 메시지가 더 \n"
+"적은 메시지들이 출력되게 됩니다 (예를 들어 --less-than은 유일한 \n"
+"메시지만을 출력합니다). 번역문, 주석문과 소스에서 추출된 주석문은 \n"
+"모두 유지될 것이지만, --user-first 옵션을 사용하면 그 메시지가 \n"
+"나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
+"위치는 그대로 유지될 것입니다.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
-msgstr "  �Է����� ...                �Է� ����\n"
+msgstr "  입력파일 ...                입력 파일\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
-msgstr "  -f, --files-from=<����>     �Է� ������ ����� <����>���� �н��ϴ�\n"
+msgstr "  -f, --files-from=<파일>     입력 파일의 목록을 <파일>에서 읽습니다\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
-msgstr "�Է� ������ -�̸�, ǥ�� �Է��� �н��ϴ�.\n"
+msgstr "입력 파일이 -이면, 표준 입력을 읽습니다.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
-"  -<, --less-than=<ũ��>      ������ �ͺ��� ���� �޼������� ����մϴ�.\n"
-"                              �� �ɼ��� ���� ��쿡 �⺻���� ���Ѵ��Դϴ�.\n"
+"  -<, --less-than=<크기>      지정한 것보다 적은 메시지만을 출력합니다.\n"
+"                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
-"  -<, --less-than=<ũ��>      ������ �ͺ��� ���� �޼������� ����մϴ�.\n"
-"                              �� �ɼ��� ���� ��쿡 �⺻���� ���Ѵ��Դϴ�.\n"
+"  -<, --less-than=<크기>      지정한 것보다 많은 메시지만을 출력합니다.\n"
+"                              이 옵션이 없을 경우에 기본값은 무한대입니다.\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
-"  -u, --unique                --less-than=2�� ª�� �� ���Դϴ�.\n"
-"                              ������ �޼������� ����մϴ�.\n"
+"  -u, --unique                --less-than=2를 짧게 쓴 것입니다.\n"
+"                              유일한 메시지만을 출력합니다.\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
-"  -P, --properties-input      �Է� ������ �ڹ� .properties �������� �Ǿ� �ֽ�"
-"�ϴ�\n"
+"  -P, --properties-input      입력 파일이 자바 .properties 문법으로 되어 있습"
+"니다\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
-"      --stringtable-input     �Է� ������ NeXTstep/GNUstep .strings �����Դ�"
-"��\n"
+"      --stringtable-input     입력 파일이 NeXTstep/GNUstep .strings 문법입니"
+"다\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
-msgstr "  -t, --to-code=<�̸�>          ����� ���ڵ�\n"
+msgstr "  -t, --to-code=<이름>          출력의 인코딩\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
-"      --use-first               �� �޼����߿��� ù��°�� ��Ÿ���� ��������\n"
-"                                ����ϰ�, ���� �������� ��ġ�� �ʽ��ϴ�\n"
+"      --use-first               각 메시지중에서 첫번째로 나타나는 번역문만\n"
+"                                사용하고, 여러 번역문을 합치지 않습니다\n"
+
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1281,33 +1289,38 @@ msgid ""
 "                              WHEN may be 'always', 'never', 'auto', or "
 "'html'.\n"
 msgstr ""
+"      --color                 색이나 기타 텍스트 속성을 항상 사용합니다\n"
+"      --color=<상황>          색이나 기타 텍스트 속성을 <상황>에 사용합니다\n"
+"                              <상황>은 'always', 'never', 'auto', 혹은 "
+"'html'.\n"
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
+"      --style=<스타일파일>    --color 옵션에 대해 CSS 스타일을 지정합니다\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
-msgstr "���� �з� (Peter Miller)"
+msgstr "피터 밀러 (Peter Miller)"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, c-format
 msgid "no input files given"
-msgstr "�Է� ������ �־����� �ʾҽ��ϴ�"
+msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "��Ȯ�� 2���� �Է� ������ �ʿ��մϴ�"
+msgstr "정확히 2개의 입력 파일이 필요합니다"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "����: %s [<�ɼ�>] def.po ref.pot\n"
+msgstr "사용법: %s [<옵션>] def.po ref.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1317,87 +1330,92 @@ msgid ""
 "you have translated each and every message in your program.  Where an exact\n"
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
-"���� ������ msgid ���ڿ��� �����ϰ� �ִ��� Ȯ���ϱ� ���� Uniforum ������ \n"
-"�� .po ������ ���մϴ�.  def.po ������ �̹� �����ϴ� �����̸� ������ \n"
-"������ �޽����� ��� �ֽ��ϴ�.  ref.po ������ �ֱٿ� ������� PO �����̰ų� \n"
-"PO Ʋ �����Դϴ�(�Ϲ������� xgettext�� ���� ��������ϴ�). �� ���α׷���\n"
-"���α׷� ���� �ִ� ������ �޽������� �����Ǿ����� Ȯ���� �� �����մϴ�.\n"
-"��Ȯ�� ¦�� ã�� ���� ���, ���� ���� ����� ��� ���� ���� ��Ī�� ���˴ϴ�.\n"
+"같은 내용의 msgid 문자열을 포함하고 있는지 확인하기 위해 Uniforum 형태의 \n"
+"두 .po 파일을 비교합니다. def.po 파일은 이미 존재하는 파일이며 예전에 \n"
+"번역된 메시지를 담고 있습니다. ref.po 파일은 최근에 만들어진 PO 파일이거나 \n"
+"PO 틀 파일입니다(일반적으로 xgettext에 의해 만들어집니다). 이 프로그램은\n"
+"프로그램 내에 있는 각각의 메시지들이 번역되었는지 확인할 때 유용합니다.\n"
+"정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻기 위해 퍼지 매칭이 사용됩니다.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
-msgstr "  def.po                      ������\n"
+msgstr "  def.po                      번역문\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
-msgstr "  ref.pot                     �ҽ��� ����\n"
+msgstr "  ref.pot                     소스를 참조\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
-msgstr "���� ����:\n"
+msgstr "동작 변경:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, 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"
+"  -m, --multi-domain          ref.pot 파일을 def.po의 각 도메인에 적용합니"
+"다\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr "  -N, --no-fuzzy-matching     퍼지 매칭을 하지 않습니다\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
-msgstr "      --use-fuzzy             ���� �׸��� ����մϴ�\n"
+msgstr "      --use-fuzzy             퍼지 항목을 사용합니다\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
-msgstr "      --use-untranslated      �������� ���� �׸��� ����մϴ�\n"
+msgstr "      --use-untranslated      번역하지 않은 항목을 사용합니다\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
-msgstr "�� �޼����� �������� �ʾҽ��ϴ�"
+msgstr "이 메시지는 번역되지 않았습니다"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
-msgstr "�� �޼����� �������� ���䰡 �ʿ��մϴ�"
+msgstr "이 메시지는 번역자의 검토가 필요합니다"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
-msgstr "�� �޽����� �������� ���ǵ��� �ʾҽ��ϴ�..."
+msgstr "이 메시지는 사용되지만 정의되지 않았습니다..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
-msgstr "...������ �� ���Ǵ� �����մϴ�"
+msgstr "...하지만 이 정의는 유사합니다"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
-msgstr "�� �޽����� �������� %s���� ���ǵ��� �ʾҽ��ϴ�"
+msgstr "이 메시지는 사용되지만 %s에서 정의되지 않았습니다"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
-msgstr "���: �� �޽����� ������ �ʽ��ϴ�"
+msgstr "경고: 이 메시지는 사용되지 않습니다"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
-msgstr[0] "%d���� ġ������ ������ ã�ҽ��ϴ�"
+msgstr[0] "%d개의 치명적인 오류를 찾았습니다"
 
 #: src/msgcomm.c:303
 #, c-format
 msgid "at least two files must be specified"
-msgstr "�ּ��� �� ���� ������ �����ؾ� �մϴ�"
+msgstr "최소한 두 개의 파일을 지정해야 합니다"
 
 #: src/msgcomm.c:351
 #, c-format, no-wrap
@@ -1411,14 +1429,14 @@ msgid ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
-"�� �� Ȥ�� �� �̻��� PO ���Ͽ��� ���������� ��� �ִ� �޼����� \n"
-"ã���ϴ�.  --more-than �ɼ��� ����ϸ� ���� �޼����� ���� �޼����� \n"
-"��µ� ���Դϴ�.  �� �ݴ��, --less-than �ɼ��� ���� �޼����� �� \n"
-"���� �޼������� ��µǰ� �˴ϴ� (���� ��� --less-than�� ������ \n"
-"�޼������� ����մϴ�).  ������, �ּ����� �ҽ����� ����� �ּ����� \n"
-"��� ������ ��������, --user-first �ɼ��� ����ϸ� �� �޼����� \n"
-"��Ÿ���� ���� ù ��° PO ���Ͽ� ��� �ִ�  ��� PO ���Ͽ��� ���� \n"
-"��ġ�� �״�� ������ ���Դϴ�.\n"
+"두 개 혹은 그 이상의 PO 파일에서 공통적으로 들어 있는 메시지를 \n"
+"찾습니다. --more-than 옵션을 사용하면 같은 메시지가 많은 메시지가 \n"
+"출력될 것입니다. 그 반대로, --less-than 옵션은 같은 메시지가 더 \n"
+"적은 메시지들이 출력되게 됩니다 (예를 들어 --less-than은 유일한 \n"
+"메시지만을 출력합니다). 번역문, 주석문과 소스에서 추출된 주석문은 \n"
+"모두 유지될 것이지만, --user-first 옵션을 사용하면 그 메시지가 \n"
+"나타나는 가장 첫 번째 PO 파일에 들어 있는  모든 PO 파일에서 파일 \n"
+"위치는 그대로 유지될 것입니다.\n"
 
 #: src/msgcomm.c:389
 #, c-format
@@ -1426,73 +1444,73 @@ msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
-"  ->, --more-than=<ũ��>         ������ �ͺ��� ���� �޼������� ����մϴ�.\n"
-"                                 �� �ɼ��� ���� ��쿡 �⺻���� 1�Դϴ�.\n"
+"  ->, --more-than=<크기>         지정한 것보다 많은 메시지만을 출력합니다.\n"
+"                                 이 옵션이 없을 경우에 기본값은 1입니다.\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
 msgstr ""
-"      --omit-header              ����� `msgid \"\"' �׸��� ���� �ʽ��ϴ�\n"
+"      --omit-header              헤더에 `msgid \"\"' 항목을 쓰지 않습니다\n"
 
 #: src/msgconv.c:294
 #, c-format
 msgid "Converts a translation catalog to a different character encoding.\n"
-msgstr "���� ����� �ٸ� ���� ���ڵ����� ��ȯ�մϴ�.\n"
+msgstr "번역 목록을 다른 문자 인코딩으로 변환합니다.\n"
 
 #: src/msgconv.c:318
 #, c-format
 msgid "Conversion target:\n"
-msgstr "��ȯ ��ǥ:\n"
+msgstr "변환 목표:\n"
 
 #: src/msgconv.c:322
 #, c-format
 msgid "The default encoding is the current locale's encoding.\n"
-msgstr "�⺻ ���ڵ��� ���� �������� ���ڵ��Դϴ�.\n"
+msgstr "기본 인코딩은 현재 로캘의 인코딩입니다.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
-msgstr "  -i, --indent                   �鿩����� ��� ����\n"
+msgstr "  -i, --indent                   들여쓰기된 출력 형태\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
-"      --no-location              ''#: �����̸�:�ٹ�ȣ' ���� ���� �ʽ��ϴ�\n"
+"      --no-location              ''#: 파일이름:줄번호' 줄을 쓰지 않습니다\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
-"      --add-location          '#: filename:line' ���� ����ϴ� (�⺻��)\n"
+"      --add-location          '#: filename:line' 줄을 만듭니다 (기본값)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
-msgstr "      --strict                   ������ Uniforum ��� ���·� ���ϴ�\n"
+msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
-msgstr "�Է� ������ �־����� �ʾҽ��ϴ�"
+msgstr "입력 파일이 주어지지 않았습니다"
 
-#: src/msgen.c:233
+#: src/msgen.c:241
 #, c-format
 msgid "exactly one input file required"
-msgstr "��Ȯ�� �� ���� �Է� ������ �ʿ��մϴ�"
+msgstr "정확히 한 개의 입력 파일이 필요합니다"
 
-#: src/msgen.c:274
+#: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "����: %s [<�ɼ�>] <�Է�����>\n"
+msgstr "사용법: %s [<옵션>] <입력파일>\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1500,27 +1518,27 @@ msgid ""
 "xgettext).  Untranslated entries are assigned a translation that is\n"
 "identical to the msgid.\n"
 msgstr ""
-"���� ���� ����� ����ϴ�.  �Է� ������ �ֱٿ� ������� ����\n"
-"PO �����̰ų�, PO Ʋ �����Դϴ� (�Ϲ������� xgettext�� ����ϴ�).\n"
-"�������� ���� �׸��� msgid�� ������ �������� �Ҵ�� ���̰�,\n"
-"������ ǥ�õ� ���Դϴ�.\n"
+"영어 번역 목록을 만듭니다. 입력 파일은 최근에 만들어진 영어\n"
+"PO 파일이거나, PO 틀 파일입니다 (일반적으로 xgettext로 만듭니다).\n"
+"번역되지 않은 항목은 msgid와 동일한 번역문이 할당될 것이고,\n"
+"퍼지로 표시될 것입니다.\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
-msgstr "  <�Է�����>                   �Է� PO ���� Ȥ�� POT ����\n"
+msgstr "  <입력파일>                   입력 PO 파일 혹은 POT 파일\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr "���ɾ� �̸��� �������ϴ�"
+msgstr "명령어 이름이 빠졌습니다"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr "����: %s [<�ɼ�>] <���ɾ�> [<���ɾ�-�ɼ�>]\n"
+msgstr "사용법: %s [<옵션>] <명령어> [<명령어-옵션>]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1529,300 +1547,283 @@ msgid ""
 "msgexec's output.  msgexec's return code is the maximum return code\n"
 "across all invocations.\n"
 msgstr ""
-"���� ����� ��� �������� ���� ���ɾ �����մϴ�.  <���ɾ�>�� ǥ��\n"
-"�Է¿��� �������� �о���̴� � ���α׷��̶� �� �� �ֽ��ϴ�.  ��\n"
-"���α׷��� ������ �������� ���� �� ���� ����˴ϴ�.  �� ���α׷��� \n"
-"����� msgexec�� ����� �˴ϴ�.  ���α׷��� ���������� �������� �� ���� \n"
-"ū ���� �ڵ尡 msgexec�� ���� �ڵ尡 �˴ϴ�.\n"
+"번역 목록의 모든 번역문에 대해 명령어를 실행합니다. <명령어>는 표준\n"
+"입력에서 번역문을 읽어들이는 어떤 프로그램이라도 될 수 있습니다. 이\n"
+"프로그램은 각각의 번역문에 대해 한 번씩 실행됩니다. 이 프로그램의 \n"
+"출력은 msgexec의 출력이 됩니다. 프로그램을 번역문마다 실행했을 때 가장 \n"
+"큰 리턴 코드가 msgexec의 리턴 코드가 됩니다.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
-"Ư���� ���� ���ɾ� '0'�� �������� �״�� ����ϰ�, �� ���� 0 �� ����Ʈ�� \n"
-"����մϴ�.   \"msgexec 0\"�� ��¹��� \"xargs -0\"�� �Է����� ����ϱ⿡ �����մϴ�\n"
+"특별히 내부 명령어 '0'은 번역문을 그대로 출력하고, 맨 끝에 0 널 바이트를 \n"
+"출력합니다. \"msgexec 0\"의 출력물은 \"xargs -0\"의 입력으로 사용하기에 적합합니다\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
-msgstr "  -i, --input=<�Է�����>       �Է� PO ����\n"
+msgstr "  -i, --input=<입력파일>       입력 PO 파일\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr "ǥ�� ��¿� ���Ⱑ �����߽��ϴ�"
+msgstr "표준 출력에 쓰기가 실패했습니다"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
-msgstr "%s �������μ����� ���Ⱑ �����߽��ϴ�"
+msgstr "%s 서브프로세스에 쓰기가 실패했습니다"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
-msgstr "���� �̸��� �������ϴ�"
+msgstr "필터 이름이 빠졌습니다"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr "�ּ��� �� ���� sed ��ũ��Ʈ�� �����ؾ� �մϴ�"
+msgstr "최소한 한 개의 sed 스크립트를 지정해야 합니다"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr "����: %s [<�ɼ�>] <����> [<����-�ɼ�>]\n"
+msgstr "사용법: %s [<옵션>] <필터> [<필터-옵션>]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr "���� ����� ��� �������� ���Ͽ� ���͸� �����մϴ�.\n"
+msgstr "번역 목록의 모든 번역문에 대하여 필터를 적용합니다.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
-"\"����\"�� ǥ�� �Է¿��� �������� �о ������ �������� ǥ�� �������\n"
-"����ϴ� ���α׷��̸� � ���α׷��̵� �����մϴ�.\n"
+"\"필터\"는 표준 입력에서 번역문을 읽어서 수정된 번역문을 표준 출력으로\n"
+"출력하는 프로그램이면 어떤 프로그램이든 가능합니다.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr "<����>�� 'sed'�� �� ������ <����-�ɼ�>��:\n"
+msgstr "<필터>가 'sed'일 때 유용한 <필터-옵션>들:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
-msgstr "  -e, --expression=<��ũ��Ʈ> ������ ���ɾ <��ũ��Ʈ>�� ���մϴ�\n"
+msgstr ""
+"  -e, --expression=<스크립트> 실행할 명령어에 <스크립트>를 추가합니다\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
 "commands\n"
 "                                to be executed\n"
 msgstr ""
-"  -f, --file=<��ũ��Ʈ����>   <��ũ��Ʈ����>�� ������ ������ ���ɾ\n"
-"                                ���մϴ�.\n"
+"  -f, --file=<스크립트파일>   <스크립트파일>의 내용을 실행할 명령어에\n"
+"                              추가합니다.\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
-"  -n, --quiet, --silent       ���� ������ �ڵ����� ������� �ʵ��� �մϴ�\n"
+"  -n, --quiet, --silent       패턴 공백을 자동으로 출력하지 않도록 합니다\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
-"      --no-escape             ��¿� C �̽��������� ���� �ʽ��ϴ� (�⺻��)\n"
+"      --no-escape             출력에 C 이스케이프를 쓰지 않습니다 (기본값)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
-msgstr "      --indent                �鿩 ����� ��� ��Ÿ��\n"
+msgstr "      --indent                들여 쓰기된 출력 스타일\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
-"      --keep-header           ��� �׸��� �������� �ʽ��ϴ�. ���͸����� �ʽ�"
-"�ϴ�.\n"
-
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "���� �������� �ʾҽ��ϴ�."
+"      --keep-header           헤더 항목을 수정하지 않습니다. 필터링하지 않습"
+"니다.\n"
 
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "%s �������μ����� ������ ������� ������ �� �����ϴ�"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "%s �������μ������� ��ſ� �����߽��ϴ�"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "%s �������μ������� �бⰡ �����߽��ϴ�"
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s �������μ����� �����ڵ� %d(��)�� �������ϴ�"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
-msgstr "%s�� ���ڴ� �� ���� ������ ���ڿ��� �մϴ�"
+msgstr "%s의 인자는 한 개의 구두점 문자여야 합니다"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
-msgstr "������� Ʋ�Ƚ��ϴ�: %s"
+msgstr "엔디안이 틀렸습니다: %s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
-msgstr "�︮�� �巹�� (Ulrich Drepper)"
+msgstr "울리히 드레퍼 (Ulrich Drepper)"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
-msgstr "%s��(��) \"-d ���丮\" ������ �ʿ��մϴ�"
+msgstr "%s은(는) \"-d 디렉터리\" 지정이 필요합니다"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
-msgstr "%s��(��) \"-d ������\" ������ �ʿ��մϴ�"
+msgstr "%s은(는) \"-d 로캘\" 지정이 필요합니다"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
-msgstr "%s��(��) %s Ȥ�� %s��(��) �Բ� ��߸� ȿ���� �ֽ��ϴ�"
+msgstr "%s은(는) %s 혹은 %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
-msgstr "%s��(��) %s, %s Ȥ�� %s��(��) �Բ� ��߸� ȿ���� �ֽ��ϴ�"
+msgstr "%s은(는) %s, %s 혹은 %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:616
+#, c-format
+msgid "%s: "
+msgstr ""
 
-#: src/msgfmt.c:599
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
-msgstr[0] "������ �޽��� %d��"
+msgstr[0] "번역된 메시지 %d개"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
-msgstr[0] ", ���� ������ %d��"
+msgstr[0] ", 퍼지 번역문 %d개"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
-msgstr[0] ", �������� ���� �޽��� %d��"
+msgstr[0] ", 번역되지 않은 메시지 %d개"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
-msgstr "����: %s [<�ɼ�>] <�����̸�>.po ...\n"
+msgstr "사용법: %s [<옵션>] <파일이름>.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
-msgstr "�־��� ���������� ���� �޼��� ��� ������ ����� ���ϴ�.\n"
+msgstr "주어진 번역문에서 이진 메시지 목록 파일을 만들어 냅니다.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
-"�� �ɼǿ��� �� �ʿ��� �μ��� ª�� �ɼǿ��� �� �ʿ��մϴ�.\n"
-"��� �Ǵ� ���ڵ� ���������Դϴ�.\n"
+"긴 옵션에서 꼭 필요한 인수는 짧은 옵션에도 꼭 필요합니다.\n"
+"없어도 되는 인자도 마찬가지입니다.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
-msgstr "  <�����̸�>.po ...             �Է� ����\n"
+msgstr "  <파일이름>.po ...             입력 파일\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
-msgstr "���� ���:\n"
+msgstr "동작 모드:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  �ڹ� ���: �ڹ� ResourceBundle Ŭ������ �����"
-"��\n"
+"  -j, --java                  자바 모드: 자바 ResourceBundle 클래스를 만듭니"
+"다\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
-"      --java2                 --java�� ������, Java2�� �����մϴ�(JDK 1.2 ��"
-"��)\n"
+"      --java2                 --java와 같지만, Java2를 가정합니다(JDK 1.2 이"
+"상)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
-msgstr "      --csharp                C# ���: .NET .dll ������ ����ϴ�\n"
+msgstr "      --csharp                C# 모드: .NET .dll 파일을 만듭니다\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C# ���ҽ� ���: .NET .resources ������ �����"
-"��\n"
+"      --csharp-resources      C# 리소스 모드: .NET .resources 파일을 만듭니"
+"다\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl ���: tcl/msgcat .msg ������ ����ϴ�\n"
+"      --tcl                   Tcl 모드: tcl/msgcat .msg 파일을 만듭니다\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
-msgstr "      --qt                    Qt ���: Qt .qm ������ ����ϴ�\n"
+msgstr "      --qt                    Qt 모드: Qt .qm 파일을 만듭니다\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
-msgstr "      --strict                   ������ Uniforum ��� ���·� ���ϴ�\n"
+msgstr "      --strict                   엄격한 Uniforum 출력 형태로 씁니다\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
-msgstr "��� ������ -�̸�, ����� ǥ�� ��¿� ���ϴ�.\n"
+msgstr "출력 파일이 -이면, 출력은 표준 출력에 씁니다.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr "�ڹ� ��忡�� ��� ���� ��ġ:\n"
+msgstr "자바 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
-msgstr "  -r, --resource=<���ҽ�>     ���ҽ� �̸�\n"
+msgstr "  -r, --resource=<리소스>     리소스 이름\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
 "  -l, --locale=LOCALE         locale name, either language or "
 "language_COUNTRY\n"
-msgstr "  -l, --locale=<������>       ������ �̸�, ��� Ȥ�� ���_����\n"
+msgstr "  -l, --locale=<로캘>         로캘 이름, 언어 혹은 언어_국가\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
-msgstr "  -d <���丮>               Ŭ���� ���丮 ������ ���̽� ���丮\n"
+msgstr "  -d <디렉터리>               클래스 디렉터리 구조의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1830,57 +1831,54 @@ msgid ""
 "separated with an underscore.  The -d option is mandatory.  The class is\n"
 "written under the specified directory.\n"
 msgstr ""
-"Ŭ���� �̸��� ���ҽ� �̸��� ������ �̸���, ���̿� ���ٷ� �����ؼ� ������ \n"
-"�̸����� �����˴ϴ�.  -d �ɼ��� �� �ʿ��մϴ�.  Ŭ������ ������ ���丮\n"
-"�Ʒ��� ��µ˴ϴ�.\n"
+"클래스 이름은 리소스 이름에 로캘 이름을, 사이에 밑줄로 구분해서 덧붙인 \n"
+"이름으로 결정됩니다. -d 옵션은 꼭 필요합니다. 클래스는 지정한 디렉터리\n"
+"아래에 출력됩니다.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "C# ��忡�� ��� ���� ��ġ:\n"
+msgstr "C# 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
-msgstr ""
-"  -d <���丮>               ������ ����  .dll ������ ���̽� ���丮\n"
+msgstr "  -d <디렉터리>               로캘 의존  .dll 파일의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"-l�� -d �ɼ��� �� �ʿ��մϴ�.  .dll ������ ������ ���丮�� (�����Ͽ� ���� "
-"�޶����� �̸���) �Ʒ� ���丮�� ���ϴ�.\n"
+"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 (로캘에 따라 달라"
+"지는 이름의) 아래 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr "Tcl ��忡�� ��� ���� ��ġ:\n"
+msgstr "Tcl 모드에서 출력 파일 위치:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
-msgstr "  -d <���丮>                .msg �޼��� ����� ���̽� ���丮\n"
+msgstr "  -d <디렉터리>               .msg 메시지 목록의 베이스 디렉터리\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
-msgstr ""
-"-l�� -d �ɼ��� �� �ʿ��մϴ�.  .msg ������ ������ ���丮��\n"
-"���ϴ�.\n"
+msgstr "-l과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리에 씁니다.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
-msgstr "�Է� ���� �ؼ�:\n"
+msgstr "입력 파일 해석:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1888,141 +1886,141 @@ msgid ""
 "domain\n"
 msgstr ""
 "  -c, --check                 --check-format, --check-header, \n"
-"                                --check-domain���� �ϴ� �˻縦 ��� �����մ�"
-"��\n"
+"                              --check-domain에서 하는 검사를 모두 수행합니"
+"다\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
-msgstr "      --check-format          �� ���� ���� ���ڿ��� �˻��մϴ�\n"
+msgstr "      --check-format          언어에 따라 포맷 문자열을 검사합니다\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
-"      --check-header          ��� �׸��� �ִ����� �� ������ �˻��մϴ�\n"
+"      --check-header          헤더 항목이 있는지와 그 내용을 검사합니다\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
-"      --check-domain          ������ ������ --output-file �ɼ��� ��������\n"
-"                                �浹���� �ʴ��� �˻��մϴ�\n"
+"      --check-domain          도메인 지정과 --output-file 옵션의 도메인이\n"
+"                              충돌하지 않는지 검사합니다\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
-"  -C, --check-compatibility   GNU msgfmt�� X/Open�� msgfmtó�� �˻��մϴ�\n"
+"  -C, --check-compatibility   GNU msgfmt이 X/Open의 msgfmt처럼 검사합니다\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 "for\n"
 "                                menu items\n"
 msgstr ""
-"      --check-accelerators[=CHAR]  �޴� �����ۿ� Ű���� ����ۼ谡 �ִ��� \n"
-"                                �˻��մϴ�\n"
+"      --check-accelerators[=CHAR]  메뉴 아이템에 키보드 단축글쇠가 있는지 \n"
+"                              검사합니다\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
-msgstr "  -f, --use-fuzzy             ��¿� ���� �׸��� ����մϴ�\n"
+msgstr "  -f, --use-fuzzy             출력에 퍼지 항목을 사용합니다\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=<ũ��>      ���ڿ��� <ũ��> ����Ʈ�� �����մϴ�(�⺻��: %"
-"d)\n"
+"  -a, --alignment=<크기>      문자열을 <크기> 바이트에 정렬합니다(기본값: "
+"%d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
-"      --no-hash               ���� ���Ͽ� �ؽ� ���̺��� ���� �ʽ��ϴ�\n"
+"      --no-hash               이진 파일에 해쉬 테이블을 넣지 않습니다\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
-msgstr "      --statistics            ������ ���� ��踦 ǥ���մϴ�\n"
+msgstr "      --statistics            번역에 대한 통계를 표시합니다\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
-msgstr "  -v, --verbose               �� �ڼ��� ����մϴ�\n"
+msgstr "  -v, --verbose               더 자세히 출력합니다\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
-msgstr "���: PO ���� ����� �����ų� �߸��Ǿ����ϴ�\n"
+msgstr "경고: PO 파일 헤더가 빠졌거나 잘못되었습니다\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
-msgstr "���: ���ڼ� ��ȯ�� �������� ���� ���Դϴ�\n"
+msgstr "경고: 문자셋 변환이 동작하지 않을 것입니다\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
-msgstr "���: PO ���� ����� �����Դϴ�\n"
+msgstr "경고: PO 파일 헤더가 퍼지입니다\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
-msgstr "���: ���� ������ msgfmt�� ���⿡ ������ �� ���Դϴ�\n"
+msgstr "경고: 과거 버전의 msgfmt은 여기에 오류를 낼 것입니다\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
-msgstr "�������̸� \"%s\"��(��) ���� �̸����� �˸��� �ʽ��ϴ�"
+msgstr "도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
-"�������̸� \"%s\"��(��) ���� �̸����� �˸��� �ʽ��ϴ�. �׷��Ƿ� ���λ縦\n"
-"����� ���Դϴ�"
+"도메인이름 \"%s\"은(는) 파일 이름으로 알맞지 않습니다. 그러므로 접두사를\n"
+"사용할 것입니다"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
-msgstr "`domain %s' �����ڴ� ���õ�"
+msgstr "`domain %s' 지시자는 무시됨"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
-msgstr "�� `msgstr' �׸��� ���õ�"
+msgstr "빈 `msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
-msgstr "���� `msgstr' �׸��� ���õ�"
+msgstr "퍼지 `msgstr' 항목은 무시됨"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "%s: ���: �ҽ� ������ ���� �������� �����ϰ� �ֽ��ϴ�"
+msgstr "%s: 경고: 소스 파일이 퍼지 번역문을 포함하고 있습니다"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
-msgstr "\"%s\"��(��) �д� ���� ���� �߻�"
+msgstr "\"%s\"을(를) 읽는 동안 오류 발생"
 
 #: src/msggrep.c:484
 #, c-format
@@ -2030,7 +2028,7 @@ msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"'%c' �ɼ��� 'J'�� 'K'�� 'T'�� 'C'�� 'X'�� �����DZ� ������ �� �� �����ϴ�"
+"'%c' 옵션은 'J'나 'K'나 'T'나 'C'나 'X'가 지정되기 전에는 쓸 수 없습니다"
 
 #: src/msggrep.c:504
 #, c-format, no-wrap
@@ -2038,8 +2036,8 @@ msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
-"���� ��Ͽ��� �־��� ���Ͽ� �´� �޼��� Ȥ�� �־��� �ҽ� ���Ͽ� ��� �ִ�\n"
-"�޼������� �̾� ���ϴ�.\n"
+"번역 목록에서 주어진 패턴에 맞는 메시지 혹은 주어진 소스 파일에 들어 있는\n"
+"메시지만을 뽑아 냅니다.\n"
 
 #: src/msggrep.c:530
 #, c-format, no-wrap
@@ -2080,57 +2078,57 @@ msgid ""
 "  -v, --invert-match          output only the messages that do not match any\n"
 "                              selection criterion\n"
 msgstr ""
-"�޼��� ����:\n"
-"  [-N �ҽ�����]... [-M �������̸�]...\n"
-"  [-J MSGCTXT-����] [-K MSGID-����] [-T MSGSTR-����]\n"
-"  [ -C �ּ�-���� ] [-X ������-�ּ�-����]\n"
-"�޼����� �����մϴ�: ������ �ҽ� ������ �ϳ����� ���� �޼���,\n"
-"Ȥ�� ������ �������� �ϳ����� ���� �޼���\n"
-"Ȥ�� -J �ɼ��� ���ٸ� �� ���ؽ�Ʈ(msgctxt)�� \"MSGCTXT-����\"�� �´� ���,\n"
-"Ȥ�� -K �ɼ��� ���ٸ� �� Ű(msgid�� msgid_plural)�� \"MSGID-����\"�� �´� ���,\n"
-"Ȥ�� -T �ɼ��� ���ٸ� �� ����(msgstr)�� \"MSGSTR-����\"�� �´� ���,\n"
-"Ȥ�� -C �ɼ��� ���ٸ� �� ������ �ּ��� \"�ּ�-����\"�� �´� ���,\n"
-"Ȥ�� -X �ɼ��� ���ٸ� �� ������ �ּ��� \"������-�ּ�-����\"�� �´� ���.\n"
+"메시지 선택:\n"
+"  [-N 소스파일]... [-M 도메인이름]...\n"
+"  [-J MSGCTXT-패턴] [-K MSGID-패턴] [-T MSGSTR-패턴]\n"
+"  [ -C 주석-패턴 ] [-X 추출한-주석-패턴]\n"
+"메시지를 선택합니다: 지정한 소스 파일중 하나에서 나온 메시지,\n"
+"혹은 지정한 도메인중 하나에서 나온 메시지\n"
+"혹은 -J 옵션을 쓴다면 그 컨텍스트(msgctxt)가 \"MSGCTXT-패턴\"과 맞는 경우,\n"
+"혹은 -K 옵션을 쓴다면 그 키(msgid나 msgid_plural)가 \"MSGID-패턴\"과 맞는 경우,\n"
+"혹은 -T 옵션을 쓴다면 그 번역(msgstr)이 \"MSGSTR-패턴\"과 맞는 경우,\n"
+"혹은 -C 옵션을 쓴다면 그 번역자 주석이 \"주석-패턴\"과 맞는 경우,\n"
+"혹은 -X 옵션을 쓴다면 그 추출한 주석이 \"추출한-주석-패턴\"과 맞는 경우.\n"
 "\n"
-"�����ϴ� ����� ���� �� �����Ǵ� ���, ���õǴ� �޼����� �� �����ϴ�\n"
-"������� ���õ� �޼������� �����մϴ�.\n"
+"선택하는 방법이 여러 개 지정되는 경우, 선택되는 메시지는 각 선택하는\n"
+"방법으로 선택된 메시지들의 공집합니다.\n"
 "\n"
-"\"MSGCTXT-����\" Ȥ�� \"MSGID-����\" Ȥ�� \"MSGSTR-����\" Ȥ�� \"�ּ�-����\" Ȥ��\n"
-"\"������-�ּ�-����\"�� ����:\n"
-"  [-E | -F] [-e ���� | -f ����]...\n"
-"�⺻������ \"����\"�� ������ ���Խ��̰�, -E�� �־��� ��� Ȯ�� ���Խ��̰�, -F��\n"
-"�־��� ��� ������ ���ڿ��Դϴ�.\n"
+"\"MSGCTXT-패턴\" 혹은 \"MSGID-패턴\" 혹은 \"MSGSTR-패턴\" 혹은 \"주석-패턴\" 혹은\n"
+"\"추출한-주석-패턴\"의 형식:\n"
+"  [-E | -F] [-e 패턴 | -f 파일]...\n"
+"기본값으로 \"패턴\"은 간단한 정규식이고, -E가 주어진 경우 확장 정규식이고, -F가\n"
+"주어진 경우 고정된 문자열입니다.\n"
 "\n"
-"  -N, --location=<�ҽ�����>   <�ҽ�����>���� �޼����� �����մϴ�\n"
-"  -M, --domain=<�������̸�>   <�������̸�> �����ο� ���� �޼����� �����մϴ�\n"
-"  -J, --msgctxt               msgctxt�� ���� ����\n"
-"  -K, --msgid                 msgid�� ���� ����\n"
-"  -T, --msgstr                msgstr�� ���� ����\n"
-"  -C, --comment               ������ �ּ��� ���� ����\n"
-"  -X, --extracted-comment     ������ �ּ��� ���� ����\n"
-"  -E, --extended-regexp       \"����\"�� Ȯ�� ���Խ��Դϴ�\n"
-"  -F, --fixed-strings         \"����\"�� �ٹٲ����� ���е� ���ڿ� �����Դϴ�\n"
-"  -e, --regexp=<����>         <����>�� ���Խ����� ����մϴ�\n"
-"  -f, --file=<����>           \"����\"�� <����>���� �����ɴϴ�\n"
-"  -i, --ignore-case           ��ҹ��� ������ ���� �ʽ��ϴ�\n"
-"  -v, --invert-match          ������ �ɼǿ� ���� �ʴ� �޼������� ����մϴ�\n"
+"  -N, --location=<소스파일>   <소스파일>에서 메시지를 선택합니다\n"
+"  -M, --domain=<도메인이름>   <도메인이름> 도메인에 속한 메시지를 선택합니다\n"
+"  -J, --msgctxt               msgctxt의 시작 패턴\n"
+"  -K, --msgid                 msgid의 시작 패턴\n"
+"  -T, --msgstr                msgstr의 시작 패턴\n"
+"  -C, --comment               번역자 주석의 시작 패턴\n"
+"  -X, --extracted-comment     추출한 주석의 시작 패턴\n"
+"  -E, --extended-regexp       \"패턴\"이 확장 정규식입니다\n"
+"  -F, --fixed-strings         \"패턴\"이 줄바꿈으로 구분된 문자열 집합입니다\n"
+"  -e, --regexp=<패턴>         <패턴>을 정규식으로 사용합니다\n"
+"  -f, --file=<파일>           \"패턴\"을 <파일>에서 가져옵니다\n"
+"  -i, --ignore-case           대소문자 구별을 하지 않습니다\n"
+"  -v, --invert-match          지정한 옵션에 맞지 않는 메시지만을 출력합니다\n"
 
 #: src/msggrep.c:579
 #, c-format
 msgid ""
 "      --escape                use C escapes in output, no extended chars\n"
 msgstr ""
-"      --escape                Ȯ�� ���� ����, ��¿� C �̽��������� ���ϴ�\n"
+"      --escape                확장 문자 없이, 출력에 C 이스케이프를 씁니다\n"
 
 #: src/msggrep.c:600
 #, c-format
 msgid "      --sort-output           generate sorted output\n"
-msgstr "      --sort-output           ���ĵ� ����� ����ϴ�\n"
+msgstr "      --sort-output           정렬된 출력을 만듭니다\n"
 
 #: src/msggrep.c:602
 #, c-format
 msgid "      --sort-by-file          sort output by file location\n"
-msgstr "      --sort-by-file          ������ ��ġ�� ���� ����� �����մϴ�\n"
+msgstr "      --sort-by-file          파일의 위치에 따라 출력을 정렬합니다\n"
 
 #: src/msginit.c:285
 msgid ""
@@ -2138,9 +2136,9 @@ msgid ""
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
-"�� �������� ���� ȯ���Դϴ�.  ABOUT-NLS ���Ͽ� ������ ���\n"
-"�������� LANG ȯ�溯���� �����Ͻʽÿ�.  �����ؾ߸��� ��������\n"
-"�������� �׽�Ʈ�� �� �ֽ��ϴ�.\n"
+"언어가 지정되지 않은 환경입니다. ABOUT-NLS 파일에 설명된 대로\n"
+"여러분의 LANG 환경변수를 세팅하십시오. 세팅해야만이 여러분의\n"
+"번역문을 테스트할 수 있습니다.\n"
 
 #: src/msginit.c:309
 #, c-format
@@ -2149,14 +2147,14 @@ msgid ""
 "Please specify the locale through the --locale option or\n"
 "the output .po file through the --output-file option.\n"
 msgstr ""
-"��� ���� %s��(��) �̹� �����մϴ�.\n"
-"--locale �ɼ����� �������� �����ϰų� --output-file �ɼ�����\n"
-"��� .po ������ �����Ͻʽÿ�.\n"
+"출력 파일 %s이(가) 이미 존재합니다.\n"
+"--locale 옵션으로 로캘을 지정하거나 --output-file 옵션으로\n"
+"출력 .po 파일을 지정하십시오.\n"
 
 #: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
-msgstr "%s��(��) ��������ϴ�.\n"
+msgstr "%s을(를) 만들었습니다.\n"
 
 #: src/msginit.c:355
 #, c-format, no-wrap
@@ -2164,13 +2162,13 @@ msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
-"���ο� PO ������ �����, ������� ȯ�濡�� ��Ÿ ��������\n"
-"�ʱ�ȭ�մϴ�\n"
+"새로운 PO 파일을 만들고, 사용자의 환경에서 메타 정보들을\n"
+"초기화합니다\n"
 
 #: src/msginit.c:365
 #, c-format
 msgid "  -i, --input=INPUTFILE       input POT file\n"
-msgstr "  -i, --input=<�Է�����>       �Է� POT ����\n"
+msgstr "  -i, --input=<입력파일>       입력 POT 파일\n"
 
 #: src/msginit.c:367
 #, c-format
@@ -2179,13 +2177,13 @@ msgid ""
 "file.\n"
 "If it is -, standard input is read.\n"
 msgstr ""
-"���� �Է� ������ �־����� ������, ���� ���丮���� POT ������ ã���ϴ�.\n"
-"�Է� ������ \"-\"�̸�, ǥ�� �Է��� �н��ϴ�.\n"
+"만약 입력 파일이 주어지지 않으면, 현재 디렉터리에서 POT 파일을 찾습니다.\n"
+"입력 파일이 \"-\"이면, 표준 입력을 읽습니다.\n"
 
 #: src/msginit.c:373
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified PO file\n"
-msgstr "  -o, --output-file=<����>    ������ PO ���Ϸ� ����մϴ�\n"
+msgstr "  -o, --output-file=<파일>    지정한 PO 파일로 출력합니다\n"
 
 #: src/msginit.c:375
 #, c-format
@@ -2193,50 +2191,50 @@ msgid ""
 "If no output file is given, it depends on the --locale option or the user's\n"
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
-"���� ��� ������ �־����� ������, --locale �ɼ��̳� ������� ������ ���ÿ�\n"
-"���� �����˴ϴ�.  ��� ������ \"-\"�̸�, ǥ�� ��¿� ���ϴ�.\n"
+"만약 출력 파일이 주어지지 않으면, --locale 옵션이나 사용자의 로캘 세팅에\n"
+"따라 결정됩니다. 출력 파일이 \"-\"이면, 표준 출력에 씁니다.\n"
 
 #: src/msginit.c:388
 #, c-format
 msgid "  -l, --locale=LL_CC          set target locale\n"
-msgstr "  -l, --locale=LL_CC          ��ǥ �������� �����մϴ�\n"
+msgstr "  -l, --locale=LL_CC          목표 로캘을 지정합니다\n"
 
 #: src/msginit.c:390
 #, c-format
 msgid ""
 "      --no-translator         assume the PO file is automatically generated\n"
 msgstr ""
-"      --no-translator         PO ������ �ڵ����� ��������ٰ� �����մϴ�\n"
+"      --no-translator         PO 파일이 자동으로 만들어졌다고 가정합니다\n"
 
 #: src/msginit.c:450
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"�� �� �̻��� .pot ������ ã�ҽ��ϴ�.\n"
-"�Է� .pot ������ --input �ɼ����� �����Ͻʽÿ�.\n"
+"두 개 이상의 .pot 파일을 찾았습니다.\n"
+"입력 .pot 파일을 --input 옵션으로 지정하십시오.\n"
 
 #: src/msginit.c:458 src/msginit.c:463
 #, c-format
 msgid "error reading current directory"
-msgstr "���� ���丮�� �д� �� ������ �߻��߽��ϴ�"
+msgstr "현재 디렉터리를 읽는 데 오류가 발생했습니다"
 
 #: src/msginit.c:471
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
-"���� ���丮���� .pot ������ ã�� �� �����ϴ�.\n"
-"--input �ɼ����� �Է� .pot ������ �����Ͻʽÿ�.\n"
+"현재 디렉터리에서 .pot 파일을 찾을 수 없습니다.\n"
+"--input 옵션으로 입력 .pot 파일을 지정하십시오.\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2244,66 +2242,65 @@ msgid ""
 "contact\n"
 "you in case of unexpected technical problems.\n"
 msgstr ""
-"���ο� �޼��� ��Ͽ��� �ݵ�� �������� �̸��� �ּҰ� �� �־�� �մ�"
-"��.  \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:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
-msgstr "%s ��Ű���� ���� �ѱ��� ������"
+msgstr "%s 패키지에 대한 한국어 번역문"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr "���� ���ڼ� \"%s\"��(��) �θ� �� �� �ִ� ���ڵ� �̸��� �ƴմϴ�"
+msgstr "현재 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름이 아닙니다"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
-msgstr "�Է� ���Ͽ� �� ���� ���ڼ� \"%s\"��(��) \"%s\"��(��) �����մϴ�"
+msgstr "입력 파일에 두 개의 문자셋 \"%s\"과(와) \"%s\"이(가) 존재합니다"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
-msgstr "�Է� ���� `%s'���� ���ڼ��� �����ϴ� ��� �׸��� ��� ���� �ʽ��ϴ�"
+msgstr "입력 파일 `%s'에는 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
-"�Է� ���� `%2$s'�� ������ \"%1$s\"���� ���ڼ��� �����ϴ� ��� �׸��� ��� ��"
-"�� �ʽ��ϴ�"
+"입력 파일 `%2$s'의 도메인 \"%1$s\"에는 문자셋을 지정하는 헤더 항목이 들어 있"
+"지 않습니다"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr "��ǥ ���ڼ� \"%s\"��(��) �θ� �� �� �ִ� ���ڵ� �̸��� �ƴմϴ�."
+msgstr "목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름이 아닙니다."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
-msgstr "���: "
+msgstr "경고: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
-"�Է� ������ ���� ���� ���ڵ����� �� �޼����� ��� �ְ�, �� ���� �ϳ��� \n"
-"UTF-8�Դϴ�.  ����� UTF-8���� ��ȯ�մϴ�.\n"
+"입력 파일은 여러 개의 인코딩으로 된 메시지가 들어 있고, 그 중의 하나가 \n"
+"UTF-8입니다. 출력을 UTF-8으로 변환합니다.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2311,11 +2308,11 @@ msgid ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"�Է� ������ ���� ���� ���ڵ����� �� �޼����� ��� �ְ�, �� �߿� %s��(��)\n"
-"%s��(��) �ֽ��ϴ�.  ����� UTF-8���� ��ȯ�մϴ�.\n"
-"�ٸ� ��� ���ڵ��� �����Ϸ���, --to-code �ɼ��� ������.\n"
+"입력 파일은 여러 개의 인코딩으로 된 메시지가 들어 있고, 그 중에 %s과(와)\n"
+"%s이(가) 있습니다. 출력을 UTF-8으로 변환합니다.\n"
+"다른 출력 인코딩을 선택하려면, --to-code 옵션을 쓰세요.\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2323,12 +2320,12 @@ msgid ""
 "Either change all msgids and msgctxts to be pure ASCII, or ensure they are\n"
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
-"%s ������ %s ���ڵ����� %s ���ڵ����� ��ȯ�ϸ� �Ϻ� msgid�� msgctxt�� �ٲٰ� "
-"�˴ϴ�.\n"
-"��� msgid�� msgctxt�� ���� ASCII�� �ٲٰų�, ó������ (�ҽ��ڵ����) UTF-8\n"
-"���ڵ����� ����ʽÿ�.\n"
+"%s 파일을 %s 인코딩에서 %s 인코딩으로 변환하면 일부 msgid와 msgctxt를 바꾸게 "
+"됩니다.\n"
+"모든 msgid와 msgctxt를 순수 ASCII로 바꾸거나, 처음부터 (소스코드부터) UTF-8\n"
+"인코딩으로 만드십시오.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2336,28 +2333,28 @@ msgid ""
 "Output of '%s' might be incorrect.\n"
 "Possible workarounds are:\n"
 msgstr ""
-"������ ���ڼ� \"%s\"��(��) �Է� ������\n"
-"���ڼ� \"%s\"��(��) �ٸ��ϴ�.\n"
-"'%s'��(����) ����ϴ� ���� Ʋ���� �� �ֽ��ϴ�.\n"
-"������ �ذ�å��:\n"
+"로캘 문자셋 \"%s\"은(는) 입력 파일의\n"
+"문자셋 \"%s\"과(와) 다릅니다.\n"
+"'%s'로(으로) 출력하는 것이 틀렸을 수 있습니다.\n"
+"가능한 해결책은:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
-msgstr "- LC_ALL ȯ�溯���� %s ���ڵ��� ���� �����Ϸ� �����Ͻʽÿ�.\n"
+msgstr "- LC_ALL 환경변수를 %s 인코딩을 쓰는 로캘로 세팅하십시오.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- ���� �����'msgconv'�� �̿��� %s��(����) ��ȯ�Ͻʽÿ�\n"
-"  �� ���� '%s'��(��) �����ϰ�,\n"
-"  �ٽ� 'msgconv'�� �̿��� '%s'��(����) ��ȯ�Ͻʽÿ�\n"
+"- 번역 목록을'msgconv'를 이용해 %s로(으로) 변환하십시오\n"
+"  그 다음 '%s'을(를) 적용하고,\n"
+"  다시 'msgconv'를 이용해 '%s'로(으로) 변환하십시오\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2365,209 +2362,209 @@ msgid ""
 "  then apply '%s',\n"
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
-"- LC_ALL ȯ�溯���� %s ���ڵ��� ���� �����Ϸ� �����ϰ�,\n"
-"  ���� �����'msgconv'�� �̿��� %s��(����) ��ȯ�Ͻʽÿ�\n"
-"  �� ���� '%s'��(��) �����ϰ�,\n"
-"  �ٽ� 'msgconv'�� �̿��� '%s'��(����) ��ȯ�Ͻʽÿ�\n"
+"- LC_ALL 환경변수를 %s 인코딩을 쓰는 로캘로 세팅하고,\n"
+"  번역 목록을'msgconv'를 이용해 %s로(으로) 변환하십시오\n"
+"  그 다음 '%s'을(를) 적용하고,\n"
+"  다시 'msgconv'를 이용해 '%s'로(으로) 변환하십시오\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
-"��ǥ ���ڼ� \"%s\"��(��) �θ� �� �� �ִ� ���ڵ� �̸��� �ƴմϴ�\n"
-"'%s'��(����) ����ϴ� ���� Ʋ���� �� �ֽ��ϴ�.\n"
-"������ �ذ�å�� \"LC_ALL=C\"�� �����ϴ� ���Դϴ�.\n"
+"목표 문자셋 \"%s\"은(는) 널리 쓸 수 있는 인코딩 이름이 아닙니다\n"
+"'%s'로(으로) 출력하는 것이 틀렸을 수 있습니다.\n"
+"가능한 해결책은 \"LC_ALL=C\"로 세팅하는 것입니다.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
-msgstr "���� ǥ������ ���� ���� ���� ���� �ֽ��ϴ�"
+msgstr "복수 표현식이 음수 값을 만들 수도 있습니다"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
-msgstr "nplurals = %lu ������ ���� ǥ������ %lu��ŭ ū ���� ���� ���� �ֽ��ϴ�"
+msgstr "nplurals = %lu 하지만 복수 표현식이 %lu만큼 큰 값을 만들 수도 있습니다"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
-msgstr "���� ǥ������ 0���� ������ ������ �� ���� �ֽ��ϴ�"
+msgstr "복수 표현식이 0으로 나누는 연산을 할 수도 있습니다"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
-msgstr "���� ǥ������ ���� �����÷ο츦 �߻���ų �� �ֽ��ϴ�"
+msgstr "복수 표현식이 정수 오버플로우를 발생시킬 수 있습니다"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
-"���� ǥ������ ���� ���ܸ� �߻���ų �� �ֽ��ϴ�.  0���� ������ ������ �� �� ��"
-"���ϴ�"
+"복수 표현식이 연산 예외를 발생시킬 수 있습니다. 0으로 나누는 연산을 할 수 있"
+"습니다"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
-msgstr "������ ����� ���ʽÿ�.  %s�� ���ؼ� �ùٸ�:"
+msgstr "다음을 사용해 보십시오. %s에 대해서 올바름:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
-msgstr "�޼��� ����� ������ ������ ��� �ֽ��ϴ�"
+msgstr "메시지 목록은 복수형 번역이 들어 있습니다"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
-msgstr "������ ��� �׸񿡴� \"plural=ǥ����\" �Ӽ��� ��� ���� �ʽ��ϴ�"
+msgstr "하지만 헤더 항목에는 \"plural=표현식\" 속성이 들어 있지 않습니다"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
-msgstr "������ ��� �׸񿡴� \"nplurals=����\" �Ӽ��� ��� ���� �ʽ��ϴ�"
+msgstr "하지만 헤더 항목에는 \"nplurals=정수\" 속성이 들어 있지 않습니다"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
-msgstr "nplurals ���� �߸��Ǿ����ϴ�"
+msgstr "nplurals 값이 잘못되었습니다"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
-msgstr "�߸��� ���� ǥ����"
+msgstr "잘못된 복수 표현식"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "������ � �޼����� %lu���� ���� ���ۿ� �����ϴ�"
+msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형밖에 없습니다"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "������ � �޼����� %lu���� ���� ���� �ֽ��ϴ�"
+msgstr[0] "하지만 어떤 메시지는 %lu개의 복수 형이 있습니다"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������, ��� �׸� \"Plural-Forms: "
-"nplurals=����; plural=ǥ����;\"�� �����ϴ�"
+"메시지 목록에 복수형 번역이 들어 있지만, 헤더 항목에 \"Plural-Forms: "
+"nplurals=정수; plural=표현식;\"이 없습니다"
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-msgstr "`msgid'�� `msgstr_plural' �׸��� ��� '\\n'���� �������� �ʽ��ϴ�"
+msgstr "`msgid'와 `msgstr_plural' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "`msgid'�� `msgstr[%u]' �׸��� ��� '\\n'���� �������� �ʽ��ϴ�"
+msgstr "`msgid'와 `msgstr[%u]' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "`msgid'�� `msgstr' �׸��� ��� '\\n'���� �������� �ʽ��ϴ�"
+msgstr "`msgid'와 `msgstr' 항목이 모두 '\\n'으로 시작하지 않습니다"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr "`msgid'�� `msgid_plural' �׸��� ��� '\\n'���� ������ �ʽ��ϴ�"
+msgstr "`msgid'와 `msgid_plural' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr "`msgid'�� `msgstr[%u]' �׸��� ��� '\\n'���� ������ �ʽ��ϴ�"
+msgstr "`msgid'와 `msgstr[%u]' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "`msgid'�� `msgstr' �׸��� ��� '\\n'���� ������ �ʽ��ϴ�"
+msgstr "`msgid'와 `msgstr' 항목이 모두 '\\n'으로 끝나지 않습니다"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
-msgstr "���� ó���� GNU gettext Ȯ�� ����Դϴ�"
+msgstr "복수 처리는 GNU gettext 확장 기능입니다"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
-msgstr "msgstr�� Ű���� ����Ű '%c'�� ���� ǥ�ð� �����ϴ�"
+msgstr "msgstr에 키보드 단축키 '%c'에 대한 표시가 없습니다"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
-msgstr "msgstr�� Ű���� ����Ű '%c' ǥ�ð� �ʹ� �����ϴ�"
+msgstr "msgstr에 키보드 단축키 '%c' 표시가 너무 많습니다"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "����� ��� �ʵ� `%s'��(��) ������\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
+msgstr "헤더에 헤더 필드 `%s'이(가) 빠졌음\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
-msgstr "��� �ʵ� `%s'��(��) ���� ó������ �����ؾ� �մϴ�\n"
+msgstr "헤더 필드 `%s'은(는) 행의 처음부터 시작해야 합니다\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
-msgstr "��� ��� �ʵ尡 ������ �ʱ��� �������� ������ �ֽ��ϴ�\n"
+msgstr "몇몇 헤더 필드가 아직도 초기의 내정값을 가지고 있습니다\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "`%s' �ʵ尡 ������ �ʱ��� �������� ������ �ֽ��ϴ�\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "몇몇 헤더 필드가 아직도 초기의 내정값을 가지고 있습니다\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
-msgstr "%s: �Է��� \"%s\" ���ڵ����� �ùٸ��� �ʽ��ϴ�"
+msgstr "%s: 입력이 \"%s\" 인코딩에서 올바르지 않습니다"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "%s: \"%s\" ���ڵ����� \"%s\" ���ڵ����� ��ȯ�ϴ� ���� ���� �߻�"
+msgstr "%s: \"%s\" 인코딩에서 \"%s\" 인코딩으로 변환하는 동안 오류 발생"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
-msgstr "�Է� ������ ���ڼ��� �����ϴ� ��� �׸��� ��� ���� �ʽ��ϴ�"
+msgstr "입력 파일은 문자셋을 지정하는 헤더 항목이 들어 있지 않습니다"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"\"%s\"���� \"%s\"��(����) ��ȯ�� �� �����ϴ�.  %s��(��) iconv()�� ��������"
-"��, iconv()�� �̰��� ��ȯ�� �������� �ʽ��ϴ�."
+"\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
+"iconv()가 이같은 변환을 지원하지 않습니다."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"\"%s\"���� \"%s\"(��)�� ��ȯ�ϸ� �ߺ��˴ϴ�: �ٸ� �� �� �̻��� msgid�� �Ȱ�"
-"�� ���ϴ�."
+"\"%s\"에서 \"%s\"(으)로 변환하면 중복됩니다: 다른 두 개 이상의 msgid가 똑같"
+"아 집니다."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
-"\"%s\"���� \"%s\"��(����) ��ȯ�� �� �����ϴ�. %s��(��) iconv()�� ����������, "
-"�� ������ iconv()�� �������� �ʴ� ���·� ����Ǿ����ϴ�."
+"\"%s\"에서 \"%s\"로(으로) 변환할 수 없습니다. %s은(는) iconv()에 의존하지만, "
+"이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다."
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
-msgstr "%s��(��) %s��(��) �Բ� ��߸� ȿ���� �ֽ��ϴ�"
+msgstr "%s은(는) %s과(와) 함께 써야만 효과가 있습니다"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
-msgstr "��� ����"
+msgstr "백업 종류"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2580,67 +2577,67 @@ msgid ""
 "comments and file positions will be preserved.  Where an exact match\n"
 "cannot be found, fuzzy matching is used to produce better results.\n"
 msgstr ""
-"Uniforum ������ �� ������ �ϳ��� ��Ĩ�ϴ�.  def.po ������ �̹� \n"
-"�����ϴ� �����̸� ������ ������ �޽����� ��� �ֽ��ϴ�.  �� ����������\n"
-"¦�� �ִ� �Ϳ� ���� ���Ӱ� ������� ������ ������ ��ü�˴ϴ�; �ּ��� \n"
-"���������� ���� �ּ��� ���� ��ġ�� ���ŵ˴ϴ�.  ref.pot ������ �ֱٿ�\n"
-"����������鼭 �ֽ��� �ҽ��� �����ؼ� ����� ������ ������ �������� ���� \n"
-"�����̰ų�, PO Ʋ �����Դϴ� (�Ϲ������� xgettext�� ���� ��������ϴ�); \n"
-"���� ���� ��� �������̳� �ּ��� ���ŵ����� �� �ּ��� ���� ��ġ�� \n"
-"�����˴ϴ�.  ��Ȯ�� ¦�� ã�� ���� ���, ���� ���� ����� ��� ���� ���� \n"
-"��Ī�� ���˴ϴ�.\n"
+"Uniforum 형태의 두 파일을 하나로 합칩니다. def.po 파일은 이미 \n"
+"존재하는 파일이며 예전에 번역된 메시지를 담고 있습니다. 이 번역문들은\n"
+"짝이 있는 것에 한해 새롭게 만들어진 파일의 것으로 대체됩니다; 주석은 \n"
+"보존되지만 추출 주석과 파일 위치는 제거됩니다. ref.pot 파일은 최근에\n"
+"만들어졌으면서 최신의 소스를 참조해서 만들어 졌지만 과거의 번역문을 가진 \n"
+"파일이거나, PO 틀 파일입니다 (일반적으로 xgettext에 의해 만들어집니다); \n"
+"파일 내의 모든 번역문이나 주석은 제거되지만 점 주석과 파일 위치는 \n"
+"보존됩니다. 정확한 짝을 찾지 못할 경우, 보다 나은 결과를 얻기 위해 퍼지 \n"
+"매칭이 사용됩니다.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:490
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
-msgstr "  def.po                      ���� �ҽ��� �����ϴ� ������\n"
+msgstr "  def.po                      과거 소스를 참조하는 번역문\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:492
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
-msgstr "  ref.pot                     ���ο� �ҽ��� ����\n"
+msgstr "  ref.pot                     새로운 소스를 참조\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
-"  -C, --compendium=<����>      �޼��� ���� ���̺귯�� ���ϱ�,\n"
-"                               �� �� �̻� ������ �� �ֽ��ϴ�\n"
+"  -C, --compendium=<파일>      메시지 번역 라이브러리 추가,\n"
+"                               두 개 이상 지정할 수 있습니다\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
-"  -U, --update                def.po�� �����մϴ�,\n"
-"                              �̹� def.po�� ���ŵǾ� �ִٸ� �ƹ� �͵� �� �մ�"
-"��\n"
+"  -U, --update                def.po를 업데이트합니다\n"
+"                              이미 def.po를 업데이트했다면 아무 것도 안 합니"
+"다\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr "������Ʈ ��忡�� ��� ���� ��ġ:\n"
+msgstr "업데이트 모드에서 출력 파일 위치:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:516
 #, c-format
 msgid "The result is written back to def.po.\n"
-msgstr "������� def.po���Ϸ� �ٽ� �������ϴ�.\n"
+msgstr "결과물은 def.po파일로 다시 쓰여집니다.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:518
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
-msgstr "      --backup=<��Ʈ��>       def.po�� ����� ����ϴ�\n"
+msgstr "      --backup=<컨트롤>       def.po의 백업을 만듭니다\n"
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
-"      --suffix=<���̾�>       �Ϲ����� ��� ���̾� ��� <���̾�>�� ���ϴ�\n"
+"      --suffix=<접미어>       일반적인 백업 접미어 대신 <접미어>를 씁니다\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2651,78 +2648,75 @@ msgid ""
 "  existing, nil   numbered if numbered backups exist, simple otherwise\n"
 "  simple, never   always make simple backups\n"
 msgstr ""
-"���� ��Ʈ�� ����� --backup �ɼ��̳� VERSION_CONTROL ȯ�� ������ \n"
-"������ �� �ֽ��ϴ�.  ������ ���� �� �� �ֽ��ϴ�:\n"
-"  none, off       ����� ������ �ʽ��ϴ� (--backup �ɼ��� ��������)\n"
-"  nummbered, t    ��ȣ�� ���� ����� ����ϴ�\n"
-"  existing, nil   ��ȣ�� ���� ����� ������ ��ȣ�� �ٿ���, �׷��� ������ ����"
-"��\n"
-"  simple, never   ������ ������� ����ϴ�\n"
+"버전 컨트롤 방법은 --backup 옵션이나 VERSION_CONTROL 환경 변수로 \n"
+"선택할 수 있습니다. 다음의 값을 쓸 수 있습니다:\n"
+"  none, off       백업을 만들지 않습니다 (--backup 옵션이 있을지라도)\n"
+"  nummbered, t    번호를 붙인 백업을 만듭니다\n"
+"  existing, nil   번호를 붙인 백업이 있으면 번호를 붙여서, 그렇지 않으면 간단"
+"히\n"
+"  simple, never   간단한 백업만을 만듭니다\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, 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:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr "  -N, --no-fuzzy-matching     ���� ��Ī�� ���� �ʽ��ϴ�\n"
+"--suffix 옵션이나 SIMPLE_BACKUP_SUFFIX 환경 변수를 세팅하지 않았다면, 백업 접"
+"미어는 '~'입니다.\n"
 
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
-"      --previous              ������ ������ �޼����� msgid�� �� �Ӵϴ�\n"
+"      --previous              이전에 번역한 메시지의 msgid를 놔 둡니다\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
-msgstr "  -q, --quiet, --silent       ������� ǥ�ø� ���� �ʽ��ϴ�\n"
+msgstr "  -q, --quiet, --silent       진행상태 표시를 하지 않습니다\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, c-format
 msgid "this message should define plural forms"
-msgstr "�� �޽����� �������� �����ؾ߸� �մϴ�"
+msgstr "이 메시지는 복수형을 지정해야만 합니다"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, c-format
 msgid "this message should not define plural forms"
-msgstr "�� �޽����� �������� �����ؼ��� �� �˴ϴ�"
+msgstr "이 메시지는 복수형을 지정해서는 안 됩니다"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, 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"
+"%s%ld개의 예전 것 + %ld개의 참조문, 결합된 것 %ld, 퍼지 %ld, 빠진 것 %ld, 쓸"
+"모없는 것 %ld개를 읽었습니다.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
-msgstr " �Ϸ�.\n"
+msgstr " 완료.\n"
 
 #: src/msgunfmt.c:296 src/msgunfmt.c:305 src/msgunfmt.c:328
 #, c-format
 msgid "%s and explicit file names are mutually exclusive"
-msgstr "%s��(��) �����̸��� ���������� �����ϴ� ���� ���ÿ� �� �� �����ϴ�"
+msgstr "%s과(와) 파일이름을 명시적으로 지정하는 것은 동시에 쓸 수 없습니다"
 
 #: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "����: %s [<�ɼ�>] [<����>]...\n"
+msgstr "사용법: %s [<옵션>] [<파일>]...\n"
 
 #: src/msgunfmt.c:419
 #, c-format
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
-msgstr "���� �޼��� ����� Uniforum ��Ÿ�� .po ���Ϸ� ��ȯ�մϴ�.\n"
+msgstr "이진 메시지 목록을 Uniforum 스타일 .po 파일로 변환합니다.\n"
 
 #: src/msgunfmt.c:428
 #, c-format
@@ -2730,13 +2724,13 @@ msgid ""
 "  -j, --java                  Java mode: input is a Java ResourceBundle "
 "class\n"
 msgstr ""
-"  -j, --java                  �ڹ� ���: �Է��� �ڹ� ResourceBundle Ŭ������"
-"�ϴ�\n"
+"  -j, --java                  자바 모드: 입력은 자바 ResourceBundle 클래스입"
+"니다\n"
 
 #: src/msgunfmt.c:430
 #, c-format
 msgid "      --csharp                C# mode: input is a .NET .dll file\n"
-msgstr "      --csharp                C# ���: �Է��� .NET .dll �����Դϴ�\n"
+msgstr "      --csharp                C# 모드: 입력은 .NET .dll 파일입니다\n"
 
 #: src/msgunfmt.c:432
 #, c-format
@@ -2744,25 +2738,25 @@ msgid ""
 "      --csharp-resources      C# resources mode: input is a .NET .resources "
 "file\n"
 msgstr ""
-"      --csharp-resources      C# ���ҽ� ���: �Է��� .NET .resources �����Դ�"
-"��\n"
+"      --csharp-resources      C# 리소스 모드: 입력은 .NET .resources 파일입니"
+"다\n"
 
 #: src/msgunfmt.c:434
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
-"      --tcl                   Tcl ���: �Է��� tcl/msgcat .msg �����Դϴ�\n"
+"      --tcl                   Tcl 모드: 입력은 tcl/msgcat .msg 파일입니다\n"
 
 #: src/msgunfmt.c:439
 #, c-format
 msgid "  FILE ...                    input .mo files\n"
-msgstr "  <����> ...                  �Է� .mo ����\n"
+msgstr "  <파일> ...                  입력 .mo 파일\n"
 
 #: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr "�ڹ� ��忡�� �Է� ���� ��ġ:\n"
+msgstr "자바 모드에서 입력 파일 위치:\n"
 
 #: src/msgunfmt.c:450
 #, c-format
@@ -2771,13 +2765,13 @@ msgid ""
 "name,\n"
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
-"Ŭ���� �̸��� ������ �̸��� ���ҽ� �̸��� ���ٷ� �����ؼ� ������ �̸�����\n"
-"�����˴ϴ�.  Ŭ������ CLASSPATH�� ���� ��ġ�� ���̰� �˴ϴ�.\n"
+"클래스 이름은 로캘 이름에 리소스 이름을 밑줄로 구분해서 연결한 이름으로\n"
+"결정됩니다. 클래스는 CLASSPATH에 따른 위치에 놓이게 됩니다.\n"
 
 #: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "C# ��忡�� �Է� ���� ����:\n"
+msgstr "C# 모드에서 입력 파일 지정:\n"
 
 #: src/msgunfmt.c:463
 #, c-format
@@ -2785,13 +2779,13 @@ msgid ""
 "The -l and -d options are mandatory.  The .dll file is located in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
-"-l�� -d �ɼ��� �� �ʿ��մϴ�.  .dll ������ ������ ���丮�� (�����Ͽ� ���� "
-"�޶����� �̸���) �Ʒ� ���丮�� ��� �ֽ��ϴ�.\n"
+"-l과 -d 옵션은 꼭 필요합니다. .dll 파일은 지정한 디렉터리의 아래\n"
+"디렉터리에 (디렉터리 이름은 로캘에 따라 달라집니다) 들어 있습니다.\n"
 
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr "Tcl ��忡�� �Է� ���� ����:\n"
+msgstr "Tcl 모드에서 입력 파일 지정:\n"
 
 #: src/msgunfmt.c:473
 #, c-format
@@ -2799,18 +2793,18 @@ msgid ""
 "The -l and -d options are mandatory.  The .msg file is located in the\n"
 "specified directory.\n"
 msgstr ""
-"-l �ɼǰ� -d �ɼ��� �� �ʿ��մϴ�.  .msg ������ ������ ���丮\n"
-"�Ʒ��� ��� �ֽ��ϴ�.\n"
+"-l 옵션과 -d 옵션은 꼭 필요합니다. .msg 파일은 지정한 디렉터리\n"
+"아래에 들어 있습니다.\n"
 
 #: src/msgunfmt.c:493
 #, c-format
 msgid "  -i, --indent                write indented output style\n"
-msgstr "  -i, --indent                �鿩����� ��� ���·� ���ϴ�\n"
+msgstr "  -i, --indent                들여쓰기된 출력 형태로 씁니다\n"
 
 #: src/msgunfmt.c:495
 #, c-format
 msgid "      --strict                write strict uniforum style\n"
-msgstr "      --strict                ������ Uniforum ��� ���·� ���ϴ�\n"
+msgstr "      --strict                엄격한 Uniforum 출력 형태로 씁니다\n"
 
 #: src/msguniq.c:318
 #, c-format, no-wrap
@@ -2824,19 +2818,19 @@ msgid ""
 "specified, they will be taken from the first translation.  File positions\n"
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
-"���� ��Ͽ��� �ߺ��� �������� �ϳ��� ����ϴ�.\n"
-"���� �޼��� ID�� ���� �ߺ��� �������� ã���ϴ�.  �̷��� �ߺ��� ��������\n"
-"msgfmt, msgmerge�� msgcat���� ���α׷��鿡�� �߸��� �Է��� �˴ϴ�.\n"
-"�⺻������, �ߺ��� �������� �ϳ��� �������ϴ�.  --repeated �ɼ��� ����ϸ�,\n"
-"�ߺ��� �޼������� ��µǰ�, �ٸ� �޼������� �����ϴ�.  �ּ����� \n"
-"����� �ּ����� ��� ������ ��������, --use-first�� �����ϸ� ù ��°\n"
-"�������� �ִ� �͸��� ���� �˴ϴ�.  ������ ��ġ�� ��� ������ ���Դϴ�.\n"
-"--unique �ɼ��� ����� ��, �ߺ��� �޼�������  �����ϴ�.\n"
+"번역 목록에서 중복된 번역문을 하나로 만듭니다.\n"
+"같은 메시지 ID를 가진 중복된 번역문을 찾습니다. 이렇게 중복된 번역문은\n"
+"msgfmt, msgmerge나 msgcat같은 프로그램들에서 잘못된 입력이 됩니다.\n"
+"기본값으로, 중복된 번역문은 하나로 합쳐집니다. --repeated 옵션을 사용하면,\n"
+"중복된 메시지만이 출력되고, 다른 메시지들을 버립니다. 주석문과 \n"
+"추출된 주석문은 모두 유지될 것이지만, --use-first를 지정하면 첫 번째\n"
+"번역문에 있는 것만을 쓰게 됩니다. 파일의 위치는 모두 유지될 것입니다.\n"
+"--unique 옵션을 사용할 때, 중복된 메시지들을  버립니다.\n"
 
 #: src/msguniq.c:351
 #, c-format
 msgid "  -d, --repeated              print only duplicates\n"
-msgstr "  -d, --repeated                 �ߺ��� �޼������� ����մϴ�\n"
+msgstr "  -d, --repeated                 중복된 메시지만을 출력합니다\n"
 
 #: src/msguniq.c:353
 #, c-format
@@ -2844,13 +2838,13 @@ msgid ""
 "  -u, --unique                print only unique messages, discard "
 "duplicates\n"
 msgstr ""
-"  -u, --unique                   ������ �޼������� ����ϰ�, �ߺ��� ���� ����"
-"�ϴ�\n"
+"  -u, --unique                   유일한 메시지만을 출력하고, 중복된 것은 버립"
+"니다\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
-msgstr "<ǥ���Է�>"
+msgstr "<표준입력>"
 
 #: src/po-charset.c:489
 #, c-format
@@ -2858,8 +2852,8 @@ msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
-"���ڼ� \"%s\"��(��) ���������� �̿��ϴ� ���ڵ� �̸��� �ƴմϴ�.\n"
-"������� ���ڼ������� �޼��� ��ȯ�� ���� ���� ���Դϴ�.\n"
+"문자셋 \"%s\"이(가) 공통적으로 이용하는 인코딩 이름이 아닙니다.\n"
+"사용자의 문자셋으로의 메시지 변환은 하지 않을 것입니다.\n"
 
 #: src/po-charset.c:556
 #, c-format
@@ -2867,24 +2861,24 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
-"���ڼ� \"%s\"��(��) �������� �ʽ��ϴ�. %s��(��) iconv()�� ����������,\n"
-"iconv()�� %s��(��) �������� �ʽ��ϴ�.\n"
+"문자셋 \"%s\"은(는) 지원되지 않습니다. %s은(는) iconv()에 의존하지만,\n"
+"iconv()는 %s을(를) 지원하지 않습니다.\n"
 
 #: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgstr ""
-"GNU libiconv�� ��ġ�ϰ� GNU gettext�� �ٽ� ��ġ�ϸ� ��\n"
-"������ ���� ���Դϴ�.\n"
+"GNU libiconv를 설치하고 GNU gettext를 다시 설치하면 이\n"
+"문제가 없을 것입니다.\n"
 
 #: src/po-charset.c:577 src/po-charset.c:615
 msgid "Continuing anyway, expect parse errors."
-msgstr "��·�� ����մϴ�.  ���� �ַ��� Ÿ���� ���Դϴ�."
+msgstr "어쨌든 계속합니다. 문법 애러가 타나날 것입니다."
 
 #: src/po-charset.c:579
 msgid "Continuing anyway."
-msgstr "��·�� ����մϴ�."
+msgstr "어쨌든 계속합니다."
 
 #: src/po-charset.c:606
 #, c-format
@@ -2892,157 +2886,157 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
-"���ڼ� \"%s\"��(��) �������� �ʽ��ϴ�. %s��(��) iconv()�� ����������,\n"
-"�� ������ iconv()�� �������� �ʴ� ���·� ����Ǿ����ϴ�.\n"
+"문자셋 \"%s\"은(는) 지원되지 않습니다. %s은(는) iconv()에 의존하지만,\n"
+"이 버전은 iconv()를 지원되지 않는 상태로 빌드되었습니다.\n"
 
 #: src/po-charset.c:643
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgstr ""
-"����� ���ڼ��� �����ϴ�\n"
-"����� ���ڼ������� �޼��� ��ȯ�� ���� �ʽ��ϴ�.\n"
+"헤더에 문자셋이 없습니다\n"
+"사용자 문자셋으로의 메시지 변환은 하지 않습니다.\n"
 
 #: src/po-gram-gen.y:93
 #, c-format
 msgid "inconsistent use of #~"
-msgstr "#~�� ����ǰ� �̿�Ǿ����ϴ�"
+msgstr "#~가 모순되게 이용되었습니다"
 
 #: src/po-gram-gen.y:240
 #, c-format
 msgid "missing `msgstr[]' section"
-msgstr "`msgstr[]' �κ��� �������ϴ�"
+msgstr "`msgstr[]' 부분이 빠졌습니다"
 
 #: src/po-gram-gen.y:249
 #, c-format
 msgid "missing `msgid_plural' section"
-msgstr "`msgstr_plural' �κ��� �������ϴ�"
+msgstr "`msgstr_plural' 부분이 빠졌습니다"
 
 #: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
-msgstr "`msgstr' �κ��� �������ϴ�"
+msgstr "`msgstr' 부분이 빠졌습니다"
 
 #: src/po-gram-gen.y:396
 #, c-format
 msgid "first plural form has nonzero index"
-msgstr "ù ��° �������� �ε����� 0�� �ƴմϴ�"
+msgstr "첫 번째 복수형의 인덱스가 0이 아닙니다"
 
 #: src/po-gram-gen.y:398
 #, c-format
 msgid "plural form has wrong index"
-msgstr "�������� �ε����� �߸��Ǿ����ϴ�"
+msgstr "복수형의 인덱스가 잘못되었습니다"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
-msgstr "������ �ʹ� ���Ƽ� �ߴ��մϴ�"
+msgstr "오류가 너무 많아서 중단합니다"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
-msgstr "�߸��� ��������Ʈ ���ڿ�"
+msgstr "잘못된 가변바이트 문자열"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
-msgstr "������ ������ �ҿ����� ���߹���Ʈ ���ڿ�"
+msgstr "파일의 끝에서 불완전한 다중바이트 문자열"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
-msgstr "���� ������ �ҿ����� ���߹���Ʈ ���ڿ�"
+msgstr "줄의 끝에서 불완전한 다중바이트 문자열"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
-msgstr "iconv ����"
+msgstr "iconv 실패"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
-msgstr "�� �� ���� ���� \"%s\""
+msgstr "알 수 없는 키워드 \"%s\""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
-msgstr "�߸��� ���� ������"
+msgstr "잘못된 제어 순서열"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
-msgstr "���ڿ� ���ο��� ������ ����"
+msgstr "문자열 내부에서 파일이 끝남"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
-msgstr "���ڿ� ���ο��� ���� ����"
+msgstr "문자열 내부에서 행이 끝남"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
-msgstr "���ڿ� �ȿ� ���ؽ�Ʈ ���� <EOT>�� �ֽ��ϴ�."
+msgstr "문자열 안에 컨텍스트 구분 <EOT>가 있습니다."
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "�� ������ ������ �����ڸ� �����ϰ� ���� ���� ���� �ֽ��ϴ�"
+msgstr "이 파일은 도메인 지시자를 포함하고 있지 않을 수도 있습니다"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
-msgstr "�ߺ��� �޽��� ����"
+msgstr "중복된 메시지 정의"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
-msgstr "����� ù��° ������ ��ġ�Դϴ�"
+msgstr "여기는 첫번째 정의의 위치입니다"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, c-format
 msgid "file \"%s\" is truncated"
-msgstr "\"%s\" ������ �߷Ƚ��ϴ�"
+msgstr "\"%s\" 파일이 잘렸습니다"
 
 #: src/read-mo.c:129
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string"
-msgstr "\"%s\" ���Ͽ� NUL�� ������ �ʴ� ���ڿ��� �ֽ��ϴ�"
+msgstr "\"%s\" 파일에 NUL로 끝나지 않는 문자열이 있습니다"
 
 #: src/read-mo.c:165 src/read-mo.c:274
 #, c-format
 msgid "file \"%s\" is not in GNU .mo format"
-msgstr "\"%s\" ������ GNU .mo ������ �ƴմϴ�"
+msgstr "\"%s\" 파일은 GNU .mo 형식이 아닙니다"
 
 #: src/read-mo.c:178
 #, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "\"%s\" ������ %s ��ġ�� NUL�� ������ �ʴ� ���ڿ��� �ֽ��ϴ�"
+msgstr "\"%s\" 파일의 %s 위치에 NUL로 끝나지 않는 문자열이 있습니다"
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "���:  �����ڵ� ���ڿ� \\uxxxx ������ Ʋ�Ƚ��ϴ�"
+msgstr "경고:  유니코드 문자에 \\uxxxx 문법이 틀렸습니다"
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
-msgstr "���: �ϰ���� ���� ���ڿ�"
+msgstr "경고: 완결되지 않은 문자열"
 
 #: src/read-stringtable.c:810
 msgid "warning: syntax error"
-msgstr "���: ���� ����"
+msgstr "경고: 문법 오류"
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
 msgid "warning: unterminated key/value pair"
-msgstr "���: Ű/�� ���� �ϰ���� �ʾҽ��ϴ�"
+msgstr "경고: 키/값 쌍이 완결되지 않았습니다"
 
 #: src/read-stringtable.c:939
 msgid "warning: syntax error, expected ';' after string"
-msgstr "���: ���� ����, ���ڿ� ������ ';'�� �;� �մϴ�"
+msgstr "경고: 문법 오류, 문자열 다음에 ';'이 와야 합니다"
 
 #: src/read-stringtable.c:948
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "���: ���� ����, ���ڿ� ������ '=' Ȥ�� ';'�� �;� �մϴ�"
+msgstr "경고: 문법 오류, 문자열 다음에 '=' 혹은 ';'이 와야 합니다"
 
 #: src/recode-sr-latin.c:116
 #, c-format
 msgid "Written by %s and %s.\n"
-msgstr "%s �� %s��(��) ��������ϴ�.\n"
+msgstr "%s 및 %s이(가) 만들었습니다.\n"
 
 #. TRANSLATORS: This is a proper name. The last name is
 #. (with Unicode escapes) "\u0160egan" or (with HTML entities)
@@ -3050,76 +3044,91 @@ msgstr "%s �� %s��(��) ��������ϴ�.\n"
 #. This is a proper name. See the gettext manual, section Names.
 #: src/recode-sr-latin.c:120
 msgid "Danilo Segan"
-msgstr "�ٴҷ� ���̰� (Danilo Segan)"
+msgstr "다닐로 세이건 (Danilo Segan)"
 
 #: src/recode-sr-latin.c:153
 #, c-format, no-wrap
 msgid "Recode Serbian text from Cyrillic to Latin script.\n"
-msgstr "������ƾ� �ؽ�Ʈ�� Ű�� ���ڿ��� ��ƾ ���ڷ� ��ȯ�մϴ�.\n"
+msgstr "세르비아어 텍스트를 키릴 문자에서 라틴 문자로 변환합니다.\n"
 
 #: src/recode-sr-latin.c:156
 #, c-format, no-wrap
 msgid ""
 "The input text is read from standard input.  The converted text is output to\n"
 "standard output.\n"
-msgstr "�Է� �ؽ�Ʈ�� ǥ�� �Է¿��� �н��ϴ�.  ��ȯ�� �ؽ�Ʈ�� ǥ�� ������� ����մϴ�.\n"
+msgstr "입력 텍스트는 표준 입력에서 읽습니다. 변환한 텍스트는 표준 출력으로 출력합니다.\n"
 
 #: src/recode-sr-latin.c:338
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
-msgstr "�Է��� \"%s\" ���ڵ����� �ùٸ��� �ʽ��ϴ�"
+msgstr "입력이 \"%s\" 인코딩에서 올바르지 않습니다"
 
 #: src/recode-sr-latin.c:366
 #, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
-msgstr "\"%s\" ���ڵ����� \"%s\" ���ڵ����� ��ȯ�ϴ� ���� ���� �߻�"
+msgstr "\"%s\" 인코딩에서 \"%s\" 인코딩으로 변환하는 동안 오류 발생"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
-msgstr "�μ��� �� ���̾�� �մϴ�"
+msgstr "인수는 두 개이어야 합니다"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
-msgstr "����: %s [<�ɼ�>] <URL> <����>\n"
+msgstr "사용법: %s [<옵션>] <URL> <파일>\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
-"URL�� ������ �����ͼ� ����մϴ�.  <URL>�� ������ �� ���� ��쿡��, ��Į���� ������ �� �ִ�\n"
-"<����>�� ��� ���˴ϴ�.\n"
+"URL의 내용을 가져와서 출력합니다. <URL>에 접근할 수 없는 경우에는, 로칼에서 접근할 수 있는\n"
+"<파일>이 대신 사용됩니다.\n"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
-msgstr "ǥ�� ��¿� ���� ���� ���� �߻�"
+msgstr "표준 출력에 쓰는 동안 오류 발생"
+
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
 
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format. Try using PO file syntax instead."
 msgstr ""
-"���� ���� ���� �������� ��� ���Ŀ� ���� �� ���� ���Ϸ� ����� �� �����ϴ�. "
-"PO ���� ������ �õ��� ���ʽÿ�."
+"여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다. "
+"PO 파일 문법을 시도해 보십시오."
 
 #: src/write-catalog.c:129
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
 "specified output format."
 msgstr ""
-"���� ���� ���� �������� ��� ���Ŀ� ���� �� ���� ���Ϸ� ����� �� �����ϴ�."
+"여러 개의 번역 도메인을 출력 형식에 따라 한 개의 파일로 출력할 수 없습니다."
 
 #: src/write-catalog.c:162
 msgid ""
 "message catalog has context dependent translations, but the output format "
 "does not support them."
 msgstr ""
-"�޼��� ��Ͽ� ���ؽ�Ʈ ���� ������ ��� ������, ��� ������ ���ؽ�Ʈ�� ������"
-"�� �ʽ��ϴ�."
+"메시지 목록에 컨텍스트 의존 번역이 들어 있지만, 출력 형식이 컨텍스트를 지원하"
+"지 않습니다."
 
 #: src/write-catalog.c:197
 msgid ""
@@ -3127,72 +3136,70 @@ msgid ""
 "support them. Try generating a Java class using \"msgfmt --java\", instead "
 "of a properties file."
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������, ��� ������ �������� �������� �ʽ���"
-"��. properties ���� ��ſ� \"msgfmt --java\"�� �ڹ� Ŭ������ ����� ���ʽÿ�."
+"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
+"다. properties 파일 대신에 \"msgfmt --java\"로 자바 클래스를 만들어 보십시오."
 
 #: src/write-catalog.c:202
 msgid ""
 "message catalog has plural form translations, but the output format does not "
 "support them."
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������, ��� ������ �������� �������� �ʽ���"
-"��."
+"메시지 목록에 복수형 번역이 들어 있지만, 출력 형식이 복수형을 지원하지 않습니"
+"다."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "��� ���� \"%s\"��(��) ���� �� �����ϴ�"
+msgstr "출력 파일 \"%s\"을(를) 만들 수 없습니다"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
-msgstr "ǥ�� ���"
+msgstr "표준 출력"
 
 #: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr "\"%s\" ���丮�� ����� �� �����߽��ϴ�"
+msgstr "\"%s\" 디렉터리를 만드는 데 실패했습니다"
 
 #: src/write-csharp.c:751
 #, c-format
 msgid "compilation of C# class failed, please try --verbose"
-msgstr "C# Ŭ���� �����Ͽ� �����߽��ϴ�.  --verbose�� �õ��� ���ʽÿ�"
+msgstr "C# 클래스 컴파일에 실패했습니다. --verbose로 시도해 보십시오"
 
 #: src/write-csharp.c:753
-#, fuzzy, c-format
+#, c-format
 msgid "compilation of C# class failed"
-msgstr "C# Ŭ���� �����Ͽ� �����߽��ϴ�.  --verbose�� �õ��� ���ʽÿ�"
+msgstr "C# 클래스 컴파일에 실패했습니다"
 
 #: src/write-java.c:975
 #, c-format
 msgid "not a valid Java class name: %s"
-msgstr "�ùٸ� �ڹ� Ŭ���� �̸��� �ƴմϴ�: %s"
+msgstr "올바른 자바 클래스 이름이 아닙니다: %s"
 
 #: src/write-java.c:1060
 #, c-format
 msgid "compilation of Java class failed, please try --verbose or set $JAVAC"
 msgstr ""
-"�ڹ� Ŭ���� �����Ͽ� �����߽��ϴ�.  --verbose�� �õ��� ���ų� $JAVAC ȯ�溯��"
-"�� �����Ͻʽÿ�"
+"자바 클래스 컴파일에 실패했습니다. --verbose로 시도해 보거나 $JAVAC 환경변수"
+"를 세팅하십시오"
 
 #: src/write-java.c:1063
-#, fuzzy, c-format
+#, c-format
 msgid "compilation of Java class failed, please try to set $JAVAC"
-msgstr ""
-"�ڹ� Ŭ���� �����Ͽ� �����߽��ϴ�.  --verbose�� �õ��� ���ų� $JAVAC ȯ�溯��"
-"�� �����Ͻʽÿ�"
+msgstr "자바 클래스 컴파일에 실패했습니다. $JAVAC 환경변수를 세팅하십시오"
 
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "���� ���� \"%s\"��(��) ���� ���� ���� �߻�"
+msgstr "쓰기 위해 \"%s\"을(를) 여는 동안 오류 발생"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
-msgstr "����ȭ�� �޽����� `\\%c' �̽������� �������� ������ �� �����ϴ�"
+msgstr "국제화된 메시지는 `\\%c' 이스케이프 순서열을 포함할 수 없습니다"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3200,12 +3207,12 @@ msgid ""
 "different from yours. Consider using a pure ASCII msgctxt instead.\n"
 "%s\n"
 msgstr ""
-"���� msgctxt�� ASCII�� �ƴ� ���ڰ� ��� �ֽ��ϴ�.\n"
-"�̷��� �����а� �ٸ� ���� ���ڵ��� ����ϴ� �����ڿ��� ������ \n"
-"�߻��� �� �ֽ��ϴ�.  ������ ASCII msgctxt���� ����ϵ��� �Ͻʽÿ�.\n"
+"다음 msgctxt는 ASCII가 아닌 문자가 들어 있습니다.\n"
+"이러면 여러분과 다른 문자 인코딩을 사용하는 번역자에게 문제가 \n"
+"발생할 수 있습니다. 순수한 ASCII msgctxt만을 사용하도록 하십시오.\n"
 "%s\n"
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3213,9 +3220,9 @@ msgid ""
 "different from yours. Consider using a pure ASCII msgid instead.\n"
 "%s\n"
 msgstr ""
-"���� msgid�� ASCII�� �ƴ� ���ڰ� ��� �ֽ��ϴ�.\n"
-"�̷��� �����а� �ٸ� ���� ���ڵ��� ����ϴ� �����ڿ��� ������ \n"
-"�߻��� �� �ֽ��ϴ�.  ������ ASCII msgid���� ����ϵ��� �Ͻʽÿ�.\n"
+"다음 msgid는 ASCII가 아닌 문자가 들어 있습니다.\n"
+"이러면 여러분과 다른 문자 인코딩을 사용하는 번역자에게 문제가 \n"
+"발생할 수 있습니다. 순수한 ASCII msgid만을 사용하도록 하십시오.\n"
 "%s\n"
 
 #: src/write-qt.c:667
@@ -3223,21 +3230,21 @@ msgid ""
 "message catalog has plural form translations\n"
 "but the Qt message catalog format doesn't support plural handling\n"
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������, Qt �޼��� ����� �������� �������� "
-"�ʽ��ϴ�\n"
+"메시지 목록에 복수형 번역이 들어 있지만, Qt 메시지 목록은 복수형을 지원하지 "
+"않습니다\n"
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
-"�޼��� ��Ͽ� ISO-8859-1�� �ƴ� msgctxt ���ڿ��� ��� �ֽ��ϴ�. Qt �޼��� ��"
-"��\n"
-"���Ŀ����� ������ ���ڿ��� �����ڵ带 �����ϰ�, ���ؽ�Ʈ ���ڿ������� ������"
-"��\n"
-"�ʽ��ϴ�.\n"
+"메시지 목록에 ISO-8859-1이 아닌 msgctxt 문자열이 들어 있습니다. Qt 메시지 목"
+"록\n"
+"형식에서는 번역된 문자열만 유니코드를 지원하고, 컨텍스트 문자열에서는 지원하"
+"지\n"
+"않습니다.\n"
 
 #: src/write-qt.c:717
 msgid ""
@@ -3245,346 +3252,343 @@ msgid ""
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the untranslated strings\n"
 msgstr ""
-"�޼��� ��Ͽ� ISO-8859-1�� �ƴ� msgid ���ڿ��� ��� �ֽ��ϴ�. Qt �޼��� ��"
-"��\n"
-"���Ŀ����� ������ ���ڿ��� �����ڵ带 �����ϰ�, �������� ���� ���ڿ������� ��"
-"������\n"
-"�ʽ��ϴ�.\n"
+"메시지 목록에 ISO-8859-1이 아닌 msgid 문자열이 들어 있습니다. Qt 메시지 목"
+"록\n"
+"형식에서는 번역된 문자열만 유니코드를 지원하고, 번역하지 않은 문자열에서는 지"
+"원하지\n"
+"않습니다.\n"
 
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "%s ���� ���μ����� ���� ���� ���� �߻�"
+msgstr "%s 하위 프로세스에 쓰는 동안 오류 발생"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
-"�޼��� ��Ͽ� ���ؽ�Ʈ ���� ������ ��� ������,\n"
-"C# .resources ������ ���ؽ�Ʈ�� �������� �ʽ��ϴ�\n"
+"메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
+"C# .resources 형식은 컨텍스트를 지원하지 않습니다\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������,\n"
-"C# .resource ������ �������� �������� �ʽ��ϴ�\n"
+"메시지 목록에 복수형 번역이 들어 있지만,\n"
+"C# .resource 형식은 복수형을 지원하지 않습니다\n"
 
 #: src/write-tcl.c:157
 msgid ""
 "message catalog has context dependent translations\n"
 "but the Tcl message catalog format doesn't support contexts\n"
 msgstr ""
-"�޼��� ��Ͽ� ���ؽ�Ʈ ���� ������ ��� ������,\n"
-"Tcl �޼��� ��� ������ ���ؽ�Ʈ�� �������� �ʽ��ϴ�\n"
+"메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
+"Tcl 메시지 목록 형식은 컨텍스트를 지원하지 않습니다\n"
 
 #: src/write-tcl.c:176
 msgid ""
 "message catalog has plural form translations\n"
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
-"�޼��� ��Ͽ� ������ ������ ��� ������, \n"
-"Tcl �޼��� ��� ������ �������� �������� �ʽ��ϴ�\n"
+"메시지 목록에 복수형 번역이 들어 있지만, \n"
+"Tcl 메시지 목록 형식은 복수형을 지원하지 않습니다\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "%s:%d: ���: �ϰ���� ���� ���ڿ�"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "%s:%d: ���: �ϰ���� ���� ���Խ�"
+msgstr "%s:%d: 경고: 완결되지 않은 정규식"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "%s:%d: ���: �ϰ���� ���� ���� ���"
+msgstr "%s:%d: 경고: 완결되지 않은 문자 상수"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "%s:%d: ���: �ϰ���� ���� ���ڿ� ���"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
-"%s%s�� ASCII�� �ƴ� ���ڿ��� �ֽ��ϴ�.\n"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s%s에 ASCII가 아닌 문자열이 있습니다.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: �߸��� ���߹���Ʈ ������.\n"
-"�ùٸ� �ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s:%d: 잘못된 다중바이트 시퀀스.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: ��� �ҿ����� ���߹���Ʈ ������.\n"
-"�ùٸ� �ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s:%d: 길고 불완전한 다중바이트 시퀀스.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 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"
-"�ùٸ� �ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 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"
-"�ùٸ� �ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
-msgstr "%s:%d: iconv ����"
+msgstr "%s:%d: iconv 실패"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
-"%s:%d: �߸��� ���߹���Ʈ ������.\n"
-"�ùٸ� �ҽ� ���ڵ��� --from-code �ɼ����� �����Ͻʽÿ�.\n"
+"%s:%d: 잘못된 다중바이트 시퀀스.\n"
+"올바른 소스 인코딩을 --from-code 옵션으로 지정하십시오.\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "%s:%d: ���: �߸��� �����ڵ� ����"
+msgstr "%s:%d: 경고: 잘못된 유니코드 문자"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "%s:%d: ���: �ϰ���� ���� ���ڿ� ���"
+msgstr "%s:%d: 경고: 완결되지 않은 문자열 상수"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
-msgstr "%s:%d: ���: '}'�� �;� �ϴ� ���� ')'�� �߰ߵǾ����ϴ�"
+msgstr "%s:%d: 경고: '}'가 와야 하는 곳에 ')'가 발견되었습니다"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
-msgstr "%s:%d: ���: ')�� �;� �ϴ� ���� '}'�� �߰ߵǾ����ϴ�"
+msgstr "%s:%d: 경고: ')가 와야 하는 곳에 '}'가 발견되었습니다"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
-"��� \"glade\"�� �������� �ʽ��ϴ�. %s��(��) expat�� �����մϴ�.\n"
-"�� ������ expat ���� ����Ǿ����ϴ�.\n"
+"언어 \"glade\"는 지원되지 않습니다. %s은(는) expat에 의존합니다.\n"
+"이 버전은 expat 없이 빌드되었습니다.\n"
 
-#: src/x-java.c:492
-#, fuzzy, c-format
+#: src/x-java.c:494
+#, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: ���: �ϰ���� ���� ���ڿ�"
+msgstr "%s:%d: 경고: U+%04X 서로게이트 문자가 단독으로 있습니다"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
-"%s:%d: ���ڿ��� ������ \"%s\"��(��) ������ ������ ���� ������ �ʾҽ��ϴ�."
+"%s:%d: 문자열을 끝내는 \"%s\"이(가) 파일이 끝나기 전에 나오지 않았습니다."
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
-msgstr "%s:%d: \\x{��������}���� ������ �߰�ȣ�� �������ϴ�"
+msgstr "%s:%d: \\x{십육진수}에서 오른쪽 중괄호가 빠졌습니다"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
-msgstr "%s:%d: 8��Ʈ ���� \"%c\"�� ���������̼�(\"\\l\")�� �߸��Ǿ����ϴ�"
+msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\l\")이 잘못되었습니다"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
-msgstr "%s:%d: 8��Ʈ ���� \"%c\"�� ���������̼�(\"\\u\")�� �߸��Ǿ����ϴ�"
+msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\u\")이 잘못되었습니다"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
-msgstr "%s:%d: \"%c\"���� ���� ���������̼��� �߸��Ǿ����ϴ�"
+msgstr "%s:%d: \"%c\"에서 변수 인터폴레이션이 잘못되었습니다"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
-msgstr "%s:%d: 8��Ʈ ���� \"%c\"�� ���������̼�(\"\\L\")�� �߸��Ǿ����ϴ�"
+msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\L\")이 잘못되었습니다"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
-msgstr "%s:%d: 8��Ʈ ���� \"%c\"�� ���������̼�(\"\\U\")�� �߸��Ǿ����ϴ�"
+msgstr "%s:%d: 8비트 문자 \"%c\"의 인터폴레이션(\"\\U\")이 잘못되었습니다"
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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%s�� ASCII�� �ƴ� ���ڿ��� �ֽ��ϴ�.\n"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s%s에 ASCII가 아닌 문자열이 있습니다.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s:%d: 잘못된 다중바이트 시퀀스\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "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"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s:%d: 길고 불완전한 다중바이트 시퀀스\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "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"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s:%d: 파일의 끝에 불완전한 다중바이트 시퀀스.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "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"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s:%d: 줄 끝에 불완전한 다중바이트 시퀀스.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "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"
-"�ҽ� ���ڵ��� --from-code �ɼ����� �����ϰų� http://www.python.org/peps/pep-"
-"0263.html �������� �ִ� ��ó�� �ּ����� �����Ͻʽÿ�.\n"
+"%s:%d: 잘못된 다중바이트 시퀀스.\n"
+"소스 인코딩을 --from-code 옵션으로 지정하거나 http://www.python.org/peps/"
+"pep-0263.html 페이지에 있는 것처럼 주석으로 지정하십시오.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
-"\"%s\" ���ڵ��� � ���ڵ����� �� �� �����ϴ�. ��� ASCII�� �����մϴ�."
+"\"%s\" 인코딩은 어떤 인코딩인지 알 수 없습니다. 대신 ASCII로 진행합니다."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
-msgstr "%s:%d: �߸��� ���ڿ� ����"
+msgstr "%s:%d: 잘못된 문자열 정의"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
-msgstr "%s:%d: # ������ ���ڰ� �������ϴ�"
+msgstr "%s:%d: # 다음에 숫자가 빠졌습니다"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
-msgstr "%s:%d: �߸��� ���ڿ� ǥ��"
+msgstr "%s:%d: 잘못된 문자열 표현"
 
-#: src/x-sh.c:1075
+#: 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�� ����Ͻʽÿ�"
+"%s:%lu: 경고: $\"...\" 문법은 보안상의 이유로 없어질 예정입니다; 대신에 "
+"eval_gettext를 사용하십시오"
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
-msgstr "--join-exeisting�� ����� ǥ����¿� ������ �� ���� �� �����ϴ�"
+msgstr "--join-exeisting은 출력이 표준출력에 쓰여질 때 사용될 수 없습니다"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
-msgstr "xgettext�� �˻��� Ű���� ���̴� �������� �ʽ��ϴ�"
+msgstr "xgettext는 검색할 키워드 없이는 동작하지 않습니다"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
-msgstr "���: `%s' ������ Ȯ���� `%s'��(��) �� �� �����ϴ�; C �������� ������"
+msgstr "경고: `%s' 파일의 확장자 `%s'을(를) 알 수 없습니다; C 형식으로 간주함"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
-msgstr "�־��� �Է� ���Ͽ��� ���� ������ ���ڿ��� �̾Ƴ��ϴ�.\n"
+msgstr "주어진 입력 파일에서 번역 가능한 문자열을 뽑아냅니다.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
-"  -d, --default-domain=<�̸�>    ��¿� (messages.po ���) <�̸�>.po�� ����"
-"��\n"
+"  -d, --default-domain=<이름>    출력에 (messages.po 대신) <이름>.po를 씁니"
+"다\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
-msgstr "  -o, --output=<����>            ������ ���Ͽ� ����մϴ�\n"
+msgstr "  -o, --output=<파일>            지정된 파일에 출력합니다\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
-"  -p, --output-dir=<���丮>    ��� ������ <���丮> ���丮�� �����ϴ�\n"
+"  -p, --output-dir=<디렉터리>    출력 파일을 <디렉터리> 디렉터리에 놓습니다\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
-msgstr "�Է� ������ ��� ����:\n"
+msgstr "입력 파일의 언어 선택:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3595,7 +3599,7 @@ msgid ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
-"  -L, --language=<�̸�>          ������ ���� �ν��ϵ��� �մϴ�\n"
+"  -L, --language=<이름>          지정한 언어로 인식하도록 합니다\n"
 "                                (C, C++, ObjectiveC, PO, Shell, Python, "
 "Lisp,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
@@ -3603,65 +3607,68 @@ msgstr ""
 "PHP, \n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
-msgstr "  -C, --c++                   --language=C++�� ª�� �� ���Դϴ�\n"
+msgstr "  -C, --c++                   --language=C++를 짧게 쓴 것입니다\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
-"�⺻������ �Է� ������ Ȯ���ڿ� ���� � �� ����� �� �����մϴ�.\n"
+"기본적으로 입력 파일의 확장자에 따라 어떤 언어를 사용할 지 짐작합니다.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
-"      --from-code=<�̸�>      �Է� ������ ���ڵ�\n"
-"                                (Python, Tcl, Glade ����)\n"
+"      --from-code=<이름>      입력 파일의 인코딩\n"
+"                                (Python, Tcl, Glade 제외)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
-msgstr "�⺻������ �Է� ������ ASCII�� ���ڵ��Ǿ� �ִٰ� �����մϴ�.\n"
+msgstr "기본값으로 입력 파일은 ASCII로 인코딩되어 있다고 가정합니다.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
-msgstr "  -j, --join-existing            �����ϴ� ���ϰ� �޼����� ��Ĩ�ϴ�\n"
+msgstr "  -j, --join-existing            현존하는 파일과 메시지를 합칩니다\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
-"  -x, --exclude-file=<����.po>   <����.po>�� �޼����� �̾Ƴ��� �ʽ��ϴ�\n"
+"  -x, --exclude-file=<파일.po>   <파일.po>의 메시지는 뽑아내지 않습니다\n"
 
-# TAG�� ��Ȯ�� ����?
-#: src/xgettext.c:825
-#, c-format
+# TAG가 정확이 뭐지?
+#: src/xgettext.c:827
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
-"  -c, --add-comments[=<�±�>]    �ּ� �κ��� <��ũ>�� (Ȥ�� Ű���� �� �տ�\n"
-"                                 �ִ� ������) ��� ���Ͽ� ���ϴ�\n"
+"  -c, --add-comments[=<태그>]    주석 부분을 <태크>로 (혹은 키워드 줄 앞에\n"
+"                                 있는 것으로) 출력 파일에 씁니다\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
-msgstr "Language ���� �ɼ�:\n"
+msgstr "Language 관련 옵션:\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
-msgstr "  -a, --extract-all              ��� ���ڿ��� �̾� ���ϴ�\n"
+msgstr "  -a, --extract-all              모든 문자열을 뽑아 냅니다\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3669,32 +3676,32 @@ msgid ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
-"                                (���� �� ����: C, C++, ObjectiveC, "
+"                                (다음 언어만 지원: C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme "
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:841
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
-"  -k, --keyword[=<�ܾ�>]         �߰��� ã�� Ű���� (<�ܾ�>�� ������ �⺻\n"
-"                                 Ű���带 ������� �ʰڴٴ� �ǹ��Դϴ�)\n"
+"  -k, --keyword[=<단어>]         추가로 찾을 키워드 (<단어>가 없으면 기본\n"
+"                                 키워드를 사용하지 않겠다는 의미입니다)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 "argument\n"
 "                              number ARG of keyword WORD\n"
 msgstr ""
-"      --flag=WORD:ARG:FLAG    Ű���� WORD�� ���� ��ȣ ARG�ȿ� �ִ� ���ڿ���\n"
-"                              �߰� �÷���\n"
+"      --flag=WORD:ARG:FLAG    키워드 WORD의 인자 번호 ARG안에 있는 문자열의\n"
+"                              추가 플래그\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3702,139 +3709,156 @@ msgid ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
-"                                (���� �� ����: C, C++, ObjectiveC, "
+"                                (다음 언어만 지원: C, C++, ObjectiveC, "
 "Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
-"  -T, --trigraphs                �Է¿��� ANSI C ������(trigraph)�� �ν��մ�"
-"��\n"
+"  -T, --trigraphs                입력에서 ANSI C 삼중자(trigraph)를 인식합니"
+"다\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
-"                                (���� �� ����: C, C++, ObjectiveC)\n"
+"                                (다음 언어만 지원: C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
-msgstr "      --qt                    Qt ���� ���ڿ��� �˾Ƴ��ϴ�\n"
+msgstr "      --qt                    Qt 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
-msgstr "                                (C++�� ����)\n"
+msgstr "                                (C++만 지원)\n"
 
-#: src/xgettext.c:859
-#, fuzzy, c-format
+#: src/xgettext.c:863
+#, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
-msgstr "      --qt                    Qt ���� ���ڿ��� �˾Ƴ��ϴ�\n"
+msgstr "      --kde                   KDE 4 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
-msgstr "      --boost                 Boost ���� ���ڿ��� �˾Ƴ��ϴ�\n"
+msgstr "      --boost                 Boost 형식 문자열을 알아냅니다\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
-msgstr "      --debug                    �� �ڼ��� ���Ĺ��ڿ� �ν� ���\n"
+msgstr "      --debug                    더 자세한 형식문자열 인식 결과\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
-msgstr "      --properties-output     �ڹ� .properties ������ ���ϴ�\n"
+msgstr "      --properties-output     자바 .properties 파일을 씁니다\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
-msgstr "      --copyright-holder=<���ڿ�> ����� ���۱� �����ڸ� �����մϴ�\n"
+msgstr "      --copyright-holder=<문자열> 출력할 저작권 소유자를 지정합니다\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
-"      --foreign-user             �ܺ� ����ڸ� ���� FSF ���۱� ǥ�ø� ����"
-"��\n"
+"      --foreign-user             외부 사용자를 위해 FSF 저작권 표시를 뺍니"
+"다\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
-msgstr ""
+msgstr "      --package-name=<패키지> 출력에서 패키지 이름을 지정합니다\n"
 
-#: src/xgettext.c:907
-#, fuzzy, c-format
+#: src/xgettext.c:911
+#, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
-msgstr "      --copyright-holder=<���ڿ�> ����� ���۱� �����ڸ� �����մϴ�\n"
+msgstr "      --package-version=<버전>   출력에서 패키지 버전을 지정합니다\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
-"      --msgid-bugs-address=�̸���@�ּ�     msgid ���׸� ������ �ּҸ� ������"
-"�ϴ�\n"
+"      --msgid-bugs-address=이메일@주소     msgid 버그를 보고할 주소를 지정합"
+"니다\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
-"  -m, --msgstr-prefix[=<���ڿ�>] msgstr �׸� <���ڿ�> Ȥ�� \"\"�� ���ξ�"
-"��\n"
+"  -m, --msgstr-prefix[=<문자열>] msgstr 항목에 <문자열> 혹은 \"\"을 접두어"
+"로\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:918
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
-"  -M, --msgstr-suffix[=<���ڿ�>] msgstr �׸� <���ڿ�> Ȥ�� \"\"�� ���̾�"
-"��\n"
+"  -M, --msgstr-suffix[=<문자열>] msgstr 항목에 <문자열> 혹은 \"\"을 접미어"
+"로\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
-msgstr "--flag�� ���ڰ� <keyword>:<argnum>:[pass-]<flag> ������ �ƴմϴ�: %s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
+msgstr "--flag의 인자가 <keyword>:<argnum>:[pass-]<flag> 문법이 아닙니다: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
-msgstr "ǥ�� �Է�"
+msgstr "표준 입력"
+
+#: src/xgettext.c:1927
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
-msgstr "%s%s: ���: "
+msgstr "%s%s: 경고: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
-"���� ���ڿ��� ��ġ ������ ���������, %s��(��) �߸��� %s ���� ���ڿ��Դϴ�. "
-"����: %s\n"
+"형식 문자열에 위치 지정을 사용했지만, %s은(는) 잘못된 %s 형식 문자열입니다. "
+"이유: %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
-"������ �Ͱ��� �޸�, '%s'��(��) �ùٸ� %s ���� ���ڿ��� �ƴմϴ�. ����: %s\n"
+"선언한 것과는 달리, '%s'은(는) 올바른 %s 형식 문자열이 아닙니다. 이유: %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3842,64 +3866,85 @@ msgid ""
 "Please consider using a format string with named arguments,\n"
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
-"�̸����� ���ڷ� '%s' ���� ���ڿ��� ���� �ùٸ� ����ȭ�� �� �� �����ϴ�.\n"
-"�����ڰ� ���� ������ �����ؾ� �մϴ�.\n"
-"�̸��� �ִ� ���ڸ� �̿��� ���� ���ڿ��� ����� ���ʽÿ�.\n"
-"�ƴϸ� ���ڿ� ���� Ʃ�� ��ſ� ������ ����� ���ʽÿ�.\n"
+"이름없는 인자로 '%s' 포맷 문자열을 쓰면 올바른 지역화를 할 수 없습니다.\n"
+"번역자가 인자 순서를 조정해야 합니다.\n"
+"이름이 있는 인자를 이용해 형식 문자열을 사용해 보십시오.\n"
+"아니면 인자에 대해 튜플 대신에 매핑을 사용해 보십시오.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
-"��� �ִ� msgid�Դϴ�.  �� msgid�� GNU gettext�� �ٸ� �������� ����մϴ�:\n"
-"gettext(\"\")�� �� ���ڿ��� �ƴ϶�, ��Ÿ ������ ��� �ִ� \n"
-"��� �׸��� �����մϴ�.\n"
+"비어 있는 msgid입니다. 이 msgid는 GNU gettext가 다른 목적으로 사용합니다:\n"
+"gettext(\"\")는 빈 문자열이 아니라, 메타 정보가 들어 있는 \n"
+"헤더 항목을 리턴합니다.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
-msgstr "'%.*s' Ű���忡 ���� ���� ������ �ָ��մϴ�"
+msgstr "'%.*s' 키워드에 대한 인자 지정이 애매합니다"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
-msgstr "���: '%.*s' Ű���忡 ���� ���ؽ�Ʈ�� �����ϴ�"
+msgstr "경고: '%.*s' 키워드에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
-msgstr "���: '%.*s' Ű������ ������ ���ڿ� ���� ���ؽ�Ʈ�� �����ϴ�"
+msgstr "경고: '%.*s' 키워드의 복수형 인자에 대해 컨텍스트가 없습니다"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
-msgstr "�ܼ����� ������ ���̿� ���ؽ�Ʈ�� �ٸ��ϴ�"
+msgstr "단수형과 복수형 사이에 컨텍스트가 다릅니다"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 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 ""
-"--msgid-bugs-address �ɼ��� �������� �ʾҽ��ϴ�.\n"
-"`Makevars' ������ ����� ���, MSGID_BUGS_ADDRESS\n"
-"������ �����Ͻʽÿ�; �׷��� ������ --msgid-bugs-address\n"
-"������ �ɼ��� ����Ͻʽÿ�.\n"
+"--msgid-bugs-address 옵션이 지정되지 않았습니다.\n"
+"`Makevars' 파일을 사용할 경우, MSGID_BUGS_ADDRESS\n"
+"변수를 지정하십시오; 그렇지 않으면 --msgid-bugs-address\n"
+"명령행 옵션을 사용하십시오.\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
-msgstr "\"%s\" ���Ͽ� NUL�� ������ �ʴ� sysdep ���׸�Ʈ�� �ֽ��ϴ�"
+msgstr "\"%s\" 파일에 NUL로 끝나지 않는 sysdep 세그먼트가 있습니다"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
-msgstr "<�̸�����>"
+msgstr "<이름없음>"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle이 오류 코드 0x%08x번으로 실패했습니다"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "아직 구현되지 않았습니다."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "%s 서브프로세스에 비차단 입출력을 설정할 수 없습니다"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "%s 서브프로세스와의 통신에 실패했습니다"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "%s 서브프로세스에서 읽기가 실패했습니다"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s 서브프로세스가 종료코드 %d(으)로 끝났습니다"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "`%s' 필드가 아직도 초기의 내정값을 가지고 있습니다\n"
 
 #~ msgid "Multiple references to %%%c."
-#~ msgstr "%%%c��(��) ���� �� �����߽��ϴ�."
+#~ msgstr "%%%c을(를) 여러 번 참조했습니다."
 
 #~ msgid ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -3909,65 +3954,65 @@ msgstr "<�̸�����>"
 #~ "PURPOSE.\n"
 #~ msgstr ""
 #~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "�� ���α׷��� ���� ����Ʈ�����Դϴ�.  ���� ������ �ҽ��� �����Ͻʽÿ�. ��"
-#~ "ǰ��\n"
-#~ "�̳� Ư�� ������ ���� ���ռ��� ����Ͽ�, ��� ������ ���� �ʽ��ϴ�.\n"
+#~ "이 프로그램은 자유 소프트웨어입니다. 복사 조건은 소스를 참조하십시오. 상품"
+#~ "성\n"
+#~ "이나 특정 목적에 대한 적합성을 비롯하여, 어떠한 보증도 하지 않습니다.\n"
 
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the C# .dll format doesn't support contexts\n"
 #~ msgstr ""
-#~ "�޼��� ��Ͽ� ���ؽ�Ʈ ���� ������ ��� ������,\n"
-#~ "C# .dll ������ ���ؽ�Ʈ�� �������� �ʽ��ϴ�\n"
+#~ "메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
+#~ "C# .dll 형식은 컨텍스트를 지원하지 않습니다\n"
 
 #~ msgid ""
 #~ "message catalog has context dependent translations\n"
 #~ "but the Java ResourceBundle format doesn't support contexts\n"
 #~ msgstr ""
-#~ "�޼��� ��Ͽ� ���ؽ�Ʈ ���� ������ ��� ������,\n"
-#~ "Java ResourceBundle ������ ���ؽ�Ʈ�� �������� �ʽ��ϴ�\n"
+#~ "메시지 목록에 컨텍스트 의존 번역이 들어 있지만,\n"
+#~ "Java ResourceBundle 형식은 컨텍스트를 지원하지 않습니다\n"
 
 #~ msgid "conversion failure"
-#~ msgstr "��ȯ ����"
+#~ msgstr "변환 실패"
 
 #~ msgid "%s: warning: "
-#~ msgstr "%s: ���: "
+#~ msgstr "%s: 경고: "
 
 #~ msgid "%s\n"
 #~ msgstr "%s\n"
 
 #~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "%s:%lu: ���: ���ڿ��� �ϰ���� �ʾҽ��ϴ�"
+#~ msgstr "%s:%lu: 경고: 문자열이 완결되지 않았습니다"
 
 #~ msgid "%s:%d: fatal: plural message seen before singular message\n"
-#~ msgstr "%s:%d: ġ���� ����: ������ �޼����� �ܼ��� �޼��� �տ� ���Խ��ϴ�\n"
+#~ msgstr "%s:%d: 치명적 오류: 복수형 메시지가 단수형 메시지 앞에 나왔습니다\n"
 
 #~ msgid "Which is your email address?"
-#~ msgstr "���ڸ��� �ּҰ� �����Դϱ�?"
+#~ msgstr "전자메일 주소가 무엇입니까?"
 
 #~ msgid "Please choose the number, or enter your email address."
-#~ msgstr "���� �� �ϳ��� �����Ͻðų�, ���ڸ��� �ּҸ� �Է��Ͻʽÿ�."
+#~ msgstr "다음 중 하나를 선택하시거나, 전자메일 주소를 입력하십시오."
 
 #~ msgid "Invalid email address: invalid character."
-#~ msgstr "�߸��� ���ڸ��� �ּ�: �� �� ���� ���ڰ� �ֽ��ϴ�."
+#~ msgstr "잘못된 전자메일 주소: 쓸 수 없는 문자가 있습니다."
 
 #~ msgid ""
 #~ "Invalid email address: need a fully qualified host name or domain name."
 #~ msgstr ""
-#~ "�߸��� ���ڸ��� �ּ�: ������ (fully qualified) ȣ��Ʈ �̸� Ȥ�� ������ ��"
-#~ "���� �ʿ��մϴ�."
+#~ "잘못된 전자메일 주소: 완전한 (fully qualified) 호스트 이름 혹은 도메인 이"
+#~ "름이 필요합니다."
 
 #~ msgid "Invalid email address: missing @"
-#~ msgstr "�߸��� ���ڸ��� �ּ�: @�� �������ϴ�"
+#~ msgstr "잘못된 전자메일 주소: @가 빠졌습니다"
 
 #~ msgid "Is the following your email address?"
-#~ msgstr "���ڸ��� �ּҰ� ������ �����ϱ�?"
+#~ msgstr "전자메일 주소가 다음과 같습니까?"
 
 #~ msgid "Please confirm by pressing Return, or enter your email address."
-#~ msgstr "������ ���� Ȯ���ϰų�, ���ڸ��� �ּҸ� �Է��Ͻʽÿ�."
+#~ msgstr "리턴을 눌러 확인하거나, 전자메일 주소를 입력하십시오."
 
 #~ msgid "Couldn't find out about your email address."
-#~ msgstr "���ڸ��� �ּҸ� �˾Ƴ� �� �����ϴ�."
+#~ msgstr "전자메일 주소를 알아낼 수 없습니다."
 
 #~ msgid "Please enter your email address."
-#~ msgstr "���ڸ��� �ּҸ� �Է��Ͻʽÿ�."
+#~ msgstr "전자메일 주소를 입력하십시오."
diff --git a/gettext-tools/po/nl.po b/gettext-tools/po/nl.po
index 5840c2f..c4bb200 100644
--- a/gettext-tools/po/nl.po
+++ b/gettext-tools/po/nl.po
@@ -1,22 +1,24 @@
-# Translation of gettext-tools-0.16.2-pre5 to Dutch.
-# Dutch translation for GNU gettext messages.
-# Copyright (C) 1996, 2007 Free Software Foundation, Inc.
+# Dutch translations for gettext-tools.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
 #
 # Erick Branderhorst <Erick.Branderhorst@asml.nl>, 1996.
-# Benno Schulenberg <benno@vertaalt.nl>, 2007.
+# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: gettext-tools-0.16.2-pre5\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 2007-10-17 23:28+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-10 12:48+0100\n"
+"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Launchpad-Export-Date: 2008-06-30 19:52+0000\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -36,7 +38,7 @@ msgstr "Geldige argumenten zijn:"
 #: gnulib-lib/clean-temp.c:333
 #, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "kan geen tijdelijke map vinden -- zet omgevingsvariabele TMPDIR"
+msgstr "kan geen tijdelijke map vinden; zet $TMPDIR"
 
 #: gnulib-lib/clean-temp.c:347
 #, c-format
@@ -57,44 +59,44 @@ msgstr "kan tijdelijke map '%s' niet verwijderen"
 msgid "write error"
 msgstr "schrijffout"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "fout bij openen van '%s' voor lezen"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "kan reservebestand '%s' niet openen voor schrijven"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "fout bij lezen van '%s'"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "fout bij schrijven van '%s'"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "fout na lezen van '%s'"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
 msgstr "fdopen() is mislukt"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
@@ -104,70 +106,70 @@ msgstr "C#-compiler is niet gevonden; installeer 'pnet'"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "virtuele C#-machine is niet gevonden; installeer 'pnet'"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "subproces %s is mislukt"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie '%s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie '--%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie '%c%s' staat geen argument toe\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie '%s' vereist een argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie '--%s'\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie '%c%s'\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie '-W %s' is niet eenduidig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie '-W %s' staat geen argument toe\n"
@@ -189,14 +191,14 @@ msgstr "ongeldige waarde voor 'target_version' in compile_java_class()"
 msgid "failed to create \"%s\""
 msgstr "aanmaken van '%s' is mislukt"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "fout bij schrijven van bestand '%s'"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
@@ -204,23 +206,23 @@ msgstr "Java-compiler is niet gevonden; installeer 'gcj' of zet $JAVAC"
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
-msgstr "Java virtuele machine is niet gevonden; installeer 'gcj' of zet $JAVAC"
+msgstr "Virtuele Java-machine is niet gevonden; installeer 'gcj' of zet $JAVA"
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "I/O-fout in subproces %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "kan geen pijp aanmaken"
@@ -238,77 +240,76 @@ msgstr "kan geen pijp aanmaken"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "‘"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "’"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle() is mislukt met foutcode 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle() is mislukt"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan uitvoerbestand '%s' niet aanmaken"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "subproces %s"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "subproces %s ontving het fatale signaal %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "'%s' is geen geldige opmaakreeks voor %s, anders dan 'msgid'.  Reden: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument %u, als in '%s', komt niet voor in 'msgid'"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "opmaakcode voor argument %u komt niet voor in '%s'"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "opmaakcodes in 'msgid' en '%s' voor argument %u zijn niet hetzelfde"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
+msgstr "Directiefnummer %u begint met | maar eindigt niet op |."
 
 #: src/format-c.c:181
 #, c-format
@@ -316,118 +317,137 @@ msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
+"In directiefnummer %u is de tekenreeks na '<' niet de naam van macro met een "
+"opmaakcode. Juiste macronamen staan opgesomd in ISO C 99, paragraaf 7.8.1."
 
 #: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
+"In directiefnummer %u wordt de tekenreeks na '<' niet gevolgd door '>'."
 
 #: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
+"De tekenreeks verwijst naar argumentnummer %u maar negeert argumentnummer %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "het aantal opmaakcodes in 'msgid' en '%s' is niet gelijk"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
+msgstr "In directiefnummer %u wordt '{' niet gevolgd door een argumentnummer."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr ""
+msgstr "In directiefnummer %u wordt ',' niet gevolgd door een nummer."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
+"De tekenreeks stopt midden in een directief: '{' gevonden zonder gepaarde "
+"'}'."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
+"Het directiefnummer %u eindigt op een ongeldig karakter '%c' in plaats van "
+"'}'."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
 msgstr ""
+"Het directiefnummer %u eindigt op een ongeldig karakter in plaats van '}'."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
+"De tekenreeks begint midden in een directief: '}' gevonden zonder gepaarde "
+"'{'."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr ""
+msgstr "De tekenreeks bevat een ongepaarde '}' na directiefnummer %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr ""
+msgstr "In directiefnummer %u is de combinatie van vlaggen ongeldig."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr ""
+"In directiefnummer %u is geen nauwkeurigheidsaanduiding voor '%c' toegestaan."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr ""
+"In directiefnummer %u moet het argumentnummer voor de nauwkeurigheid gelijk "
+"zijn aan %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
+"In directiefnummer %u is geen nauwkeurigheidsspecificatie toegestaan voor "
+"'%c'."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr ""
+msgstr "In directiefnummer %u is de nauwkeurigheidsspecificatie ongeldig."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr ""
+"In directiefnummer %u zijn geen vlaggen toegestaan voorafgaand aan '%c'."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "'msgid' gebruikt %%m, maar '%s' niet"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "'msgid' gebruikt geen %%m, maar '%s' gebruikt %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr ""
+msgstr "De tekenreeks stopt midden in een directief."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
+"De tekenreeks verwijst naar argumenten zowel via absolute argumentnummers "
+"als via ongenummerde argumentspecificaties."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr ""
+msgstr "In directiefnummer %u is argumentnummer 0 geen positief geheel getal."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -435,6 +455,8 @@ msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
+"In directiefnummer %u is de breedte's argumentnummer 0 geen positief geheel "
+"getal."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -442,6 +464,8 @@ msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
+"In directiefnummer %u is de nauwkeurigheid's argumentnummer 0 geen positief "
+"geheel getal."
 
 #: src/format-invalid.h:36
 #, c-format
@@ -449,6 +473,7 @@ msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
+"In directiefnummer %u is karakter '%c' geen geldige conversiespecificatie."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -456,11 +481,14 @@ msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
+"Het karakter waarmee directiefnummer %u afsluit is geen geldige "
+"conversiespecificatie."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
 msgstr ""
+"De tekenreeks verwijst naar argumentnummer %u op niet-compatibele manieren."
 
 #: src/format-java.c:240
 #, c-format
@@ -468,17 +496,19 @@ msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
+"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige datum/tijdstijl."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr ""
+msgstr "In directiefnummer %u wordt \"%s\" niet gevolgd door een komma."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
 msgstr ""
+"In directiefnummer %u is deeltekenreeks \"%s\" geen geldige getallenstijl."
 
 #: src/format-java.c:323
 #, c-format
@@ -486,11 +516,13 @@ msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
+"In directiefnummer %u wordt het argumentnummer niet gevolgd door een komma "
+"en één van \"%s\", \"%s\", \"%s\", \"%s\"."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr ""
+msgstr "In directiefnummer %u bevat een keuze geen getal."
 
 #: src/format-java.c:583
 #, c-format
@@ -498,23 +530,24 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
+"In directiefnummer %u bevat een keuze een getal dat niet gevolgd wordt door "
+"'<', '#' of '%s'."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument {%u}, als in '%s', komt niet voor in 'msgid'"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "opmaakcode voor argument {%u} komt niet voor in '%s'"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "opmaakcodes in 'msgid' en '%s' voor argument {%u} zijn niet hetzelfde"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -524,43 +557,49 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
+"In directiefnummer %u is parameter %u van type '%s' maar wordt een parameter "
+"van type '%s' verwacht."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
+"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
+"parameter wordt verwacht."
 msgstr[1] ""
+"In directiefnummer %u zijn teveel parameters opgegeven; maximaal %u "
+"parameters worden verwacht."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr ""
+msgstr "In directiefnummer %u wordt '%c' niet gevolgd door een cijfer."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
+msgstr "In directiefnummer %u is argument %d negatief."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr ""
+msgstr "De tekenreeks stopt midden in een ~/.../ directief."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr ""
+msgstr "'-%c' gevonden zonder overeenkomstige '-%c'."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
-msgstr ""
+msgstr "In directiefnummer %u zijn zowel de @- en de :-aanpastekens gegeven."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -568,24 +607,27 @@ msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
+"In directiefnummer %u is '~:[' niet gevolgd door twee clausules, gescheiden "
+"door een '~;'."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
+msgstr "In directiefnummer %u is '~;' gebruikt op een onjuiste positie."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
 msgstr ""
+"De tekenreeks verwijst naar enig argument op niet-compatibele manieren."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "de opmaakcodes in 'msgid' en '%s' zijn niet gelijkwaardig"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "de opmaakcodes in '%s' zijn geen subset van die in 'msgid'"
 
 #: src/format-perl.c:433
@@ -594,59 +636,66 @@ msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
+"In directiefnummer %u is de groottespecificatie niet-compatibel met de "
+"conversiespecificatie '%c'."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s' komt niet voor in '%s'"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
+"De tekenreeks verwijst naar argumenten zowel via argumentnamen als via "
+"onbenoemde argumentspecificaties."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
+"De tekenreeks verwijst naar het argument genaamd '%s' op niet-compatibele "
+"wijze."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "de opmaakcodes in 'msgid' verwachten een afbeelding, die in '%s' verwachten "
 "een tupel"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
+"opmaakcodes in 'msgid' verwachten een tuple, terwijl die in '%s' een "
+"afbeelding verwachten"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "opmaakcode voor argument '%s', als in '%s', komt niet voor in 'msgid'"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "de opmaakcodes in 'msgid' en '%s' voor argument '%s' zijn niet hetzelfde"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
+"'msgid' is een eenvoudige opmaakcode maar '%s' is dat niet: het bevat een "
+"'L'-vlag of een argumentnummer met dubbele cijfers."
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -682,11 +731,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -700,20 +749,20 @@ msgstr ""
 "zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
 "Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Geschreven door %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
@@ -722,11 +771,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "te veel argumenten"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
@@ -734,22 +783,22 @@ msgstr "Typ '%s --help' voor meer informatie.\n"
 #: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr ""
+msgstr "Gebruik:  %s [OPTIE...]\n"
 
 #: src/hostname.c:215
 #, c-format
 msgid "Print the machine's hostname.\n"
-msgstr ""
+msgstr "De hostnaam van de machine tonen.\n"
 
 #: src/hostname.c:218
 #, c-format
 msgid "Output format:\n"
-msgstr ""
+msgstr "Opmaak van de uitvoer:\n"
 
 #: src/hostname.c:220
 #, c-format
 msgid "  -s, --short                 short host name\n"
-msgstr ""
+msgstr "  -s, --short                 korte hostnaam\n"
 
 #: src/hostname.c:222
 #, c-format
@@ -757,49 +806,49 @@ msgid ""
 "  -f, --fqdn, --long          long host name, includes fully qualified "
 "domain\n"
 "                                name, and aliases\n"
-msgstr ""
+msgstr "  -f, --fqdn, --long          lange hostnaam: FQDN plus aliassen\n"
 
 #: src/hostname.c:225
 #, c-format
 msgid "  -i, --ip-address            addresses for the hostname\n"
-msgstr ""
+msgstr "  -i, --ip-address            IP-adressen behorend bij de hostnaam\n"
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
-msgstr ""
+msgstr "Informatieve uitvoer:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
-msgstr ""
+msgstr "  -h, --help          deze hulptekst tonen en stoppen\n"
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
-msgstr ""
+msgstr "  -V, --version       programmaversie tonen en stoppen\n"
 
 #. TRANSLATORS: The placeholder indicates the bug-reporting address
 #. 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 "Rapporteer gebreken in het programma aan <bug-gnu-gettext@gnu.org>;\n"
@@ -808,30 +857,30 @@ msgstr ""
 #: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268
 #, c-format
 msgid "could not get host name"
-msgstr ""
+msgstr "kan hostnaam niet verkrijgen"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
-msgstr ""
+msgstr "hoogstens één invoerbestand is toegestaan"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
-msgstr "%s en %s zijn mutually exclusive"
+msgstr "%s en %s sluiten elkaar uit"
 
 #: src/msgattrib.c:395 src/msgconv.c:290 src/msggrep.c:499 src/msguniq.c:313
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
-msgstr ""
+msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]\n"
 
 #: src/msgattrib.c:400
 #, c-format, no-wrap
@@ -840,19 +889,20 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
+"Een verplicht argument bij een lange optie geldt ook voor de korte vorm.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr "Locatie van invoerbestand:\n"
@@ -862,38 +912,38 @@ msgstr "Locatie van invoerbestand:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  INVOERBESTAND               in te lezen PO-bestand\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr "Locatie van uitvoerbestand:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -901,10 +951,10 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
-msgstr ""
+msgstr "Berichtenselectie:\n"
 
 #: src/msgattrib.c:426
 #, c-format
@@ -993,142 +1043,142 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
-msgstr ""
+msgstr "Uitvoerdetails:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
-msgstr ""
+msgstr "Gebruik:  %s [OPTIE...] [INVOERBESTAND]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1142,71 +1192,77 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  INVOERBESTAND...            invoerbestanden\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1215,32 +1271,32 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
-msgstr ""
+msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, c-format
 msgid "no input files given"
 msgstr "geen invoerbestanden gegeven"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "precies twee invoerbestanden zijn vereist"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
-msgstr "Gebruik:  %s [OPTIE] bestaande.po referentie.pot\n"
+msgstr "Gebruik:  %s [OPTIE...] bestaande.po referentie.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1253,74 +1309,79 @@ msgstr ""
 "Twee PO-bestaden in Uniforum-stijl vergelijken en controleren dat beide\n"
 "dezelfde set msgid's bevatten.  Het bestand 'bestaande.po' is een bestaand\n"
 "PO-bestand met oude vertalingen; het bestand 'referentie.pot' is het laatst\n"
-" aangemaakte PO-bestand, of een een POT-bestand (gewoonlijk aangemaakt door\n"
+"aangemaakte PO-bestand, of een een POT-bestand (gewoonlijk aangemaakt door\n"
 "'xgettext').  Het is belangrijk om te controleren dat alle berichten in het\n"
 "programma vertaald zijn.  Wanneer er geen exacte overeenkomst is, wordt er\n"
 "ook naar vage gelijkenissen gekeken, om een betere diagnose te kunnen geven.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  bestaande.po                bestaand bestand met vertalingen\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  referentie.pot              verwijzingen naar de programmatekst\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "dit bericht is onvertaald"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "dit bericht moet door een vertaler gecontroleerd worden"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...maar de definitie is gelijksoortig"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "dit bericht wordt gebruikt maar is niet gedefinieerd in %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "waarschuwing: dit bericht wordt niet gebruikt"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1352,7 +1413,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1373,46 +1434,46 @@ msgstr ""
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "geen invoerbestand gegeven"
 
-#: src/msgen.c:233
+#: src/msgen.c:241
 #, c-format
 msgid "exactly one input file required"
 msgstr "precies één invoerbestand is vereist"
 
-#: src/msgen.c:274
+#: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
-msgstr "Gebruik:  %s [OPTIE] INVOERBESTAND\n"
+msgstr "Gebruik:  %s [OPTIE...] INVOERBESTAND\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1421,22 +1482,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
-msgstr ""
+msgstr "ontbrekende opdrachtnaam"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
-msgstr ""
+msgstr "Gebruik:  %s [OPTIE...] OPDRACHT [OPDRACHTOPTIE...]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1446,67 +1507,69 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
-msgstr ""
+msgstr "schrijven naar standaarduitvoer is mislukt"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
-msgstr ""
+msgstr "schrijven naar subproces %s is mislukt"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
 msgstr "ontbrekende filternaam"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
-msgstr ""
+msgstr "er moet minstens één sed-script gegeven worden"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
-msgstr ""
+msgstr "Gebruik:  %s [OPTIE...] FILTER [FILTEROPTIE...]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
-msgstr ""
+msgstr "Een filter toepassen op alle vertalingen in een PO-bestand.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
+"Het FILTER kan elk programma zijn dat een bericht leest van standaardinvoer\n"
+"en een gewijzigd bericht naar standaarduitvoer schrijft.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
-msgstr ""
+msgstr "Nuttige FILTEROPTIEs als het FILTER 'sed' is:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1514,196 +1577,180 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
-msgstr ""
+msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d vertaald bericht"
 msgstr[1] "%d vertaalde berichten"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d vage gelijkenis"
 msgstr[1] ", %d vage gelijkenissen"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d onvertaald bericht"
 msgstr[1] ", %d onvertaalde berichten"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Gebruik:  %s [OPTIE] bestandsnaam.po...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "Uit een vertalingenbestand een binaire berichtencatalogus genereren.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
+"Een verplicht of optioneel argument bij een lange optie\n"
+"geldt ook voor de korte vorm.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  bestandsnaam.po...          invoerbestanden\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Werkingsmodus:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
-msgstr ""
+msgstr "Locatie van uitvoerbestand in Java-modus:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1711,13 +1758,13 @@ msgid ""
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1726,48 +1773,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
-msgstr ""
+msgstr "Locatie van uitvoerbestand in C#-modus:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
-msgstr ""
+msgstr "Locatie van uitvoerbestand in Tcl-modus:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1775,33 +1822,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1809,92 +1856,92 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "waarschuwing: PO-kopregels ontbreken of zijn ongeldig\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "waarschuwing: tekensetconversie zal niet werken\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "waarschuwing: PO-kopregels zijn gemarkeerd als 'fuzzy'\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "waarschuwing: oudere versies van 'msgfmt' vinden dit een fout\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domeinnaam '%s' is niet bruikbaar als bestandsnaam"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr ""
 "domeinnaam '%s' is niet bruikbaar als bestandsnaam: voorvoegsel wordt "
 "gebruikt"
 
-#: src/msgfmt.c:927
-#, fuzzy, c-format
+#: src/msgfmt.c:948
+#, c-format
 msgid "`domain %s' directive ignored"
-msgstr "`domein %s' directive genegeerd"
+msgstr "directief 'domain %s' is genegeerd"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
-msgstr "leeg 'msgstr'-item genegeerd"
+msgstr "leeg 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
-msgstr "vaag 'msgstr'-item genegeerd"
+msgstr "vaag 'msgstr'-item is genegeerd"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: waarschuwing: bronbestand bevat vage vertaling"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "fout tijdens lezen van '%s'"
@@ -1905,6 +1952,8 @@ msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
+"optie '%c' kan niet gebruikt worden voordat\n"
+"'J' of 'K' of 'T' of 'C' of 'X' gegeven is"
 
 #: src/msggrep.c:504
 #, c-format, no-wrap
@@ -2049,14 +2098,14 @@ msgid ""
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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 "subproces %s is mislukt met afsluitwaarde %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2068,54 +2117,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
-msgstr "Engelse vertalingen voor het pakket %s"
+msgstr "Nederlandse vertalingen voor het pakket %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
-msgstr ""
+msgstr "huidige tekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
-msgstr ""
+msgstr "doeltekensetnaam '%s' is geen overdraagbare coderingsnaam"
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2124,7 +2173,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2133,7 +2182,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2142,12 +2191,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2155,7 +2204,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2164,195 +2213,196 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
 "Output of '%s' might be incorrect.\n"
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
+"Tekensetnaam '%s' (gegeven door de taalregio) is geen overdraagbare\n"
+"coderingsnaam.  De uitvoer van '%s' zou onjuist kunnen zijn.\n"
+"Het zetten van LC_ALL=C kan dit eventueel vermijden.\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "ongeldige waarde van 'nplurals'"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "ongeldige meervoudsexpressie"
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "aantal meervouden = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "maar sommige berichten hebben slechts één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben slechts %lu meervoudsvormen"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] ""
-"maar sommige berichten hebben maar sommige berichten hebben slechts één "
-"meervoudsvorméén meervoudsvorm"
+msgstr[0] "maar sommige berichten hebben één meervoudsvorm"
 msgstr[1] "maar sommige berichten hebben %lu meervoudsvormen"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgid_plural' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "'msgid' en 'msgstr' beginnen niet beide met '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgid_plural' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr[%u]' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "'msgid' en 'msgstr' eindigen niet beide met '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr "meervoudsvormen zijn een uitbreiding van GNU gettext"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "sneltoetsmarkering '%c' ontbreekt in 'msgstr'"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "'msgstr' bevat te veel '%c'-sneltoetsmarkeringen"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "kopveld '%s' ontbreekt in PO-kopregels\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "kopveld '%s' moet aan het begin van de regel beginnen\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "sommige kopvelden hebben nog de standaardwaarde\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: invoer is ongeldig in codering '%s'"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: fout tijdens omzetten van codering '%s' naar '%s'"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "invoerbestand bevat geen kopregel met een tekensetspecificatie"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s is alleen geldig met %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2376,52 +2426,52 @@ msgstr ""
 "Wanneer er geen exacte overeenkomst is, wordt er ook naar vage gelijkenissen\n"
 "gekeken, om een beter resultaat te produceren.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:490
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr "  bestaande.po                bestaand bestand met oude vertalingen\n"
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:492
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 "  referentie.pot              verwijzingen naar nieuwe programmatekst\n"
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, c-format
 msgid "Output file location in update mode:\n"
-msgstr ""
+msgstr "Locatie van uitvoerbestand in update-modus:\n"
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:516
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr "Het resultaat wordt teruggeschreven naar bestaande.po.\n"
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:518
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2433,7 +2483,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2441,42 +2491,39 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, c-format
 msgid "this message should define plural forms"
 msgstr "dit bericht dient meervouden te definiëren"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "dit bericht dient geen meervouden te definiëren"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, %"
-"ld vervanderd, %ld ontbreken, %ld verouderd.\n"
+"%s Gelezen: %ld bestaande plus %ld referentiebestanden -- %ld overgenomen, "
+"%ld vervanderd, %ld ontbreken, %ld verouderd.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " voltooid.\n"
 
@@ -2488,7 +2535,7 @@ msgstr "%s en expliciete bestandsnamen gaan niet samen"
 #: src/msgunfmt.c:415
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]...\n"
-msgstr "Gebruik:  %s [OPTIE] [BESTAND]...\n"
+msgstr "Gebruik:  %s [OPTIE...] [BESTAND]...\n"
 
 #: src/msgunfmt.c:419
 #, c-format
@@ -2528,7 +2575,7 @@ msgstr ""
 #: src/msgunfmt.c:444
 #, c-format
 msgid "Input file location in Java mode:\n"
-msgstr ""
+msgstr "Locatie van invoerbestand in Java-modus:\n"
 
 #: src/msgunfmt.c:450
 #, c-format
@@ -2541,7 +2588,7 @@ msgstr ""
 #: src/msgunfmt.c:455
 #, c-format
 msgid "Input file location in C# mode:\n"
-msgstr ""
+msgstr "Locatie van invoerbestand in C#-modus:\n"
 
 #: src/msgunfmt.c:463
 #, c-format
@@ -2553,7 +2600,7 @@ msgstr ""
 #: src/msgunfmt.c:467
 #, c-format
 msgid "Input file location in Tcl mode:\n"
-msgstr ""
+msgstr "Locatie van invoerbestand in Tcl-modus:\n"
 
 #: src/msgunfmt.c:473
 #, c-format
@@ -2597,7 +2644,7 @@ msgid ""
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2608,6 +2655,8 @@ msgid ""
 "Charset \"%s\" is not a portable encoding name.\n"
 "Message conversion to user's charset might not work.\n"
 msgstr ""
+"Tekensetnaam '%s' is geen overdraagbare coderingsnaam.\n"
+"Conversie van berichten naar een andere tekenset kan mislukken.\n"
 
 #: src/po-charset.c:556
 #, c-format
@@ -2615,6 +2664,8 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 "and iconv() does not support \"%s\".\n"
 msgstr ""
+"Tekenset '%s' wordt niet ondersteund -- %s gebruikt iconv(),\n"
+"en iconv() ondersteunt '%s' niet.\n"
 
 #: src/po-charset.c:563 src/po-charset.c:611
 msgid ""
@@ -2636,6 +2687,8 @@ msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 "This version was built without iconv().\n"
 msgstr ""
+"Tekenset '%s' wordt niet ondersteund -- %s steunt op iconv(),\n"
+"en deze versie is gecompileerd zonder iconv().\n"
 
 #: src/po-charset.c:643
 msgid ""
@@ -2675,65 +2728,65 @@ msgstr "eerste meervoudsvorm heeft een index ongelijk aan nul"
 msgid "plural form has wrong index"
 msgstr "meervoudsvorm heeft een onjuiste index"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "te veel fouten -- gestopt"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ongeldige multibyte-sequentie"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "onvolledige multibyte-sequentie aan einde van bestand"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "onvolledige multibyte-sequentie aan einde van regel"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "iconv() is mislukt"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "sleutelwoord '%s' is onbekend"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "ongeldige stuurtekenreeks"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "bestandseindeteken IN een tekenreeks"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "regeleindeteken IN een tekenreeks"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "tekstscheidingteken <EOT> IN een tekenreeks"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "dit bestand mag geen domeindirectieven bevatten"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "dubbele definitie van een bericht"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "dit is de plek van de eerste definitie"
 
@@ -2762,7 +2815,7 @@ msgstr ""
 
 #: src/read-properties.c:227
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr ""
+msgstr "waarschuwing: ongeldige '\\uxxxx '-syntax voor Unicode-teken"
 
 #: src/read-stringtable.c:802
 msgid "warning: unterminated string"
@@ -2819,28 +2872,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "fout tijdens omzetten van codering '%s' naar '%s'"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "er werden twee argumenten verwacht"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Gebruik:  %s [OPTIE] URL BESTAND\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "fout bij schrijven naar standaarduitvoer"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2872,19 +2940,19 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
-msgstr "kan uitvoerbestand \"%s\" niet aanmaken"
+msgstr "kan uitvoerbestand '%s' niet aanmaken"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "standaarduitvoer"
 
 #: src/write-csharp.c:688
 #, c-format
 msgid "failed to create directory \"%s\""
-msgstr ""
+msgstr "kan map '%s' niet aanmaken"
 
 #: src/write-csharp.c:751
 #, c-format
@@ -2914,16 +2982,16 @@ msgstr ""
 #: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212
 #, c-format
 msgid "error while opening \"%s\" for writing"
-msgstr "fout bij openen om te schrijven van \"%s\""
+msgstr "fout bij openen van '%s' voor schrijven"
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "geïnternationaliseerde berichten horen geen '\\%c'-stuurcodes te bevatten"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2932,7 +3000,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2949,8 +3017,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -2965,15 +3033,15 @@ msgstr ""
 #: src/write-resources.c:94
 #, c-format
 msgid "error while writing to %s subprocess"
-msgstr "fout bij schrijven naar '%s'-subproces"
+msgstr "fout bij schrijven naar subproces %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -2991,154 +3059,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: waarschuwing: onafgesloten reguliere expressie"
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenconstante"
 
-#: src/x-c.c:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeks"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: waarschuwing: ongeldig Unicode-teken"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 msgid "%s:%d: warning: unterminated string constant"
 msgstr "%s:%d: waarschuwing: onafgesloten tekenreeksconstante"
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr "%s:%d: waarschuwing: ')' gevonden waar '}' werd verwacht"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d: waarschuwing: '}' gevonden waar ')' werd verwacht"
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "%s:%d: waarschuwing: losse U+%04X "
+msgstr "%s:%d: waarschuwing: losse U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d: kan tekenreeksafsluiter '%s' niet vinden"
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: ontbrekend rechterhaakje in \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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 ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3146,7 +3209,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3154,7 +3217,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3162,7 +3225,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3170,7 +3233,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3178,81 +3241,81 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: ongeldige definitie van tekenreeks"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: ontbrekend getal na #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: ongeldige tekenreeksexpressie"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "'--join-existing' kan niet gebruikt worden wanneer uitvoer naar "
 "standaarduitvoer wordt geschreven"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 "waarschuwing: onbekende extensie '%2$s' van bestand '%1$s'; C wordt "
 "aangenomen"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Vertaalbare berichten extraheren uit de gegeven invoerbestanden.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr ""
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3264,58 +3327,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:827
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3324,14 +3390,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:841
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3339,7 +3405,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3348,119 +3414,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:915
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:918
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr "standaardinvoer"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1927
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: waarschuwing: "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3469,34 +3552,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3504,7 +3587,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr "taal '%s' is onbekend"
@@ -3512,3 +3595,21 @@ msgstr "taal '%s' is onbekend"
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr "<ongenoemd>"
+
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle() is mislukt met foutcode 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Nog niet geïmplementeerd."
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "communicatie met subproces %s is mislukt"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "lezen van subproces %s is mislukt"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "subproces %s is geëindigd met afsluitwaarde %d"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "kopveld '%s' heeft nog de standaardwaarde\n"
diff --git a/gettext-tools/po/nn.po b/gettext-tools/po/nn.po
index b60e04f..259cd48 100644
--- a/gettext-tools/po/nn.po
+++ b/gettext-tools/po/nn.po
@@ -1,226 +1,234 @@
-# Norwegian messages for GNU gettext.  (nynorsk dialect)
+# Norwegian Nynorsk translation of GNU gettext-tools.
 # Copyright (C) 1996 Free Software Foundation, Inc.
-# Karl Anders �ygard <karlo@ifi.uio.no>, 1996.
+# This file is distributed under the same license as the gettext package.
 #
+# Karl Anders Øygard <karlo@ifi.uio.no>, 1996.
+# Eirik U. Birkeland <eirbir@gmail.com>, 2009 (started thorough revision).
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gettext 0.10.12\n"
+"Project-Id-Version: GNU gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 1996-03-21 08:46 EST\n"
-"Last-Translator: Karl Anders �ygard <karlo@ifi.uio.no>\n"
-"Language-Team: Norwegian-nynorsk <no@li.org>\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-06-17 22:37+0200\n"
+"Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
-msgstr ""
+msgstr "Ugyldig argument %s for %s"
 
 #: gnulib-lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "Fleirtydig argument %s for %s"
 
 #: gnulib-lib/argmatch.c:153
 #, c-format
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Gyldige argument er:"
 
 #: gnulib-lib/clean-temp.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
-msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
+msgstr "Finn inga mellombels mappe. Prøv å velja «$TMPDIR»"
 
 #: gnulib-lib/clean-temp.c:347
-#, fuzzy, c-format
+#, c-format
 msgid "cannot create a temporary directory using template \"%s\""
-msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
+msgstr "Klarer ikkje laga mellombels mappe med malen «%s»"
 
 #: gnulib-lib/clean-temp.c:443
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove temporary file %s"
-msgstr "kan ikkje opprette utfila \"%s\""
+msgstr "Klarer ikkje fjerna mellombelsfila «%s»"
 
 #: gnulib-lib/clean-temp.c:458
-#, fuzzy, c-format
+#, c-format
 msgid "cannot remove temporary directory %s"
-msgstr "kan ikkje skifte tilbake til filkatalog \"%s\""
+msgstr "Klarer ikkje fjerna mellombelsmappa «%s»"
 
 #: gnulib-lib/closeout.c:66
 msgid "write error"
-msgstr ""
+msgstr "Skrivefeil"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
-#, fuzzy, c-format
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
+#, c-format
 msgid "error while opening \"%s\" for reading"
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Feil ved opning av fila «%s» for lesing"
 
-#: gnulib-lib/copy-file.c:73
-#, fuzzy, c-format
+#: gnulib-lib/copy-file.c:74
+#, c-format
 msgid "cannot open backup file \"%s\" for writing"
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Klarer ikkje opna reservekopien «%s» for skriving"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:213
-#, fuzzy, c-format
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#, c-format
 msgid "error reading \"%s\""
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Feil ved lesing av «%s»"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
-#, fuzzy, c-format
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
+#, c-format
 msgid "error writing \"%s\""
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Feil ved skriving til «%s»"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
-#, fuzzy, c-format
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#, c-format
 msgid "error after reading \"%s\""
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Feil etter lesing av «%s»"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
-msgstr ""
+msgstr "«fdopen()» mislukkast"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
-msgstr ""
+msgstr "Fann ikkje C#-kompilatoren. Prøv å installera «pnet»."
 
 #: gnulib-lib/csharpexec.c:343
 #, c-format
 msgid "C# virtual machine not found, try installing pnet"
-msgstr ""
+msgstr "Fann ikkje virtuell maskin for C#. Prøv å installera «pnet»."
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
-msgstr ""
+msgstr "Ukjend systemfeil"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
-msgstr ""
+msgstr "Underprosessen %s var mislukka"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagg �%s� er fleirtydig\n"
+msgstr "%s: Flagget «%s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flagg �--%s� tek ikkje argument\n"
+msgstr "%s: Flagget «--%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flagg �%c%s� tek ikkje argument\n"
+msgstr "%s: Flagget «%c%s» tek ikkje argument\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagg �%s� treng eit argument\n"
+msgstr "%s: Flagget «%s» treng eit argument\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
-#, fuzzy, c-format
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ulovleg flagg -- %c\n"
+msgstr "%s: Flagget «--%s» er ukjent\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
-#, fuzzy, c-format
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ulovleg flagg -- %c\n"
+msgstr "%s: Flagget «%c%s» er ukjent\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovleg flagg -- %c\n"
+msgstr "%s: Flagget «-- %c» er ulovleg\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: ulovleg flagg -- %c\n"
+msgstr "%s: Flagget «--%s» er ugyldig\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagg treng eit argument -- %c\n"
+msgstr "%s: Flagget treng eit argument -- %c\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
-#, fuzzy, c-format
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
+#, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagg �%s� er fleirtydig\n"
+msgstr "%s: Flagget «-W %s» er fleirtydig\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
-#, fuzzy, c-format
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
+#, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flagg �--%s� tek ikkje argument\n"
+msgstr "%s: Flagget «-W %s» tek ikkje argument\n"
 
 #: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140
 #: gnulib-lib/javacomp.c:156
 #, c-format
 msgid "invalid source_version argument to compile_java_class"
-msgstr ""
+msgstr "Ugyldig «source_version»-argument til «compile_java_class»"
 
 #: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192
 #, c-format
 msgid "invalid target_version argument to compile_java_class"
-msgstr ""
+msgstr "Ugyldig «target_version»-argument til «compile_java_class»"
 
 #: gnulib-lib/javacomp.c:503 src/write-csharp.c:724 src/write-java.c:1026
 #: src/write-java.c:1038
 #, c-format
 msgid "failed to create \"%s\""
-msgstr ""
+msgstr "Klarte ikkje oppretta «%s»"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 src/write-mo.c:811
 #: src/write-qt.c:748 src/write-tcl.c:222
 #, c-format
 msgid "error while writing \"%s\" file"
-msgstr "feil under skriving av fila \"%s\""
+msgstr "Feil under skriving av fila «%s»"
 
-#: gnulib-lib/javacomp.c:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
+"Fann ikkje Java-kompilatoren. Prøv å installera «gcj» eller vel "
+"«$JAVAC»."
 
 #: gnulib-lib/javaexec.c:417
 #, c-format
 msgid "Java virtual machine not found, try installing gij or set $JAVA"
 msgstr ""
+"Fann ikkje virtuell maskin for Java. Prøv å installera «gij» eller vel "
+"«$JAVA»."
 
-#: gnulib-lib/javaversion.c:84 src/msginit.c:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
-msgstr ""
+msgstr "Inn/ut-feil i underprosessen %s"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
-msgstr ""
+msgstr "Tomt for minne"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
-#, fuzzy, c-format
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
+#, c-format
 msgid "cannot create pipe"
-msgstr "kan ikkje opprette utfila \"%s\""
+msgstr "Klarer ikkje oppretta røyr"
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
@@ -235,76 +243,80 @@ msgstr "kan ikkje opprette utfila \"%s\""
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
-msgstr ""
+msgstr "'"
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr ""
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
-msgstr ""
+msgstr "«_open_osfhandle» mislukkast"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "kan ikkje opprette utfila \"%s\""
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
-msgstr ""
+msgstr "%s-underprosess"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
-msgstr ""
+msgstr "Underprosessen %s fekk det alvorlege signalet %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
+"«%s» er ikkje ein gyldig streng i %s-formatet, til skilnad frå «msgif». "
+"Årsak: %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"Ein formatspesifikasjon for argumentet %u, som i «%s», finst ikkje i "
+"«msgid»"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
-#, fuzzy, c-format
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
+#, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+msgstr "Ein formatspesifikasjon for argumentet %u finst ikkje i «%s»"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
 #, fuzzy, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
-msgstr "format-spesifiseringane for argument %u er ulike"
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
+msgstr ""
+"Formatspesifikasjonane i «msgid» og «%s» for argumentet %u er ikkje like"
 
 #: src/format-boost.c:449
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
-msgstr ""
+msgstr "Direktivnummeret %u startar, men sluttar ikkje, med |."
 
 #: src/format-c.c:181
 #, c-format
@@ -312,119 +324,135 @@ msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
+"I direktivnummer %u er symbolet etter «<» ikkje namnet på ein "
+"formatspesifikasjonsmakro. Gyldige makronamn kan ein finne i ISO C 99, "
+"avsnitt 7.8.1."
 
 #: src/format-c.c:588
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
+"I direktivnummer %u er symbolet etter «<» ikkje etterfølgt av «>»."
 
 #: src/format-c.c:814
 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
+"Strengen viser til argumentnummer %u, men tek ikkje omsyn til argumentnummer "
+"%u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
 #, fuzzy, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr ""
-"antall format-spesifiseringar i �msgid� og �msgstr� stemmer ikkje overeins"
+"Talet på formatspesifikasjonar i «msgid» og «%s» er ikkje det same"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr ""
+msgstr "I direktivnummer %u er ikkje «{» etterfølgt av eit argumentnummer."
 
 #: src/format-csharp.c:109
 #, c-format
 msgid "In the directive number %u, ',' is not followed by a number."
-msgstr ""
+msgstr "I direktivnummer %u er ikkje «,» etterfølgt av eit tal."
 
 #: src/format-csharp.c:130 src/format-java.c:191
 msgid ""
 "The string ends in the middle of a directive: found '{' without matching '}'."
 msgstr ""
+"Strengen sluttar midt i eit direktiv. «{» vart funnen utan tilhøyrande «}"
+"»."
 
 #: src/format-csharp.c:139
 #, c-format
 msgid ""
 "The directive number %u ends with an invalid character '%c' instead of '}'."
 msgstr ""
+"Direktivnummer %u sluttar med det ugyldige teiknet «%c», i staden for «}"
+"»."
 
 #: src/format-csharp.c:140
 #, c-format
 msgid "The directive number %u ends with an invalid character instead of '}'."
-msgstr ""
+msgstr "Direktivnummer %u sluttar med eit ugyldig teikn i staden for «}»."
 
 #: src/format-csharp.c:161 src/format-java.c:346
 msgid ""
 "The string starts in the middle of a directive: found '}' without matching "
 "'{'."
 msgstr ""
+"Strengen byrjar midt i eit direktiv. «}» vart funnen utan tilhøyrande "
+"«{»."
 
 #: src/format-csharp.c:162
 #, c-format
 msgid "The string contains a lone '}' after directive number %u."
-msgstr ""
+msgstr "Strengen inneheld ein enkelt «}» etter direktivnummer %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
-msgstr ""
+msgstr "Flaggkombinasjonen i direktivnummer %u er ugyldig."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
-msgstr ""
+msgstr "I direktivnummer %u er det ikkje lov med ei presisering før «%c»."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
-msgstr ""
+msgstr "Argumentnummeret for presiseringa må vera lik %u i direktivnummer %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
 "'%c'."
 msgstr ""
+"I direktivnummer %u er det ikkje lov med ein presiseringsspesifikasjon før "
+"«%c»."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
-msgstr ""
+msgstr "Presiseringsspesifikasjonen i direktivnummer %u er ugyldig."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
-msgstr ""
+msgstr "I direktivnummer %u er det ikkje lov med flagg før «%c»."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
-msgstr ""
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
+msgstr "«msgid» brukar %%m, men «%s» gjer det ikkje"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
-msgstr ""
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
+msgstr "«msgid» brukar ikkje %%m, men «%s» brukar %%m"
 
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
-msgstr ""
+msgstr "Strengen sluttar midt i eit direktiv."
 
 #: src/format-invalid.h:25
 msgid ""
 "The string refers to arguments both through absolute argument numbers and "
 "through unnumbered argument specifications."
 msgstr ""
+"Strengen viser til argument både gjennom absolutte argumentnummer og "
+"unummererte argumentspesifikasjonar."
 
 #: src/format-invalid.h:28
 #, c-format
 msgid ""
 "In the directive number %u, the argument number 0 is not a positive integer."
-msgstr ""
+msgstr "Argumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
 
 #: src/format-invalid.h:30
 #, c-format
@@ -432,6 +460,7 @@ msgid ""
 "In the directive number %u, the width's argument number 0 is not a positive "
 "integer."
 msgstr ""
+"Breiddeargumentnummeret 0 i direktivnummer %u er ikkje eit positivt heiltal."
 
 #: src/format-invalid.h:32
 #, c-format
@@ -439,6 +468,8 @@ msgid ""
 "In the directive number %u, the precision's argument number 0 is not a "
 "positive integer."
 msgstr ""
+"Presisjonsargumentnummeret 0 i direktivnummer %u er ikkje eit positivt "
+"heiltal."
 
 #: src/format-invalid.h:36
 #, c-format
@@ -446,6 +477,8 @@ msgid ""
 "In the directive number %u, the character '%c' is not a valid conversion "
 "specifier."
 msgstr ""
+"I direktivnummer %u er ikkje teiknet «%c» ein gyldig "
+"omgjeringsspesifikasjon."
 
 #: src/format-invalid.h:37
 #, c-format
@@ -453,11 +486,13 @@ msgid ""
 "The character that terminates the directive number %u is not a valid "
 "conversion specifier."
 msgstr ""
+"Teiknet som avsluttar direktivnummer %u er ikkje ein gyldig "
+"omgjeringsspesifikasjon."
 
 #: src/format-invalid.h:40
 #, c-format
 msgid "The string refers to argument number %u in incompatible ways."
-msgstr ""
+msgstr "Strengen viser til argumentnummer %u på måtar som ikkje er gyldige."
 
 #: src/format-java.c:240
 #, c-format
@@ -465,17 +500,19 @@ msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid date/time "
 "style."
 msgstr ""
+"I direktivnummer %u har ikkje delstrengen «%s» eit gyldig format for dato "
+"og klokkeslett."
 
 #: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314
 #, c-format
 msgid "In the directive number %u, \"%s\" is not followed by a comma."
-msgstr ""
+msgstr "I direktivnummer %u er ikkje «%s» etterfølgt av eit komma."
 
 #: src/format-java.c:274
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr ""
+msgstr "I direktivnummer %u har ikkje delstrengen «%s» eit gyldig talformat."
 
 #: src/format-java.c:323
 #, c-format
@@ -483,11 +520,13 @@ msgid ""
 "In the directive number %u, the argument number is not followed by a comma "
 "and one of \"%s\", \"%s\", \"%s\", \"%s\"."
 msgstr ""
+"Argumentnummeret i direktivnummer %u er ikkje etterfølgt av eit komma og "
+"anten «%s», «%s», «%s» eller «%s»."
 
 #: src/format-java.c:572
 #, c-format
 msgid "In the directive number %u, a choice contains no number."
-msgstr ""
+msgstr "Valet i direktivnummer %u har ikkje noko nummer."
 
 #: src/format-java.c:583
 #, c-format
@@ -495,24 +534,29 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
+"Valet i direktivnummer %u har eit nummer som ikkje er etterfølgt av «<», "
+"«#» eller «%s»."
 
 #: src/format-java.c:745
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
+msgstr ""
+"Ein formatspesifikasjon for argument {%u}, som i «%s», finst ikkje i "
+"«msgid»"
 
-#: src/format-java.c:755
-#, fuzzy, c-format
+#: src/format-java.c:756
+#, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+msgstr "Ein formatspesifikasjon for argument {%u} finst ikkje i «%s»"
 
-#: src/format-java.c:775
+#: src/format-java.c:776
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
-msgstr "format-spesifiseringane for argument %u er ulike"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
+msgstr ""
+"Formatspesifikasjonane i «msgid» og «%s» for argumentet {%u} er ikkje "
+"like"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
 #: src/format-scheme.c:2375
@@ -521,43 +565,50 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
+"Parameteren «%u» i direktivnummer %u er av typen «%s», men det var venta "
+"ein parameter av typen «%s»."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
+"Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det "
+"meste venta %u parameter."
 msgstr[1] ""
+"Det er oppgjeve for mange parametrar i direktivnummer %u. Det var på det "
+"meste venta %u parametrar."
 
 #: src/format-lisp.c:2496 src/format-scheme.c:2499
 #, c-format
 msgid "In the directive number %u, '%c' is not followed by a digit."
-msgstr ""
+msgstr "I direktivnummer %u er ikkje «%c» etterfølgt av eit tal."
 
 #: src/format-lisp.c:2736 src/format-scheme.c:2754
 #, c-format
 msgid "In the directive number %u, the argument %d is negative."
-msgstr ""
+msgstr "I direktivnummer %u er argumentet «%d» negativt."
 
 #: src/format-lisp.c:2805
 msgid "The string ends in the middle of a ~/.../ directive."
-msgstr ""
+msgstr "Strengen sluttar midt i eit «~/.../»-direktiv."
 
 #: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225
 #: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840
 #: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320
 #, c-format
 msgid "Found '~%c' without matching '~%c'."
-msgstr ""
+msgstr "Fann «~%c» utan passande «~%c»."
 
 #: src/format-lisp.c:2863 src/format-scheme.c:2860
 #, c-format
 msgid "In the directive number %u, both the @ and the : modifiers are given."
 msgstr ""
+"Det er oppgjeve valtastar for både «@» og «:» i direktivnummer %u."
 
 #: src/format-lisp.c:2976 src/format-scheme.c:2973
 #, c-format
@@ -565,26 +616,27 @@ msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
+"«~:[» i direktivnummer %u er ikkje etterfølgt av to paragrafteikn skilde "
+"av «~;»."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
 msgid "In the directive number %u, '~;' is used in an invalid position."
-msgstr ""
+msgstr "«~;» har ei ugyldig plassering i direktivnummer %u."
 
 #: src/format-lisp.c:3432 src/format-scheme.c:3355
 msgid "The string refers to some argument in incompatible ways."
-msgstr ""
+msgstr "Strengen viser til nokre av argumenta på måtar som ikkje er gyldige."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
 #, fuzzy, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
-msgstr ""
-"antall format-spesifiseringar i �msgid� og �msgstr� stemmer ikkje overeins"
+msgid "format specifications in '%s' and '%s' are not equivalent"
+msgstr "Formatspesifikasjonane i «msgid» og «%s» er ikkje like"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
 #, fuzzy, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+msgid "format specifications in '%s' are not a subset of those in '%s'"
+msgstr "Formatspesifikasjonane i «%s» er ikkje ein del av dei i «msgid»"
 
 #: src/format-perl.c:433
 #, c-format
@@ -592,57 +644,60 @@ msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
+"Storleiksspesifikasjonen i direktivnummer %u er ikkje gyldig med "
+"omgjeringsspesifikasjonen «%c»."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
-#, fuzzy, c-format
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
-msgstr "format-spesifiseringane for argument %u er ulike"
+msgstr "Ein formatspesifikasjon for argument «%s» finst ikkje i «%s»"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
 msgstr ""
+"Strengen viser til argument både gjennom argumentnamn og gjennom namnlause "
+"argumentspesifikasjonar."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 
-#: src/format-python.c:419
+#: src/format-python.c:430
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
-"antall format-spesifiseringar i �msgid� og �msgstr� stemmer ikkje overeins"
+"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
+"overeins"
 
-#: src/format-python.c:426
+#: src/format-python.c:437
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
-"antall format-spesifiseringar i �msgid� og �msgstr� stemmer ikkje overeins"
+"antall format-spesifiseringar i «msgid» og «msgstr» stemmer ikkje "
+"overeins"
 
-#: src/format-python.c:449 src/format-sh.c:297
+#: src/format-python.c:460 src/format-sh.c:297
 #, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/format-python.c:479
+#: src/format-python.c:494
 #, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
 #: src/format-qt.c:152
 #, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 
 #: src/format-sh.c:79
@@ -679,11 +734,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
-#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -691,42 +746,46 @@ msgid ""
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"© %s Free Software Foundation, Inc.\n"
+"Lisens: GPLv3+ (GNU GPL versjon 3 eller seinare, <http://gnu.org/licenses/gpl.html>)\n"
+"Dette er fri programvare. Du kan fritt endra og distribuera henne vidare.\n"
+"Det er INGEN GARANTI for dette produktet utover det som står i lova.\n"
 
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, c-format
 msgid "Written by %s.\n"
-msgstr ""
+msgstr "Skrive av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
-msgstr ""
+msgstr "Bruno Haible"
 
 #: src/hostname.c:194 src/msginit.c:272 src/recode-sr-latin.c:130
-#, fuzzy, c-format
+#, c-format
 msgid "too many arguments"
-msgstr "manglar argument"
+msgstr "For mange argument"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
-#, fuzzy, c-format
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
+#, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Pr�v �%s --help� for meir informasjon\n"
+msgstr "Prøv «%s --help» for meir informasjon.\n"
 
 #: src/hostname.c:211 src/msginit.c:350 src/recode-sr-latin.c:148
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
-msgstr ""
+msgstr "Bruk: %s [VAL]\n"
 
 #: src/hostname.c:215
 #, c-format
@@ -756,29 +815,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
-#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
@@ -787,11 +846,11 @@ msgstr ""
 #. 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
@@ -800,20 +859,20 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
-#, fuzzy, c-format
+#, c-format
 msgid "at most one input file allowed"
-msgstr "treng n�yaktig to innfiler"
+msgstr ""
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
@@ -830,19 +889,19 @@ msgid ""
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "inga innfil spesifisert"
@@ -852,38 +911,38 @@ msgstr "inga innfil spesifisert"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
-#: src/msgattrib.c:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -891,7 +950,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
@@ -983,152 +1042,142 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
 "syntax\n"
 msgstr ""
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
-#, fuzzy, c-format
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
+#, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 "                              the output page width, into several lines\n"
 msgstr ""
-"Usage: %s [OPTION] [FILE]...\n"
-"Mandatory arguments to long options are mandatory for short options too.\n"
-"  -e, --no-escape          do not use C escapes in output (default)\n"
-"  -E, --escape             use C escapes in output, no extended chars\n"
-"  -h, --help               display this help and exit\n"
-"  -i, --indent             write indented output style\n"
-"  -o, --output-file=FILE   write output into FILE instead of standard "
-"output\n"
-"      --strict             write strict uniforum style\n"
-"  -V, --version            output version information and exit\n"
-
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1142,71 +1191,77 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
 "                              definitions, defaults to infinite if not set\n"
 msgstr ""
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
 "                              definitions, defaults to 0 if not set\n"
 msgstr ""
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
 "                              that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
 "                              syntax\n"
 msgstr ""
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr ""
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
 "                              message, don't merge several translations\n"
 msgstr ""
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1215,32 +1270,32 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
 msgstr ""
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, fuzzy, c-format
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
-msgstr "treng n�yaktig to innfiler"
+msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1251,84 +1306,90 @@ msgid ""
 "match cannot be found, fuzzy matching is used to produce better diagnostics.\n"
 msgstr ""
 "Bruk: %s [FLAGG] def.po ref.po\n"
-"Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte flagg.\n"
+"Obligatoriske argumenter til lange flagg er obligatoriske også til korte flagg.\n"
 "  -h, --help               vis denne hjelpeteksta og avslutt\n"
 "  -V, --version            vis programversjon og avslutt\n"
 "\n"
-"Samanliknar to Uniforum .po-filer for � sjekke at begge inneheld det samme\n"
+"Samanliknar to Uniforum .po-filer for å sjekke at begge inneheld det samme\n"
 "settet msgid-strengar.  def.po-filen er ein eksisterende PO-fil med dei\n"
 "gamle oversetjingane.  ref.po-filen er den sist genererte PO-fila\n"
-"(vanligvis generert med xgettext).  Dette er nyttig for � sjekke at du har\n"
+"(vanligvis generert med xgettext).  Dette er nyttig for å sjekke at du har\n"
 "oversett alle meldingar i programmet.  Der samsvar ikkje kan finnast, vert\n"
-"�fuzzy� samanlikning brukt for � f� betre diagnostikk.\n"
+"«fuzzy» samanlikning brukt for å få betre diagnostikk.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr ""
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr ""
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr ""
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
 "po\n"
 msgstr ""
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, c-format
+msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
+msgstr ""
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr ""
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, fuzzy, c-format
 msgid "this message is untranslated"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr ""
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, fuzzy, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 msgstr[0] "fann %d fatale feil"
+msgstr[1] "fann %d fatale feil"
 
 #: src/msgcomm.c:303
 #, c-format
@@ -1355,7 +1416,7 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1376,46 +1437,46 @@ msgstr ""
 msgid "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr ""
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr ""
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:233
+#: src/msgen.c:241
 #, fuzzy, c-format
 msgid "exactly one input file required"
-msgstr "treng n�yaktig to innfiler"
+msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:274
+#: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1424,22 +1485,22 @@ msgid ""
 "identical to the msgid.\n"
 msgstr ""
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr ""
 
-#: src/msgexec.c:194
-#, fuzzy, c-format
+#: src/msgexec.c:196
+#, c-format
 msgid "missing command name"
-msgstr "manglar argument"
+msgstr ""
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr ""
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1449,67 +1510,67 @@ msgid ""
 "across all invocations.\n"
 msgstr ""
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, fuzzy, c-format
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr ""
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1517,196 +1578,178 @@ msgid ""
 "                                to be executed\n"
 msgstr ""
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr ""
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr ""
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr ""
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr ""
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr ""
-
-#: src/msgfilter.c:711
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr ""
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
 msgstr ""
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr ""
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1714,13 +1757,13 @@ msgid ""
 "language_COUNTRY\n"
 msgstr ""
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1729,48 +1772,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:690
-#, fuzzy, c-format
+#: src/msgfmt.c:711
+#, c-format
 msgid "Output file location in C# mode:\n"
-msgstr "inga innfil spesifisert"
+msgstr ""
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
 "subdirectory of the specified directory whose name depends on the locale.\n"
 msgstr ""
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1778,33 +1821,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1812,90 +1855,90 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenamnet \"%s\" passar ikkje som filnavn: brukar prefiks"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr ""
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr ""
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, fuzzy, c-format
 msgid "%s: warning: source file contains fuzzy translation"
-msgstr "ADVARSEL: kildefila har �fuzzy� oversetjingar"
-
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
+
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
 #, fuzzy, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under skriving av fila \"%s\""
@@ -2050,14 +2093,14 @@ msgid ""
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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 ""
 
-#: src/msginit.c:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2069,54 +2112,54 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr ""
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr ""
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
 "charset specification"
 msgstr ""
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr ""
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
 "Converting the output to UTF-8.\n"
 msgstr ""
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2125,7 +2168,7 @@ msgid ""
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2134,7 +2177,7 @@ msgid ""
 "UTF-8 encoded from the beginning, i.e. already in your source code files.\n"
 msgstr ""
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2143,12 +2186,12 @@ msgid ""
 "Possible workarounds are:\n"
 msgstr ""
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr ""
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2156,7 +2199,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2165,7 +2208,7 @@ msgid ""
 "  then convert back to %s using 'msgconv'.\n"
 msgstr ""
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2173,190 +2216,190 @@ msgid ""
 "A possible workaround is to set LC_ALL=C.\n"
 msgstr ""
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr ""
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr ""
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr ""
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr ""
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
 msgstr ""
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr ""
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr ""
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr ""
 
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr ""
 
-#: src/msgl-check.c:392
-#, fuzzy, c-format
+#: src/msgl-check.c:468
+#, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
-msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
-msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/msgl-check.c:408
-#, fuzzy, c-format
+#: src/msgl-check.c:484
+#, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
-msgstr[0] "denne meldinga er brukt, men ikkje definert i %s"
-msgstr[1] "denne meldinga er brukt, men ikkje definert i %s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane byrjarr ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane byrjarr ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane byrjarr ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane byrjarr ikkje båe med '\\n'"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 #, fuzzy
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane sluttar ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, fuzzy, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane sluttar ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 #, fuzzy
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
-msgstr "�msgid�- og �msgstr�-verdiane sluttar ikkje b�e med '\\n'"
+msgstr "«msgid»- og «msgstr»-verdiane sluttar ikkje båe med '\\n'"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
-#: src/msgl-check.c:695
+#: src/msgl-check.c:776
 #, fuzzy, c-format
-msgid "headerfield `%s' missing in header\n"
-msgstr "filhovud-feltet �%s� manglar i filhovud"
+msgid "header field `%s' missing in header\n"
+msgstr "filhovud-feltet «%s» manglar i filhovud"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, fuzzy, c-format
 msgid "header field `%s' should start at beginning of line\n"
-msgstr "filhovud-feltet �%s� skulle ha starta p� byrjinga av linja"
+msgstr "filhovud-feltet «%s» skulle ha starta på byrjinga av linja"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 #, fuzzy
 msgid "some header fields still have the initial default value\n"
 msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-check.c:730
+#: src/msgl-check.c:826
 #, fuzzy, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "feltet �%s� har framleis sin forvalgte verdi"
+msgid "header field `%s' still has the initial default value\n"
+msgstr "nokre filhovud-felt har framleis sin initielle verdi"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr ""
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, fuzzy, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, fuzzy, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2371,61 +2414,61 @@ msgid ""
 msgstr ""
 "\n"
 "Fletter saman to Uniforum .po-filer.  def.po-filen er ei eksisterande\n"
-"PO-fil med gamle oversetjingar, som vil verte overf�rt til den nye fila\n"
+"PO-fil med gamle oversetjingar, som vil verte overført til den nye fila\n"
 "dersom dei framleis stemmer.  Kommentarar vert teke med, men kommentarer om\n"
-"sj�lve ekstraheringa og fil-posisjoner vert sletta.  ref.po-filen er den\n"
+"sjølve ekstraheringa og fil-posisjoner vert sletta.  ref.po-filen er den\n"
 "sist genererte PO-fila (vanlegvis generert med xgettext).  Oversetjingar\n"
 "eller kommentarer i denne fila vert sletta, men punktum-kommentarer og\n"
-"fil-posisjonar vert teke vare p�.  Der det ikkje er mogleg � finne ei\n"
-"eksakt overeinsstemming, vert �fuzzy� samanlikning brukt for � f� betre\n"
+"fil-posisjonar vert teke vare på.  Der det ikkje er mogleg å finne ei\n"
+"eksakt overeinsstemming, vert «fuzzy» samanlikning brukt for å få betre\n"
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:475
+#: src/msgmerge.c:490
 #, c-format
 msgid "  def.po                      translations referring to old sources\n"
 msgstr ""
 
-#: src/msgmerge.c:477
+#: src/msgmerge.c:492
 #, c-format
 msgid "  ref.pot                     references to new sources\n"
 msgstr ""
 
-#: src/msgmerge.c:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, c-format
 msgid "Output file location in update mode:\n"
 msgstr ""
 
-#: src/msgmerge.c:501
+#: src/msgmerge.c:516
 #, c-format
 msgid "The result is written back to def.po.\n"
 msgstr ""
 
-#: src/msgmerge.c:503
+#: src/msgmerge.c:518
 #, c-format
 msgid "      --backup=CONTROL        make a backup of def.po\n"
 msgstr ""
 
-#: src/msgmerge.c:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2437,7 +2480,7 @@ msgid ""
 "  simple, never   always make simple backups\n"
 msgstr ""
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
@@ -2445,42 +2488,39 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:523
-#, c-format
-msgid "  -N, --no-fuzzy-matching     do not use fuzzy matching\n"
-msgstr ""
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
 msgstr ""
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, fuzzy, c-format
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, fuzzy, c-format
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
 "obsolete %ld.\n"
 msgstr ""
-"%sLeste %d gamle + %d referansar, fletta inn %d, �fuzzya� %d, manglar %d,\n"
+"%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr ""
 
@@ -2543,9 +2583,9 @@ msgid ""
 msgstr ""
 
 #: src/msgunfmt.c:455
-#, fuzzy, c-format
+#, c-format
 msgid "Input file location in C# mode:\n"
-msgstr "inga innfil spesifisert"
+msgstr ""
 
 #: src/msgunfmt.c:463
 #, c-format
@@ -2601,7 +2641,7 @@ msgid ""
 "duplicates\n"
 msgstr ""
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr ""
@@ -2655,17 +2695,17 @@ msgstr ""
 #: src/po-gram-gen.y:240
 #, fuzzy, c-format
 msgid "missing `msgstr[]' section"
-msgstr "manglar �msgstr�-seksjon"
+msgstr "manglar «msgstr»-seksjon"
 
 #: src/po-gram-gen.y:249
 #, fuzzy, c-format
 msgid "missing `msgid_plural' section"
-msgstr "manglar �msgstr�-seksjon"
+msgstr "manglar «msgstr»-seksjon"
 
 #: src/po-gram-gen.y:257
 #, c-format
 msgid "missing `msgstr' section"
-msgstr "manglar �msgstr�-seksjon"
+msgstr "manglar «msgstr»-seksjon"
 
 #: src/po-gram-gen.y:396
 #, c-format
@@ -2677,68 +2717,68 @@ msgstr ""
 msgid "plural form has wrong index"
 msgstr ""
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, fuzzy, c-format
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr ""
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr ""
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr ""
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr ""
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr ""
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr ""
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr ""
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr ""
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr ""
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
-msgstr "denne fila kan ikkje innehalde domene-n�kkelord"
+msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr ""
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 #, fuzzy
 msgid "this is the location of the first definition"
-msgstr "den f�rste definisjonen finst her"
+msgstr "den første definisjonen finst her"
 
 #: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199
 #, fuzzy, c-format
@@ -2756,39 +2796,33 @@ msgid "file \"%s\" is not in GNU .mo format"
 msgstr "fila \"%s\" er ikkje i GNU .mo-format"
 
 #: src/read-mo.c:178
-#, fuzzy, c-format
+#, c-format
 msgid "file \"%s\" contains a not NUL terminated string, at %s"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-properties.c:227
-#, fuzzy
 msgid "warning: invalid \\uxxxx syntax for Unicode character"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-stringtable.c:802
-#, fuzzy
 msgid "warning: unterminated string"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-stringtable.c:810
-#, fuzzy
 msgid "warning: syntax error"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-stringtable.c:871 src/read-stringtable.c:893
-#, fuzzy
 msgid "warning: unterminated key/value pair"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-stringtable.c:939
-#, fuzzy
 msgid "warning: syntax error, expected ';' after string"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/read-stringtable.c:948
-#, fuzzy
 msgid "warning: syntax error, expected '=' or ';' after string"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
 #: src/recode-sr-latin.c:116
 #, c-format
@@ -2825,28 +2859,43 @@ msgstr ""
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, fuzzy, c-format
 msgid "expected two arguments"
 msgstr "manglar argument"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr ""
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av fila \"%s\""
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -2878,12 +2927,12 @@ msgid ""
 "support them."
 msgstr ""
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr ""
 
@@ -2922,14 +2971,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
-"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen �\\%c�"
+"internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -2938,7 +2987,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2955,8 +3004,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -2973,13 +3022,13 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
 msgstr ""
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -2997,154 +3046,149 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: src/x-awk.c:593
-#, fuzzy, c-format
+#: src/x-awk.c:592
+#, c-format
 msgid "%s:%d: warning: unterminated regular expression"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-c.c:1194 src/x-csharp.c:1506 src/x-java.c:869
-#, fuzzy, c-format
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
+#, c-format
 msgid "%s:%d: warning: unterminated character constant"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-c.c:1218
-#, fuzzy, c-format
+#: src/x-c.c:1247
+#, c-format
 msgid "%s:%d: warning: unterminated string literal"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
-#, fuzzy, c-format
+#: src/x-csharp.c:1390 src/x-python.c:1281
+#, c-format
 msgid "%s:%d: warning: invalid Unicode character"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-csharp.c:1509 src/x-java.c:872
-#, fuzzy, c-format
+#: src/x-csharp.c:1512 src/x-java.c:875
+#, c-format
 msgid "%s:%d: warning: unterminated string constant"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-csharp.c:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 src/x-java.c:1369
 #, c-format
 msgid "%s:%d: warning: ')' found where '}' was expected"
 msgstr ""
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 "This version was built without expat.\n"
 msgstr ""
 
-#: src/x-java.c:492
-#, fuzzy, c-format
+#: src/x-java.c:494
+#, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
-msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+msgstr ""
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
 
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr ""
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, fuzzy, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s: ulovleg flagg -- %c\n"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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 ""
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3152,7 +3196,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3160,7 +3204,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3168,7 +3212,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3176,7 +3220,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3184,78 +3228,78 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr ""
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr ""
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
 "use eval_gettext instead"
 msgstr ""
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
-"--join-existing kan ikkje brukast n�r utdata vert skrive til standard ut"
+"--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "inga innfil spesifisert"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3267,58 +3311,61 @@ msgid ""
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
-#: src/xgettext.c:825
+#: src/xgettext.c:827
 #, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3327,14 +3374,14 @@ msgid ""
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 msgstr ""
 
-#: src/xgettext.c:837
+#: src/xgettext.c:841
 #, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3342,7 +3389,7 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3351,119 +3398,136 @@ msgid ""
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 msgstr ""
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
-#: src/xgettext.c:859
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
-#: src/xgettext.c:907
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
-#: src/xgettext.c:911
+#: src/xgettext.c:915
 #, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:913
+#: src/xgettext.c:918
 #, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1927
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr ""
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3472,34 +3536,34 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
 "meta information, not the empty string.\n"
 msgstr ""
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3507,7 +3571,7 @@ msgid ""
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""
@@ -3516,207 +3580,16 @@ msgstr ""
 msgid "<unnamed>"
 msgstr ""
 
-#, fuzzy
-#~ msgid "...this is the location of the first definition"
-#~ msgstr "den f�rste definisjonen finst her"
-
-#, fuzzy
-#~ msgid "%s:%lu: warning: unterminated string"
-#~ msgstr "fila \"%s\" er ikkje i GNU .mo-format"
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "Feil i «DuplicateHandle», med feilkoden 0x%08x"
 
 #, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -t, --to-code=NAME             encoding for output\n"
-#~ "      --use-first                use first available translation for "
-#~ "each\n"
-#~ "                                 message, don't merge several "
-#~ "translations\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer "
-#~ "than\n"
-#~ "                                 the output page width, into several "
-#~ "lines\n"
-#~ "  -s, --sort-output              generate sorted output\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte "
-#~ "flagg.\n"
-#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
-#~ "teikn\n"
-#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
-#~ "  -i, --indent             indentert utdata\n"
-#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
-#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
-#~ "  -V, --version            vis programversjon og avslutt\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape                do not use C escapes in output "
-#~ "(default)\n"
-#~ "  -E, --escape                   use C escapes in output, no extended "
-#~ "chars\n"
-#~ "      --force-po                 write PO file even if empty\n"
-#~ "  -i, --indent                   write the .po file using indented style\n"
-#~ "      --no-location              do not write '#: filename:line' lines\n"
-#~ "  -n, --add-location             generate '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                   write out strict Uniforum conforming .po "
-#~ "file\n"
-#~ "  -w, --width=NUMBER             set output page width\n"
-#~ "      --no-wrap                  do not break long message lines, longer "
-#~ "than\n"
-#~ "                                 the output page width, into several "
-#~ "lines\n"
-#~ "  -s, --sort-output              generate sorted output\n"
-#~ "  -F, --sort-by-file             sort output by file location\n"
-#~ "      --omit-header              don't write header with `msgid \"\"' "
-#~ "entry\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte "
-#~ "flagg.\n"
-#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
-#~ "teikn\n"
-#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
-#~ "  -i, --indent             indentert utdata\n"
-#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
-#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
-#~ "  -V, --version            vis programversjon og avslutt\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "  -i, --indent                indented output style\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer "
-#~ "than\n"
-#~ "                              the output page width, into several lines\n"
-#~ "  -s, --sort-output           generate sorted output\n"
-#~ "  -F, --sort-by-file          sort output by file location\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte "
-#~ "flagg.\n"
-#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
-#~ "teikn\n"
-#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
-#~ "  -i, --indent             indentert utdata\n"
-#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
-#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
-#~ "  -V, --version            vis programversjon og avslutt\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "      --no-escape             do not use C escapes in output (default)\n"
-#~ "  -E, --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "      --indent                indented output style\n"
-#~ "      --keep-header           keep header entry unmodified, don't filter "
-#~ "it\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer "
-#~ "than\n"
-#~ "                              the output page width, into several lines\n"
-#~ "  -s, --sort-output           generate sorted output\n"
-#~ "  -F, --sort-by-file          sort output by file location\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte "
-#~ "flagg.\n"
-#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
-#~ "teikn\n"
-#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
-#~ "  -i, --indent             indentert utdata\n"
-#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
-#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
-#~ "  -V, --version            vis programversjon og avslutt\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "      --no-escape             do not use C escapes in output (default)\n"
-#~ "      --escape                use C escapes in output, no extended chars\n"
-#~ "      --force-po              write PO file even if empty\n"
-#~ "      --indent                indented output style\n"
-#~ "      --no-location           suppress '#: filename:line' lines\n"
-#~ "      --add-location          preserve '#: filename:line' lines "
-#~ "(default)\n"
-#~ "      --strict                strict Uniforum output style\n"
-#~ "  -w, --width=NUMBER          set output page width\n"
-#~ "      --no-wrap               do not break long message lines, longer "
-#~ "than\n"
-#~ "                              the output page width, into several lines\n"
-#~ "      --sort-output           generate sorted output\n"
-#~ "      --sort-by-file          sort output by file location\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] INNFIL ...\n"
-#~ "Obligatoriske argumenter til lange flagg er obligatoriske ogs� til korte "
-#~ "flagg.\n"
-#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
-#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
-#~ "teikn\n"
-#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
-#~ "  -i, --indent             indentert utdata\n"
-#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
-#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
-#~ "  -V, --version            vis programversjon og avslutt\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Output details:\n"
-#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
-#~ "  -E, --escape             use C escapes in output, no extended chars\n"
-#~ "      --force-po           write PO file even if empty\n"
-#~ "  -i, --indent             write indented output style\n"
-#~ "      --strict             write strict uniforum style\n"
-#~ "  -w, --width=NUMBER       set output page width\n"
-#~ "      --no-wrap            do not break long message lines, longer than\n"
-#~ "                           the output page width, into several lines\n"
-#~ "  -s, --sort-output        generate sorted output\n"
-#~ msgstr ""
-#~ "Usage: %s [OPTION] [FILE]...\n"
-#~ "Mandatory arguments to long options are mandatory for short options too.\n"
-#~ "  -e, --no-escape          do not use C escapes in output (default)\n"
-#~ "  -E, --escape             use C escapes in output, no extended chars\n"
-#~ "  -h, --help               display this help and exit\n"
-#~ "  -i, --indent             write indented output style\n"
-#~ "  -o, --output-file=FILE   write output into FILE instead of standard "
-#~ "output\n"
-#~ "      --strict             write strict uniforum style\n"
-#~ "  -V, --version            output version information and exit\n"
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "feltet «%s» har framleis sin forvalgte verdi"
 
 #, fuzzy
 #~ msgid ""
+#~ "Usage: %s [OPTION] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
 #~ "  -d, --domain=TEXTDOMAIN   retrieve translated messages from TEXTDOMAIN\n"
 #~ "  -e                        enable expansion of some escape sequences\n"
 #~ "  -E                        (ignored for compatibility)\n"
@@ -3727,19 +3600,19 @@ msgstr ""
 #~ "                            to MSGID from TEXTDOMAIN\n"
 #~ msgstr ""
 #~ "Bruk: %s [FLAGG] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=TEXTDOMAIN   hent oversette meldingar fr� TEXTDOMAIN\n"
-#~ "  -e                        sl� p� ekspandering av nokre escape-"
+#~ "  -d, --domain=TEXTDOMAIN   hent oversette meldingar frå TEXTDOMAIN\n"
+#~ "  -e                        slå på ekspandering av nokre escape-"
 #~ "sekvensar\n"
 #~ "  -E                        (tillete av kompatibilitetsomsyn)\n"
 #~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
-#~ "  -n                        undertrykk etterf�lgjande linjeskift\n"
+#~ "  -n                        undertrykk etterfølgjande linjeskift\n"
 #~ "  -v, --version             vis programversjon og avslutt\n"
 #~ "  [TEXTDOMAIN] MSGID        hent oversett melding som stemmer overeins "
 #~ "med\n"
-#~ "                            MSGID fr� TEXTDOMAIN\n"
+#~ "                            MSGID frå TEXTDOMAIN\n"
 
-#, fuzzy
 #~ msgid ""
+#~ "\n"
 #~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
 #~ "the\n"
 #~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
@@ -3755,86 +3628,57 @@ msgstr ""
 #~ "Standard search directory: %s\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Dersom TEXTDOMAIN-parameteren ikkje er gjeven, vert domenet valgt fr�\n"
-#~ "milj�variabelen TEXTDOMAIN.  Dersom meldingskatalogen ikkje finst i den\n"
+#~ "Dersom TEXTDOMAIN-parameteren ikkje er gjeven, vert domenet valgt frå\n"
+#~ "miljøvariabelen TEXTDOMAIN.  Dersom meldingskatalogen ikkje finst i den\n"
 #~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp "
 #~ "av\n"
-#~ "milj�variabelen TEXTDOMAIN.\n"
-#~ "N�r flagget -s vert brukt, oppf�rer programmet seg som kommandoen �echo�,\n"
+#~ "miljøvariabelen TEXTDOMAIN.\n"
+#~ "Når flagget -s vert brukt, oppfører programmet seg som kommandoen "
+#~ "«echo»,\n"
 #~ "men gjer ikkje ein enkel kopiering av argumenta sine til standard ut.  I\n"
 #~ "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
-#~ "Standard s�kekatalog er: %s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -d, --domain=TEXTDOMAIN   retrieve translated message from TEXTDOMAIN\n"
-#~ "  -e                        enable expansion of some escape sequences\n"
-#~ "  -E                        (ignored for compatibility)\n"
-#~ "  -h, --help                display this help and exit\n"
-#~ "  -V, --version             display version information and exit\n"
-#~ "  [TEXTDOMAIN]              retrieve translated message from TEXTDOMAIN\n"
-#~ "  MSGID MSGID-PLURAL        translate MSGID (singular) / MSGID-PLURAL "
-#~ "(plural)\n"
-#~ "  COUNT                     choose singular/plural form based on this "
-#~ "value\n"
-#~ msgstr ""
-#~ "Bruk: %s [FLAGG] [[[TEXTDOMAIN] MSGID] | [-s [MSGID]...]]\n"
-#~ "  -d, --domain=TEXTDOMAIN   hent oversette meldingar fr� TEXTDOMAIN\n"
-#~ "  -e                        sl� p� ekspandering av nokre escape-"
-#~ "sekvensar\n"
-#~ "  -E                        (tillete av kompatibilitetsomsyn)\n"
-#~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
-#~ "  -n                        undertrykk etterf�lgjande linjeskift\n"
-#~ "  -v, --version             vis programversjon og avslutt\n"
-#~ "  [TEXTDOMAIN] MSGID        hent oversett melding som stemmer overeins "
-#~ "med\n"
-#~ "                            MSGID fr� TEXTDOMAIN\n"
+#~ "Standard søkekatalog er: %s\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "If the TEXTDOMAIN parameter is not given, the domain is determined from "
-#~ "the\n"
-#~ "environment variable TEXTDOMAIN.  If the message catalog is not found in "
-#~ "the\n"
-#~ "regular directory, another location can be specified with the "
-#~ "environment\n"
-#~ "variable TEXTDOMAINDIR.\n"
-#~ "Standard search directory: %s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Dersom TEXTDOMAIN-parameteren ikkje er gjeven, vert domenet valgt fr�\n"
-#~ "milj�variabelen TEXTDOMAIN.  Dersom meldingskatalogen ikkje finst i den\n"
-#~ "vanlege filkatalogen, kan ein annan filkatalog spesifiserast ved hjelp "
-#~ "av\n"
-#~ "milj�variabelen TEXTDOMAIN.\n"
-#~ "N�r flagget -s vert brukt, oppf�rer programmet seg som kommandoen �echo�,\n"
-#~ "men gjer ikkje ein enkel kopiering av argumenta sine til standard ut.  I\n"
-#~ "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
-#~ "Standard s�kekatalog er: %s\n"
-
-#~ msgid "seek \"%s\" offset %ld failed"
-#~ msgstr "�seek� \"%s\" posisjon %ld feila"
-
-#, fuzzy
-#~ msgid "a format specification for argument {%u} doesn't exist in 'msgstr'"
-#~ msgstr "format-spesifiseringane for argument %u er ulike"
-
-#, fuzzy
-#~ msgid "a format specification for argument '%s' doesn't exist in 'msgstr'"
-#~ msgstr "format-spesifiseringane for argument %u er ulike"
-
-#, fuzzy
-#~ msgid "a format specification for argument %u doesn't exist in 'msgstr'"
-#~ msgstr "format-spesifiseringane for argument %u er ulike"
-
-#~ msgid "while creating hash table"
-#~ msgstr "mens hash-tabellen vart laga"
+#~ msgid "this message has no definition in the \"%s\" domain"
+#~ msgstr "denne meldinga har ingen definisjon i \"%s\"-domenet"
 
 #~ msgid "while preparing output"
 #~ msgstr "under klargjering av utdata"
 
-#~ msgid "this message has no definition in the \"%s\" domain"
-#~ msgstr "denne meldinga har ingen definisjon i \"%s\"-domenet"
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ "  -h, --help                     display this help and exit\n"
+#~ msgstr ""
+#~ "Bruk: %s [FLAGG] INNFIL ...\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -a, --extract-all             ekstrahér alle strengar\n"
+#~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
+#~ "                                kommentarar i linjer som kjem foran\n"
+#~ "                                nøkkelord) i utfila\n"
+#~ "  -C, --c++                     kjenn igjen C++-kommentarar\n"
+#~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
+#~ "                                messages.po)\n"
+#~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
+#~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
+#~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
 
 #, fuzzy
 #~ msgid ""
@@ -3855,16 +3699,96 @@ msgstr ""
 #~ "  -u, --unique                   shorthand for --less-than=2, requests\n"
 #~ "                                 that only unique messages be printed\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag �#: filenavn:linje�-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med �msgid \"\"�\n"
-#~ "  -p, --output-dir=KAT          plass�r utfiler i filkatalogen KAT\n"
-#~ "  -s, --sort-output             sort�r utdata og ta bort duplikat\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
+#~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
+#~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
-#~ "  -T, --trigraphs               forst� ANSI C trigraphs i inndata\n"
+#~ "  -T, --trigraphs               forstå ANSI C trigraphs i inndata\n"
 #~ "  -V, --version                 vis programversjon og avslutt\n"
-#~ "  -x, --exclude-file=FIL        innslag fr� FIL vert ikkje ekstrahert\n"
+#~ "  -x, --exclude-file=FIL        innslag frå FIL vert ikkje ekstrahert\n"
 #~ "\n"
-#~ "Dersom INNFIL er -, vil det verte lese fr� standard inn.\n"
+#~ "Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] filename.po ...\n"
+#~ "Generate binary message catalog from textual translation description.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: "
+#~ "%d)\n"
+#~ "  -c, --check                 perform language dependent checks on "
+#~ "strings\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -f, --use-fuzzy             use fuzzy entries in output\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "      --no-hash               binary file will not include the hash "
+#~ "table\n"
+#~ "  -o, --output-file=FILE      specify output file name as FILE\n"
+#~ "      --statistics            print statistics about translations\n"
+#~ "      --strict                enable strict Uniforum mode\n"
+#~ "  -v, --verbose               list input file anomalies\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "\n"
+#~ "Giving the -v option more than once increases the verbosity level.\n"
+#~ "\n"
+#~ "If input file is -, standard input is read.  If output file is -,\n"
+#~ "output is written to standard output.\n"
+#~ msgstr ""
+#~ "Bruk: %s [FLAGG] filnavn.po ...\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -a, --alignment=ANTALL    justér strengar til ANTALL bytes (forvalgt: "
+#~ "%d)\n"
+#~ "  -h, --help                vis denne hjelpeteksta og avslutt\n"
+#~ "      --no-hash             binærfil skal ikkje innehalde hash-tabell\n"
+#~ "  -o, --output-file=FILNAVN sett utfil til FILNAVN\n"
+#~ "      --strict              lag strengt Uniforum-konform .po-fil\n"
+#~ "  -v, --verbose             list alle avvik i innfil\n"
+#~ "  -V, --version             vis programversjon og avslutt\n"
+#~ "\n"
+#~ "Dersom innfil er -, vil inndata verte lest frå standard inn.  Dersom "
+#~ "utfil\n"
+#~ "er -, vil utdata verte skrive til standard ut.\n"
+
+#~ msgid "while creating hash table"
+#~ msgstr "mens hash-tabellen vart laga"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] def.po ref.po\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape             do not use C escapes in output (default)\n"
+#~ "  -E, --escape                use C escapes in output, no extended chars\n"
+#~ "      --force-po              write PO file even if empty\n"
+#~ "  -h, --help                  display this help and exit\n"
+#~ "  -i, --indent                indented output style\n"
+#~ "  -o, --output-file=FILE      result will be written to FILE\n"
+#~ "      --no-location           suppress '#: filename:line' lines\n"
+#~ "      --add-location          preserve '#: filename:line' lines "
+#~ "(default)\n"
+#~ "      --strict                strict Uniforum output style\n"
+#~ "  -v, --verbose               increase verbosity level\n"
+#~ "  -V, --version               output version information and exit\n"
+#~ "  -w, --width=NUMBER          set output page width\n"
+#~ msgstr ""
+#~ "Bruk: %s [FLAGG] INNFIL ...\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -e, --no-escape          ikkje bruk C-escapekoder i utdata (forvalgt)\n"
+#~ "  -E, --escape             bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
+#~ "  -h, --help               vis denne hjelpeteksta og avslutt\n"
+#~ "  -i, --indent             indentert utdata\n"
+#~ "  -o, --output-file=FIL    resultat vert skrive til FIL\n"
+#~ "      --strict             lag strengt Uniforum-konformt utdata\n"
+#~ "  -V, --version            vis programversjon og avslutt\n"
 
 #, fuzzy
 #~ msgid ""
@@ -3901,11 +3825,59 @@ msgstr ""
 #~ "By default the output is written to standard output.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Konverter bin�re .mo-filer til Uniforum .po-filer.  B�de �little-endian� "
-#~ "og\n"
-#~ "�big-endian� .mo filer vert h�ndtert.  Dersom innfil er -, blir standard\n"
+#~ "Konverter binære .mo-filer til Uniforum .po-filer.  Både «little-"
+#~ "endian» og\n"
+#~ "«big-endian» .mo filer vert håndtert.  Dersom innfil er -, blir "
+#~ "standard\n"
 #~ "inn lest.  Dersom utfil er -, vert det skrive til standard ut.\n"
 
+#~ msgid "seek \"%s\" offset %ld failed"
+#~ msgstr "«seek» \"%s\" posisjon %ld feila"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [OPTION] INPUTFILE ...\n"
+#~ "Extract translatable string from given input files.\n"
+#~ "\n"
+#~ "Mandatory arguments to long options are mandatory for short options too.\n"
+#~ "  -a, --extract-all              extract all strings\n"
+#~ "  -c, --add-comments[=TAG]       place comment block with TAG (or those\n"
+#~ "                                 preceding keyword lines) in output file\n"
+#~ "  -C, --c++                      shorthand for --language=C++\n"
+#~ "      --debug                    more detailed formatstring recognision "
+#~ "result\n"
+#~ "  -d, --default-domain=NAME      use NAME.po for output (instead of "
+#~ "messages.po)\n"
+#~ "  -D, --directory=DIRECTORY      add DIRECTORY to list for input files "
+#~ "search\n"
+#~ "  -e, --no-escape                do not use C escapes in output "
+#~ "(default)\n"
+#~ "  -E, --escape                   use C escapes in output, no extended "
+#~ "chars\n"
+#~ "  -f, --files-from=FILE          get list of input files from FILE\n"
+#~ "      --force-po                 write PO file even if empty\n"
+#~ "      --foreign-user             omit FSF copyright in output for foreign "
+#~ "user\n"
+#~ "  -F, --sort-by-file             sort output by file location\n"
+#~ msgstr ""
+#~ "Bruk: %s [FLAGG] INNFIL ...\n"
+#~ "Obligatoriske argumenter til lange flagg er obligatoriske også til korte "
+#~ "flagg.\n"
+#~ "  -a, --extract-all             ekstrahér alle strengar\n"
+#~ "  -c, --add-comments[=TAG]      lagre kommentarblokker med TAG (eller\n"
+#~ "                                kommentarar i linjer som kjem foran\n"
+#~ "                                nøkkelord) i utfila\n"
+#~ "  -C, --c++                     kjenn igjen C++-kommentarar\n"
+#~ "  -d, --default-domain=NAVN     lagre utdata i NAVN.po (i staden for\n"
+#~ "                                messages.po)\n"
+#~ "  -D, --directory=FILKATALOG    skift til FILKATALOG før prosessering\n"
+#~ "  -e, --no-escape               ikkje bruk C-escapekoder i utdata "
+#~ "(forvalgt)\n"
+#~ "  -E, --escape                  bruk C-escapekoder i utdata, ingen utvida "
+#~ "teikn\n"
+#~ "  -f, --files-from=FIL          hent liste av innfiler frå FIL\n"
+#~ "  -F, --sort-by-file            sorter utdata etter fil-lokasjon\n"
+
 #, fuzzy
 #~ msgid ""
 #~ "  -h, --help                     display this help and exit\n"
@@ -3914,6 +3886,8 @@ msgstr ""
 #~ "  -k, --keyword[=WORD]           additonal keyword to be looked for "
 #~ "(without\n"
 #~ "                                 WORD means not to use default keywords)\n"
+#~ "  -l, --string-limit=NUMBER      set string length limit to NUMBER "
+#~ "instead %u\n"
 #~ "  -L, --language=NAME            recognise the specified language (C, C+"
 #~ "+, PO),\n"
 #~ "                                 otherwise is guessed from file "
@@ -3928,17 +3902,17 @@ msgstr ""
 #~ "  -i, --indent                  lag indentert utdata\n"
 #~ "  -j, --join-existing           flett saman meldingar med eksisterande "
 #~ "fil\n"
-#~ "  -k, --keyword[=ORD]           sj� ogs� etter n�kkelordet ORD (manglar "
-#~ "ORD,\n"
-#~ "                                skal ikkje dei vanlege n�kkelorda "
+#~ "  -k, --keyword[=ORD]           sjå også etter nøkkelordet ORD "
+#~ "(manglar ORD,\n"
+#~ "                                skal ikkje dei vanlege nøkkelorda "
 #~ "nyttast)\n"
-#~ "  -l, --string-limit=NUMMER     sett st�rste streng-lengde til NUMMER\n"
+#~ "  -l, --string-limit=NUMMER     sett største streng-lengde til NUMMER\n"
 #~ "                                i staden for %u\n"
 #~ "  -m, --msgstr-prefix[=STRENG]  bruk STRENG eller \"\" som prefiks for\n"
 #~ "                                msgstr-verdiar\n"
 #~ "  -M, --msgstr-suffix[=STRENG]  bruk STRENG eller \"\" som suffiks for\n"
 #~ "                                msgstr-verdiar\n"
-#~ "      --no-location             ikkje lag �#: filnavn:linje�-linjer\n"
+#~ "      --no-location             ikkje lag «#: filnavn:linje»-linjer\n"
 
 #, fuzzy
 #~ msgid ""
@@ -3960,35 +3934,15 @@ msgstr ""
 #~ "\n"
 #~ "If INPUTFILE is -, standard input is read.\n"
 #~ msgstr ""
-#~ "  -n, --add-location            lag �#: filenavn:linje�-linjer (forvalgt)\n"
-#~ "      --omit-header             ikkje lag startseksjon med �msgid \"\"�\n"
-#~ "  -p, --output-dir=KAT          plass�r utfiler i filkatalogen KAT\n"
-#~ "  -s, --sort-output             sort�r utdata og ta bort duplikat\n"
+#~ "  -n, --add-location            lag «#: filenavn:linje»-linjer "
+#~ "(forvalgt)\n"
+#~ "      --omit-header             ikkje lag startseksjon med «msgid "
+#~ "\"\"»\n"
+#~ "  -p, --output-dir=KAT          plassér utfiler i filkatalogen KAT\n"
+#~ "  -s, --sort-output             sortér utdata og ta bort duplikat\n"
 #~ "      --strict                  lag strengt Uniforum-konform .po-fil\n"
-#~ "  -T, --trigraphs               forst� ANSI C trigraphs i inndata\n"
+#~ "  -T, --trigraphs               forstå ANSI C trigraphs i inndata\n"
 #~ "  -V, --version                 vis programversjon og avslutt\n"
-#~ "  -x, --exclude-file=FIL        innslag fr� FIL vert ikkje ekstrahert\n"
+#~ "  -x, --exclude-file=FIL        innslag frå FIL vert ikkje ekstrahert\n"
 #~ "\n"
-#~ "Dersom INNFIL er -, vil det verte lese fr� standard inn.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s: warning: charset \"%s\" is not supported by iconv%s\n"
-#~ "%*s  warning: consider installing GNU libiconv and then\n"
-#~ "%*s           reinstalling GNU gettext"
-#~ msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s: warning: charset \"%s\" is not supported without iconv%s\n"
-#~ "%*s  warning: consider installing GNU libiconv and then\n"
-#~ "%*s           reinstalling GNU gettext"
-#~ msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#, fuzzy
-#~ msgid "found %d errors"
-#~ msgstr "fann %d fatale feil"
-
-#, fuzzy
-#~ msgid "%s: warning: no header entry found"
-#~ msgstr "advarsel: denne meldinga er ikkje brukt"
+#~ "Dersom INNFIL er -, vil det verte lese frå standard inn.\n"
diff --git a/gettext-tools/po/vi.po b/gettext-tools/po/vi.po
index b5d674f..02254c3 100644
--- a/gettext-tools/po/vi.po
+++ b/gettext-tools/po/vi.po
@@ -1,20 +1,22 @@
 # Vietnamese Translation for gettext-tools.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005-2007.
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gettext package.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2007-11-02 03:23+0100\n"
-"PO-Revision-Date: 2007-10-17 16:11+0930\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-09-24 22:40+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: gnulib-lib/argmatch.c:133
 #, c-format
@@ -55,44 +57,44 @@ msgstr "không thể gỡ bỏ thư mục tạm thời %s"
 msgid "write error"
 msgstr "lỗi ghi"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
-#: src/open-catalog.c:121 src/read-mo.c:252 src/read-tcl.c:124
-#: src/urlget.c:201 src/xgettext.c:1794 src/xgettext.c:1807
-#: src/xgettext.c:1817
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
+#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "gặp lỗi khi mở « %s » để đọc"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, 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:81 src/urlget.c:213
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "gặp lỗi khi đọc « %s »"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "gặp lỗi khi ghi « %s »"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:223
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, 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:839
-#: src/msginit.c:914 src/msginit.c:1074 src/msginit.c:1173
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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
 msgid "fdopen() failed"
 msgstr "fdopen() bị lỗi"
 
-#: gnulib-lib/csharpcomp.c:570
+#: gnulib-lib/csharpcomp.c:571
 #, c-format
 msgid "C# compiler not found, try installing pnet"
 msgstr "Không tìm thấy trình biên dịch C#, hãy thử cài đặt pnet."
@@ -102,70 +104,70 @@ msgstr "Không tìm thấy trình biên dịch C#, hãy thử cài đặt pnet."
 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."
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "Lỗi hệ thống không rõ"
 
-#: gnulib-lib/execute.c:184 gnulib-lib/execute.c:260 gnulib-lib/execute.c:302
-#: gnulib-lib/pipe.c:229 gnulib-lib/pipe.c:347 gnulib-lib/pipe.c:407
-#: gnulib-lib/wait-process.c:333 gnulib-lib/wait-process.c:400
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
+#: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "Tiến trình con « %s » bị lỗi"
 
-#: gnulib-lib/getopt.c:530 gnulib-lib/getopt.c:546
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:579 gnulib-lib/getopt.c:583
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:592 gnulib-lib/getopt.c:597
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: gnulib-lib/getopt.c:640 gnulib-lib/getopt.c:659 gnulib-lib/getopt.c:975
-#: gnulib-lib/getopt.c:994
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần phải có đối số\n"
 
-#: gnulib-lib/getopt.c:697 gnulib-lib/getopt.c:700
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận diện tùy chọn « --%s »\n"
 
-#: gnulib-lib/getopt.c:708 gnulib-lib/getopt.c:711
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận diện tùy chọn « %c%s »\n"
 
-#: gnulib-lib/getopt.c:763 gnulib-lib/getopt.c:766
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: không cho phép tùy chọn « -- %c »\n"
 
-#: gnulib-lib/getopt.c:772 gnulib-lib/getopt.c:775
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ « -- %c »\n"
 
-#: gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:843 gnulib-lib/getopt.c:1047
-#: gnulib-lib/getopt.c:1065
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số « -- %c »\n"
 
-#: gnulib-lib/getopt.c:896 gnulib-lib/getopt.c:912
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: gnulib-lib/getopt.c:936 gnulib-lib/getopt.c:954
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
@@ -191,14 +193,14 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr "lỗi tạo « %s »"
 
-#: gnulib-lib/javacomp.c:510 src/write-catalog.c:253 src/write-catalog.c:317
+#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319
 #: src/write-csharp.c:733 src/write-java.c:1047 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:2341
+#: gnulib-lib/javacomp.c:2343
 #, c-format
 msgid "Java compiler not found, try installing gcj or set $JAVAC"
 msgstr ""
@@ -209,21 +211,21 @@ msgstr ""
 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:847 src/msginit.c:922
-#: src/msginit.c:1082
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s lỗi VR tiến trình con"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
-#: gnulib-lib/xsetenv.c:38 src/msgl-check.c:473 src/po-lex.c:84
-#: src/po-lex.c:103 src/x-glade.c:588 libgettextpo/gettext-po.c:1284
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "hết bộ nhớ rồi"
 
-#: gnulib-lib/pipe.c:155 gnulib-lib/pipe.c:158 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "không thể tạo ống dẫn"
@@ -241,74 +243,73 @@ msgstr "không thể tạo ống dẫn"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:228
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "« "
 
-#: gnulib-lib/quotearg.c:229
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr " »"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle bị lỗi với mã lỗi 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle bị lỗi"
 
-#: gnulib-lib/wait-process.c:276 gnulib-lib/wait-process.c:308
-#: gnulib-lib/wait-process.c:366
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "không thể tạo tập tin xuất « %s »"
+
+#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
+#: gnulib-lib/wait-process.c:317
 #, c-format
 msgid "%s subprocess"
 msgstr "%s tiến trình con"
 
-#: gnulib-lib/wait-process.c:325 gnulib-lib/wait-process.c:392
+#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346
 #, c-format
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s tiến trình con nhập tín hiệu nghiêm trọng %d"
 
-#: src/format.c:143
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr ""
 "« %s » không phải là một chuỗi định dạng %s hợp lệ, khác với « msgid ». Lý "
 "do : %s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
-#: src/format-gcc-internal.c:623 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "một đặc tả định dạng cho đối số %u, như trong « %s », không tồn tại trong « "
 "msgid »"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:633 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "một đặc tả định dạng cho đối số %u, không tồn tại trong « %s »"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:653
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:510 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr ""
 "đặc tả định dạng trong « msgid » và « %s » cho đối số %u không phải trùng"
 
@@ -316,7 +317,8 @@ msgstr ""
 #, c-format
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
-"Chỉ thị số %u bắt đầu với ký hiệu ống dẫn « | » nhưng không kết thúc với « | »."
+"Chỉ thị số %u bắt đầu với ký hiệu ống dẫn « | » nhưng không kết thúc với « | "
+"»."
 
 #: src/format-c.c:181
 #, c-format
@@ -324,9 +326,9 @@ msgid ""
 "In the directive number %u, the token after '<' is not the name of a format "
 "specifier macro. The valid macro names are listed in ISO C 99 section 7.8.1."
 msgstr ""
-"Trong chỉ thị số %u, hiệu bài nằm sau « < » không phải là tên của vĩ lệnh đặc "
-"tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 tiết đoạn "
-"7.8.1."
+"Trong chỉ thị số %u, hiệu bài nằm sau « < » không phải là tên của vĩ lệnh "
+"đặc tả định dạng. Những tên vĩ lệnh hợp lệ được liệt kê trong ISO C 99 tiết "
+"đoạn 7.8.1."
 
 #: src/format-c.c:588
 #, c-format
@@ -339,15 +341,16 @@ msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 "Chuỗi này tham chiệu đến đối số có số %u nhưng mà bỏ qua đối số có số %u."
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:501
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "số đặc tả định dạng trong « msgid » và « %s » không phải trùng"
 
 #: src/format-csharp.c:88 src/format-java.c:205
 #, c-format
 msgid "In the directive number %u, '{' is not followed by an argument number."
-msgstr "Trong chỉ thị số %u, dấu ngoặc móc mở « { » không có số đối số đi theo."
+msgstr ""
+"Trong chỉ thị số %u, dấu ngoặc móc mở « { » không có số đối số đi theo."
 
 #: src/format-csharp.c:109
 #, c-format
@@ -385,24 +388,24 @@ msgstr "Chuỗi bắt đầu ở giữa chỉ thị: tìm « } » không có «
 msgid "The string contains a lone '}' after directive number %u."
 msgstr "Chuỗi chứa một « } » riêng lẻ nằm sau chỉ thị số %u."
 
-#: src/format-gcc-internal.c:253
+#: src/format-gcc-internal.c:255
 #, c-format
 msgid "In the directive number %u, the flags combination is invalid."
 msgstr "Chỉ thị số %u chứa tổ hợp cờ không hợp lệ."
 
-#: src/format-gcc-internal.c:290
+#: src/format-gcc-internal.c:292
 #, c-format
 msgid "In the directive number %u, a precision is not allowed before '%c'."
 msgstr "Trong chỉ thị số %u, không cho phép độ chính xác nằm trước « %c »."
 
-#: src/format-gcc-internal.c:332
+#: src/format-gcc-internal.c:334
 #, c-format
 msgid ""
 "In the directive number %u, the argument number for the precision must be "
 "equal to %u."
 msgstr "Trong chỉ thị số %u, số đối số cho độ chính xác phải bằng %u."
 
-#: src/format-gcc-internal.c:396
+#: src/format-gcc-internal.c:398
 #, c-format
 msgid ""
 "In the directive number %u, a precision specification is not allowed before "
@@ -410,24 +413,24 @@ msgid ""
 msgstr ""
 "Trong chỉ thị số %u, không cho phép đặc tả độ chính xác nằm trước « %c »."
 
-#: src/format-gcc-internal.c:404
+#: src/format-gcc-internal.c:406
 #, c-format
 msgid "In the directive number %u, the precision specification is invalid."
 msgstr "Chỉ thị số %u chứa đặc tả độ chính xác không hợp lệ."
 
-#: src/format-gcc-internal.c:459
+#: src/format-gcc-internal.c:463
 #, c-format
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "Trong chỉ thị số %u, không cho phép cờ nằm trước « %c »."
 
-#: src/format-gcc-internal.c:671
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "« msgid » dùng %%m còn « %s » không phải"
 
-#: src/format-gcc-internal.c:674
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "« msgid » không dùng %%m còn « %s » có phải dùng %%m"
 
 #: src/format-invalid.h:22
@@ -502,7 +505,8 @@ msgstr "Chỉ thị số %u chứa « %s » không có dấu phẩy đi theo."
 #, c-format
 msgid ""
 "In the directive number %u, the substring \"%s\" is not a valid number style."
-msgstr "Chỉ thị số %u chứa chuỗi phụ « %s » không phải kiểu dáng con số hợp lệ."
+msgstr ""
+"Chỉ thị số %u chứa chuỗi phụ « %s » không phải kiểu dáng con số hợp lệ."
 
 #: src/format-java.c:323
 #, c-format
@@ -524,27 +528,26 @@ msgid ""
 "In the directive number %u, a choice contains a number that is not followed "
 "by '<', '#' or '%s'."
 msgstr ""
-"Chỉ thị số %u có một lựa chọn chứa con số không có dấu « < », « # » hay « %s » "
-"theo sau."
+"Chỉ thị số %u có một lựa chọn chứa con số không có dấu « < », « # » hay « %s "
+"» theo sau."
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr ""
 "đặc tả định dạng cho đối số {%u}, như trong « %s », không tồn tại trong « "
 "msgid »"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "đặc tả định dạng cho đối số {%u}, không tồn tại trong « %s »"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr ""
 "đặc tả định dạng trong « msgid » và « %s » cho đối số {%u} không phải trùng"
 
@@ -555,17 +558,17 @@ msgid ""
 "In the directive number %u, parameter %u is of type '%s' but a parameter of "
 "type '%s' is expected."
 msgstr ""
-"Chỉ thị số %u chứa tham số %u có kiểu « %s » nhưng lẽ ra phải có tham số kiểu "
-"« %s »."
+"Chỉ thị số %u chứa tham số %u có kiểu « %s » nhưng lẽ ra phải có tham số "
+"kiểu « %s »."
 
 #: src/format-lisp.c:2372 src/format-scheme.c:2398
 #, c-format
 msgid ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameter."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameter."
 msgid_plural ""
-"In the directive number %u, too many parameters are given; expected at most %"
-"u parameters."
+"In the directive number %u, too many parameters are given; expected at most "
+"%u parameters."
 msgstr[0] ""
 "Chỉ thị số %u có quá nhiều tham số, còn mong đợi nhiều nhất %u tham số."
 
@@ -601,7 +604,8 @@ msgid ""
 "In the directive number %u, '~:[' is not followed by two clauses, separated "
 "by '~;'."
 msgstr ""
-"Chỉ thị số %u chứa « ~:[ » không có hai mệnh đề đi theo, định giớí bằng « ~; »."
+"Chỉ thị số %u chứa « ~:[ » không có hai mệnh đề đi theo, định giớí bằng « ~; "
+"»."
 
 #: src/format-lisp.c:3326 src/format-scheme.c:3263
 #, c-format
@@ -615,13 +619,13 @@ msgstr ""
 "nhau."
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "đặc tả định dạng trong « msgid » và « %s » không phải tương đương"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr ""
 "đặc tả định dạng trong « %s » không phải tập con của đặc tả trong « msgid »"
 
@@ -631,15 +635,15 @@ msgid ""
 "In the directive number %u, the size specifier is incompatible with the "
 "conversion specifier '%c'."
 msgstr ""
-"Chỉ thị số %u chứa đặc tả kích cỡ không tương thích với đặc tả chuyển đổi « %"
-"c »."
+"Chỉ thị số %u chứa đặc tả kích cỡ không tương thích với đặc tả chuyển đổi « "
+"%c »."
 
-#: src/format-perl-brace.c:199 src/format-python.c:459 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "đặc tả định dạng cho đối số « %s » không tồn tại trong « %s »"
 
-#: src/format-python.c:112
+#: src/format-python.c:115
 msgid ""
 "The string refers to arguments both through argument names and through "
 "unnamed argument specifications."
@@ -647,55 +651,52 @@ msgstr ""
 "Chuỗi tham chiếu đến đối số bằng cả hai tên đối số và đặc tả đối số không "
 "tên."
 
-#: src/format-python.c:343
+#: src/format-python.c:354
 #, c-format
 msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr ""
 "Chuỗi tham chiếu đến đối số tên « %s » bằng nhiều cách không tương thích với "
 "nhau."
 
-#: src/format-python.c:419
-#, c-format
+#: src/format-python.c:430
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr ""
 "đặc tả định dạng trong « msgid » mong đợi sự ánh xạ, còn đặc tả trong « %s » "
 "mong đợi đồ nhiều thành phần"
 
-#: src/format-python.c:426
-#, c-format
+#: src/format-python.c:437
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr ""
 "đặc tả định dạng trong « msgid » mong đợi đồ nhiều thành phần, còn đặc tả "
 "trong « %s » mong đợi sự ánh xạ"
 
-#: src/format-python.c:449 src/format-sh.c:297
-#, c-format
+#: src/format-python.c:460 src/format-sh.c:297
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr ""
 "đặc tả định dạng cho đối số « %s », như trong « %s », không tồn tại trong « "
 "msgid »"
 
-#: src/format-python.c:479
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr ""
 "đặc tả định dạng trong « msgid » và « %s » cho đối số « %s » không phải trùng"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
-"« msgid » là chuỗi định dạng đơn giản, nhưng « %s » không phải: nó chứa một cờ "
-"« L » hay một số kiểu đối số có hai chữ số"
+"« msgid » là chuỗi định dạng đơn giản, nhưng « %s » không phải: nó chứa một "
+"cờ « L » hay một số kiểu đối số có hai chữ số"
 
 #: src/format-sh.c:79
 msgid "The string refers to a shell variable with a non-ASCII name."
@@ -735,11 +736,11 @@ msgid ""
 "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:325 src/msgcat.c:281 src/msgcmp.c:161
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:211 src/msgexec.c:178
-#: src/msgfilter.c:280 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
-#: src/msgmerge.c:322 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:130 src/xgettext.c:530
+#: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
+#: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -752,21 +753,21 @@ 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:331 src/msgcat.c:287 src/msgcmp.c:167
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:217 src/msgexec.c:184
-#: src/msgfilter.c:286 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
-#: src/msgmerge.c:328 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:136
-#: src/xgettext.c:536
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
+#: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
+#: src/xgettext.c:538
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Tác giả: %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:331 src/msgcat.c:287 src/msgconv.c:229
-#: src/msgen.c:217 src/msgexec.c:184 src/msgfilter.c:286 src/msggrep.c:404
+#: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgconv.c:229
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
-#: src/urlget.c:136
+#: src/urlget.c:149
 msgid "Bruno Haible"
 msgstr "Bruno Haible"
 
@@ -775,11 +776,11 @@ msgstr "Bruno Haible"
 msgid "too many arguments"
 msgstr "quá nhiều đối số"
 
-#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:350 src/msgcmp.c:198
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:270 src/msgexec.c:236
-#: src/msgfilter.c:391 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
-#: src/msgmerge.c:449 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:159 src/xgettext.c:758
+#: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
+#: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Hãy thử lệnh « %s --help » để xem thông tin thêm.\n"
@@ -819,29 +820,29 @@ msgstr ""
 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:497 src/msgcat.c:454 src/msgcmp.c:245
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:343 src/msgexec.c:278
-#: src/msgfilter.c:477 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
-#: src/msgmerge.c:566 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:173 src/xgettext.c:916
+#: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
+#: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "Kết xuất thông tin:\n"
 
-#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:456 src/msgcmp.c:247
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:345 src/msgexec.c:280
-#: src/msgfilter.c:479 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
-#: src/msgmerge.c:568 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:175 src/xgettext.c:918
+#: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
+#: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, 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:501 src/msgcat.c:458 src/msgcmp.c:249
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:347 src/msgexec.c:282
-#: src/msgfilter.c:481 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
-#: src/msgmerge.c:570 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:177 src/xgettext.c:920
+#: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
+#: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               xuất thông tin _phiên bản_ rồi thoát\n"
@@ -850,11 +851,11 @@ 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:508 src/msgcat.c:465 src/msgcmp.c:256
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:354 src/msgexec.c:289
-#: src/msgfilter.c:488 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
-#: src/msgmerge.c:581 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:184 src/xgettext.c:927
+#: src/hostname.c:239 src/msgattrib.c:508 src/msgcat.c:479 src/msgcmp.c:269
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
+#: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 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"
 
@@ -863,20 +864,20 @@ msgstr "Hãy thông báo lỗi cho <bug-gnu-gettext@gnu.org>.\n"
 msgid "could not get host name"
 msgstr "không thể lấy tên máy"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:150 src/msgfilter.c:210
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
 msgstr "cho phép nhiều nhất một tập tin nhập"
 
-#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:303 src/msgcat.c:307
+#: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:239 src/msgen.c:243 src/msgfilter.c:301 src/msgfilter.c:305
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
-#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:353 src/msgmerge.c:374
-#: src/msgmerge.c:378 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:546 src/xgettext.c:550 src/xgettext.c:557 src/xgettext.c:560
-#: src/xgettext.c:563
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
+#: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
+#: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s và %s loại từ lẫn nhau"
@@ -895,9 +896,9 @@ msgstr ""
 "Lọc các thông điệp của phân loại thông dịch tùy theo thuộc tính,\n"
 "cũng thao tác thuộc tính.\n"
 
-#: src/msgattrib.c:404 src/msgcat.c:371 src/msgcmp.c:216 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:286 src/msgexec.c:259 src/msgfilter.c:403
-#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:470 src/msgunfmt.c:423
+#: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
+#: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
 msgid ""
@@ -906,10 +907,10 @@ msgstr ""
 "Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy "
 "chọn ngắn.\n"
 
-#: src/msgattrib.c:407 src/msgcat.c:374 src/msgcmp.c:219 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:289 src/msgexec.c:262 src/msgfilter.c:406
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:473
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:776
+#: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr "Vị trí tập tin nhập:\n"
@@ -919,10 +920,10 @@ msgstr "Vị trí tập tin nhập:\n"
 msgid "  INPUTFILE                   input PO file\n"
 msgstr "  TẬP_TIN_NHẬP              tập tin PO nhập vào\n"
 
-#: src/msgattrib.c:411 src/msgcat.c:380 src/msgcmp.c:225 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:293 src/msgexec.c:266 src/msgfilter.c:410
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:479 src/msguniq.c:336
-#: src/xgettext.c:782
+#: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
@@ -930,30 +931,31 @@ msgstr ""
 "  -D, --directory=THƯ_MỤC\n"
 "\tthêm _thư mục_ này vào danh sách để tìm kiếm tập tin nhập\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:268 src/msgfilter.c:412
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
-"Không đưa ra tập tin nhập, hay nó là « - » thì thiết bị nhập chuẩn được đọc.\n"
+"Không đưa ra tập tin nhập, hay nó là « - » thì thiết bị nhập chuẩn được "
+"đọc.\n"
 
-#: src/msgattrib.c:416 src/msgcat.c:385 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:298 src/msgfilter.c:415 src/msgfmt.c:667 src/msggrep.c:521
-#: src/msginit.c:371 src/msgmerge.c:491 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:787
+#: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
+#: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr "Vị trí tấp tin xuất:\n"
 
-#: src/msgattrib.c:418 src/msgcat.c:387 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:300 src/msgfilter.c:417 src/msgfmt.c:669 src/msggrep.c:523
-#: src/msgmerge.c:493 src/msgunfmt.c:479 src/msguniq.c:343
+#: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
+#: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, 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:420 src/msgcat.c:389 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:302 src/msgfilter.c:419 src/msggrep.c:525 src/msgmerge.c:495
+#: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -964,7 +966,7 @@ msgstr ""
 "ra,\n"
 "hoặc nếu nó là « ~ ».\n"
 
-#: src/msgattrib.c:424 src/msgcat.c:393 src/msgcomm.c:384 src/msguniq.c:349
+#: src/msgattrib.c:424 src/msgcat.c:405 src/msgcomm.c:384 src/msguniq.c:349
 #, c-format
 msgid "Message selection:\n"
 msgstr "Chọn thông điệp:\n"
@@ -1019,7 +1021,8 @@ msgstr "Thao tác thuộc tính:\n"
 #: src/msgattrib.c:441
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
-msgstr "      --set-fuzzy             đặt mọi thông điệp là « mờ » (_đặt mờ_)\n"
+msgstr ""
+"      --set-fuzzy             đặt mọi thông điệp là « mờ » (_đặt mờ_)\n"
 
 #: src/msgattrib.c:443
 #, c-format
@@ -1077,16 +1080,16 @@ msgid ""
 msgstr ""
 "      --obsolete              bằng --only-obsolete hay --clear-obsolete\n"
 
-#: src/msgattrib.c:460 src/msgcat.c:405 src/msgcmp.c:237 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:306 src/msgexec.c:271 src/msgfilter.c:438
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:528
+#: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "Cú pháp tập tin nhập:\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:308 src/msgexec.c:273
-#: src/msgfilter.c:440 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
@@ -1094,8 +1097,8 @@ msgstr ""
 "  -P, --properties-input\n"
 "\ttập tin nhập có cú pháp .properties (tài sản) của Java (_tài sản_)\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:310 src/msgexec.c:275
-#: src/msgfilter.c:442 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1105,17 +1108,17 @@ msgstr ""
 "\ttập tin nhập có cú phãp .strings kiểu NeXTstep/GNUstep\n"
 "\t{_bảng chuỗi-nhập_)\n"
 
-#: src/msgattrib.c:467 src/msgcat.c:413 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:313 src/msgfilter.c:445 src/msgfmt.c:740 src/msggrep.c:575
-#: src/msginit.c:386 src/msgmerge.c:536 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:870
+#: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
+#: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
 msgstr "Chi tiết xuất:\n"
 
-#: src/msgattrib.c:469 src/msgcat.c:426 src/msgcomm.c:406 src/msgconv.c:334
-#: src/msgen.c:315 src/msgmerge.c:538 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:872
+#: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
+#: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
@@ -1123,9 +1126,9 @@ msgstr ""
 "  -e, --no-escape\n"
 "\tkhông dùng ký tự thoát C trong kết xuất [mặc định] (_không thoát_)\n"
 
-#: src/msgattrib.c:471 src/msgcat.c:428 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:317 src/msgfilter.c:449 src/msgmerge.c:540 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:874
+#: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
@@ -1133,24 +1136,24 @@ msgstr ""
 "  -E, --escape\n"
 "\tdùng ký tự thoát C trong kết xuất, không có ký tự đã mở rộng (_thoát_)\n"
 
-#: src/msgattrib.c:473 src/msgcat.c:430 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:319 src/msgfilter.c:451 src/msggrep.c:581 src/msgmerge.c:542
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:876
+#: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 "      --force-po     ghi ra tập tin PO thậm chí nếu nó rỗng (_buộc PO_)\n"
 
-#: src/msgattrib.c:475 src/msgcat.c:432 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:878
+#: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 "  -i, --indent                ghi ra tập tin PO bằng kiểu dáng thụt lề "
 "(_thụt lề_)\n"
 
-#: src/msgattrib.c:477 src/msgcat.c:434 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:880
+#: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
@@ -1158,8 +1161,8 @@ msgstr ""
 "\tkhông ghi dòng kiểu « #: tên_tập_tin:số_hiệu_dòng »\n"
 "\t(_không vị trí_)\n"
 
-#: src/msgattrib.c:479 src/msgcat.c:436 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:882
+#: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
@@ -1168,8 +1171,8 @@ msgstr ""
 "\ttạo ra dòng kiểu « #: tên_tập_tin:số_hiệu_dòng » [mặc định]\n"
 "\t(_thêm vị trí_)\n"
 
-#: src/msgattrib.c:481 src/msgcat.c:438 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:884
+#: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1177,18 +1180,18 @@ msgstr ""
 "      --strict         xuất tập tin PO tùy theo Uniforum chính xác\n"
 "\t(_chặt chẽ_)\n"
 
-#: src/msgattrib.c:483 src/msgcat.c:440 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:329 src/msgfilter.c:463 src/msggrep.c:591 src/msginit.c:392
-#: src/msgmerge.c:552 src/msgunfmt.c:497 src/msguniq.c:384
+#: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
+#: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 "  -p, --properties-output\n"
 "\txuất tập tin .properties (tài sản) kiểu Java (_tài sản-xuất_)\n"
 
-#: src/msgattrib.c:485 src/msgcat.c:442 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:331 src/msgfilter.c:465 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:554 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:888
+#: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
@@ -1197,16 +1200,16 @@ msgstr ""
 "\txuất tập tin .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 "\t(_bảng chuỗi-xuất_)\n"
 
-#: src/msgattrib.c:487 src/msgcat.c:444 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:333 src/msgfilter.c:467 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:556 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:890
+#: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=SỐ          đặt độ rộng của trang xuất (_độ rộng_)\n"
 
-#: src/msgattrib.c:489 src/msgcat.c:446 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:335 src/msgfilter.c:469 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:558 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:892
+#: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1215,35 +1218,35 @@ msgstr ""
 "      --no-wrap\t\t_hông ngắt ra nhiều dòng, dòng thông điệp\n"
 "dài hơn độ rộng của trang xuất (_không ngắt_)\n"
 
-#: src/msgattrib.c:492 src/msgcat.c:449 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:338 src/msgfilter.c:472 src/msgmerge.c:561 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:895
+#: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 "  -s, --sort-output           tạo ra kết xuất đã sắp xếp\n"
 "\t(_sắp xếp kết xuất)\n"
 
-#: src/msgattrib.c:494 src/msgcat.c:451 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:340 src/msgfilter.c:474 src/msgmerge.c:563 src/msguniq.c:395
-#: src/xgettext.c:897
+#: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 "  -F, --sort-by-file          sắp xếp kết xuất theo vị trí tập tin\n"
 "\t(_sắp xếp theo tập tin_)\n"
 
-#: src/msgcat.c:313 src/msgcomm.c:314
+#: src/msgcat.c:321 src/msgcomm.c:314
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "tiêu chuẩn lựa chọn không thể được xác định (%d < n < %d)"
 
-#: src/msgcat.c:354 src/msgcomm.c:346 src/xgettext.c:762
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] [TẬP_TIN_NHẬP]...\n"
 
-#: src/msgcat.c:359
+#: src/msgcat.c:371
 #, c-format, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -1268,25 +1271,25 @@ msgstr ""
 "chúng sẽ được lấy từ tập tin PO thứ nhất có định nghĩa chúng.\n"
 "Vị trí tập tin từ mọi tập tin PO sẽ được lũy tích.\n"
 
-#: src/msgcat.c:376 src/msgcomm.c:367 src/xgettext.c:778
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  TẬP_TIN_NHẬP ...           những tập tin nhập\n"
 
-#: src/msgcat.c:378 src/msgcomm.c:369 src/xgettext.c:780
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 "  -f, --files-from=TẬP_TIN\n"
 "\tlấy danh sách các tập tin nhập từ tập tin này (_tập tin từ_)\n"
 
-#: src/msgcat.c:382 src/msgcomm.c:373 src/msgen.c:295 src/msgfmt.c:649
-#: src/xgettext.c:784
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "Tập tin nhập là « - » thì thiết bị nhập chuẩn được đọc.\n"
 
-#: src/msgcat.c:395 src/msgcomm.c:386
+#: src/msgcat.c:407 src/msgcomm.c:386
 #, c-format
 msgid ""
 "  -<, --less-than=NUMBER      print messages with less than this many\n"
@@ -1296,7 +1299,7 @@ msgstr ""
 "\tin ra các thông điệp có ít hơn SỐ lời định nghĩa;\n"
 "\tkhông đặt thì mặc định là vô hạn (_ít hơn_)\n"
 
-#: src/msgcat.c:398
+#: src/msgcat.c:410
 #, c-format
 msgid ""
 "  ->, --more-than=NUMBER      print messages with more than this many\n"
@@ -1306,7 +1309,7 @@ msgstr ""
 "\tin ra các thông điệp có nhiều hơn SỐ lời định nghĩa;\n"
 "\tkhông đặt thì mặc định là 0 (_nhiều hơn_)\n"
 
-#: src/msgcat.c:401 src/msgcomm.c:392
+#: src/msgcat.c:413 src/msgcomm.c:392
 #, c-format
 msgid ""
 "  -u, --unique                shorthand for --less-than=2, requests\n"
@@ -1315,8 +1318,8 @@ msgstr ""
 "  -u, --unique  \ttốc ký cho tùy chọn « --less-than=2 » (ít hơn 2),\n"
 "\tyêu cầu chỉ những thông điệp duy nhất được in (_duy nhất_)\n"
 
-#: src/msgcat.c:407 src/msgcmp.c:239 src/msgcomm.c:398 src/msgfmt.c:714
-#: src/msgmerge.c:530
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
+#: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
@@ -1325,8 +1328,8 @@ msgstr ""
 "\ttập tin nhập có cú pháp kiểu .properties (tài sản) của Java\n"
 "\t(_tài sản-nhập_)\n"
 
-#: src/msgcat.c:409 src/msgcmp.c:241 src/msgcomm.c:400 src/msgfmt.c:716
-#: src/msgmerge.c:532
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
+#: src/msgmerge.c:547
 #, c-format
 msgid ""
 "      --stringtable-input     input files are in NeXTstep/GNUstep .strings\n"
@@ -1336,12 +1339,12 @@ msgstr ""
 "\ttập tin nhập có cú pháp .strings (chuỗi) kiểu NeXTstep/GNUstep\n"
 "\t(_bảng chuỗi-nhập_)\n"
 
-#: src/msgcat.c:415 src/msgconv.c:320 src/msguniq.c:365
+#: src/msgcat.c:427 src/msgconv.c:320 src/msguniq.c:365
 #, c-format
 msgid "  -t, --to-code=NAME          encoding for output\n"
 msgstr "  -t, --to-code=MÃ          \tbộ ký tự cho kết xuất (_đến mã_)\n"
 
-#: src/msgcat.c:417 src/msguniq.c:367
+#: src/msgcat.c:429 src/msguniq.c:367
 #, c-format
 msgid ""
 "      --use-first             use first available translation for each\n"
@@ -1350,7 +1353,13 @@ msgstr ""
 "      --use-first\tdùng bản dịch sẵn sàng thứ nhất cho mỗi thông điệp,\n"
 "\tkhông trộn nhiều bản dịch (_dùng thứ nhất_)\n"
 
-#: src/msgcat.c:420
+#: src/msgcat.c:432 src/msgen.c:327 src/msgmerge.c:553
+#, c-format
+msgid ""
+"      --lang=CATALOGNAME      set 'Language' field in the header entry\n"
+msgstr ""
+
+#: src/msgcat.c:434
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
@@ -1365,7 +1374,7 @@ msgstr ""
 "\t• auto\t\ttự động\n"
 "\t• html\t\tHTML.\n"
 
-#: src/msgcat.c:424
+#: src/msgcat.c:438
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
@@ -1374,26 +1383,26 @@ msgstr ""
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgcmp.c:167 src/msgcomm.c:274 src/msgmerge.c:328
+#: src/msgcmp.c:178 src/msgcomm.c:274 src/msgmerge.c:338
 msgid "Peter Miller"
 msgstr "Peter Miller"
 
-#: src/msgcmp.c:178 src/msgmerge.c:339
+#: src/msgcmp.c:189 src/msgmerge.c:349
 #, c-format
 msgid "no input files given"
 msgstr "chưa đưa ra tập tin nhập"
 
-#: src/msgcmp.c:183 src/msgmerge.c:344
+#: src/msgcmp.c:194 src/msgmerge.c:354
 #, c-format
 msgid "exactly 2 input files required"
 msgstr "cần thiết chính xác 2 tập tin nhập"
 
-#: src/msgcmp.c:202 src/msgmerge.c:453
+#: src/msgcmp.c:213 src/msgmerge.c:468
 #, c-format
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] cũ.po mới.pot\n"
 
-#: src/msgcmp.c:207
+#: src/msgcmp.c:218
 #, c-format, no-wrap
 msgid ""
 "Compare two Uniforum style .po files to check that both contain the same\n"
@@ -1411,22 +1420,22 @@ msgstr ""
 "của bạn. Không tìm được sự khớp chính xác thì khả năng khớp mờ\n"
 "được dùng để cung cấp sự chẩn đoán tốt hơn.\n"
 
-#: src/msgcmp.c:221
+#: src/msgcmp.c:232
 #, c-format
 msgid "  def.po                      translations\n"
 msgstr "  cũ.po                      chuỗi đã dịch\n"
 
-#: src/msgcmp.c:223
+#: src/msgcmp.c:234
 #, c-format
 msgid "  ref.pot                     references to the sources\n"
 msgstr "  mới.pot                   tham chiếu đến nguồn\n"
 
-#: src/msgcmp.c:228 src/msgmerge.c:519
+#: src/msgcmp.c:239 src/msgmerge.c:534
 #, c-format
 msgid "Operation modifiers:\n"
 msgstr "Sửa đổi thao tác:\n"
 
-#: src/msgcmp.c:230 src/msgmerge.c:521
+#: src/msgcmp.c:241 src/msgmerge.c:536
 #, c-format
 msgid ""
 "  -m, --multi-domain          apply ref.pot to each of the domains in def."
@@ -1436,49 +1445,56 @@ msgstr ""
 "\táp dụng tập tin mới.pot vào mỗi miền nằm trong tập tin cũ.po\n"
 "\t(_đa miền_)\n"
 
-#: src/msgcmp.c:232
+#: src/msgcmp.c:243 src/msgmerge.c:538
+#, 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ờ\n"
+"\t(_không có khả năng khớp mờ_)\n"
+
+#: src/msgcmp.c:245
 #, c-format
 msgid "      --use-fuzzy             consider fuzzy entries\n"
 msgstr "      --use-fuzzy             gồm mục nhập mờ (_dùng mờ_)\n"
 
-#: src/msgcmp.c:234
+#: src/msgcmp.c:247
 #, c-format
 msgid "      --use-untranslated      consider untranslated entries\n"
 msgstr ""
 "      --use-untranslated      gồm mục nhập chưa dịch\n"
 "\t(_dùng chưa dịch_)\n"
 
-#: src/msgcmp.c:309
+#: src/msgcmp.c:324
 #, c-format
 msgid "this message is untranslated"
 msgstr "thông điệp này chưa được dùng"
 
-#: src/msgcmp.c:315
+#: src/msgcmp.c:330
 #, c-format
 msgid "this message needs to be reviewed by the translator"
 msgstr "thông điệp này cần phải được xem lại bởi dịch giả"
 
-#: src/msgcmp.c:331 src/msgmerge.c:1234
+#: src/msgcmp.c:369 src/msgmerge.c:1482
 #, c-format
 msgid "this message is used but not defined..."
 msgstr "thông điệp này được dùng còn chưa được xác định..."
 
-#: src/msgcmp.c:334 src/msgmerge.c:1237
+#: src/msgcmp.c:372 src/msgmerge.c:1485
 #, c-format
 msgid "...but this definition is similar"
 msgstr "...nhưng mà lời xác định này là tương tự"
 
-#: src/msgcmp.c:339 src/msgmerge.c:1267
+#: src/msgcmp.c:377 src/msgmerge.c:1513
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "thông điệp này được dùng còn chưa được xác định trong %s"
 
-#: src/msgcmp.c:443
+#: src/msgcmp.c:546
 #, c-format
 msgid "warning: this message is not used"
 msgstr "cảnh báo : thông điệp này không được dùng"
 
-#: src/msgcmp.c:450 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:541
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
@@ -1520,7 +1536,7 @@ msgstr ""
 "\tin các thông điệp chứa nhiều lời xác định hơn số này;\n"
 "\tmặc định là 1 nếu không được đặt (_nhiều hơn_)\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:899
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1543,21 +1559,21 @@ 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 mã ký tự của miền địa phương hiện có.\n"
 
-#: src/msgconv.c:340 src/msgen.c:321 src/msgmerge.c:544
+#: src/msgconv.c:340 src/msgen.c:335 src/msgmerge.c:561
 #, c-format
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                kiểu dáng xuất đã thụt lề (_thụt lề_)\n"
 
-#: src/msgconv.c:342 src/msgen.c:323 src/msgfilter.c:457 src/msggrep.c:585
-#: src/msgmerge.c:546
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
+#: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr ""
 "      --no-location\n"
 "\tthu hồi dòng kiểu « #: tên_tập_tin:số_dòng » (_không vị trí_)\n"
 
-#: src/msgconv.c:344 src/msgen.c:325 src/msgfilter.c:459 src/msggrep.c:587
-#: src/msgmerge.c:548
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
+#: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
@@ -1565,30 +1581,30 @@ msgstr ""
 "      --add-location\n"
 "\tbảo quản dòng kiểu « #: tên_tập_tin:số_dòng » (_thêm vị trí_)\n"
 
-#: src/msgconv.c:346 src/msgen.c:327 src/msgfilter.c:461 src/msggrep.c:589
-#: src/msgmerge.c:550
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
+#: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 "      --strict                xuất dữ liệu kiểu Uniforum chính xác\n"
 "\t(_chặt chẽ_)\n"
 
-#: src/msgen.c:228 src/msgfmt.c:381 src/xgettext.c:580
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "chưa đưa ra tập tin nhập vào"
 
-#: src/msgen.c:233
+#: src/msgen.c:241
 #, c-format
 msgid "exactly one input file required"
 msgstr "cần thiết chính xác một tập tin nhập vào"
 
-#: src/msgen.c:274
+#: src/msgen.c:286
 #, c-format
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] TẬP_TIN_NHẬP\n"
 
-#: src/msgen.c:279
+#: src/msgen.c:291
 #, c-format, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -1601,22 +1617,22 @@ msgstr ""
 "(POT: thường do xgettext tạo). Mục nhập chưa dịch được gán\n"
 "bản dịch trùng với chuỗi gốc (msgid).\n"
 
-#: src/msgen.c:291
+#: src/msgen.c:303
 #, c-format
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  TẬP_TIN_NHẬP               tập tin dạng .po hay .pot nhập vào\n"
 
-#: src/msgexec.c:194
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "thiếu tên lệnh"
 
-#: src/msgexec.c:240
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] LỆNH [TÙY_CHỌN_LÊNH]\n"
 
-#: src/msgexec.c:245
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1631,7 +1647,7 @@ msgstr ""
 "Kết xuất của nó trở thành kết xuất của tiến trình msgexec.\n"
 "Mã trả lại của megexec là mã trả lại tối đa qua mọi cuộc gọi.\n"
 
-#: src/msgexec.c:254
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1641,44 +1657,44 @@ msgstr ""
 "với một byte vô giá trị theo sau. Kết xuất của tiến trình msgexec\n"
 "là thích hợp là kết nhập vào « xargs -0 ».\n"
 
-#: src/msgexec.c:264 src/msgfilter.c:408
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr ""
 "  -i, --input=TẬP_TIN_NHẬP       tập tin dạng .po nhập vào\n"
 "\t(_tập tin nhập vào_)\n"
 
-#: src/msgexec.c:328
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "lỗi ghi vào thiết bị xuất chuẩn"
 
-#: src/msgexec.c:355 src/msgfilter.c:664
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "lỗi ghi vào tiến trình phụ %s"
 
-#: src/msgfilter.c:296
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
 msgstr "thiếu tên bộ lọc"
 
-#: src/msgfilter.c:320
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "phải xác định ít nhất một văn lệnh sed"
 
-#: src/msgfilter.c:395
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] BỘ_LỌC [TÙY_CHỌN_LỌC]\n"
 
-#: src/msgfilter.c:399
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "Áp dụng bộ lọc vào mọi chuỗi dịch của phân loại thông dịch.\n"
 
-#: src/msgfilter.c:423
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1687,12 +1703,12 @@ msgstr ""
 "BỘ LỌC là bất cứ chương trình nào đọc chuỗi dịch từ thiết bị nhập chuẩn\n"
 "và ghi chuỗi dịch đã sửa đổi vào thiết bị xuất chuẩn.\n"
 
-#: src/msgfilter.c:428
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "Tùy chọn lọc hữu ích khi BỘ LỌC là « sed »:\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
@@ -1700,7 +1716,7 @@ msgstr ""
 "  -e, --expression=VĂN_LỆNH\n"
 "\tthêm văn lệnh này vào những lệnh cần thực hiện (_biểu thức_)\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1711,14 +1727,14 @@ msgstr ""
 "\tthêm nội dung của tập tin văn lệnh này vào những lệnh cần thực hiện\n"
 "\t(_tập tin văn lệnh_)\n"
 
-#: src/msgfilter.c:435
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 "  -n, --quiet, --silent       thu hồi khả năng tự động in miền mẫu (_im_)\n"
 
-#: src/msgfilter.c:447 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
@@ -1727,12 +1743,12 @@ msgstr ""
 "\tkhông dùng ký tự thoát C trong kết xuất [mặc định]\n"
 "\t(_không thoát_)\n"
 
-#: src/msgfilter.c:453 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                kiểu dáng xuất đã thụt lề (_thụt lề_)\n"
 
-#: src/msgfilter.c:455
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
@@ -1740,98 +1756,80 @@ msgstr ""
 "      --keep-header       giữ phần đầu không được sửa đổi, không lọc nó\n"
 "\t(_giữ phần đầu_)\n"
 
-#: src/msgfilter.c:587
-#, c-format
-msgid "Not yet implemented."
-msgstr "Chưa thực hiện."
-
-#: src/msgfilter.c:616
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "không thể thiết lập VR không chặn tới tiến trình phụ %s"
-
-#: src/msgfilter.c:644
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "lỗi liên lạc với tiến trình phụ %s"
-
-#: src/msgfilter.c:695
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "lỗi đọc từ tiến trình phụ %s"
-
-#: src/msgfilter.c:711
-#, 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"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "đối số tới %s nên là một ký tự chấm câu riêng lẻ"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "tình trạng cuối không hợp lệ: %s"
 
 # Name: don't translate / Tên: đừng dịch
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:536
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s cần thiết đặc tả « -d directory » (thư mục)"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s cần thiết đặc tả « -l locale » (miền địa phương)"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s chỉ hợp lệ với %s hay %s"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s chỉ hợp lệ với %s, %s hay %s"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d thông điệp đã dịch"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d bản dịch mờ"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d thông điệp chưa dịch"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] tên_tập_tin.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 "Tạo ra phân loại thông điệp nhị phân từ mô tả thông dịch kiểu văn bản.\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:771
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1840,17 +1838,17 @@ msgstr ""
 "Tất cả đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn ngắn.\n"
 "Cũng vậy với đối số kiểu tùy chọn.\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  tên_tập_tin.po ...         những tập tin nhập vào\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:485 src/msgunfmt.c:426 src/xgettext.c:819
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr "Chế độ thao tác:\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
@@ -1858,7 +1856,7 @@ msgid ""
 msgstr ""
 "  -j, --java           chế độ Java: tạo ra hạng ResourceBundle kiểu Java\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1867,13 +1865,13 @@ msgstr ""
 "      --java2           giống như --java, cũng giả sử Java2 (JDK 1.2 hay "
 "sau)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 "      --csharp                chế độ C#: tạo ra một tập tin .dll kiểu .NET\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
@@ -1882,41 +1880,41 @@ msgstr ""
 "      --csharp-resources\n"
 "\tchế độ tài sản C#: tạo ra một tập tin .resources kiểu .NET\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 "      --tcl             chế độ Tcl: tạo ra một tập tin .msg kiểu tcl/msgcat\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 "      --qt                    chế độ Qt: tạo ra một tập tin .qm kiểu Qt\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 "      --strict                bật chế độ Uniforum chính xác (_chặt chẽ_)\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:795
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "Tập tin xuất là - thì kết xuất được ghi vào thiết bị xuất chuẩn.\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Java:\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=TÀI_SẢN     tên tài sản (_tài sản_)\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1927,13 +1925,13 @@ msgstr ""
 "\ttên miền địa phương, hoặc ngôn ngữ hoặc ngôn ngữ_quốc gia\n"
 "\t(v.d. hoặc « vi » hay « vi_VN »)\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d THƯ_MỤC                thư mục cơ sở của phân cấp thư mục hạng\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1945,12 +1943,12 @@ msgstr ""
 "vào tên tài sản, định giới bằng dấu gạch dưới. Tùy chọn « -d » bắt buộc\n"
 "phải sử dụng. Hạng được ghi dưới thư mục đã xác định.\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ C#:\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
@@ -1959,7 +1957,7 @@ msgstr ""
 "  -d THƯ_MỤC\t\tthư mục cơ sở cho tập tin dạng .dll\n"
 "\tphụ thuộc vào miền địa phương\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1969,19 +1967,19 @@ msgstr ""
 "Tập tin .dll được ghi trong thư mục con của thư mục đã xác định\n"
 "có tên phụ thuộc vào miền địa phương.\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "Vị trí của tập tin xuất trong chế độ Tcl:\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 "  -d THƯ_MỤC\n"
 "\t thư mục cơ sở của phân loại thông điệp dạng .msg\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
@@ -1990,12 +1988,12 @@ msgstr ""
 "Hai tùy chọn « -l » và « -d » bắt buộc phải sử dụng.\n"
 "Tập tin dạng .msg được ghi trong thư mục đã xác định.\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:811
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "Giải thích tập tin nhập vào:\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -2007,7 +2005,7 @@ msgstr ""
 "\t--check-header (kiểm tra phần đầu),\n"
 "\t--check-domain (kiểm tra miền).\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
@@ -2015,7 +2013,7 @@ msgstr ""
 "\tkiểm tra các chuỗi có định dạng phụ thuộc vào ngôn ngữ\n"
 "\t(_kiểm tra định dạng_)\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
@@ -2024,7 +2022,7 @@ msgstr ""
 "      --check-header          kiểm tra có mục nhập phần đầu đúng\n"
 "\t(_kiểm tra phần đầu_)\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -2034,7 +2032,7 @@ msgstr ""
 "\tvà tùy chọn « --output-file » (tập tin xuất)\n"
 "\t(_kiểm tra miền_)\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -2043,7 +2041,7 @@ msgstr ""
 "  -C, --check-compatibility    kiểm tra msgfmt của GNU ứng xử\n"
 "\tgiống như msgfmt của X/Open (_kiểm tra tính tương thích_)\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -2054,22 +2052,22 @@ msgstr ""
 "\tkiểm tra có ký tự tâng tốc bàn phím cho mục trình đơn\n"
 "\t(_kiểm tra bộ tăng tốc_)\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 "  -f, --use-fuzzy             dùng mục nhập mờ trong kết xuất (_dùng mờ_)\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
-"  -a, --alignment=SỐ     chỉnh canh các chuỗi theo số byte này (mặc định: %"
-"d)\n"
+"  -a, --alignment=SỐ     chỉnh canh các chuỗi theo số byte này (mặc định: "
+"%d)\n"
 "\t(_chỉnh canh_)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
@@ -2077,75 +2075,75 @@ msgstr ""
 "      --no-hash               tập tin nhị phân sẽ không chứa bảng băm\n"
 "\t(_không băm_)\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 "      --statistics            in ra thống kê về các chuỗi dịch (_thống kê_)\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:572 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               tăng cấp xuất thông tin (_chi tiết_)\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "cảnh báo : phần đầu của tập tin .po còn thiếu hay không hợp lệ\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "cảnh báo : việc chuyển đổi bộ ký tự sẽ không hoạt động được\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "cảnh báo : phần đầu tập tin PO còn mờ\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 "cảnh báo : phiên bản msgfmt cũ hơn sẽ thông báo lỗi trong trường hợp này.\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "tên miền « %s » không thích hợp làm tên tập tin"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "tên miền « %s » không thích hợp làm tên tập tin nên dùng tiền tố"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "chỉ thị « domain %s » bị bỏ qua"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "mục nhập « msgstr » rỗng bị bỏ qua"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "mục nhập « msgstr » mờ bị bỏ qua"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: cảnh báo : tập tin nguồn chứa chuỗi dịch mờ"
 
-#: src/msggrep.c:255 src/po-lex.c:658 src/read-mo.c:86
-#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:140
-#: src/x-c.c:455 src/x-csharp.c:164 src/x-elisp.c:146 src/x-glade.c:604
-#: src/x-java.c:182 src/x-librep.c:148 src/x-lisp.c:213 src/x-perl.c:226
-#: src/x-perl.c:301 src/x-perl.c:394 src/x-php.c:164 src/x-python.c:175
-#: src/x-rst.c:234 src/x-scheme.c:172 src/x-sh.c:156 src/x-smalltalk.c:92
-#: src/x-tcl.c:151 src/x-ycp.c:92
+#: src/msggrep.c:255 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:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
+#: 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-ycp.c:91
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "gặp lỗi khi đọc « %s »"
@@ -2156,8 +2154,8 @@ msgid ""
 "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been "
 "specified"
 msgstr ""
-"tùy chọn « %c » không thể được dùng trước khi xác định « J » hay « K » hay « T » "
-"hay « C » hay « X »"
+"tùy chọn « %c » không thể được dùng trước khi xác định « J » hay « K » hay « "
+"T » hay « C » hay « X »"
 
 #: src/msggrep.c:504
 #, c-format, no-wrap
@@ -2383,14 +2381,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 xác định tập tin .pot nhập vào, bằng tùy chọn « --input » (nhập vào)\n"
 
-#: src/msginit.c:860 src/msginit.c:935 src/msginit.c:1095 src/msginit.c:1190
-#: src/read-csharp.c:82 src/read-java.c:80 src/read-resources.c:83
-#: src/read-tcl.c:126 src/write-resources.c:103
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
+#: 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 phụ %s bị lỗi với mã thoát %d"
 
-#: src/msginit.c:1060
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2405,28 +2403,28 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1465
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
 msgstr "Bản dịch tiếng Việt cho gói %s"
 
-#: src/msgl-cat.c:176 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "bộ ký tự hiện có « %s » không phải tên bộ ký tự di động"
 
-#: src/msgl-cat.c:187 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "tập tin nhập vào chứa hai bộ ký tự khác nhau « %s » và « %s »"
 
-#: src/msgl-cat.c:202
+#: src/msgl-cat.c:203
 #, c-format
 msgid ""
 "input file `%s' doesn't contain a header entry with a charset specification"
 msgstr "tập tin nhập vào « %s » không chứa mục nhập phần đầu xác định bộ ký tư"
 
-#: src/msgl-cat.c:206
+#: src/msgl-cat.c:207
 #, c-format
 msgid ""
 "domain \"%s\" in input file `%s' doesn't contain a header entry with a "
@@ -2435,19 +2433,19 @@ msgstr ""
 "miền « %s » trong tập tin nhập vào « %s » không chứa mục nhập phần đầu xác "
 "định bộ ký tư"
 
-#: src/msgl-cat.c:388 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "bộ ký tự đích « %s » không phải tên bảng mã di động."
 
-#: src/msgl-cat.c:439 src/msgl-cat.c:445 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2827
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr "cảnh báo : "
 
-#: src/msgl-cat.c:440
+#: src/msgl-cat.c:443
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, UTF-8 among others.\n"
@@ -2456,7 +2454,7 @@ msgstr ""
 "Những tập tin nhập chứa thông điệp bằng mã ký tự khác nhau, gồm UTF-8,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
 
-#: src/msgl-cat.c:446
+#: src/msgl-cat.c:449
 #, c-format
 msgid ""
 "Input files contain messages in different encodings, %s and %s among "
@@ -2464,12 +2462,12 @@ msgid ""
 "Converting the output to UTF-8.\n"
 "To select a different output encoding, use the --to-code option.\n"
 msgstr ""
-"Những tập tin nhập vào chứa thông điệp bằng mã ký tự khác nhau, gồm %s và %"
-"s,\n"
+"Những tập tin nhập vào chứa thông điệp bằng mã ký tự khác nhau, gồm %s và "
+"%s,\n"
 "nên chuyển đổi kết xuất sang UTF-8.\n"
 "Để chọn mã ký tự xuất khác, hãy dùng tùy chọn « --to-code » (sang mã).\n"
 
-#: src/msgl-cat.c:485
+#: src/msgl-cat.c:488
 #, c-format
 msgid ""
 "Conversion of file %s from %s encoding to %s encoding\n"
@@ -2483,7 +2481,7 @@ msgstr ""
 "sang mã ký tự ASCII, hoặc đảm bảo chúng được mã hoá bằng UTF-8 từ đầu,\n"
 "tức là trong các tập tin mã nguồn.\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2496,12 +2494,12 @@ msgstr ""
 "Kết xuất của « %s » có thể không đúng.\n"
 "Chỉnh sửa có thể:\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "• Đặt LC_ALL thành miền địa phương có mã ký tự %s.\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2512,7 +2510,7 @@ msgstr ""
 "  rồi áp dụng « %s »,\n"
 "  rồi chuyển đổi lại về %s bằng « msgconv ».\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2525,7 +2523,7 @@ msgstr ""
 "  rồi áp dụng « %s »,\n"
 "  rồi chuyển đổi lại về %s bằng « msgconv ».\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2536,24 +2534,24 @@ msgstr ""
 "Kết xuất của « %s » có thể không đúng.\n"
 "Chỉnh sửa có thể là lập « LC_ALL=C »\n"
 
-#: src/msgl-check.c:93
+#: src/msgl-check.c:130
 msgid "plural expression can produce negative values"
 msgstr "biểu thức số nhiều có thể cung cấp giá trị âm"
 
-#: src/msgl-check.c:103
+#: src/msgl-check.c:141
 #, c-format
 msgid "nplurals = %lu but plural expression can produce values as large as %lu"
 msgstr "« nplurals = %lu » nhưng biểu thức số nhiều có thể tạo giá trị đến %lu"
 
-#: src/msgl-check.c:147
+#: src/msgl-check.c:187
 msgid "plural expression can produce division by zero"
 msgstr "biểu thức số nhiều có thể gây ra trường hợp chia cho số không"
 
-#: src/msgl-check.c:152
+#: src/msgl-check.c:192
 msgid "plural expression can produce integer overflow"
 msgstr "biểu thức số nhiều có thể gây ra trường hợp tràn số nguyên"
 
-#: src/msgl-check.c:157
+#: src/msgl-check.c:197
 msgid ""
 "plural expression can produce arithmetic exceptions, possibly division by "
 "zero"
@@ -2561,54 +2559,54 @@ msgstr ""
 "biểu thức số nhiều có thể gây ra trường hợp ngoại lệ tính toán, có lẽ chia "
 "cho số không"
 
-#: src/msgl-check.c:189
+#: src/msgl-check.c:266
 #, c-format
 msgid "Try using the following, valid for %s:"
 msgstr "Hãy thử dùng điều theo đây mà hợp lệ cho %s:"
 
-#: src/msgl-check.c:276 src/msgl-check.c:300
+#: src/msgl-check.c:352 src/msgl-check.c:376
 msgid "message catalog has plural form translations"
 msgstr "phân loại thông điệp chứa bản dịch dạng số nhiều"
 
-#: src/msgl-check.c:278
+#: src/msgl-check.c:354
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 "nhưng mà mục nhập phần đầu tập tin còn thiếu thuộc tính số nhiều « "
 "plural=BIỂU_THỨC »"
 
-#: src/msgl-check.c:302
+#: src/msgl-check.c:378
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 "nhưng mà mục nhập phần đầu tập tin còn thiếu thuộc tính số nhiều « "
 "plural=SỐ_NGUYÊN »"
 
-#: src/msgl-check.c:338
+#: src/msgl-check.c:414
 msgid "invalid nplurals value"
 msgstr "giá trị nplurals (số cách ở số nhiều) không hợp lệ"
 
-#: src/msgl-check.c:360
+#: src/msgl-check.c:436
 msgid "invalid plural expression"
 msgstr "biểu thức số nhiều không hợp lệ"
 
 # Literal: don't translate / Nghĩa chữ: đừng dịch
-#: src/msgl-check.c:390 src/msgl-check.c:406
+#: src/msgl-check.c:466 src/msgl-check.c:482
 #, c-format
 msgid "nplurals = %lu"
 msgstr "nplurals = %lu"
 
-#: src/msgl-check.c:392
+#: src/msgl-check.c:468
 #, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "nhưng một số thông điệp có chỉ %lu hình thái ở số nhiều"
 
-#: src/msgl-check.c:408
+#: src/msgl-check.c:484
 #, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "nhưng một số thông điệp có %lu hình thái ở số nhiều"
 
-#: src/msgl-check.c:432
+#: src/msgl-check.c:508
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
@@ -2619,105 +2617,106 @@ msgstr ""
 "Dòng ở số nhiều đúng cho tiếng Việt:\n"
 "\"Plural-Forms: nplurals=1; plural=0;\""
 
-#: src/msgl-check.c:526
+#: src/msgl-check.c:602
 msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
 msgstr ""
 "cả hai mục nhập « msgid » và « msgid_plural » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:534
+#: src/msgl-check.c:610
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
-msgstr "cả hai mục nhập « msgid» và « msgstr[%u] » đều không bắt đầu với « \\n »"
+msgstr ""
+"cả hai mục nhập « msgid» và « msgstr[%u] » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:549
+#: src/msgl-check.c:625
 msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
 msgstr "cả hai mục nhập « msgid » và « msgstr » đều không bắt đầu với « \\n »"
 
-#: src/msgl-check.c:567
+#: src/msgl-check.c:643
 msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
 msgstr ""
 "cả hai mục nhập « msgid » và « msgid_plural » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:575
+#: src/msgl-check.c:651
 #, c-format
 msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
 msgstr ""
 "cả hai mục nhập « msgid » và « msgstr[%u] » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:590
+#: src/msgl-check.c:666
 msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
 msgstr "cả hai mục nhập « msgid » và « msgstr » đều không kết thúc với « \\n »"
 
-#: src/msgl-check.c:602
+#: src/msgl-check.c:678
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 "khả năng thao tác cách ở số nhiều là phần mở rộng của phần mềm gettext của "
 "GNU"
 
-#: src/msgl-check.c:645
+#: src/msgl-check.c:720
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr "chuỗi gốc msgstr còn thiếu ký tự phím tắt « %c »"
 
-#: src/msgl-check.c:655
+#: src/msgl-check.c:730
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr "chuỗi gốc msgstr có quá nhiều ký tự phím tắt « %c »"
 
-#: src/msgl-check.c:695
-#, c-format
-msgid "headerfield `%s' missing in header\n"
+#: src/msgl-check.c:776
+#, fuzzy, c-format
+msgid "header field `%s' missing in header\n"
 msgstr "trường đầu tập tin « %s » còn thiếu trong phần đầu\n"
 
-#: src/msgl-check.c:703
+#: src/msgl-check.c:784
 #, c-format
 msgid "header field `%s' should start at beginning of line\n"
 msgstr "trường đầu tập tin « %s » nên bắt đầu tại đầu dòng\n"
 
-#: src/msgl-check.c:717
+#: src/msgl-check.c:809
 msgid "some header fields still have the initial default value\n"
 msgstr "một số trường đầu tập tin vẫn còn chứa giá tri mặc định ban đầu\n"
 
-#: src/msgl-check.c:730
-#, c-format
-msgid "field `%s' still has initial default value\n"
-msgstr "trường « %s » vẫn còn chứa giá tri mặc định ban đầu\n"
+#: src/msgl-check.c:826
+#, fuzzy, c-format
+msgid "header field `%s' still has the initial default value\n"
+msgstr "một số trường đầu tập tin vẫn còn chứa giá tri mặc định ban đầu\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s: kết nhập vào không phải hợp lệ trong mã ký tự « %s »"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s: gặp lỗi khi chuyển đổi từ mã ký tự « %s » sang mã ký tự « %s »"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "tập tin nhập vào không chứa mục nhập phần đầu xác định bộ ký tự"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:617 src/xgettext.c:638
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr ""
-"Không thể chuyển đổi từ « %s » sang « %s ». %s phụ thuộc vào iconv() mà không "
-"hỗ trợ khả năng chuyển đổi này."
+"Không thể chuyển đổi từ « %s » sang « %s ». %s phụ thuộc vào iconv() mà "
+"không hỗ trợ khả năng chuyển đổi này."
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr ""
-"Việc chuyển đổi từ « %s » sang « %s » giới thiệu một số bản sao : một số chuỗi "
-"gốc « msgid » thì trở thành trùng."
+"Việc chuyển đổi từ « %s » sang « %s » giới thiệu một số bản sao : một số "
+"chuỗi gốc « msgid » thì trở thành trùng."
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:624
-#: src/xgettext.c:645
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2726,16 +2725,16 @@ 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:361 src/msgmerge.c:367
+#: src/msgmerge.c:371 src/msgmerge.c:377
 #, c-format
 msgid "%s is only valid with %s"
 msgstr "%s chỉ hợp lệ với %s"
 
-#: src/msgmerge.c:421
+#: src/msgmerge.c:436
 msgid "backup type"
 msgstr "kiểu sao lưu"
 
-#: src/msgmerge.c:458
+#: src/msgmerge.c:473
 #, c-format, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -2759,17 +2758,17 @@ 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:475
+#: src/msgmerge.c:490
 #, 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:477
+#: src/msgmerge.c:492
 #, 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:481
+#: src/msgmerge.c:496
 #, c-format
 msgid ""
 "  -C, --compendium=FILE       additional library of message translations,\n"
@@ -2779,7 +2778,7 @@ msgstr ""
 "\ttập hợp chuỗi dịch thêm, cũng có thể được xác định nhiều lần\n"
 "\t(_bản trích yếu_)\n"
 
-#: src/msgmerge.c:487
+#: src/msgmerge.c:502
 #, c-format
 msgid ""
 "  -U, --update                update def.po,\n"
@@ -2788,29 +2787,29 @@ msgstr ""
 "  -U, --update\tcập nhật tập tin cũ.po ; không làm gì\n"
 "\tnếu nó là hiện thời (_cập nhật_)\n"
 
-#: src/msgmerge.c:499
+#: src/msgmerge.c:514
 #, 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:501
+#: src/msgmerge.c:516
 #, 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:503
+#: src/msgmerge.c:518
 #, 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:505
+#: src/msgmerge.c:520
 #, c-format
 msgid "      --suffix=SUFFIX         override the usual backup suffix\n"
 msgstr ""
 "      --suffix=HẬU_TỐ\n"
 "\tcó quyền cao hơn hậu tố sao lưu bình thường (_hậu tố_)\n"
 
-#: src/msgmerge.c:507
+#: src/msgmerge.c:522
 #, c-format
 msgid ""
 "The version control method may be selected via the --backup option or "
@@ -2833,25 +2832,19 @@ msgstr ""
 "  simple, never\tluôn luôn tạo bản sao lưu đơn giản\n"
 "\t(_đơn giản, không bao giờ_)\n"
 
-#: src/msgmerge.c:514
+#: src/msgmerge.c:529
 #, c-format
 msgid ""
 "The backup suffix is `~', unless set with --suffix or the "
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
-"Hậu tố sao lưu là « ~ » trừ khi được lập bằng tùy chọn « --suffix » (hậu tố)\n"
+"Hậu tố sao lưu là « ~ » trừ khi được lập 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:523
-#, 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ờ\n"
-"\t(_không có khả năng khớp mờ_)\n"
-
-#: src/msgmerge.c:525
+#: src/msgmerge.c:540
 #, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
@@ -2859,22 +2852,22 @@ msgstr ""
 "      --previous\tgiữ lại các chuỗi gốc msgid cũ của chuỗi đã dịch "
 "(_trước_)\n"
 
-#: src/msgmerge.c:574
+#: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
 msgid "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr "  -q, --quiet, --silent       thu hồi cái chỉ tiến hành (_im_)\n"
 
-#: src/msgmerge.c:1340
+#: src/msgmerge.c:1586
 #, c-format
 msgid "this message should define plural forms"
 msgstr "thông điệp này nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:1363
+#: src/msgmerge.c:1609
 #, c-format
 msgid "this message should not define plural forms"
 msgstr "thông điệp này không nên xác định cách ở số nhiều"
 
-#: src/msgmerge.c:1701
+#: src/msgmerge.c:2012
 #, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -2882,7 +2875,9 @@ msgid ""
 msgstr ""
 "%sĐọc %ld cũ + %ld tham chiếu, trộn %ld, làm mờ %ld, thiếu %ld, cũ %ld.\n"
 
-#: src/msgmerge.c:1709
+#: src/msgmerge.c:2020 src/urlget.c:305 src/urlget.c:351 src/urlget.c:393
+#: src/urlget.c:435
+#, c-format
 msgid " done.\n"
 msgstr " hoàn tất.\n"
 
@@ -3031,7 +3026,7 @@ msgstr ""
 "  -u, --unique\n"
 "\tin ra chỉ thông điệp duy nhất, hủy các bản sao (_duy nhất_)\n"
 
-#: src/open-catalog.c:55 libgettextpo/gettext-po.c:102
+#: src/open-catalog.c:56 libgettextpo/gettext-po.c:102
 #: libgettextpo/gettext-po.c:150 libgettextpo/gettext-po.c:198
 msgid "<stdin>"
 msgstr "<thiết_bị_nhập_chuẩn>"
@@ -3119,65 +3114,65 @@ msgstr "cách ở số nhiều thứ nhất có số mũ khác số không"
 msgid "plural form has wrong index"
 msgstr "cách ở số nhiều có số mũ không đúng"
 
-#: src/po-lex.c:91 src/po-lex.c:110
+#: src/po-lex.c:90 src/po-lex.c:109
 #, c-format
 msgid "too many errors, aborting"
 msgstr "quá nhiều lỗi nên hủy bỏ"
 
-#: src/po-lex.c:438 src/po-lex.c:508 src/write-po.c:707 src/write-po.c:832
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "dây đa byte không hợp lệ"
 
-#: src/po-lex.c:466
+#: src/po-lex.c:465
 #, c-format
 msgid "incomplete multibyte sequence at end of file"
 msgstr "dây đa byte chưa hoàn thành tại kết thúc tập tin"
 
-#: src/po-lex.c:476
+#: src/po-lex.c:475
 #, c-format
 msgid "incomplete multibyte sequence at end of line"
 msgstr "dây đa byte chưa hoàn thành tại kết thúc dòng"
 
-#: src/po-lex.c:488
+#: src/po-lex.c:487
 msgid "iconv failure"
 msgstr "lỗi iconv"
 
-#: src/po-lex.c:745
+#: src/po-lex.c:744
 #, c-format
 msgid "keyword \"%s\" unknown"
 msgstr "không biết từ khóa « %s »"
 
-#: src/po-lex.c:855
+#: src/po-lex.c:854
 #, c-format
 msgid "invalid control sequence"
 msgstr "dây điều khiển không hợp lệ"
 
-#: src/po-lex.c:982
+#: src/po-lex.c:981
 #, c-format
 msgid "end-of-file within string"
 msgstr "kết thúc tập tin bên trong chuỗi"
 
-#: src/po-lex.c:988
+#: src/po-lex.c:987
 #, c-format
 msgid "end-of-line within string"
 msgstr "kết thúc dòng bên trong chuỗi"
 
-#: src/po-lex.c:1009
+#: src/po-lex.c:1008
 #, c-format
 msgid "context separator <EOT> within string"
 msgstr "gặp dấu định giới ngữ cảnh <EOT> bên trong chuỗi"
 
-#: src/read-catalog.c:327 src/xgettext.c:939
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "tập tin này có thể không chứa chỉ thị miền"
 
-#: src/read-catalog.c:372
+#: src/read-catalog.c:377
 msgid "duplicate message definition"
 msgstr "lời xác định thông điệp trùng"
 
-#: src/read-catalog.c:374
+#: src/read-catalog.c:379
 msgid "this is the location of the first definition"
 msgstr "đây là vị trí của lời xác định thứ nhất"
 
@@ -3265,17 +3260,17 @@ msgstr "kết nhập vào không hợp lệ theo mã ký tự « %s »"
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "gặp lỗi khi chuyển đổi từ mã ký tự « %s » sang mã ký tự « %s »"
 
-#: src/urlget.c:146
+#: src/urlget.c:159
 #, c-format
 msgid "expected two arguments"
 msgstr "mong đợi hai đối số"
 
-#: src/urlget.c:163
+#: src/urlget.c:176
 #, c-format
 msgid "Usage: %s [OPTION] URL FILE\n"
 msgstr "Cách sử dụng: %s [TÙY_CHỌN] URL TẬP_TIN\n"
 
-#: src/urlget.c:168
+#: src/urlget.c:181
 #, c-format, no-wrap
 msgid ""
 "Fetches and outputs the contents of an URL.  If the URL cannot be accessed,\n"
@@ -3284,11 +3279,26 @@ 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"
 
-#: src/urlget.c:219
+#: src/urlget.c:234
 #, c-format
 msgid "error writing stdout"
 msgstr "gặp lỗi khi ghi vào thiết bị xuất chuẩn"
 
+#: src/urlget.c:264
+#, c-format
+msgid "Retrieving %s..."
+msgstr ""
+
+#: src/urlget.c:307
+#, c-format
+msgid " timed out.\n"
+msgstr ""
+
+#: src/urlget.c:443
+#, c-format
+msgid " failed.\n"
+msgstr ""
+
 #: src/write-catalog.c:126
 msgid ""
 "Cannot output multiple translation domains into a single file with the "
@@ -3331,12 +3341,12 @@ msgstr ""
 "phân loại thông điệp chứa bản dịch cách ở số nhiều, mà định dạng xuất không "
 "hỗ trợ."
 
-#: src/write-catalog.c:229 src/write-catalog.c:273
+#: src/write-catalog.c:231 src/write-catalog.c:275
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "không thể tạo tập tin xuất « %s »"
 
-#: src/write-catalog.c:237 src/write-catalog.c:281
+#: src/write-catalog.c:239 src/write-catalog.c:283
 msgid "standard output"
 msgstr "thiết bị xuất chuẩn"
 
@@ -3377,13 +3387,13 @@ msgstr "lỗi biên dịch hạng 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:766
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "thông điệp đã quốc tế hóa không nên chứa dây thoát « \\%c »"
 
-#: src/write-po.c:1212 src/write-po.c:1341
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3396,7 +3406,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:1224 src/write-po.c:1353
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3420,8 +3430,8 @@ msgstr ""
 
 #: src/write-qt.c:693
 msgid ""
-"message catalog has msgctxt strings containing characters outside ISO-8859-"
-"1\n"
+"message catalog has msgctxt strings containing characters outside "
+"ISO-8859-1\n"
 "but the Qt message catalog format supports Unicode only in the translated\n"
 "strings, not in the context strings\n"
 msgstr ""
@@ -3446,7 +3456,7 @@ msgstr ""
 msgid "error while writing to %s subprocess"
 msgstr "gặp lỗi khi ghi vào tiến trình phụ %s"
 
-#: src/write-resources.c:130
+#: src/write-resources.c:131
 msgid ""
 "message catalog has context dependent translations\n"
 "but the C# .resources format doesn't support contexts\n"
@@ -3455,7 +3465,7 @@ msgstr ""
 "vào ngữ cảnh, còn định dạng .resources (tài nguyên)\n"
 "kiểu C# không hỗ trợ khả năng ngữ cảnh.\n"
 
-#: src/write-resources.c:149
+#: src/write-resources.c:150
 msgid ""
 "message catalog has plural form translations\n"
 "but the C# .resources format doesn't support plural handling\n"
@@ -3482,36 +3492,34 @@ msgstr ""
 "còn định dạng kiểu Tcl không hỗ trợ khả năng thao tác\n"
 "cách ở số nhiều.\n"
 
-#: src/x-awk.c:342 src/x-python.c:1059
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: cảnh báo : chuỗi chưa được kết thúc"
 
-#: src/x-awk.c:593
+#: src/x-awk.c:592
 #, c-format
 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:1194 src/x-csharp.c:1506 src/x-java.c:869
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, 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:1218
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: cảnh báo : bộ nghĩa chữ kiểu chuỗi chưa được kết thúc"
 
-#: src/x-csharp.c:221 src/xgettext.c:1889
-#, c-format
-msgid ""
-"Non-ASCII string at %s%s.\n"
-"Please specify the source encoding through --from-code.\n"
+#: src/x-csharp.c:224 src/xgettext.c:1962
+#, fuzzy
+msgid "Please specify the source encoding through --from-code."
 msgstr ""
 "Gặp chuỗi khác ASCII tại %s%s.\n"
 "Hãy xác định mã ký tự nguồn bằng tùy chọn « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:268
+#: src/x-csharp.c:269
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3520,7 +3528,7 @@ msgstr ""
 "%s:%d: dây đa byte không hợp lệ.\n"
 "Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:284
+#: src/x-csharp.c:285
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3529,7 +3537,7 @@ msgstr ""
 "%s:%d: dây đa byte dài chưa hoàn thành.\n"
 "Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:296
+#: src/x-csharp.c:297
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3538,7 +3546,7 @@ msgstr ""
 "%s:%d: dây đa byte chưa hoàn thành ở kết thúc tập tin.\n"
 "Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:305
+#: src/x-csharp.c:306
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3547,12 +3555,12 @@ msgstr ""
 "%s:%d: dây đa byte chưa hoàn thành ở kết thúc dòng.\n"
 "Hãy xác định mã ký tự nguồn đúng bằng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:314 src/x-python.c:331
+#: src/x-csharp.c:315 src/x-python.c:332
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr "%s:%d: lỗi iconv"
 
-#: src/x-csharp.c:337
+#: src/x-csharp.c:338
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3561,24 +3569,24 @@ msgstr ""
 "%s:%d: dây đa byte không hợp lệ.\n"
 "Hãy xác định mã ký tự nguồn dùng « --from-code » (từ mã).\n"
 
-#: src/x-csharp.c:1387 src/x-python.c:1266
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: cảnh báo : ký tự Unicode không hợp lệ"
 
-#: src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-csharp.c:1512 src/x-java.c:875
 #, c-format
 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:2013 src/x-java.c:1366
+#: src/x-csharp.c:2020 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 mong đợi dấu ngoặc móc đóng "
 "« } »"
 
-#: src/x-csharp.c:2047 src/x-java.c:1400
+#: src/x-csharp.c:2054 src/x-java.c:1403
 #, c-format
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
@@ -3586,12 +3594,12 @@ msgstr ""
 "« ) »"
 
 # Variable: do not translate/ biến: đừng dịch
-#: src/x-glade.c:611 src/x-glade.c:618
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu: %s"
 
-#: src/x-glade.c:645
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3600,12 +3608,12 @@ 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"
 
-#: src/x-java.c:492
+#: src/x-java.c:494
 #, c-format
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: cảnh báo : chỉ một đồ thay thế U+%04X"
 
-#: src/x-perl.c:307
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr ""
@@ -3613,40 +3621,39 @@ msgstr ""
 "thúc tập tin"
 
 # HEXNUMBER is a variable: do not translate/ HEXNUMBER là một biến: đừng dịch
-#: src/x-perl.c:1038
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d: thiếu dấu ngoặc móc đóng trên \\x{HEXNUMBER}"
 
-#: src/x-perl.c:1158
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\l\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1178
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\u\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1212
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d: phép nội suy biến không hợp lệ ở « %c »"
 
-#: src/x-perl.c:1225
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\L\") của ký tự 8-bit « %c »"
 
-#: src/x-perl.c:1242
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d: phép nội suy không hợp lệ (\"\\U\") của ký tự 8-bit « %c »"
 
-#: src/x-python.c:233
-#, c-format
+#: src/x-python.c:236
+#, fuzzy
 msgid ""
-"Non-ASCII string at %s%s.\n"
 "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 ""
@@ -3655,7 +3662,7 @@ msgstr ""
 "hoặc bằng chú thích như được ghi rõ trong tài liệu :\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:281
+#: src/x-python.c:282
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3667,7 +3674,7 @@ msgstr ""
 "hoặc bằng chú thích như được ghi rõ trong tài liệu :\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:298
+#: src/x-python.c:299
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
@@ -3679,7 +3686,7 @@ msgstr ""
 "hoặc bằng chú thích như được ghi rõ trong tài liệu :\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:311
+#: src/x-python.c:312
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
@@ -3691,7 +3698,7 @@ msgstr ""
 "hoặc bằng chú thích như được ghi rõ trong tài liệu :\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:321
+#: src/x-python.c:322
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
@@ -3703,7 +3710,7 @@ msgstr ""
 "hoặc bằng chú thích như được ghi rõ trong tài liệu :\n"
 "http://www.python.org/peps/pep-0263.html.\n"
 
-#: src/x-python.c:354
+#: src/x-python.c:355
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
@@ -3715,27 +3722,27 @@ msgstr ""
 "hoặc bằng chú thích như được xác định trong tài liệu\n"
 "<http://www.python.org/peps/pep-0263.html>.\n"
 
-#: src/x-python.c:674
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "Không biết mã ký tự « %s » nên tiếp tục với ASCII thay thế."
 
-#: src/x-rst.c:109
+#: src/x-rst.c:108
 #, c-format
 msgid "%s:%d: invalid string definition"
 msgstr "%s:%d: lời xác định chuỗi không hợp lệ"
 
-#: src/x-rst.c:173
+#: src/x-rst.c:172
 #, c-format
 msgid "%s:%d: missing number after #"
 msgstr "%s:%d: thiếu con số nằm sau dấu #"
 
-#: src/x-rst.c:208
+#: src/x-rst.c:207
 #, c-format
 msgid "%s:%d: invalid string expression"
 msgstr "%s:%d: biểu thức chuỗi không hợp lệ"
 
-#: src/x-sh.c:1075
+#: src/x-sh.c:1074
 #, c-format
 msgid ""
 "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; "
@@ -3744,29 +3751,29 @@ 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ế."
 
-#: src/xgettext.c:567
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "không cho phép dùng tùy chọn « --join-existing » (nối lại tồn tại) khi kết "
 "xuất được ghi vào thiết bị xuất chuẩn"
 
-#: src/xgettext.c:572
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "phần mềm xgettext không thể hoạt động khi không có từ khóa cần tìm"
 
-#: src/xgettext.c:715
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "cảnh báo : không biết tập tin « %s » có phần mở rộng « %s » nên thử C"
 
-#: src/xgettext.c:766
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "Trích các chuỗi có thể dịch ra những tập tin nhập vào đã cho.\n"
 
-#: src/xgettext.c:789
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
@@ -3776,12 +3783,12 @@ msgstr ""
 "\tdùng tập tin TÊN này như là kết xuất (thay cho messages.po)\n"
 "\t(_miền mặc định_)\n"
 
-#: src/xgettext.c:791
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=TẬP_TIN      ghi kết xuất vào tập tin này (_xuất_)\n"
 
-#: src/xgettext.c:793
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
@@ -3789,12 +3796,12 @@ msgstr ""
 "  -p, --output-dir=THƯ_MỤC\n"
 "\tcác tập tin xuất sẽ được để vào thư mục này (_thư mục xuất_)\n"
 
-#: src/xgettext.c:798
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "Chọn ngôn ngữ của tập tin nhập vào:\n"
 
-#: src/xgettext.c:800
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3813,12 +3820,12 @@ msgstr ""
 "PHP,\n"
 "                                GCC-source, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:806
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                  tốc ký cho tùy chọn « --language=C++ »\n"
 
-#: src/xgettext.c:808
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
@@ -3827,7 +3834,7 @@ msgstr ""
 "Mặc định là ngôn ngữ được đoán phụ thuộc vào phần mở rộng của tên tập tin "
 "nhập vào.\n"
 
-#: src/xgettext.c:813
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3836,46 +3843,49 @@ msgstr ""
 "      --from-code=MÃ        mã ký tự của tập tin nhập vào (_từ mã_)\n"
 "                                (trừ Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:816
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "Mặc định là giả sử tập tin nhập vào có bộ ký tự ASCII.\n"
 
-#: src/xgettext.c:821
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 "  -j, --join-existing         nối lại các thông điệp với tập tin đã có\n"
 "\t(_nối lại tồn tại_)\n"
 
-#: src/xgettext.c:823
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 "  -x, --exclude-file=TẬP_TIN.po\n"
 "\tmục nhập từ tập tin này sẽ không được trích ra (_loại trừ tập tin_)\n"
 
-#: src/xgettext.c:825
-#, c-format
+#: src/xgettext.c:827
+#, fuzzy, c-format
 msgid ""
-"  -c, --add-comments[=TAG]    place comment block with TAG (or those\n"
-"                              preceding keyword lines) in output file\n"
+"  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
+"                                preceding keyword lines in output file\n"
+"  -c, --add-comments          place all comment blocks preceding keyword "
+"lines\n"
+"                                in output file\n"
 msgstr ""
 "  -c, --add-comments[=THẺ]\n"
 "\tchèn khối chú thích với thẻ này (hay những điều nằm trước\n"
 "\tdòng từ khoá) vào tập tin xuất (_thêm chú thích_)\n"
 
-#: src/xgettext.c:829
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr "Tùy chọn đặc trưng cho ngôn ngữ :\n"
 
-#: src/xgettext.c:831
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           trích ra mọi chuỗi (_trích ra tất cả_)\n"
 
-#: src/xgettext.c:833 src/xgettext.c:840
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3888,16 +3898,16 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
 
-#: src/xgettext.c:837
-#, c-format
+#: src/xgettext.c:841
+#, fuzzy, c-format
 msgid ""
-"  -k, --keyword[=WORD]        additional keyword to be looked for (without\n"
-"                              WORD means not to use default keywords)\n"
+"  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
+"  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 "  -k, --keyword[=TỪ]\n"
 "\ttừ khoá thêm cần tìm (không có TỪ thì không dùng từ khoá mặc định)\n"
 
-#: src/xgettext.c:844
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3907,7 +3917,7 @@ msgstr ""
 "      --flag=TỪ:ĐỐI_SỐ:CỜ\tcờ thêm cho chuỗi nằm bên trong đối số\n"
 "\tcó số ĐỐI SỐ của từ khoá TỪ (_cờ_)\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3920,38 +3930,38 @@ msgstr ""
 "Java,\n"
 "                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
 
-#: src/xgettext.c:851
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 "  -T, --trigraphs      hiểu chữ ba C kiểu ANSI để nhập vào (_chữ ba_)\n"
 
-#: src/xgettext.c:853
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (chỉ ngôn ngữ C, C++, ObjectiveC)\n"
 
-#: src/xgettext.c:855
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    nhận diện chuỗi định dạng Qt\n"
 
-#: src/xgettext.c:857 src/xgettext.c:861 src/xgettext.c:865
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (chỉ ngôn ngữ C++)\n"
 
-#: src/xgettext.c:859
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   nhận ra chuỗi định dạng KDE4\n"
 
-#: src/xgettext.c:863
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 nhận diện chuỗi định dạng Boost\n"
 
-#: src/xgettext.c:867
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
@@ -3959,21 +3969,21 @@ msgstr ""
 "      --debug\n"
 "\tkết quả nhận diện định dạng chuỗi chi tiết hơn (_gỡ lỗi _)\n"
 
-#: src/xgettext.c:886
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 "      --properties-output\n"
 "\tghi ra tập tin .properties (tài sản) kiểu Java (_xuất_)\n"
 
-#: src/xgettext.c:901
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 "      --copyright-holder=CHUỖI\n"
 "\tđặt người giữ bản quyền trong kết xuất\n"
 
-#: src/xgettext.c:903
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
@@ -3981,18 +3991,18 @@ msgstr ""
 "      --foreign-user\t\tbỏ sót bản quyền Tổ Chức Phần Mềm Tự Do\n"
 "\ttrong kết xuất cho người dùng nước ngoại\n"
 
-#: src/xgettext.c:905
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=GÓI  \tđặt tên gói trong kết xuất\n"
 
-#: src/xgettext.c:907
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 "      --package-version=PHIÊN_BẢN  đặt phiên bản của gói trong kết xuất\n"
 
-#: src/xgettext.c:909
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
@@ -4000,42 +4010,59 @@ msgstr ""
 "      --msgid-bugs-address=ĐỊA_CHỈ_THƯ\n"
 "\tđặt địa chỉ thông báo lỗi trong chuỗi gốc msgid\n"
 
-#: src/xgettext.c:911
-#, c-format
+#: src/xgettext.c:915
+#, fuzzy, c-format
 msgid ""
-"  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr "
-"entries\n"
+"  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -m, --msgstr-prefix[=CHUỖI]\n"
 "\tdùng chuỗi này hay « » là tiền tố cho mục nhập chuỗi dịch msgstr\n"
 
-#: src/xgettext.c:913
-#, c-format
+#: src/xgettext.c:918
+#, fuzzy, c-format
 msgid ""
-"  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr "
-"entries\n"
+"  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
+"msgstr\n"
+"                                values\n"
 msgstr ""
 "  -M, --msgstr-suffix[=CHUỖI]\n"
 "\tdùng chuỗi này hay « » là hậu tố cho mục nhập chuỗi dịch msgstr\n"
 
-#: src/xgettext.c:1686
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
-"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: %"
-"s"
+"A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
+"%s"
 msgstr ""
 "Đối số « --flag » (cờ) không có cú pháp <từ khóa>:<số đối số>:[qua-]<cờ>: %s"
 
-#: src/xgettext.c:1785
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr "thiết bị nhập chuẩn"
 
-#: src/xgettext.c:1965 src/xgettext.c:1998 src/xgettext.c:2056
+#: src/xgettext.c:1927
+#, c-format
+msgid "Non-ASCII character at %s%s."
+msgstr ""
+
+#: src/xgettext.c:1931
+#, c-format
+msgid "Non-ASCII comment at or before %s%s."
+msgstr ""
+
+#: src/xgettext.c:1936
+#, c-format
+msgid "Non-ASCII string at %s%s."
+msgstr ""
+
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s: cảnh báo : "
 
-#: src/xgettext.c:1968
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -4044,16 +4071,16 @@ msgstr ""
 "Dù nó được dùng tại vị trí của chuỗi định dạng, %s không phải chuỗi định "
 "dạng %s hợp lệ. Lý do : %s\n"
 
-#: src/xgettext.c:1969
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
-"Although declared as such, the %s is not a valid %s format string. Reason: %"
-"s\n"
+"Although declared as such, the %s is not a valid %s format string. Reason: "
+"%s\n"
 msgstr ""
 "Dù nó được tuyên bố như vậy, %s không phải chuỗi định dạng %s hợp lệ. Lý "
 "do : %s\n"
 
-#: src/xgettext.c:2000
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -4067,7 +4094,7 @@ msgstr ""
 "Đề nghị bạn dùng chuỗi định dạng có đối số có tên,\n"
 "và sự ánh xạ thay cho đồ nhiều thành phần cho những đối số.\n"
 
-#: src/xgettext.c:2058
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -4078,27 +4105,27 @@ msgstr ""
 "gettext(\"\") trả lại mục nhập phần đầu có siêu thông tin,\n"
 "không phải chuỗi rỗng.\n"
 
-#: src/xgettext.c:2664
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "đặc tả đối số mơ hồ cho từ khoá « %.*s »"
 
-#: src/xgettext.c:2691
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "cảnh báo : thiếu ngữ cảnh cho từ khoá « %.*s »"
 
-#: src/xgettext.c:2716
+#: src/xgettext.c:2828
 #, 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 »"
 
-#: src/xgettext.c:2737
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "ngữ cảnh xung đột giữa cách ở số ít và số nhiều"
 
-#: src/xgettext.c:2828
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -4110,7 +4137,7 @@ msgstr ""
 "hãy xác định biến MSGID_BUGS_ADDRESS trong đó;\n"
 "không thì xác định tùy chọn dòng lệnh « --msgid-bugs-address ».\n"
 
-#: src/xgettext.c:3035
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr "không biết ngôn ngữ « %s »"
@@ -4119,33 +4146,23 @@ msgstr "không biết ngôn ngữ « %s »"
 msgid "<unnamed>"
 msgstr "<không_tên>"
 
-#~ msgid "Multiple references to %%%c."
-#~ msgstr "Nhiều tham chiếu đến « %%%c »."
-
-#~ msgid ""
-#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
-#~ "This is free software; see the source for copying conditions.  There is "
-#~ "NO\n"
-#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR "
-#~ "PURPOSE.\n"
-#~ msgstr ""
-#~ "Tác quyền © %s của Tổ chức Phần mềm Tự do.\n"
-#~ "Đây là phần mềm tự do ; xem mã nguồn để tìm điều kiện sao chép.\n"
-#~ "KHÔNG CÓ BẢO HÀNH GÌ CẢ, THẬM CHÍ KHÔNG CÓ BẢO ĐẢM ĐƯỢC NGỤ Ý\n"
-#~ "KHẢ NĂNG BÁN HAY KHẢ NĂNG LÀM ĐƯỢC VIỆC DỨT KHOÁT.\n"
-
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the C# .dll format doesn't support contexts\n"
-#~ msgstr ""
-#~ "phân loại thông điệp chứa bản dịch phụ thuộc\n"
-#~ "vào ngữ cảnh, còn định dạng .dll kiểu C# không\n"
-#~ "hỗ trợ khả năng ngữ cảnh.\n"
-
-#~ msgid ""
-#~ "message catalog has context dependent translations\n"
-#~ "but the Java ResourceBundle format doesn't support contexts\n"
-#~ msgstr ""
-#~ "phân loại thông điệp chứa bản dịch phụ thuộc vào ngữ cảnh,\n"
-#~ "còn định dạng ResourceBundle kiểu Java không hỗ trợ\n"
-#~ "khả năng ngữ cảnh.\n"
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle bị lỗi với mã lỗi 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "Chưa thực hiện."
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "không thể thiết lập VR không chặn tới tiến trình phụ %s"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "lỗi liên lạc với tiến trình phụ %s"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "lỗi đọc từ tiến trình phụ %s"
+
+#~ 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"
+
+#~ msgid "field `%s' still has initial default value\n"
+#~ msgstr "trường « %s » vẫn còn chứa giá tri mặc định ban đầu\n"
diff --git a/gettext-tools/po/zh_CN.po b/gettext-tools/po/zh_CN.po
index 9119112..2359699 100644
--- a/gettext-tools/po/zh_CN.po
+++ b/gettext-tools/po/zh_CN.po
@@ -5,10 +5,10 @@
 # Ji ZhengYu <zhengyuji@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gettext-tools 0.16.2-pre5\n"
+"Project-Id-Version: gettext-tools 0.17\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
-"POT-Creation-Date: 2008-12-08 12:26+0100\n"
-"PO-Revision-Date: 2009-01-06 11:04+0800\n"
+"POT-Creation-Date: 2009-12-13 13:17+0100\n"
+"PO-Revision-Date: 2009-03-20 20:06中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
 "sourceforge.net>\n"
@@ -57,37 +57,37 @@ msgstr "无法删除临时目录 %s"
 msgid "write error"
 msgstr "写错误"
 
-#: gnulib-lib/copy-file.c:66 src/file-list.c:53 src/msggrep.c:244
+#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:244
 #: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1799 src/xgettext.c:1812
-#: src/xgettext.c:1822
+#: src/urlget.c:216 src/xgettext.c:1832 src/xgettext.c:1845
+#: src/xgettext.c:1855
 #, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "打开“%s”读取时出错"
 
-#: gnulib-lib/copy-file.c:73
+#: gnulib-lib/copy-file.c:74
 #, c-format
 msgid "cannot open backup file \"%s\" for writing"
 msgstr "无法打开备份文件“%s”写入"
 
-#: gnulib-lib/copy-file.c:81 src/urlget.c:228
+#: gnulib-lib/copy-file.c:82 src/urlget.c:228
 #, c-format
 msgid "error reading \"%s\""
 msgstr "读取“%s”出错"
 
-#: gnulib-lib/copy-file.c:86 gnulib-lib/copy-file.c:91
-#: gnulib-lib/copy-file.c:130
+#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
+#: gnulib-lib/copy-file.c:133
 #, c-format
 msgid "error writing \"%s\""
 msgstr "写入“%s”出错"
 
-#: gnulib-lib/copy-file.c:93 gnulib-lib/copy-file.c:132 src/urlget.c:238
+#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
 #, c-format
 msgid "error after reading \"%s\""
 msgstr "读取“%s”后出错"
 
-#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:845
-#: src/msginit.c:920 src/msginit.c:1080 src/msginit.c:1179
+#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:873
+#: src/msginit.c:948 src/msginit.c:1108 src/msginit.c:1207
 #: 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,70 +104,70 @@ msgstr "未找到 C# 编译器，试着安装 pnet"
 msgid "C# virtual machine not found, try installing pnet"
 msgstr "未找到 C# 虚拟机，试着安装 pnet"
 
-#: gnulib-lib/error.c:125
+#: gnulib-lib/error.c:153
 msgid "Unknown system error"
 msgstr "未知的系统错误"
 
-#: gnulib-lib/execute.c:197 gnulib-lib/execute.c:270 gnulib-lib/pipe.c:241
-#: gnulib-lib/pipe.c:356 gnulib-lib/wait-process.c:282
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:229
+#: gnulib-lib/pipe.c:342 gnulib-lib/wait-process.c:282
 #: gnulib-lib/wait-process.c:356
 #, c-format
 msgid "%s subprocess failed"
 msgstr "%s 子进程失败"
 
-#: gnulib-lib/getopt.c:526 gnulib-lib/getopt.c:542
+#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”含糊\n"
 
-#: gnulib-lib/getopt.c:575 gnulib-lib/getopt.c:579
+#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:588 gnulib-lib/getopt.c:593
+#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:655 gnulib-lib/getopt.c:971
-#: gnulib-lib/getopt.c:990
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 gnulib-lib/getopt.c:972
+#: gnulib-lib/getopt.c:991
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”需要参数\n"
 
-#: gnulib-lib/getopt.c:693 gnulib-lib/getopt.c:696
+#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: gnulib-lib/getopt.c:704 gnulib-lib/getopt.c:707
+#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: gnulib-lib/getopt.c:759 gnulib-lib/getopt.c:762
+#: gnulib-lib/getopt.c:760 gnulib-lib/getopt.c:763
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:768 gnulib-lib/getopt.c:771
+#: gnulib-lib/getopt.c:769 gnulib-lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: gnulib-lib/getopt.c:823 gnulib-lib/getopt.c:839 gnulib-lib/getopt.c:1043
-#: gnulib-lib/getopt.c:1061
+#: gnulib-lib/getopt.c:824 gnulib-lib/getopt.c:840 gnulib-lib/getopt.c:1044
+#: gnulib-lib/getopt.c:1062
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项需要参数 -- %c\n"
 
-#: gnulib-lib/getopt.c:892 gnulib-lib/getopt.c:908
+#: gnulib-lib/getopt.c:893 gnulib-lib/getopt.c:909
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”含糊\n"
 
-#: gnulib-lib/getopt.c:932 gnulib-lib/getopt.c:950
+#: gnulib-lib/getopt.c:933 gnulib-lib/getopt.c:951
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s：选项“-W %s”不允许参数\n"
@@ -206,21 +206,21 @@ 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:853 src/msginit.c:928
-#: src/msginit.c:1088
+#: gnulib-lib/javaversion.c:84 src/msginit.c:881 src/msginit.c:956
+#: src/msginit.c:1116
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr "%s 子进程 I/O 错误"
 
 #: gnulib-lib/obstack.c:423 gnulib-lib/obstack.c:425 gnulib-lib/xmalloc.c:37
 #: gnulib-lib/xsetenv.c:37 src/msgl-check.c:550 src/po-lex.c:83
-#: src/po-lex.c:102 src/x-glade.c:587 libgettextpo/gettext-po.c:1328
+#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328
 #, c-format
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: gnulib-lib/pipe.c:148 gnulib-lib/pipe.c:152 gnulib-lib/pipe.c:271
-#: gnulib-lib/pipe.c:275
+#: gnulib-lib/pipe.c:137 gnulib-lib/pipe.c:140 gnulib-lib/pipe.c:258
+#: gnulib-lib/pipe.c:261
 #, c-format
 msgid "cannot create pipe"
 msgstr "无法创建管道"
@@ -238,30 +238,30 @@ msgstr "无法创建管道"
 #. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
 #. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
 #. MARK).  A British English Unicode locale should instead
-#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
-#. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
+#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK)
+#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #.
 #. If you don't know what to put here, please see
 #. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
 #. and use glyphs suitable for your language.
-#: gnulib-lib/quotearg.c:266
+#: gnulib-lib/quotearg.c:272
 msgid "`"
 msgstr "“"
 
-#: gnulib-lib/quotearg.c:267
+#: gnulib-lib/quotearg.c:273
 msgid "'"
 msgstr "”"
 
-#: gnulib-lib/w32spawn.h:47
-#, c-format
-msgid "DuplicateHandle failed with error code 0x%08x"
-msgstr "DuplicateHandle 失败，错误码为 0x%08x"
-
-#: gnulib-lib/w32spawn.h:52
+#: gnulib-lib/w32spawn.h:40
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr "_open_osfhandle 失败"
 
+#: gnulib-lib/w32spawn.h:81
+#, fuzzy, c-format
+msgid "cannot restore fd %d: dup2 failed"
+msgstr "无法创建输出文件“%s”"
+
 #: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255
 #: gnulib-lib/wait-process.c:317
 #, c-format
@@ -273,35 +273,34 @@ msgstr "%s 子进程"
 msgid "%s subprocess got fatal signal %d"
 msgstr "%s 子进程收到致命信号 %d"
 
-#: src/format.c:144
-#, c-format
-msgid "'%s' is not a valid %s format string, unlike 'msgid'. Reason: %s"
+#: src/format.c:148
+#, fuzzy, c-format
+msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s"
 msgstr "不像“msgid”，“%s”不是有效的 %s 格式字符串。原因：%s"
 
 #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348
 #: src/format-gcc-internal.c:627 src/format-librep.c:312
 #: src/format-pascal.c:401 src/format-perl.c:584 src/format-php.c:350
-#: src/format-qt.c:170 src/format-tcl.c:390 src/format-ycp.c:144
-#, c-format
+#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument %u, as in '%s', doesn't exist in 'msgid'"
+"a format specification for argument %u, as in '%s', doesn't exist in '%s'"
 msgstr "“%2$s”中的参数 %1$u 的格式指定符在“msgid”中不存在"
 
-#: src/format-awk.c:519 src/format-boost.c:627 src/format-elisp.c:358
-#: src/format-gcc-internal.c:637 src/format-librep.c:322
-#: src/format-pascal.c:411 src/format-perl.c:594 src/format-php.c:360
-#: src/format-qt.c:169 src/format-tcl.c:400 src/format-ycp.c:143
+#: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
+#: src/format-gcc-internal.c:638 src/format-librep.c:323
+#: src/format-pascal.c:412 src/format-perl.c:595 src/format-php.c:361
+#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144
 #, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "参数 %u 的格式指定符在“%s”中不存在"
 
-#: src/format-awk.c:539 src/format-boost.c:647 src/format-c.c:910
-#: src/format-elisp.c:378 src/format-gcc-internal.c:657
-#: src/format-librep.c:342 src/format-pascal.c:431 src/format-perl.c:614
-#: src/format-php.c:380 src/format-python.c:525 src/format-tcl.c:420
-#, c-format
-msgid ""
-"format specifications in 'msgid' and '%s' for argument %u are not the same"
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-elisp.c:379 src/format-gcc-internal.c:658
+#: src/format-librep.c:343 src/format-pascal.c:432 src/format-perl.c:615
+#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "参数 %2$u 的“msgid”和“%1$s”中的格式指定符并不相同"
 
 #: src/format-boost.c:449
@@ -328,9 +327,9 @@ msgstr "第 %u 条指令中，没有与“<”匹配的“>”。"
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr "字符串引用了第 %u 个参数但是却忽略了第 %u 个参数。"
 
-#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:513
-#, c-format
-msgid "number of format specifications in 'msgid' and '%s' does not match"
+#: src/format-c.c:901 src/format-csharp.c:206 src/format-python.c:515
+#, fuzzy, c-format
+msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "“msgid”和“%s”中的格式指定符数量不匹配"
 
 #: src/format-csharp.c:88 src/format-java.c:205
@@ -404,14 +403,14 @@ msgstr "第 %u 条指令中，精度指定无效。"
 msgid "In the directive number %u, flags are not allowed before '%c'."
 msgstr "第 %u 条指令中，“%c”前不允许有标志。"
 
-#: src/format-gcc-internal.c:675
-#, c-format
-msgid "'msgid' uses %%m but '%s' doesn't"
+#: src/format-gcc-internal.c:677
+#, fuzzy, c-format
+msgid "'%s' uses %%m but '%s' doesn't"
 msgstr "“msgid”使用了 %%m，但“%s”没有使用"
 
-#: src/format-gcc-internal.c:678
-#, c-format
-msgid "'msgid' does not use %%m but '%s' uses %%m"
+#: src/format-gcc-internal.c:680
+#, fuzzy, c-format
+msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr "“msgid”没有使用 %%m，但“%s”使用了 %%m"
 
 #: src/format-invalid.h:22
@@ -501,21 +500,20 @@ msgid ""
 msgstr "第 %u 条指令中，选择包含的数字后面没有“<”、“#”或“%s”。"
 
 #: src/format-java.c:745
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument {%u}, as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument {%u}, as in '%s', doesn't exist in '%s'"
 msgstr "“%2$s”参数 {%1$u} 的格式指定符未在“msgid”中找到"
 
-#: src/format-java.c:755
+#: src/format-java.c:756
 #, c-format
 msgid "a format specification for argument {%u} doesn't exist in '%s'"
 msgstr "参数 {%u} 中未在“%s”中找到"
 
-#: src/format-java.c:775
-#, c-format
+#: src/format-java.c:776
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument {%u} are not the same"
+"format specifications in '%s' and '%s' for argument {%u} are not the same"
 msgstr "参数 {%2$u} 在“msgid”和“%1$s”中的格式指定不相同"
 
 #: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363
@@ -579,13 +577,13 @@ msgid "The string refers to some argument in incompatible ways."
 msgstr "字符串引用某些参数的方式不兼容。"
 
 #: src/format-lisp.c:3474 src/format-scheme.c:3397
-#, c-format
-msgid "format specifications in 'msgid' and '%s' are not equivalent"
+#, fuzzy, c-format
+msgid "format specifications in '%s' and '%s' are not equivalent"
 msgstr "“msgid”和“%s”中的格式指定符不同"
 
 #: src/format-lisp.c:3490 src/format-scheme.c:3413
-#, c-format
-msgid "format specifications in '%s' are not a subset of those in 'msgid'"
+#, fuzzy, c-format
+msgid "format specifications in '%s' are not a subset of those in '%s'"
 msgstr "“%s”中的格式指定符不是“msgid”格式指定符的子集"
 
 #: src/format-perl.c:433
@@ -595,7 +593,7 @@ msgid ""
 "conversion specifier '%c'."
 msgstr "第 %u 条指令中，大小指定符与转换指定符“%c”不兼容。"
 
-#: src/format-perl-brace.c:199 src/format-python.c:470 src/format-sh.c:307
+#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
 #, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "参数“%s”的格式指定符未在“%s”中找到"
@@ -612,37 +610,34 @@ msgid "The string refers to the argument named '%s' in incompatible ways."
 msgstr "字符串对名为“%s”的参数引用方式不兼容。"
 
 #: src/format-python.c:430
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a mapping, those in '%s' expect a "
-"tuple"
+"format specifications in '%s' expect a mapping, those in '%s' expect a tuple"
 msgstr "“msgid”中的格式指定符需要映射，而“%s”中的格式指定符需要元组"
 
 #: src/format-python.c:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' expect a tuple, those in '%s' expect a "
-"mapping"
+"format specifications in '%s' expect a tuple, those in '%s' expect a mapping"
 msgstr "“msgid”中的格式指定符需要元组，而“%s”中的格式指定符需要映射"
 
 #: src/format-python.c:460 src/format-sh.c:297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"a format specification for argument '%s', as in '%s', doesn't exist in "
-"'msgid'"
+"a format specification for argument '%s', as in '%s', doesn't exist in '%s'"
 msgstr "“%2$s”中对参数“%1$s”的格式指定符未在“msgid”中找到"
 
-#: src/format-python.c:493
-#, c-format
+#: src/format-python.c:494
+#, fuzzy, c-format
 msgid ""
-"format specifications in 'msgid' and '%s' for argument '%s' are not the same"
+"format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "“msgid”和“%s”中对参数“%s”的指定符不同"
 
 #: src/format-qt.c:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"'msgid' is a simple format string, but '%s' is not: it contains an 'L' flag "
-"or a double-digit argument number"
+"'%s' is a simple format string, but '%s' is not: it contains an 'L' flag or "
+"a double-digit argument number"
 msgstr ""
 "'msgid' 仅仅是个格式字符串，但‘%s’不是：它包含一个‘L’标记或是一个两位数的参数"
 "值"
@@ -683,10 +678,10 @@ msgid ""
 msgstr "终止第 %u 条指令的字符不是介于 1 和 9 之间的数字。"
 
 #: src/hostname.c:178 src/msgattrib.c:325 src/msgcat.c:289 src/msgcmp.c:172
-#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:179
-#: src/msgfilter.c:282 src/msgfmt.c:364 src/msggrep.c:398 src/msginit.c:256
+#: src/msgcomm.c:268 src/msgconv.c:223 src/msgen.c:219 src/msgexec.c:180
+#: src/msgfilter.c:261 src/msgfmt.c:366 src/msggrep.c:398 src/msginit.c:256
 #: src/msgmerge.c:332 src/msgunfmt.c:250 src/msguniq.c:247
-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:531
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:532
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -700,17 +695,17 @@ msgstr ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 
 #: src/hostname.c:184 src/msgattrib.c:331 src/msgcat.c:295 src/msgcmp.c:178
-#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:185
-#: src/msgfilter.c:288 src/msgfmt.c:370 src/msggrep.c:404 src/msginit.c:262
+#: src/msgcomm.c:274 src/msgconv.c:229 src/msgen.c:225 src/msgexec.c:186
+#: src/msgfilter.c:267 src/msgfmt.c:372 src/msggrep.c:404 src/msginit.c:262
 #: src/msgmerge.c:338 src/msgunfmt.c:256 src/msguniq.c:253 src/urlget.c:149
-#: src/xgettext.c:537
+#: src/xgettext.c:538
 #, 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:331 src/msgcat.c:295 src/msgconv.c:229
-#: src/msgen.c:225 src/msgexec.c:185 src/msgfilter.c:288 src/msggrep.c:404
+#: src/msgen.c:225 src/msgexec.c:186 src/msgfilter.c:267 src/msggrep.c:404
 #: src/msginit.c:262 src/msguniq.c:253 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 msgid "Bruno Haible"
@@ -722,10 +717,10 @@ msgid "too many arguments"
 msgstr "参数太多"
 
 #: src/hostname.c:207 src/msgattrib.c:391 src/msgcat.c:362 src/msgcmp.c:209
-#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:249
-#: src/msgfilter.c:393 src/msgfmt.c:625 src/msggrep.c:495 src/msginit.c:346
+#: src/msgcomm.c:342 src/msgconv.c:286 src/msgen.c:282 src/msgexec.c:253
+#: src/msgfilter.c:372 src/msgfmt.c:646 src/msggrep.c:495 src/msginit.c:346
 #: src/msgmerge.c:464 src/msgunfmt.c:411 src/msguniq.c:309
-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:759
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:760
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "试试“%s --help”查看帮助信息。\n"
@@ -764,28 +759,28 @@ msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr "  -i, --ip-address            主机名地址\n"
 
 #: src/hostname.c:228 src/msgattrib.c:497 src/msgcat.c:468 src/msgcmp.c:258
-#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:291
-#: src/msgfilter.c:479 src/msgfmt.c:747 src/msggrep.c:605 src/msginit.c:402
+#: src/msgcomm.c:436 src/msgconv.c:362 src/msgen.c:357 src/msgexec.c:295
+#: src/msgfilter.c:458 src/msgfmt.c:768 src/msggrep.c:605 src/msginit.c:402
 #: src/msgmerge.c:583 src/msgunfmt.c:509 src/msguniq.c:398
-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:921
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:922
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr "信息性输出：\n"
 
 #: src/hostname.c:230 src/msgattrib.c:499 src/msgcat.c:470 src/msgcmp.c:260
-#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:293
-#: src/msgfilter.c:481 src/msgfmt.c:749 src/msggrep.c:607 src/msginit.c:404
+#: src/msgcomm.c:438 src/msgconv.c:364 src/msgen.c:359 src/msgexec.c:297
+#: src/msgfilter.c:460 src/msgfmt.c:770 src/msggrep.c:607 src/msginit.c:404
 #: src/msgmerge.c:585 src/msgunfmt.c:511 src/msguniq.c:400
-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:923
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:924
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr "  -h, --help                  显示此帮助并退出\n"
 
 #: src/hostname.c:232 src/msgattrib.c:501 src/msgcat.c:472 src/msgcmp.c:262
-#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:295
-#: src/msgfilter.c:483 src/msgfmt.c:751 src/msggrep.c:609 src/msginit.c:406
+#: src/msgcomm.c:440 src/msgconv.c:366 src/msgen.c:361 src/msgexec.c:299
+#: src/msgfilter.c:462 src/msgfmt.c:772 src/msggrep.c:609 src/msginit.c:406
 #: src/msgmerge.c:587 src/msgunfmt.c:513 src/msguniq.c:402
-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:925
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:926
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr "  -V, --version               输出版本信息并退出\n"
@@ -795,10 +790,10 @@ msgstr "  -V, --version               输出版本信息并退出\n"
 #. "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:508 src/msgcat.c:479 src/msgcmp.c:269
-#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:302
-#: src/msgfilter.c:490 src/msgfmt.c:762 src/msggrep.c:616 src/msginit.c:413
+#: src/msgcomm.c:447 src/msgconv.c:373 src/msgen.c:368 src/msgexec.c:306
+#: src/msgfilter.c:469 src/msgfmt.c:783 src/msggrep.c:616 src/msginit.c:413
 #: src/msgmerge.c:598 src/msgunfmt.c:522 src/msguniq.c:409
-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:932
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:933
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 
@@ -807,7 +802,7 @@ msgstr "将错误报告至 <bug-gnu-gettext@gnu.org>。\n"
 msgid "could not get host name"
 msgstr "无法获得主机名"
 
-#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:151 src/msgfilter.c:212
+#: src/msgattrib.c:346 src/msgconv.c:244 src/msgexec.c:152 src/msgfilter.c:191
 #: src/msggrep.c:419 src/msginit.c:194 src/msguniq.c:268
 #, c-format
 msgid "at most one input file allowed"
@@ -815,12 +810,12 @@ msgstr "允许最多一个输入文件"
 
 #: src/msgattrib.c:352 src/msgattrib.c:356 src/msgcat.c:311 src/msgcat.c:315
 #: src/msgcomm.c:284 src/msgcomm.c:288 src/msgconv.c:250 src/msgconv.c:254
-#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:303 src/msgfilter.c:307
-#: src/msgfmt.c:409 src/msgfmt.c:417 src/msgfmt.c:432 src/msgfmt.c:454
+#: src/msgen.c:247 src/msgen.c:251 src/msgfilter.c:282 src/msgfilter.c:286
+#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
 #: src/msggrep.c:425 src/msggrep.c:429 src/msgmerge.c:363 src/msgmerge.c:384
 #: src/msgmerge.c:388 src/msgunfmt.c:287 src/msguniq.c:274 src/msguniq.c:278
-#: src/xgettext.c:547 src/xgettext.c:551 src/xgettext.c:558 src/xgettext.c:561
-#: src/xgettext.c:564
+#: src/xgettext.c:548 src/xgettext.c:552 src/xgettext.c:559 src/xgettext.c:562
+#: src/xgettext.c:565
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 互相排斥"
@@ -838,7 +833,7 @@ msgid ""
 msgstr "根据消息的属性过滤一个翻译库里的消息，并处理消息的属性。\n"
 
 #: src/msgattrib.c:404 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:362
-#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:272 src/msgfilter.c:405
+#: src/msgconv.c:298 src/msgen.c:298 src/msgexec.c:276 src/msgfilter.c:384
 #: src/msggrep.c:509 src/msginit.c:360 src/msgmerge.c:485 src/msgunfmt.c:423
 #: src/msguniq.c:329
 #, c-format
@@ -847,9 +842,9 @@ msgid ""
 msgstr "长选项必须用的参数在使用短选项时也是必须的。\n"
 
 #: src/msgattrib.c:407 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:365
-#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:275 src/msgfilter.c:408
-#: src/msgfmt.c:643 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
-#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:777
+#: src/msgconv.c:301 src/msgen.c:301 src/msgexec.c:279 src/msgfilter.c:387
+#: src/msgfmt.c:664 src/msggrep.c:512 src/msginit.c:363 src/msgmerge.c:488
+#: src/msgunfmt.c:437 src/msguniq.c:332 src/xgettext.c:778
 #, c-format
 msgid "Input file location:\n"
 msgstr "输入文件的位置：\n"
@@ -860,37 +855,37 @@ msgid "  INPUTFILE                   input PO file\n"
 msgstr "  输入文件                    做为输入的 PO 文件\n"
 
 #: src/msgattrib.c:411 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:371
-#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:279 src/msgfilter.c:412
-#: src/msgfmt.c:647 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
-#: src/xgettext.c:783
+#: src/msgconv.c:305 src/msgen.c:305 src/msgexec.c:283 src/msgfilter.c:391
+#: src/msgfmt.c:668 src/msggrep.c:516 src/msgmerge.c:494 src/msguniq.c:336
+#: src/xgettext.c:784
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr "  -D, --directory=目录        在<目录>中查找输入文件\n"
 
-#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:281 src/msgfilter.c:414
+#: src/msgattrib.c:413 src/msgconv.c:307 src/msgexec.c:285 src/msgfilter.c:393
 #: src/msggrep.c:518 src/msgunfmt.c:441 src/msguniq.c:338
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr "如果没有指定输入文件或输入文件是 -，则读取标准输入。\n"
 
 #: src/msgattrib.c:416 src/msgcat.c:397 src/msgcomm.c:376 src/msgconv.c:310
-#: src/msgen.c:310 src/msgfilter.c:417 src/msgfmt.c:667 src/msggrep.c:521
+#: src/msgen.c:310 src/msgfilter.c:396 src/msgfmt.c:688 src/msggrep.c:521
 #: src/msginit.c:371 src/msgmerge.c:506 src/msgunfmt.c:477 src/msguniq.c:341
-#: src/xgettext.c:788
+#: src/xgettext.c:789
 #, c-format
 msgid "Output file location:\n"
 msgstr "输出文件位置：\n"
 
 #: src/msgattrib.c:418 src/msgcat.c:399 src/msgcomm.c:378 src/msgconv.c:312
-#: src/msgen.c:312 src/msgfilter.c:419 src/msgfmt.c:669 src/msggrep.c:523
+#: src/msgen.c:312 src/msgfilter.c:398 src/msgfmt.c:690 src/msggrep.c:523
 #: src/msgmerge.c:508 src/msgunfmt.c:479 src/msguniq.c:343
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr "  -o, --output-file=文件      将输出写入指定文件\n"
 
 #: src/msgattrib.c:420 src/msgcat.c:401 src/msgcomm.c:380 src/msgconv.c:314
-#: src/msgen.c:314 src/msgfilter.c:421 src/msggrep.c:525 src/msgmerge.c:510
+#: src/msgen.c:314 src/msgfilter.c:400 src/msggrep.c:525 src/msgmerge.c:510
 #: src/msgunfmt.c:481 src/msguniq.c:345
 #, c-format
 msgid ""
@@ -991,22 +986,22 @@ msgid ""
 msgstr "      --obsolete              等于 --only-obsolete --clear-obsolete\n"
 
 #: src/msgattrib.c:460 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:396
-#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:284 src/msgfilter.c:440
-#: src/msgfmt.c:712 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
+#: src/msgconv.c:325 src/msgen.c:318 src/msgexec.c:288 src/msgfilter.c:419
+#: src/msgfmt.c:733 src/msggrep.c:568 src/msginit.c:379 src/msgmerge.c:543
 #: src/msguniq.c:356
 #, c-format
 msgid "Input file syntax:\n"
 msgstr "输入文件的语法：\n"
 
-#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:286
-#: src/msgfilter.c:442 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
+#: src/msgattrib.c:462 src/msgconv.c:327 src/msgen.c:320 src/msgexec.c:290
+#: src/msgfilter.c:421 src/msggrep.c:570 src/msginit.c:381 src/msguniq.c:358
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:288
-#: src/msgfilter.c:444 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
+#: src/msgattrib.c:464 src/msgconv.c:329 src/msgen.c:322 src/msgexec.c:292
+#: src/msgfilter.c:423 src/msggrep.c:572 src/msginit.c:383 src/msguniq.c:360
 #, c-format
 msgid ""
 "      --stringtable-input     input file is in NeXTstep/GNUstep .strings "
@@ -1015,57 +1010,57 @@ msgstr ""
 "      --stringtable-input     输入文件以 NeXTstep/GNUstep .strings 语法给出\n"
 
 #: src/msgattrib.c:467 src/msgcat.c:425 src/msgcomm.c:404 src/msgconv.c:332
-#: src/msgen.c:325 src/msgfilter.c:447 src/msgfmt.c:740 src/msggrep.c:575
+#: src/msgen.c:325 src/msgfilter.c:426 src/msgfmt.c:761 src/msggrep.c:575
 #: src/msginit.c:386 src/msgmerge.c:551 src/msgunfmt.c:485 src/msguniq.c:363
-#: src/xgettext.c:873
+#: src/xgettext.c:874
 #, c-format
 msgid "Output details:\n"
 msgstr "输出细节：\n"
 
 #: src/msgattrib.c:469 src/msgcat.c:440 src/msgcomm.c:406 src/msgconv.c:334
 #: src/msgen.c:329 src/msgmerge.c:555 src/msgunfmt.c:487 src/msguniq.c:370
-#: src/xgettext.c:875
+#: src/xgettext.c:876
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr "  -e, --no-escape             不在输出中使用 C 转码序列(默认)\n"
 
 #: src/msgattrib.c:471 src/msgcat.c:442 src/msgcomm.c:408 src/msgconv.c:336
-#: src/msgen.c:331 src/msgfilter.c:451 src/msgmerge.c:557 src/msgunfmt.c:489
-#: src/msguniq.c:372 src/xgettext.c:877
+#: src/msgen.c:331 src/msgfilter.c:430 src/msgmerge.c:557 src/msgunfmt.c:489
+#: src/msguniq.c:372 src/xgettext.c:878
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr "  -E, --escape                在输出中使用 C 转码序列，没有扩展字符\n"
 
 #: src/msgattrib.c:473 src/msgcat.c:444 src/msgcomm.c:410 src/msgconv.c:338
-#: src/msgen.c:333 src/msgfilter.c:453 src/msggrep.c:581 src/msgmerge.c:559
-#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:879
+#: src/msgen.c:333 src/msgfilter.c:432 src/msggrep.c:581 src/msgmerge.c:559
+#: src/msgunfmt.c:491 src/msguniq.c:374 src/xgettext.c:880
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr "      --force-po              就算为空也写入 PO 文件\n"
 
 #: src/msgattrib.c:475 src/msgcat.c:446 src/msgcomm.c:412 src/msguniq.c:376
-#: src/xgettext.c:881
+#: src/xgettext.c:882
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr "  -i, --indent                使用缩进风格写入 .po 文件\n"
 
 #: src/msgattrib.c:477 src/msgcat.c:448 src/msgcomm.c:414 src/msguniq.c:378
-#: src/xgettext.c:883
+#: src/xgettext.c:884
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr "      --no-location           不写入“#: 文件名:行号”位置行\n"
 
 #: src/msgattrib.c:479 src/msgcat.c:450 src/msgcomm.c:416 src/msguniq.c:380
-#: src/xgettext.c:885
+#: src/xgettext.c:886
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr "  -n, --add-location          生成“#: 文件名:行号”位置行(默认)\n"
 
 #: src/msgattrib.c:481 src/msgcat.c:452 src/msgcomm.c:418 src/msguniq.c:382
-#: src/xgettext.c:887
+#: src/xgettext.c:888
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
@@ -1073,30 +1068,30 @@ msgstr ""
 "      --strict                写入极为严格的 Uniforum 使 .po 文件保持一致\n"
 
 #: src/msgattrib.c:483 src/msgcat.c:454 src/msgcomm.c:420 src/msgconv.c:348
-#: src/msgen.c:343 src/msgfilter.c:465 src/msggrep.c:591 src/msginit.c:392
+#: src/msgen.c:343 src/msgfilter.c:444 src/msggrep.c:591 src/msginit.c:392
 #: src/msgmerge.c:569 src/msgunfmt.c:497 src/msguniq.c:384
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr "  -p, --properties-output     写出 Java .properties 文件\n"
 
 #: src/msgattrib.c:485 src/msgcat.c:456 src/msgcomm.c:422 src/msgconv.c:350
-#: src/msgen.c:345 src/msgfilter.c:467 src/msggrep.c:593 src/msginit.c:394
-#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:891
+#: src/msgen.c:345 src/msgfilter.c:446 src/msggrep.c:593 src/msginit.c:394
+#: src/msgmerge.c:571 src/msgunfmt.c:499 src/msguniq.c:386 src/xgettext.c:892
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr "      --stringtable-output    写出 NeXTstep/GNUstep .strings 文件\n"
 
 #: src/msgattrib.c:487 src/msgcat.c:458 src/msgcomm.c:424 src/msgconv.c:352
-#: src/msgen.c:347 src/msgfilter.c:469 src/msggrep.c:595 src/msginit.c:396
-#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:893
+#: src/msgen.c:347 src/msgfilter.c:448 src/msggrep.c:595 src/msginit.c:396
+#: src/msgmerge.c:573 src/msgunfmt.c:501 src/msguniq.c:388 src/xgettext.c:894
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr "  -w, --width=数字            设置输出页面宽度\n"
 
 #: src/msgattrib.c:489 src/msgcat.c:460 src/msgcomm.c:426 src/msgconv.c:354
-#: src/msgen.c:349 src/msgfilter.c:471 src/msggrep.c:597 src/msginit.c:398
-#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:895
+#: src/msgen.c:349 src/msgfilter.c:450 src/msggrep.c:597 src/msginit.c:398
+#: src/msgmerge.c:575 src/msgunfmt.c:503 src/msguniq.c:390 src/xgettext.c:896
 #, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
@@ -1104,15 +1099,15 @@ msgid ""
 msgstr "      --no-wrap               不将超过输出页宽度的长消息行断为多行\n"
 
 #: src/msgattrib.c:492 src/msgcat.c:463 src/msgcomm.c:429 src/msgconv.c:357
-#: src/msgen.c:352 src/msgfilter.c:474 src/msgmerge.c:578 src/msgunfmt.c:506
-#: src/msguniq.c:393 src/xgettext.c:898
+#: src/msgen.c:352 src/msgfilter.c:453 src/msgmerge.c:578 src/msgunfmt.c:506
+#: src/msguniq.c:393 src/xgettext.c:899
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr "  -s, --sort-output           输出前排序\n"
 
 #: src/msgattrib.c:494 src/msgcat.c:465 src/msgcomm.c:431 src/msgconv.c:359
-#: src/msgen.c:354 src/msgfilter.c:476 src/msgmerge.c:580 src/msguniq.c:395
-#: src/xgettext.c:900
+#: src/msgen.c:354 src/msgfilter.c:455 src/msgmerge.c:580 src/msguniq.c:395
+#: src/xgettext.c:901
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
@@ -1122,7 +1117,7 @@ msgstr "  -F, --sort-by-file          按文件位置排序输出\n"
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "不可能出现的选择条件 (%d < n < %d)"
 
-#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:763
+#: src/msgcat.c:366 src/msgcomm.c:346 src/xgettext.c:764
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr "用法：%s [选项] [输入文件]...\n"
@@ -1148,18 +1143,18 @@ msgstr ""
 "选项，那样则会由第一个包含该翻译条目的文件获取数据。所有 PO 文件中的翻译条目\n"
 "的文件位置都会累积下来。\n"
 
-#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:779
+#: src/msgcat.c:388 src/msgcomm.c:367 src/xgettext.c:780
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr "  输入文件 ...                输入文件\n"
 
-#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:781
+#: src/msgcat.c:390 src/msgcomm.c:369 src/xgettext.c:782
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr "  -f, --files-from=文件       由<文件>读入输入文件的列表\n"
 
-#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:649
-#: src/xgettext.c:785
+#: src/msgcat.c:394 src/msgcomm.c:373 src/msgen.c:307 src/msgfmt.c:670
+#: src/xgettext.c:786
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr "如果输入文件为 -，则将读取标准输入。\n"
@@ -1191,14 +1186,14 @@ msgstr ""
 "  -u, --unique                --less-than=2 的缩写，要求只列出出现一次\n"
 "                              的消息\n"
 
-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:714
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:398 src/msgfmt.c:735
 #: src/msgmerge.c:545
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr "  -P, --properties-input      输入文件以 Java .properties 语法给出\n"
 
-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:716
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:400 src/msgfmt.c:737
 #: src/msgmerge.c:547
 #, c-format
 msgid ""
@@ -1386,7 +1381,7 @@ msgstr ""
 "  ->, --more-than=数字        只打印出现次数多于指定次数的消息，若没有\n"
 "                              指定次数则默认值为 1\n"
 
-#: src/msgcomm.c:433 src/xgettext.c:902
+#: src/msgcomm.c:433 src/xgettext.c:903
 #, c-format
 msgid ""
 "      --omit-header           don't write header with `msgid \"\"' entry\n"
@@ -1412,26 +1407,26 @@ msgstr "默认编码为当前区域设置的编码。\n"
 msgid "  -i, --indent                indented output style\n"
 msgstr "  -i, --indent                缩进的输出风格\n"
 
-#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:459 src/msggrep.c:585
+#: src/msgconv.c:342 src/msgen.c:337 src/msgfilter.c:438 src/msggrep.c:585
 #: src/msgmerge.c:563
 #, c-format
 msgid "      --no-location           suppress '#: filename:line' lines\n"
 msgstr "      --no-location           排除“#: filename:line”行\n"
 
-#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:461 src/msggrep.c:587
+#: src/msgconv.c:344 src/msgen.c:339 src/msgfilter.c:440 src/msggrep.c:587
 #: src/msgmerge.c:565
 #, c-format
 msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 msgstr "      --add-location          保留“#: filename:line”行(默认)\n"
 
-#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:463 src/msggrep.c:589
+#: src/msgconv.c:346 src/msgen.c:341 src/msgfilter.c:442 src/msggrep.c:589
 #: src/msgmerge.c:567
 #, c-format
 msgid "      --strict                strict Uniforum output style\n"
 msgstr "      --strict                严格的 Uniforum 输出风格\n"
 
-#: src/msgen.c:236 src/msgfmt.c:381 src/xgettext.c:581
+#: src/msgen.c:236 src/msgfmt.c:383 src/xgettext.c:582
 #, c-format
 msgid "no input file given"
 msgstr "没有给出输入文件"
@@ -1463,17 +1458,17 @@ msgstr ""
 msgid "  INPUTFILE                   input PO or POT file\n"
 msgstr "  输入文件                    输入 PO 或 POT 文件\n"
 
-#: src/msgexec.c:195
+#: src/msgexec.c:196
 #, c-format
 msgid "missing command name"
 msgstr "丢失命令名"
 
-#: src/msgexec.c:253
+#: src/msgexec.c:257
 #, c-format
 msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n"
 msgstr "用法：%s [选项] 命令 [命令选项]\n"
 
-#: src/msgexec.c:258
+#: src/msgexec.c:262
 #, c-format, no-wrap
 msgid ""
 "Applies a command to all translations of a translation catalog.\n"
@@ -1488,7 +1483,7 @@ msgstr ""
 "即是 msgexec 的输出结果。msgexec 的返回值是所有\n"
 "命令调用产生的返回值的最大值。\n"
 
-#: src/msgexec.c:267
+#: src/msgexec.c:271
 #, c-format, no-wrap
 msgid ""
 "A special builtin command called '0' outputs the translation, followed by a\n"
@@ -1497,42 +1492,42 @@ msgstr ""
 "有一个称为“0”的特殊内置命令，它会输出翻译条目，并随后加上一个 null\n"
 "字节。“msgexec 0”的输出适用于作为“xargs -0”的输入。\n"
 
-#: src/msgexec.c:277 src/msgfilter.c:410
+#: src/msgexec.c:281 src/msgfilter.c:389
 #, c-format
 msgid "  -i, --input=INPUTFILE       input PO file\n"
 msgstr "  -i, --input=输入文件        输入的 PO 文件\n"
 
-#: src/msgexec.c:341
+#: src/msgexec.c:345
 #, c-format
 msgid "write to stdout failed"
 msgstr "写入 stdout 失败"
 
-#: src/msgexec.c:374 src/msgfilter.c:666
+#: src/msgexec.c:389
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr "写入 %s 子进程失败"
 
-#: src/msgfilter.c:298
+#: src/msgfilter.c:277
 #, c-format
 msgid "missing filter name"
 msgstr "缺少过滤器名称"
 
-#: src/msgfilter.c:322
+#: src/msgfilter.c:301
 #, c-format
 msgid "at least one sed script must be specified"
 msgstr "必须指定至少一个 sed 脚本"
 
-#: src/msgfilter.c:397
+#: src/msgfilter.c:376
 #, c-format
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr "用法：%s [选项] 过滤器 [过滤器选项]\n"
 
-#: src/msgfilter.c:401
+#: src/msgfilter.c:380
 #, c-format
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr "对于翻译库中的所有翻译条目进行过滤。\n"
 
-#: src/msgfilter.c:425
+#: src/msgfilter.c:404
 #, c-format
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
@@ -1541,18 +1536,18 @@ msgstr ""
 "<过滤器>可以是任何由标准输入读入翻译条目\n"
 "并将修改后的翻译写进标准输出的程序。\n"
 
-#: src/msgfilter.c:430
+#: src/msgfilter.c:409
 #, c-format
 msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
 msgstr "当过滤器是“sed”时可用的过滤选项：\n"
 
-#: src/msgfilter.c:432
+#: src/msgfilter.c:411
 #, c-format
 msgid ""
 "  -e, --expression=SCRIPT     add SCRIPT to the commands to be executed\n"
 msgstr "  -e, --expression=脚本       将<脚本>添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:434
+#: src/msgfilter.c:413
 #, c-format
 msgid ""
 "  -f, --file=SCRIPTFILE       add the contents of SCRIPTFILE to the "
@@ -1560,119 +1555,101 @@ msgid ""
 "                                to be executed\n"
 msgstr "  -f, --file=脚本文件         将<脚本文件>的内容添加到欲执行的命令中\n"
 
-#: src/msgfilter.c:437
+#: src/msgfilter.c:416
 #, c-format
 msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr "  -n, --quiet, --silent       禁用对模式空白的自动打印\n"
 
-#: src/msgfilter.c:449 src/msggrep.c:577
+#: src/msgfilter.c:428 src/msggrep.c:577
 #, c-format
 msgid ""
 "      --no-escape             do not use C escapes in output (default)\n"
 msgstr "      --no-escape             在输出中不使用 C 转义字符(默认)\n"
 
-#: src/msgfilter.c:455 src/msggrep.c:583
+#: src/msgfilter.c:434 src/msggrep.c:583
 #, c-format
 msgid "      --indent                indented output style\n"
 msgstr "      --indent                缩进的输出风格\n"
 
-#: src/msgfilter.c:457
+#: src/msgfilter.c:436
 #, c-format
 msgid ""
 "      --keep-header           keep header entry unmodified, don't filter it\n"
 msgstr "      --keep-header           保持文件头项不变，不过滤它\n"
 
-#: src/msgfilter.c:589
-#, c-format
-msgid "Not yet implemented."
-msgstr "尚未实现。"
-
-#: src/msgfilter.c:618
-#, c-format
-msgid "cannot set up nonblocking I/O to %s subprocess"
-msgstr "无法为 %s 子进程创建非专用的 I/O"
-
-#: src/msgfilter.c:646
-#, c-format
-msgid "communication with %s subprocess failed"
-msgstr "和 %s 子进程通讯时出现错误"
-
-#: src/msgfilter.c:697
-#, c-format
-msgid "read from %s subprocess failed"
-msgstr "由 %s 子进程读入数据时出现错误"
-
-#: src/msgfilter.c:714
-#, c-format
-msgid "%s subprocess terminated with exit code %d"
-msgstr "%s 子进程已终止，错误码为 %d"
-
-#: src/msgfmt.c:302
+#: src/msgfmt.c:304
 #, c-format
 msgid "the argument to %s should be a single punctuation character"
 msgstr "%s 的参数应该是一个标点符号"
 
-#: src/msgfmt.c:349
+#: src/msgfmt.c:351
 #, c-format
 msgid "invalid endianness: %s"
 msgstr "无效的 endianness：%s"
 
 #. This is a proper name. See the gettext manual, section Names.
-#: src/msgfmt.c:370 src/msgunfmt.c:256 src/xgettext.c:537
+#: src/msgfmt.c:372 src/msgunfmt.c:256 src/xgettext.c:538
 msgid "Ulrich Drepper"
 msgstr "Ulrich Drepper"
 
-#: src/msgfmt.c:423 src/msgfmt.c:445 src/msgfmt.c:467 src/msgunfmt.c:318
+#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:318
 #: src/msgunfmt.c:341
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr "%s 需要指定“-d 目录”选项"
 
-#: src/msgfmt.c:438 src/msgfmt.c:460 src/msgunfmt.c:311 src/msgunfmt.c:334
+#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:311 src/msgunfmt.c:334
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr "%s 需要指定“-l locale”选项"
 
-#: src/msgfmt.c:476 src/msgunfmt.c:350 src/msgunfmt.c:356
+#: src/msgfmt.c:478 src/msgunfmt.c:350 src/msgunfmt.c:356
 #, c-format
 msgid "%s is only valid with %s or %s"
 msgstr "%s 只能配合 %s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:482 src/msgfmt.c:488
+#: src/msgfmt.c:484 src/msgfmt.c:490
 #, c-format
 msgid "%s is only valid with %s, %s or %s"
 msgstr "%s 只能配合 %s、%s 或 %s 一起使用才有效"
 
-#: src/msgfmt.c:599
+#. TRANSLATORS: The prefix before a statistics message.  The argument
+#. is a file name or a comma separated list of file names.
+#: src/msgfmt.c:616
+#, c-format
+msgid "%s: "
+msgstr ""
+
+#: src/msgfmt.c:620
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d 条已翻译消息"
 
-#: src/msgfmt.c:604
+#: src/msgfmt.c:625
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] "，%d 条模糊消息"
 
-#: src/msgfmt.c:609
+#: src/msgfmt.c:630
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] "，%d 条未翻译消息"
 
-#: src/msgfmt.c:629
+#: src/msgfmt.c:650
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr "用法：%s [选项] 文件名.po ...\n"
 
-#: src/msgfmt.c:633
+#: src/msgfmt.c:654
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr "由文字模式描述生成二进制消息文件。\n"
 
-#: src/msgfmt.c:638 src/xgettext.c:772
+#: src/msgfmt.c:659 src/xgettext.c:773
 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
@@ -1681,24 +1658,24 @@ msgstr ""
 "长选项必须用的参数在使用短选项时也是必须的。\n"
 "可选参数也是如此。\n"
 
-#: src/msgfmt.c:645
+#: src/msgfmt.c:666
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr "  文件名.po ...               输入文件\n"
 
-#: src/msgfmt.c:652 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:820
+#: src/msgfmt.c:673 src/msgmerge.c:500 src/msgunfmt.c:426 src/xgettext.c:821
 #, c-format
 msgid "Operation mode:\n"
 msgstr "操作模式：\n"
 
-#: src/msgfmt.c:654
+#: src/msgfmt.c:675
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr "  -j, --java                  Java 模式：生成 Java 资源包类\n"
 
-#: src/msgfmt.c:656
+#: src/msgfmt.c:677
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
@@ -1707,50 +1684,50 @@ msgstr ""
 "      --java2                 类似 --java，但假设是 Java2 (JDK 1.2 或较新\n"
 "                              的版本)\n"
 
-#: src/msgfmt.c:658
+#: src/msgfmt.c:679
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr "      --csharp                C# 模式：生成 .NET .dll 文件\n"
 
-#: src/msgfmt.c:660
+#: src/msgfmt.c:681
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr "      --csharp-resources      C# 资源模式：生成 .NET .resources 文件\n"
 
-#: src/msgfmt.c:662
+#: src/msgfmt.c:683
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr "      --tcl                   Tcl 模式：生成 tcl/msgcat .msg 文件\n"
 
-#: src/msgfmt.c:664
+#: src/msgfmt.c:685
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr "      --qt                    Qt 模式：生成 Qt .qm 文件\n"
 
-#: src/msgfmt.c:671
+#: src/msgfmt.c:692
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr "      --strict                使用严格的 Uniforum 模式\n"
 
-#: src/msgfmt.c:673 src/xgettext.c:796
+#: src/msgfmt.c:694 src/xgettext.c:797
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr "如果输出文件是 -，则会将结果写入至标准输出。\n"
 
-#: src/msgfmt.c:676
+#: src/msgfmt.c:697
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr "以 Java 模式输出文件位置：\n"
 
-#: src/msgfmt.c:678 src/msgfmt.c:692 src/msgunfmt.c:446 src/msgunfmt.c:457
+#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:446 src/msgunfmt.c:457
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr "  -r, --resource=资源         资源名称\n"
 
-#: src/msgfmt.c:680 src/msgfmt.c:694 src/msgfmt.c:704 src/msgunfmt.c:448
+#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:448
 #: src/msgunfmt.c:459 src/msgunfmt.c:469
 #, c-format
 msgid ""
@@ -1759,13 +1736,13 @@ msgid ""
 msgstr ""
 "  -l, --locale=语系           语系名称，必须是“语言”或“语言_国家”的格式\n"
 
-#: src/msgfmt.c:682
+#: src/msgfmt.c:703
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr "  -d 目录                     类目录层次的基本目录\n"
 
-#: src/msgfmt.c:684
+#: src/msgfmt.c:705
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
@@ -1776,19 +1753,19 @@ msgstr ""
 "类名称是由资源名称连同语系名称共同决定的，两者之间会用下划线分隔。\n"
 "-d 选项是必须的。class 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:690
+#: src/msgfmt.c:711
 #, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "以 C# 模式输出文件位置：\n"
 
-#: src/msgfmt.c:696 src/msgunfmt.c:461
+#: src/msgfmt.c:717 src/msgunfmt.c:461
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr "  -d 目录                     依赖语系的 .dll 文件的的基本目录\n"
 
-#: src/msgfmt.c:698
+#: src/msgfmt.c:719
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .dll file is written in a\n"
@@ -1797,29 +1774,29 @@ msgstr ""
 "-l 和 -d 选项是必要的。.dll 文件会写入指定目录的子目录，而子目录的名称取决于"
 "语系。\n"
 
-#: src/msgfmt.c:702
+#: src/msgfmt.c:723
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr "以 Tcl 模式输出文件位置：\n"
 
-#: src/msgfmt.c:706 src/msgunfmt.c:471
+#: src/msgfmt.c:727 src/msgunfmt.c:471
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr "  --d 目录                    .msg 消息库的基本目录\n"
 
-#: src/msgfmt.c:708
+#: src/msgfmt.c:729
 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr "-l 和 -d 选项是必要的。所生成的 .msg 文件会存放在指定的目录。\n"
 
-#: src/msgfmt.c:720 src/xgettext.c:812
+#: src/msgfmt.c:741 src/xgettext.c:813
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr "输入文件的解释：\n"
 
-#: src/msgfmt.c:722
+#: src/msgfmt.c:743
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
@@ -1829,19 +1806,19 @@ msgstr ""
 "  -c, --check                 同时进行 --check-format、--check-header 和\n"
 "                                --check-domain 三种检查\n"
 
-#: src/msgfmt.c:725
+#: src/msgfmt.c:746
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr "      --check-format          检查和语言有关的格式字符串\n"
 
-#: src/msgfmt.c:727
+#: src/msgfmt.c:748
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr "      --check-header          检查文件头项是否存在及检查其内容\n"
 
-#: src/msgfmt.c:729
+#: src/msgfmt.c:750
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
@@ -1850,7 +1827,7 @@ msgstr ""
 "      --check-domain          检查 domain 指令和 --output-file 选项之间\n"
 "                                是否冲突\n"
 
-#: src/msgfmt.c:732
+#: src/msgfmt.c:753
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
@@ -1858,7 +1835,7 @@ msgid ""
 msgstr ""
 "  -C, --check-compatibility   让 GNU msgfmt 以 X/Open msgfmt 的方式检查文件\n"
 
-#: src/msgfmt.c:734
+#: src/msgfmt.c:755
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
@@ -1867,89 +1844,89 @@ msgid ""
 msgstr ""
 "      --check-accelerators[=CHAR]  检查菜单项目中的快捷键标记是否存在\n"
 
-#: src/msgfmt.c:737
+#: src/msgfmt.c:758
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr "  -f, --use-fuzzy             在输出中使用模糊的翻译条目\n"
 
-#: src/msgfmt.c:742
+#: src/msgfmt.c:763
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 "  -a, --alignment=数字        以<数字>个字节为单位对齐字符串(默认：%d)\n"
 
-#: src/msgfmt.c:744
+#: src/msgfmt.c:765
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr "      --no-hash               二进制文件将不包含哈希表\n"
 
-#: src/msgfmt.c:753
+#: src/msgfmt.c:774
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr "      --statistics            打印关于翻译的统计\n"
 
-#: src/msgfmt.c:755 src/msgmerge.c:589 src/msgunfmt.c:515
+#: src/msgfmt.c:776 src/msgmerge.c:589 src/msgunfmt.c:515
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr "  -v, --verbose               增加输出的详细程度\n"
 
-#: src/msgfmt.c:869
+#: src/msgfmt.c:890
 #, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr "警告：PO 文件头丢失或无效\n"
 
-#: src/msgfmt.c:872
+#: src/msgfmt.c:893
 #, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr "警告：字符集转换无法工作\n"
 
-#: src/msgfmt.c:882
+#: src/msgfmt.c:903
 #, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr "警告：PO 文件头模糊\n"
 
-#: src/msgfmt.c:884
+#: src/msgfmt.c:905
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr "警告：旧版本的 msgfmt 将在此时给出错误\n"
 
-#: src/msgfmt.c:908
+#: src/msgfmt.c:929
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "域名“%s”无法用于文件名"
 
-#: src/msgfmt.c:913
+#: src/msgfmt.c:934
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "域名“%s”无法用于文件名：将使用前缀"
 
-#: src/msgfmt.c:927
+#: src/msgfmt.c:948
 #, c-format
 msgid "`domain %s' directive ignored"
 msgstr "域名“%s”不适合作为文件名"
 
-#: src/msgfmt.c:987
+#: src/msgfmt.c:1008
 #, c-format
 msgid "empty `msgstr' entry ignored"
 msgstr "忽略了空的“msgstr”项"
 
-#: src/msgfmt.c:988
+#: src/msgfmt.c:1009
 #, c-format
 msgid "fuzzy `msgstr' entry ignored"
 msgstr "忽略了模糊的“msgstr”项"
 
-#: src/msgfmt.c:1037
+#: src/msgfmt.c:1058
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s：警告：源文件包含模糊的翻译条目"
 
 #: src/msggrep.c:255 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:454 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:603
-#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:225
-#: src/x-perl.c:300 src/x-perl.c:393 src/x-php.c:163 src/x-python.c:174
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616
+#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227
+#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174
 #: 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-ycp.c:91
 #, c-format
@@ -2154,14 +2131,14 @@ msgstr ""
 "在当前目录中找不到任何 .pot 文件。\n"
 "请通过 --input 选项指定作为输入文件的 .pot 文件。\n"
 
-#: src/msginit.c:866 src/msginit.c:941 src/msginit.c:1101 src/msginit.c:1196
+#: src/msginit.c:894 src/msginit.c:969 src/msginit.c:1129 src/msginit.c:1224
 #: 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:1066
+#: src/msginit.c:1094
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -2175,17 +2152,17 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1482
+#: src/msginit.c:1510
 #, c-format
 msgid "English translations for %s package"
 msgstr "%s 软件包的简体中文翻译"
 
-#: src/msgl-cat.c:177 src/msgl-charset.c:87 src/msgl-iconv.c:225
+#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247
 #, c-format
 msgid "present charset \"%s\" is not a portable encoding name"
 msgstr "当前的字符集编码“%s”不是通用的编码名称"
 
-#: src/msgl-cat.c:188 src/msgl-iconv.c:237
+#: src/msgl-cat.c:188 src/msgl-iconv.c:259
 #, c-format
 msgid "two different charsets \"%s\" and \"%s\" in input file"
 msgstr "输入文件中出现了两种不同的字符集“%s”和“%s”"
@@ -2203,14 +2180,14 @@ msgid ""
 "charset specification"
 msgstr "输入文件“%2$s”的域“%1$s”不包含指定字符集的文件头项"
 
-#: src/msgl-cat.c:391 src/msgl-iconv.c:360
+#: src/msgl-cat.c:391 src/msgl-iconv.c:375
 #, c-format
 msgid "target charset \"%s\" is not a portable encoding name."
 msgstr "目标字符集编码“%s”不是通用的编码名称。"
 
-#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:93
-#: src/msgl-charset.c:128 src/po-xerror.c:121 src/po-xerror.c:146
-#: src/xgettext.c:2886
+#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
+#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146
+#: src/xgettext.c:2957
 #, c-format
 msgid "warning: "
 msgstr "警告："
@@ -2247,7 +2224,7 @@ msgstr ""
 "请将全部的 msgid 和 msgctxt 都转换为纯 ASCII，或者从源代码上保证这些字符串\n"
 "都是 UTF-8 编码的。\n"
 
-#: src/msgl-charset.c:94
+#: src/msgl-charset.c:93
 #, c-format
 msgid ""
 "Locale charset \"%s\" is different from\n"
@@ -2258,12 +2235,12 @@ msgstr ""
 "当前语系的字符集“%s”和输入文件的字符集“%s”不同。\n"
 "“%s”的输出可能有误。可行的解决方法包含：\n"
 
-#: src/msgl-charset.c:101
+#: src/msgl-charset.c:100
 #, c-format
 msgid "- Set LC_ALL to a locale with encoding %s.\n"
 msgstr "- 将 LC_ALL 设为编码 %s 对应的语系。\n"
 
-#: src/msgl-charset.c:106
+#: src/msgl-charset.c:105
 #, c-format
 msgid ""
 "- Convert the translation catalog to %s using 'msgconv',\n"
@@ -2274,7 +2251,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:115
+#: src/msgl-charset.c:114
 #, c-format
 msgid ""
 "- Set LC_ALL to a locale with encoding %s,\n"
@@ -2287,7 +2264,7 @@ msgstr ""
 "   然后应用“%s”命令，\n"
 "   最后用“msgconv”将翻译库的字符集还原为 %s。\n"
 
-#: src/msgl-charset.c:129
+#: src/msgl-charset.c:128
 #, c-format
 msgid ""
 "Locale charset \"%s\" is not a portable encoding name.\n"
@@ -2430,37 +2407,37 @@ msgstr "某些文件头项仍然是默认值\n"
 msgid "header field `%s' still has the initial default value\n"
 msgstr "某些文件头项仍然是默认值\n"
 
-#: src/msgl-iconv.c:64
+#: src/msgl-iconv.c:65
 #, c-format
 msgid "%s: input is not valid in \"%s\" encoding"
 msgstr "%s：在“%s”编码中输入无效"
 
-#: src/msgl-iconv.c:68
+#: src/msgl-iconv.c:69
 #, c-format
 msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "%s：从“%s”编码转换到“%s”编码时出错"
 
-#: src/msgl-iconv.c:268
+#: src/msgl-iconv.c:290
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr "输入文件不包含指定字符集的文件头项"
 
-#: src/msgl-iconv.c:290 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
-#: src/x-python.c:620 src/xgettext.c:639
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:287 src/recode-sr-latin.c:292
+#: src/x-python.c:622 src/xgettext.c:640
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 "not support this conversion."
 msgstr "无法从“%s”转换为“%s”。%s 需要 iconv()，但 iconv() 不支持此种转换方式。"
 
-#: src/msgl-iconv.c:320
+#: src/msgl-iconv.c:335
 #, c-format
 msgid ""
 "Conversion from \"%s\" to \"%s\" introduces duplicates: some different "
 "msgids become equal."
 msgstr "从“%s”转换为“%s”出现了重复项：某些原本不同的 msgid 变成了相同项。"
 
-#: src/msgl-iconv.c:326 src/recode-sr-latin.c:301 src/x-python.c:627
-#: src/xgettext.c:646
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
+#: src/xgettext.c:647
 #, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
@@ -2571,10 +2548,10 @@ msgstr ""
 "备份后缀是“~”，您可以用 --suffix 或 SIMPLE_BACKUP_SUFFIX 环境变量设置。\n"
 
 #: src/msgmerge.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "      --previous              keep previous msgids of translated messages\n"
-msgstr "      --previous              保留已翻译条目的上一次 msgids\n"
+msgstr "      --previous              保留已翻译条目的 msgids\n"
 
 #: src/msgmerge.c:591 src/urlget.c:192
 #, c-format
@@ -2823,7 +2800,7 @@ msgstr "复数形式的索引出错"
 msgid "too many errors, aborting"
 msgstr "错误太多，中止"
 
-#: 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:739 src/write-po.c:868
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "无效的多字节序列"
@@ -2867,7 +2844,7 @@ msgstr "字符串内遇到行尾"
 msgid "context separator <EOT> within string"
 msgstr "上下文分隔符 <EOT> 出现于字符串中"
 
-#: src/read-catalog.c:332 src/xgettext.c:944
+#: src/read-catalog.c:332 src/xgettext.c:945
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "此文件可能不包含域指令"
@@ -3075,13 +3052,13 @@ msgstr "编译 Java 类失败，请尝试设置 $JAVAC 变量"
 msgid "error while opening \"%s\" for writing"
 msgstr "打开“%s”写入出错"
 
-#: src/write-po.c:803
+#: src/write-po.c:802
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr "国际化的消息不应包含“\\%c”转码序列"
 
-#: src/write-po.c:1254 src/write-po.c:1383
+#: src/write-po.c:1253 src/write-po.c:1382
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
@@ -3094,7 +3071,7 @@ msgstr ""
 "用纯 ASCII 的 msgctxt。\n"
 "%s\n"
 
-#: src/write-po.c:1266 src/write-po.c:1395
+#: src/write-po.c:1265 src/write-po.c:1394
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -3172,7 +3149,7 @@ msgstr ""
 "消息库有复数翻译\n"
 "但是 Tcl 消息库不支持复数处理\n"
 
-#: src/x-awk.c:341 src/x-python.c:1072
+#: src/x-awk.c:341 src/x-python.c:1074
 #, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d：警告：未结束的字符串"
@@ -3182,17 +3159,17 @@ msgstr "%s:%d：警告：未结束的字符串"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d：警告：未结束的正规表达式"
 
-#: src/x-c.c:1193 src/x-csharp.c:1509 src/x-java.c:872
+#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d：警告：未结束的字符常量"
 
-#: src/x-c.c:1217
+#: src/x-c.c:1247
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d：警告：未结束的字符串字面"
 
-#: src/x-csharp.c:224 src/xgettext.c:1927
+#: src/x-csharp.c:224 src/xgettext.c:1962
 #, fuzzy
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
@@ -3249,7 +3226,7 @@ msgstr ""
 "%s:%d：无效的多字节序列。\n"
 "请通过 --from-code 指定源文件的编码。\n"
 
-#: src/x-csharp.c:1390 src/x-python.c:1279
+#: src/x-csharp.c:1390 src/x-python.c:1281
 #, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d：警告：无效的 Unicode 字符"
@@ -3269,12 +3246,12 @@ msgstr "%s:%d：警告：期待“}”却发现了“)”"
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr "%s:%d：警告：期待“)”却发现了“}”"
 
-#: src/x-glade.c:610 src/x-glade.c:617
+#: src/x-glade.c:623 src/x-glade.c:630
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr "%s:%lu:%lu：%s"
 
-#: src/x-glade.c:644
+#: src/x-glade.c:657
 #, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
@@ -3288,37 +3265,37 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d：警告：未结束的字符串 U+%04X"
 
-#: src/x-perl.c:306
+#: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 msgstr "%s:%d：在文件结束符前的任何位置都找不到字符串结束符“%s”"
 
-#: src/x-perl.c:1039
+#: src/x-perl.c:1041
 #, c-format
 msgid "%s:%d: missing right brace on \\x{HEXNUMBER}"
 msgstr "%s:%d：在 \\x{十六进制数} 处缺少右大括号"
 
-#: src/x-perl.c:1159
+#: src/x-perl.c:1161
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\l”)"
 
-#: src/x-perl.c:1179
+#: src/x-perl.c:1181
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\u”)"
 
-#: src/x-perl.c:1213
+#: src/x-perl.c:1215
 #, c-format
 msgid "%s:%d: invalid variable interpolation at \"%c\""
 msgstr "%s:%d：“%c”处有无效的变量转义"
 
-#: src/x-perl.c:1226
+#: src/x-perl.c:1228
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\L”)"
 
-#: src/x-perl.c:1243
+#: src/x-perl.c:1245
 #, c-format
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr "%s:%d：8位字符“%c”转义无效(“\\U”)"
@@ -3388,7 +3365,7 @@ msgstr ""
 "请通过 --from-code 指定源文件的编码，详见\n"
 "http://www.python.org/peps/pep-0263.html。\n"
 
-#: src/x-python.c:677
+#: src/x-python.c:679
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr "未知编码“%s”。先按照 ASCII 处理。"
@@ -3415,50 +3392,50 @@ msgid ""
 "use eval_gettext instead"
 msgstr "%s:%lu：警告：为安全起见，语法 $“...”不被推荐；请换用 eval_gettext"
 
-#: src/xgettext.c:568
+#: src/xgettext.c:569
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr "输出写到 stdout 时无法使用 --join-existing"
 
-#: src/xgettext.c:573
+#: src/xgettext.c:574
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "没有指定关键字 xgettext 将无法工作"
 
-#: src/xgettext.c:716
+#: src/xgettext.c:717
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr "警告：文件“%s”扩展名“%s”未知；看作 C 语言"
 
-#: src/xgettext.c:767
+#: src/xgettext.c:768
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr "从给定的输入文件中提取可翻译的字符串。\n"
 
-#: src/xgettext.c:790
+#: src/xgettext.c:791
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr "  -d, --default-domain=名称   使用<名称.po>输出(而不是 messages.po)\n"
 
-#: src/xgettext.c:792
+#: src/xgettext.c:793
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr "  -o, --output=文件           将输出写入指定文件\n"
 
-#: src/xgettext.c:794
+#: src/xgettext.c:795
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr "  -p, --output-dir=目录       输出文件将会存放在<目录>中\n"
 
-#: src/xgettext.c:799
+#: src/xgettext.c:800
 #, c-format
 msgid "Choice of input file language:\n"
 msgstr "选择输入文件所用的语言：\n"
 
-#: src/xgettext.c:801
+#: src/xgettext.c:802
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
@@ -3477,19 +3454,19 @@ msgstr ""
 "PHP,\n"
 "                                GCC-源, NXStringTable, RST, Glade)\n"
 
-#: src/xgettext.c:807
+#: src/xgettext.c:808
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr "  -C, --c++                   --language=C++ 的简写\n"
 
-#: src/xgettext.c:809
+#: src/xgettext.c:810
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr "默认情况下，所使用的语言是根据输入文件的扩展名猜测的。\n"
 
-#: src/xgettext.c:814
+#: src/xgettext.c:815
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
@@ -3498,22 +3475,22 @@ msgstr ""
 "      --from-code=名称        输入文件的编码\n"
 "                                (除了 Python, Tcl, Glade)\n"
 
-#: src/xgettext.c:817
+#: src/xgettext.c:818
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr "默认情况下，输入文件都认为是纯 ASCII 文件。\n"
 
-#: src/xgettext.c:822
+#: src/xgettext.c:823
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr "  -j, --join-existing         将消息加入已有文件\n"
 
-#: src/xgettext.c:824
+#: src/xgettext.c:825
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr "  -x, --exclude-file=文件.po  文件.po中的项不提取\n"
 
-#: src/xgettext.c:826
+#: src/xgettext.c:827
 #, fuzzy, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
@@ -3525,17 +3502,17 @@ msgstr ""
 "  -c, --add-comments[=标记]   在输出文件中放置用<标记>(或类似的关键字\n"
 "                              行)标明的注释块\n"
 
-#: src/xgettext.c:832
+#: src/xgettext.c:833
 #, c-format
 msgid "Language specific options:\n"
 msgstr "语言特定选项：\n"
 
-#: src/xgettext.c:834
+#: src/xgettext.c:835
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr "  -a, --extract-all           提取所有字符串\n"
 
-#: src/xgettext.c:836 src/xgettext.c:843
+#: src/xgettext.c:837 src/xgettext.c:844
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3549,7 +3526,7 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源, Glade 语言)\n"
 
-#: src/xgettext.c:840
+#: src/xgettext.c:841
 #, fuzzy, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
@@ -3558,7 +3535,7 @@ msgstr ""
 "  -k, --keyword[=单词]        要查找的额外关键字(不指定<单词>表明不使用\n"
 "                              默认关键字)\n"
 
-#: src/xgettext.c:847
+#: src/xgettext.c:848
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
@@ -3569,7 +3546,7 @@ msgstr ""
 "标\n"
 "                              志\n"
 
-#: src/xgettext.c:850
+#: src/xgettext.c:851
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
@@ -3583,75 +3560,75 @@ msgstr ""
 "Tcl,\n"
 "                                Perl, PHP, GCC-源语言)\n"
 
-#: src/xgettext.c:854
+#: src/xgettext.c:855
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr "  -T, --trigraphs             理解输入时的 ANSI C 分段\n"
 
-#: src/xgettext.c:856
+#: src/xgettext.c:857
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr "                                (仅 C, C++, ObjectiveC 语言)\n"
 
-#: src/xgettext.c:858
+#: src/xgettext.c:859
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr "      --qt                    识别 Qt 格式字符串\n"
 
-#: src/xgettext.c:860 src/xgettext.c:864 src/xgettext.c:868
+#: src/xgettext.c:861 src/xgettext.c:865 src/xgettext.c:869
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr "                                (仅 C++ 语言)\n"
 
-#: src/xgettext.c:862
+#: src/xgettext.c:863
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr "      --kde                   识别 KDE 4 格式字符串\n"
 
-#: src/xgettext.c:866
+#: src/xgettext.c:867
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr "      --boost                 识别 Boost 格式字符串\n"
 
-#: src/xgettext.c:870
+#: src/xgettext.c:871
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr "      --debug                 更详细的格式字符串识别结果\n"
 
-#: src/xgettext.c:889
+#: src/xgettext.c:890
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr "      --properties-output     写出 Java .properties 文件\n"
 
-#: src/xgettext.c:904
+#: src/xgettext.c:905
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr "      --copyright-holder=字符串  在输出中设置版权占位符\n"
 
-#: src/xgettext.c:906
+#: src/xgettext.c:907
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr "      --foreign-user          为外语用户省略 FSF 版权\n"
 
-#: src/xgettext.c:908
+#: src/xgettext.c:909
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr "      --package-name=PACKAGE  输出时设定软件包名字\n"
 
-#: src/xgettext.c:910
+#: src/xgettext.c:911
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr "      --package-version=VERSION  输出时设定软件包版本\n"
 
-#: src/xgettext.c:912
+#: src/xgettext.c:913
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr "      --msgid-bugs-address=EMAIL@ADDRESS  设置报告 msgid 错误的地址\n"
 
-#: src/xgettext.c:914
+#: src/xgettext.c:915
 #, fuzzy, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
@@ -3660,7 +3637,7 @@ msgid ""
 msgstr ""
 "  -m, --msgstr-prefix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的前缀\n"
 
-#: src/xgettext.c:917
+#: src/xgettext.c:918
 #, fuzzy, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
@@ -3669,38 +3646,38 @@ msgid ""
 msgstr ""
 "  -M, --msgstr-suffix[=字符串]  使用<字符串>或\"\"作为 msgstr 项的后缀\n"
 
-#: src/xgettext.c:1691
+#: src/xgettext.c:1724
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr "--flag 参数并非以 <关键字>:<参数编号>:[遍数-]<标志> 的语法给出：%s"
 
-#: src/xgettext.c:1790
+#: src/xgettext.c:1823
 msgid "standard input"
 msgstr "标准输入"
 
-#: src/xgettext.c:1892
+#: src/xgettext.c:1927
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
-#: src/xgettext.c:1896
+#: src/xgettext.c:1931
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
-#: src/xgettext.c:1901
+#: src/xgettext.c:1936
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
-#: src/xgettext.c:2001 src/xgettext.c:2034 src/xgettext.c:2095
+#: src/xgettext.c:2042 src/xgettext.c:2075 src/xgettext.c:2137
 #, c-format
 msgid "%s%s: warning: "
 msgstr "%s%s：警告："
 
-#: src/xgettext.c:2004
+#: src/xgettext.c:2045
 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
@@ -3708,14 +3685,14 @@ msgid ""
 msgstr ""
 "尽管在格式字符串的位置使用，但 %s 仍不是有效的 %s 格式字符串。原因：%s\n"
 
-#: src/xgettext.c:2005
+#: src/xgettext.c:2046
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr "以所声明的语言 %2$s 来看，%1$s 不是有效的格式字符串。原因：%3$s\n"
 
-#: src/xgettext.c:2036
+#: src/xgettext.c:2077
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
@@ -3727,7 +3704,7 @@ msgstr ""
 "翻译者无法重新编排参数的顺序。\n"
 "请考虑使用带有命名参数和映射的格式字符串，而不是使用参数数组。\n"
 
-#: src/xgettext.c:2097
+#: src/xgettext.c:2139
 msgid ""
 "Empty msgid.  It is reserved by GNU gettext:\n"
 "gettext(\"\") returns the header entry with\n"
@@ -3737,27 +3714,27 @@ msgstr ""
 "gettext(\"\") 将返回文件头项，而不\n"
 "是空字符串。\n"
 
-#: src/xgettext.c:2723
+#: src/xgettext.c:2776
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr "关键字“%.*s”的参数指定含糊"
 
-#: src/xgettext.c:2750
+#: src/xgettext.c:2803
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少上下文"
 
-#: src/xgettext.c:2775
+#: src/xgettext.c:2828
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr "警告：关键字“%.*s”缺少复数参数上下文"
 
-#: src/xgettext.c:2796
+#: src/xgettext.c:2849
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr "单数和复数的上下文不匹配"
 
-#: src/xgettext.c:2887
+#: src/xgettext.c:2958
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 "If you are using a `Makevars' file, please specify\n"
@@ -3768,7 +3745,7 @@ msgstr ""
 "“Makevars”文件，请指定 MSGID_BUGS_ADDRESS 变量；\n"
 "否则，请指定 --msgid-bugs-address 命令行选项。\n"
 
-#: src/xgettext.c:3095
+#: src/xgettext.c:3168
 #, c-format
 msgid "language `%s' unknown"
 msgstr "语言“%s”未知"
@@ -3777,6 +3754,24 @@ msgstr "语言“%s”未知"
 msgid "<unnamed>"
 msgstr "<未命名>"
 
+#~ msgid "DuplicateHandle failed with error code 0x%08x"
+#~ msgstr "DuplicateHandle 失败，错误码为 0x%08x"
+
+#~ msgid "Not yet implemented."
+#~ msgstr "尚未实现。"
+
+#~ msgid "cannot set up nonblocking I/O to %s subprocess"
+#~ msgstr "无法为 %s 子进程创建非专用的 I/O"
+
+#~ msgid "communication with %s subprocess failed"
+#~ msgstr "和 %s 子进程通讯时出现错误"
+
+#~ msgid "read from %s subprocess failed"
+#~ msgstr "由 %s 子进程读入数据时出现错误"
+
+#~ msgid "%s subprocess terminated with exit code %d"
+#~ msgstr "%s 子进程已终止，错误码为 %d"
+
 #~ msgid "field `%s' still has initial default value\n"
 #~ msgstr "文件头项“%s”仍然是默认值\n"