Imported Upstream version 0.18.3.2

[platform/upstream/gettext.git] / gettext-tools / po / nb.po

diff --git a/gettext-tools/po/nb.po b/gettext-tools/po/nb.po
index 460dae6..3ebe11d 100644 (file)
--- a/gettext-tools/po/nb.po
+++ b/gettext-tools/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.37\n"
 "Report-Msgid-Bugs-To: bug-gnu-gettext@gnu.org\n"

-"POT-Creation-Date: 2010-06-04 01:57+0200\n"
+"POT-Creation-Date: 2014-01-07 15:19+0900\n"

 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"
 "PO-Revision-Date: 2001-05-09 02:08+02:00\n"
 "Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n"
 "Language-Team: Norwegian-bokmål <no@li.org>\n"


@@ -27,26 +27,25 @@ msgid "ambiguous argument %s for %s"
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153
 msgstr ""
 
 #: gnulib-lib/argmatch.c:153

-#, c-format

 msgid "Valid arguments are:"
 msgstr ""
 
 msgid "Valid arguments are:"
 msgstr ""
 

-#: gnulib-lib/clean-temp.c:335
+#: gnulib-lib/clean-temp.c:332

 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke opprette utfilen «%s»"
 
 #, fuzzy, c-format
 msgid "cannot find a temporary directory, try setting $TMPDIR"
 msgstr "kan ikke opprette utfilen «%s»"
 

-#: gnulib-lib/clean-temp.c:349
+#: gnulib-lib/clean-temp.c:346

 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 
 #, fuzzy, c-format
 msgid "cannot create a temporary directory using template \"%s\""
 msgstr "kan ikke opprette utfilen «%s»"
 

-#: gnulib-lib/clean-temp.c:445
+#: gnulib-lib/clean-temp.c:442

 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke opprette utfilen «%s»"
 
 #, fuzzy, c-format
 msgid "cannot remove temporary file %s"
 msgstr "kan ikke opprette utfilen «%s»"
 

-#: gnulib-lib/clean-temp.c:460
+#: gnulib-lib/clean-temp.c:457

 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke opprette utfilen «%s»"
 #, fuzzy, c-format
 msgid "cannot remove temporary directory %s"
 msgstr "kan ikke opprette utfilen «%s»"


@@ -55,33 +54,34 @@ msgstr "kan ikke opprette utfilen 
 msgid "write error"
 msgstr ""
 
 msgid "write error"
 msgstr ""
 

-#: gnulib-lib/copy-file.c:67 src/file-list.c:53 src/msggrep.c:247
-#: src/open-catalog.c:122 src/read-mo.c:252 src/read-tcl.c:125
-#: src/urlget.c:216 src/xgettext.c:1890 src/xgettext.c:1903
-#: src/xgettext.c:1913
+#: gnulib-lib/copy-acl.c:54 gnulib-lib/copy-file.c:217

 #, c-format
 #, c-format

-msgid "error while opening \"%s\" for reading"
+msgid "preserving permissions for %s"
+msgstr ""
+
+#: gnulib-lib/copy-file.c:194
+#, fuzzy, c-format
+msgid "error while opening %s for reading"

 msgstr "feil under åpning av «%s» for lesing"
 
 msgstr "feil under åpning av «%s» for lesing"
 

-#: gnulib-lib/copy-file.c:74
+#: gnulib-lib/copy-file.c:198

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "cannot open backup file \"%s\" for writing"
+msgid "cannot open backup file %s for writing"

 msgstr "feil under åpning av «%s» for skriving"
 
 msgstr "feil under åpning av «%s» for skriving"
 

-#: gnulib-lib/copy-file.c:82 src/urlget.c:228
+#: gnulib-lib/copy-file.c:202

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "error reading \"%s\""
+msgid "error reading %s"

 msgstr "feil under lesing av «%s»"
 
 msgstr "feil under lesing av «%s»"
 

-#: gnulib-lib/copy-file.c:87 gnulib-lib/copy-file.c:94
-#: gnulib-lib/copy-file.c:133
+#: gnulib-lib/copy-file.c:206

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "error writing \"%s\""
+msgid "error writing %s"

 msgstr "feil under skriving av filen «%s»"
 
 msgstr "feil under skriving av filen «%s»"
 

-#: gnulib-lib/copy-file.c:96 gnulib-lib/copy-file.c:135 src/urlget.c:238
+#: gnulib-lib/copy-file.c:210

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "error after reading \"%s\""
+msgid "error after reading %s"

 msgstr "feil under lesing av «%s»"
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897
 msgstr "feil under lesing av «%s»"
 
 #: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897


@@ -102,69 +102,69 @@ msgstr ""
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 
 msgid "C# virtual machine not found, try installing pnet"
 msgstr ""
 

-#: gnulib-lib/error.c:181
+#: gnulib-lib/error.c:188

 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 
 msgid "Unknown system error"
 msgstr "Ukjent systemfeil"
 

-#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 gnulib-lib/pipe.c:232
-#: gnulib-lib/pipe.c:346 gnulib-lib/wait-process.c:282
-#: gnulib-lib/wait-process.c:356
+#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262
+#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348
+#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356

 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 
 #, c-format
 msgid "%s subprocess failed"
 msgstr ""
 

-#: gnulib-lib/getopt.c:527 gnulib-lib/getopt.c:543
+#: gnulib-lib/getopt.c:547 gnulib-lib/getopt.c:576

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "%s: option '%s' is ambiguous\n"
+msgid "%s: option '%s' is ambiguous; possibilities:"

 msgstr "%s: flagget «%s» er flertydig\n"
 
 msgstr "%s: flagget «%s» er flertydig\n"
 

-#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580
+#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628

 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget «--%s» tillater ikke argumenter\n"
 
 #, fuzzy, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: flagget «--%s» tillater ikke argumenter\n"
 

-#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594
+#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642

 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget «%c%s» tillater ikke argumenter\n"
 
 #, fuzzy, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: flagget «%c%s» tillater ikke argumenter\n"
 

-#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656
+#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704

 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"
 
 #, fuzzy, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"
 

-#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697
+#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745

 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg «--%s»\n"
 
 #, fuzzy, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: ukjent flagg «--%s»\n"
 

-#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708
+#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756

 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg «%c%s»\n"
 
 #, fuzzy, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: ukjent flagg «%c%s»\n"
 

-#: gnulib-lib/getopt.c:757 gnulib-lib/getopt.c:760
+#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808

 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 
 #, fuzzy, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ugyldig flagg -- %c\n"
 

-#: gnulib-lib/getopt.c:810 gnulib-lib/getopt.c:827 gnulib-lib/getopt.c:1035
-#: gnulib-lib/getopt.c:1053
+#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088
+#: gnulib-lib/getopt.c:1106

 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: flagg krever et argument -- %c\n"
 

-#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899
+#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950

 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg «-W %s» er flertydig\n"
 
 #, fuzzy, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: flagg «-W %s» er flertydig\n"
 

-#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941
+#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992

 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 
 #, fuzzy, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: flagg «-W %s» tillater ikke et argument\n"
 

-#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980
+#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031

 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"
 #, fuzzy, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%s: flagget «%s» krever et argument\n"


@@ -209,52 +209,90 @@ msgstr ""
 msgid "%s subprocess I/O error"
 msgstr ""
 
 msgid "%s subprocess I/O error"
 msgstr ""
 

-#: 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:600 libgettextpo/gettext-po.c:1328
+#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37
+#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83
+#: src/po-lex.c:102 src/x-glade.c:817 libgettextpo/gettext-po.c:1328

 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 
 #, c-format
 msgid "memory exhausted"
 msgstr "minnet oppbrukt"
 

-#: gnulib-lib/pipe.c:138 gnulib-lib/pipe.c:141 gnulib-lib/pipe.c:262
-#: gnulib-lib/pipe.c:265
-#, fuzzy, c-format
-msgid "cannot create pipe"
-msgstr "kan ikke opprette utfilen «%s»"
+#: gnulib-lib/pipe-filter-ii.c:192
+#, c-format
+msgid "creation of threads failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374
+#: src/msgexec.c:389
+#, c-format
+msgid "write to %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:245 gnulib-lib/pipe-filter-ii.c:417
+#, c-format
+msgid "read from %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:298
+#, c-format
+msgid "cannot set up nonblocking I/O to %s subprocess"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:329
+#, c-format
+msgid "communication with %s subprocess failed"
+msgstr ""
+
+#: gnulib-lib/pipe-filter-ii.c:449
+#, c-format
+msgid "%s subprocess terminated with exit code %d"
+msgstr ""

 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.
 
 #. TRANSLATORS:
 #. Get translations for open and closing quotation marks.

-#.

 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for
 #. The message catalog should translate "`" to a left
 #. quotation mark suitable for the locale, and similarly for

-#. "'".  If the catalog has no translation,
-#. locale_quoting_style quotes `like this', and
-#. clocale_quoting_style quotes "like this".
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.

 #.
 #.

-#. For example, an American English Unicode locale should
-#. 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.
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.

 #.
 #. If you don't know what to put here, please see
 #.
 #. If you don't know what to put here, please see

-#. <http://en.wikipedia.org/wiki/Quotation_mark#Glyphs>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>

 #. and use glyphs suitable for your language.
 #. and use glyphs suitable for your language.

-#: gnulib-lib/quotearg.c:272
+#: gnulib-lib/quotearg.c:312

 msgid "`"
 msgstr ""
 
 msgid "`"
 msgstr ""
 

-#: gnulib-lib/quotearg.c:273
+#: gnulib-lib/quotearg.c:313

 msgid "'"
 msgstr ""
 
 msgid "'"
 msgstr ""
 

-#: gnulib-lib/w32spawn.h:40
+#: gnulib-lib/set-acl.c:46
+#, c-format
+msgid "setting permissions for %s"
+msgstr ""
+
+#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143
+#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267
+#, fuzzy, c-format
+msgid "cannot create pipe"
+msgstr "kan ikke opprette utfilen «%s»"
+
+#: gnulib-lib/w32spawn.h:43

 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 
 #, c-format
 msgid "_open_osfhandle failed"
 msgstr ""
 

-#: gnulib-lib/w32spawn.h:81
+#: gnulib-lib/w32spawn.h:84

 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke opprette utfilen «%s»"
 #, fuzzy, c-format
 msgid "cannot restore fd %d: dup2 failed"
 msgstr "kan ikke opprette utfilen «%s»"


@@ -270,13 +308,20 @@ msgstr ""
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 
 msgid "%s subprocess got fatal signal %d"
 msgstr ""
 

-#: src/format.c:148
+#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122
+#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1925
+#: src/xgettext.c:1938 src/xgettext.c:1948
+#, c-format
+msgid "error while opening \"%s\" for reading"
+msgstr "feil under åpning av «%s» for lesing"
+
+#: src/format.c:151

 #, c-format
 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
 #, c-format
 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:627 src/format-librep.c:312
+#: src/format-gcc-internal.c:627 src/format-librep.c:312 src/format-lua.c:228

 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format
 #: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350
 #: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147
 #, fuzzy, c-format


@@ -285,17 +330,19 @@ msgid ""
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: 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-gcc-internal.c:638 src/format-librep.c:323 src/format-lua.c:235

 #: src/format-pascal.c:408 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
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 #: src/format-pascal.c:408 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
 #, fuzzy, c-format
 msgid "a format specification for argument %u doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 

-#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:910
+#: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146

 #: src/format-elisp.c:379 src/format-gcc-internal.c:658
 #: src/format-elisp.c:379 src/format-gcc-internal.c:658

-#: src/format-librep.c:343 src/format-pascal.c:428 src/format-perl.c:615
-#: src/format-php.c:381 src/format-python.c:527 src/format-tcl.c:421
+#: src/format-gfc-internal.c:372 src/format-javascript.c:227
+#: src/format-librep.c:343 src/format-lua.c:242 src/format-pascal.c:428
+#: 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 "format-spesifiseringene for argument %lu er ulike"
 #, fuzzy, c-format
 msgid "format specifications in '%s' and '%s' for argument %u are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"


@@ -305,24 +352,26 @@ msgstr "format-spesifiseringene for argument %lu er ulike"
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 
 msgid "The directive number %u starts with | but does not end with |."
 msgstr ""
 

-#: src/format-c.c:181
+#: src/format-c.c:36

 #, c-format
 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 ""
 
 #, c-format
 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 ""
 

-#: src/format-c.c:588
+#: src/format-c.c:39

 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 
 #, c-format
 msgid "In the directive number %u, the token after '<' is not followed by '>'."
 msgstr ""
 

-#: src/format-c.c:814
+#: src/format-c.c:42 src/format-gfc-internal.c:289

 #, c-format
 msgid "The string refers to argument number %u but ignores argument number %u."
 msgstr ""
 
 #, c-format
 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:515
+#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363
+#: src/format-javascript.c:215 src/format-python.c:515
+#: src/format-qt-plural.c:110

 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"
 #, fuzzy, c-format
 msgid "number of format specifications in '%s' and '%s' does not match"
 msgstr "antallet format-spesifiseringer i «msgid» og «msgstr» stemmer ikke"


@@ -408,6 +457,16 @@ msgstr ""
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 
 msgid "'%s' does not use %%m but '%s' uses %%m"
 msgstr ""
 

+#: src/format-gfc-internal.c:383
+#, c-format
+msgid "'%s' uses %%C but '%s' doesn't"
+msgstr ""
+
+#: src/format-gfc-internal.c:386
+#, c-format
+msgid "'%s' does not use %%C but '%s' uses %%C"
+msgstr ""
+

 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""
 #: src/format-invalid.h:22
 msgid "The string ends in the middle of a directive."
 msgstr ""


@@ -589,7 +648,9 @@ msgid ""
 "conversion specifier '%c'."
 msgstr ""
 
 "conversion specifier '%c'."
 msgstr ""
 

-#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308
+#: src/format-perl-brace.c:199 src/format-python.c:471
+#: src/format-python-brace.c:374 src/format-python-brace.c:387
+#: src/format-sh.c:308

 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 #, fuzzy, c-format
 msgid "a format specification for argument '%s' doesn't exist in '%s'"
 msgstr "format-spesifiseringene for argument %lu er ulike"


@@ -629,6 +690,32 @@ msgid ""
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 
 "format specifications in '%s' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringene for argument %lu er ulike"
 

+#: src/format-python-brace.c:136
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a field name."
+msgstr ""
+
+#: src/format-python-brace.c:149
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getattr argument."
+msgstr ""
+
+#: src/format-python-brace.c:164
+#, c-format
+msgid "In the directive number %u, '%c' cannot start a getitem argument."
+msgstr ""
+
+#: src/format-python-brace.c:184
+#, c-format
+msgid ""
+"In the directive number %u, no more nesting is allowed in a format specifier."
+msgstr ""
+
+#: src/format-python-brace.c:210
+#, c-format
+msgid "In the directive number %u, there is an unterminated format directive."
+msgstr ""
+

 #: src/format-qt.c:152
 #, c-format
 msgid ""
 #: src/format-qt.c:152
 #, c-format
 msgid ""


@@ -670,11 +757,11 @@ msgid ""
 "1 and 9."
 msgstr ""
 
 "1 and 9."
 msgstr ""
 

-#: src/hostname.c:178 src/msgattrib.c:337 src/msgcat.c:289 src/msgcmp.c:172
+#: src/hostname.c:178 src/msgattrib.c:344 src/msgcat.c:289 src/msgcmp.c:172

 #: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
 #: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
 #: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259
 #: src/msgcomm.c:280 src/msgconv.c:235 src/msgen.c:231 src/msgexec.c:180
 #: src/msgfilter.c:273 src/msgfmt.c:366 src/msggrep.c:410 src/msginit.c:268
 #: src/msgmerge.c:344 src/msgunfmt.c:262 src/msguniq.c:259

-#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:584
+#: src/recode-sr-latin.c:110 src/urlget.c:143 src/xgettext.c:599

 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"


@@ -683,17 +770,17 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178
+#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgcmp.c:178

 #: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
 #: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
 #: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149
 #: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186
 #: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274
 #: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149

-#: src/xgettext.c:590
+#: src/xgettext.c:605

 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Skrevet av %s.\n"
 
 #. This is a proper name. See the gettext manual, section Names.

-#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241
+#: src/hostname.c:184 src/msgattrib.c:350 src/msgcat.c:295 src/msgconv.c:241

 #: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
 #: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149
 #: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416
 #: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121
 #: src/urlget.c:149


@@ -705,13 +792,13 @@ msgstr ""
 msgid "too many arguments"
 msgstr "for mange argumenter"
 
 msgid "too many arguments"
 msgstr "for mange argumenter"
 

-#: src/hostname.c:207 src/msgattrib.c:403 src/msgcat.c:362 src/msgcmp.c:209
+#: src/hostname.c:207 src/msgattrib.c:410 src/msgcat.c:362 src/msgcmp.c:209

 #: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253
 #: src/msgcomm.c:354 src/msgconv.c:298 src/msgen.c:294 src/msgexec.c:253

-#: src/msgfilter.c:384 src/msgfmt.c:646 src/msggrep.c:507 src/msginit.c:358
+#: src/msgfilter.c:384 src/msgfmt.c:650 src/msggrep.c:507 src/msginit.c:358

 #: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321
 #: src/msgmerge.c:476 src/msgunfmt.c:423 src/msguniq.c:321

-#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:812
-#, c-format
-msgid "Try `%s --help' for more information.\n"
+#: src/recode-sr-latin.c:143 src/urlget.c:172 src/xgettext.c:828
+#, fuzzy, c-format
+msgid "Try '%s --help' for more information.\n"

 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
 #: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
 #: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148


@@ -747,29 +834,29 @@ msgstr ""
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 
 msgid "  -i, --ip-address            addresses for the hostname\n"
 msgstr ""
 

-#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258
+#: src/hostname.c:228 src/msgattrib.c:525 src/msgcat.c:468 src/msgcmp.c:258

 #: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295
 #: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295

-#: src/msgfilter.c:476 src/msgfmt.c:768 src/msggrep.c:623 src/msginit.c:420
+#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420

 #: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416
 #: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416

-#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:980
+#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:1000

 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 
 #, c-format, no-wrap
 msgid "Informative output:\n"
 msgstr ""
 

-#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260
+#: src/hostname.c:230 src/msgattrib.c:527 src/msgcat.c:470 src/msgcmp.c:260

 #: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297
 #: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297

-#: src/msgfilter.c:478 src/msgfmt.c:770 src/msggrep.c:625 src/msginit.c:422
+#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422

 #: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418
 #: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418

-#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:982
+#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:1002

 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 
 #, c-format, no-wrap
 msgid "  -h, --help                  display this help and exit\n"
 msgstr ""
 

-#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262
+#: src/hostname.c:232 src/msgattrib.c:529 src/msgcat.c:472 src/msgcmp.c:262

 #: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299
 #: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299

-#: src/msgfilter.c:480 src/msgfmt.c:772 src/msggrep.c:627 src/msginit.c:424
+#: src/msgfilter.c:480 src/msgfmt.c:779 src/msggrep.c:627 src/msginit.c:424

 #: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420
 #: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420

-#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:984
+#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:1004

 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""
 #, c-format, no-wrap
 msgid "  -V, --version               output version information and exit\n"
 msgstr ""


@@ -778,11 +865,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).
 #. 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:526 src/msgcat.c:479 src/msgcmp.c:269
+#: src/hostname.c:239 src/msgattrib.c:536 src/msgcat.c:479 src/msgcmp.c:269

 #: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306
 #: src/msgcomm.c:465 src/msgconv.c:391 src/msgen.c:386 src/msgexec.c:306

-#: src/msgfilter.c:487 src/msgfmt.c:783 src/msggrep.c:634 src/msginit.c:431
+#: src/msgfilter.c:487 src/msgfmt.c:790 src/msggrep.c:634 src/msginit.c:431

 #: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427
 #: src/msgmerge.c:616 src/msgunfmt.c:540 src/msguniq.c:427

-#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:991
+#: src/recode-sr-latin.c:174 src/urlget.c:199 src/xgettext.c:1011

 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 #, fuzzy
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"


@@ -792,37 +879,37 @@ msgstr "Rapporter feil til <bug-gnu-utils@gnu.org>.\n"
 msgid "could not get host name"
 msgstr ""
 
 msgid "could not get host name"
 msgstr ""
 

-#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194
+#: src/msgattrib.c:365 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194

 #: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger nøyaktig to innfiler"
 
 #: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280
 #, fuzzy, c-format
 msgid "at most one input file allowed"
 msgstr "trenger nøyaktig to innfiler"
 

-#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315
+#: src/msgattrib.c:371 src/msgattrib.c:375 src/msgcat.c:311 src/msgcat.c:315

 #: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
 #: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
 #: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
 #: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290
 #: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266
 #: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298
 #: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456
 #: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396
 #: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290

-#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614
-#: src/xgettext.c:617
+#: src/xgettext.c:615 src/xgettext.c:619 src/xgettext.c:626 src/xgettext.c:629
+#: src/xgettext.c:632

 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker hverandre"
 

-#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325
+#: src/msgattrib.c:414 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325

 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 

-#: src/msgattrib.c:412
+#: src/msgattrib.c:419

 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
 #, c-format, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 

-#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374
+#: src/msgattrib.c:423 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374

 #: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341
 #: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396
 #: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435
 #: src/msguniq.c:341


@@ -831,50 +918,50 @@ msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
 "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 

-#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377
+#: src/msgattrib.c:426 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377

 #: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399
 #: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399

-#: src/msgfmt.c:664 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
-#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:830
+#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500
+#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:846

 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 
 #, fuzzy, c-format
 msgid "Input file location:\n"
 msgstr "ingen innfil angitt"
 

-#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346
+#: src/msgattrib.c:428 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346

 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 
 #, c-format
 msgid "  INPUTFILE                   input PO file\n"
 msgstr ""
 

-#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383
+#: src/msgattrib.c:430 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383

 #: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403
 #: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403

-#: src/msgfmt.c:668 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
-#: src/xgettext.c:836
+#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348
+#: src/xgettext.c:852

 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 

-#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405
+#: src/msgattrib.c:432 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405

 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
 #: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350
 #, c-format
 msgid "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 

-#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
-#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:688 src/msggrep.c:533
+#: src/msgattrib.c:435 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322
+#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533

 #: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353
 #: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353

-#: src/xgettext.c:841
+#: src/xgettext.c:857

 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 
 #, c-format
 msgid "Output file location:\n"
 msgstr ""
 

-#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
-#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:690 src/msggrep.c:535
+#: src/msgattrib.c:437 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324
+#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535

 #: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 
 #: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355
 #, c-format
 msgid "  -o, --output-file=FILE      write output to specified file\n"
 msgstr ""
 

-#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326
+#: src/msgattrib.c:439 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326

 #: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
 #: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format
 #: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522
 #: src/msgunfmt.c:493 src/msguniq.c:357
 #, c-format


@@ -883,114 +970,121 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
 "or if it is -.\n"
 msgstr ""
 

-#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361
+#: src/msgattrib.c:443 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361

 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 
 #, c-format
 msgid "Message selection:\n"
 msgstr ""
 

-#: src/msgattrib.c:438
+#: src/msgattrib.c:445

 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --translated            keep translated, remove untranslated messages\n"
 msgstr ""
 

-#: src/msgattrib.c:440
+#: src/msgattrib.c:447

 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --untranslated          keep untranslated, remove translated messages\n"
 msgstr ""
 

-#: src/msgattrib.c:442
+#: src/msgattrib.c:449

 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 
 #, c-format
 msgid "      --no-fuzzy              remove 'fuzzy' marked messages\n"
 msgstr ""
 

-#: src/msgattrib.c:444
+#: src/msgattrib.c:451

 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 
 #, c-format
 msgid "      --only-fuzzy            keep 'fuzzy' marked messages\n"
 msgstr ""
 

-#: src/msgattrib.c:446
+#: src/msgattrib.c:453

 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 
 #, c-format
 msgid "      --no-obsolete           remove obsolete #~ messages\n"
 msgstr ""
 

-#: src/msgattrib.c:448
+#: src/msgattrib.c:455

 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
 #, c-format
 msgid "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 

-#: src/msgattrib.c:451
+#: src/msgattrib.c:458

 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 
 #, c-format
 msgid "Attribute manipulation:\n"
 msgstr ""
 

-#: src/msgattrib.c:453
+#: src/msgattrib.c:460

 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 
 #, c-format
 msgid "      --set-fuzzy             set all messages 'fuzzy'\n"
 msgstr ""
 

-#: src/msgattrib.c:455
+#: src/msgattrib.c:462

 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 
 #, c-format
 msgid "      --clear-fuzzy           set all messages non-'fuzzy'\n"
 msgstr ""
 

-#: src/msgattrib.c:457
+#: src/msgattrib.c:464

 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 
 #, c-format
 msgid "      --set-obsolete          set all messages obsolete\n"
 msgstr ""
 

-#: src/msgattrib.c:459
+#: src/msgattrib.c:466

 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 
 #, c-format
 msgid "      --clear-obsolete        set all messages non-obsolete\n"
 msgstr ""
 

-#: src/msgattrib.c:461
+#: src/msgattrib.c:468
+#, c-format
+msgid ""
+"      --previous              when setting 'fuzzy', keep previous msgids\n"
+"                              of translated messages.\n"
+msgstr ""
+
+#: src/msgattrib.c:471

 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --clear-previous        remove the \"previous msgid\" from all "
 "messages\n"
 msgstr ""
 

-#: src/msgattrib.c:463
+#: src/msgattrib.c:473

 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --only-file=FILE.po     manipulate only entries listed in FILE.po\n"
 msgstr ""
 

-#: src/msgattrib.c:465
+#: src/msgattrib.c:475

 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --ignore-file=FILE.po   manipulate only entries not listed in FILE.po\n"
 msgstr ""
 

-#: src/msgattrib.c:467
+#: src/msgattrib.c:477

 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 
 #, c-format
 msgid "      --fuzzy                 synonym for --only-fuzzy --clear-fuzzy\n"
 msgstr ""
 

-#: src/msgattrib.c:469
+#: src/msgattrib.c:479

 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 

-#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408
+#: src/msgattrib.c:482 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408

 #: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431
 #: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431

-#: src/msgfmt.c:733 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555
+#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555

 #: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 
 #: src/msguniq.c:368
 #, c-format
 msgid "Input file syntax:\n"
 msgstr ""
 

-#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290
+#: src/msgattrib.c:484 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290

 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 
 #: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370
 #, c-format
 msgid ""
 "  -P, --properties-input      input file is in Java .properties syntax\n"
 msgstr ""
 

-#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292
+#: src/msgattrib.c:486 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292

 #: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""
 #: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372
 #, c-format
 msgid ""


@@ -998,17 +1092,17 @@ msgid ""
 "syntax\n"
 msgstr ""
 
 "syntax\n"
 msgstr ""
 

-#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
-#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:761 src/msggrep.c:587
+#: src/msgattrib.c:489 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344
+#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587

 #: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375
 #: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375

-#: src/xgettext.c:926
+#: src/xgettext.c:946

 #, c-format
 msgid "Output details:\n"
 msgstr ""
 
 #, c-format
 msgid "Output details:\n"
 msgstr ""
 

-#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346
+#: src/msgattrib.c:491 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346

 #: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404
 #: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404

-#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:928
+#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:948

 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"
 #, c-format
 msgid ""
 "      --color                 use colors and other text attributes always\n"


@@ -1017,87 +1111,87 @@ msgid ""
 "'html'.\n"
 msgstr ""
 
 "'html'.\n"
 msgstr ""
 

-#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350
+#: src/msgattrib.c:495 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350

 #: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408
 #: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408

-#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:932
+#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:952

 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 
 #, c-format
 msgid "      --style=STYLEFILE       specify CSS style rule file for --color\n"
 msgstr ""
 

-#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352
+#: src/msgattrib.c:497 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352

 #: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388
 #: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388

-#: src/xgettext.c:934
+#: src/xgettext.c:954

 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -e, --no-escape             do not use C escapes in output (default)\n"
 msgstr ""
 

-#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354
+#: src/msgattrib.c:499 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354

 #: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507
 #: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507

-#: src/msguniq.c:390 src/xgettext.c:936
+#: src/msguniq.c:390 src/xgettext.c:956

 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -E, --escape                use C escapes in output, no extended chars\n"
 msgstr ""
 

-#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356
+#: src/msgattrib.c:501 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356

 #: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577
 #: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577

-#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:938
+#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:958

 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 
 #, c-format
 msgid "      --force-po              write PO file even if empty\n"
 msgstr ""
 

-#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
-#: src/xgettext.c:940
+#: src/msgattrib.c:503 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394
+#: src/xgettext.c:960

 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 
 #, c-format
 msgid "  -i, --indent                write the .po file using indented style\n"
 msgstr ""
 

-#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
-#: src/xgettext.c:942
+#: src/msgattrib.c:505 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396
+#: src/xgettext.c:962

 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 
 #, c-format
 msgid "      --no-location           do not write '#: filename:line' lines\n"
 msgstr ""
 

-#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
-#: src/xgettext.c:944
+#: src/msgattrib.c:507 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398
+#: src/xgettext.c:964

 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 msgstr ""
 

-#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
-#: src/xgettext.c:946
+#: src/msgattrib.c:509 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400
+#: src/xgettext.c:966

 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --strict                write out strict Uniforum conforming .po file\n"
 msgstr ""
 

-#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366
+#: src/msgattrib.c:511 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366

 #: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
 #: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 
 #: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410
 #: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402
 #, c-format
 msgid "  -p, --properties-output     write out a Java .properties file\n"
 msgstr ""
 

-#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368
+#: src/msgattrib.c:513 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368

 #: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412
 #: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412

-#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:950
+#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:970

 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --stringtable-output    write out a NeXTstep/GNUstep .strings file\n"
 msgstr ""
 

-#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370
+#: src/msgattrib.c:515 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370

 #: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414
 #: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414

-#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:952
+#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:972

 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 
 #, c-format
 msgid "  -w, --width=NUMBER          set output page width\n"
 msgstr ""
 

-#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372
+#: src/msgattrib.c:517 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372

 #: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416
 #: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416

-#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:954
+#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:974

 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"
 #, fuzzy, c-format
 msgid ""
 "      --no-wrap               do not break long message lines, longer than\n"


@@ -1116,16 +1210,16 @@ msgstr ""
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 
 "  -V, --version            skriv ut programversjon og avslutt\n"
 "  -w, --width=ANTALL       sett sidebredden i utdata\n"
 

-#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375
+#: src/msgattrib.c:520 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375

 #: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524
 #: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524

-#: src/msguniq.c:411 src/xgettext.c:957
+#: src/msguniq.c:411 src/xgettext.c:977

 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 
 #, c-format
 msgid "  -s, --sort-output           generate sorted output\n"
 msgstr ""
 

-#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377
+#: src/msgattrib.c:522 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377

 #: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413
 #: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413

-#: src/xgettext.c:959
+#: src/xgettext.c:979

 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
 #, c-format
 msgid "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""


@@ -1135,7 +1229,7 @@ msgstr ""
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr "umulig utvalgskriterie angitt (%d < n < %d)"
 

-#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:816
+#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:832

 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 #, c-format
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""


@@ -1149,9 +1243,9 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"

-"comments and extract comments will be cumulated, except that if --use-first\n"
-"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"
+"comments, extracted comments, and file positions will be cumulated, except\n"
+"that if --use-first is specified, they will be taken from the first PO file\n"
+"to define them.\n"

 msgstr ""
 "  -V, --version                  skrive ut programversjon og avslutte\n"
 "  -w, --width=ANTALL             sett sidebredden i utdata\n"
 msgstr ""
 "  -V, --version                  skrive ut programversjon og avslutte\n"
 "  -w, --width=ANTALL             sett sidebredden i utdata\n"


@@ -1170,18 +1264,18 @@ msgstr ""
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 
 "PO-filen som definerer dem.  Filposisjonene fra alle PO-filene vil\n"
 "bli bevart.\n"
 

-#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:832
+#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:848

 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 
 #, c-format
 msgid "  INPUTFILE ...               input files\n"
 msgstr ""
 

-#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:834
+#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:850

 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 
 #, c-format
 msgid "  -f, --files-from=FILE       get list of input files from FILE\n"
 msgstr ""
 

-#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:670
-#: src/xgettext.c:838
+#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674
+#: src/xgettext.c:854

 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""
 #, c-format
 msgid "If input file is -, standard input is read.\n"
 msgstr ""


@@ -1207,14 +1301,14 @@ msgid ""
 "                              that only unique messages be printed\n"
 msgstr ""
 
 "                              that only unique messages be printed\n"
 msgstr ""
 

-#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:735
+#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739

 #: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 
 #: src/msgmerge.c:557
 #, c-format
 msgid ""
 "  -P, --properties-input      input files are in Java .properties syntax\n"
 msgstr ""
 

-#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:737
+#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741

 #: src/msgmerge.c:559
 #, c-format
 msgid ""
 #: src/msgmerge.c:559
 #, c-format
 msgid ""


@@ -1350,7 +1444,7 @@ msgstr "denne meldingen er brukt, men ikke definert i %s"
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 
 msgid "warning: this message is not used"
 msgstr "advarsel: denne meldingen er ikke brukt"
 

-#: src/msgcmp.c:553 src/msgfmt.c:541
+#: src/msgcmp.c:553 src/msgfmt.c:545

 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"
 #, c-format
 msgid "found %d fatal error"
 msgid_plural "found %d fatal errors"


@@ -1370,7 +1464,7 @@ msgid ""
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"
 "before messages are printed.  Conversely, the --less-than option may be\n"
 "used to specify less commonality before messages are printed (i.e.\n"
 "--less-than=2 will only print the unique messages).  Translations,\n"

-"comments and extract comments will be preserved, but only from the first\n"
+"comments and extracted comments will be preserved, but only from the first\n"

 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""
 "PO file to define them.  File positions from all PO files will be\n"
 "cumulated.\n"
 msgstr ""


@@ -1398,10 +1492,10 @@ msgid ""
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 
 "                              definitions, defaults to 1 if not set\n"
 msgstr ""
 

-#: src/msgcomm.c:451 src/xgettext.c:961
+#: src/msgcomm.c:451 src/xgettext.c:981

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"      --omit-header           don't write header with `msgid \"\"' entry\n"
+"      --omit-header           don't write header with 'msgid \"\"' entry\n"

 msgstr ""
 
 #: src/msgconv.c:306
 msgstr ""
 
 #: src/msgconv.c:306


@@ -1443,7 +1537,7 @@ msgstr ""
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 
 msgid "      --strict                strict Uniforum output style\n"
 msgstr ""
 

-#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634
+#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:649

 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"
 #, c-format
 msgid "no input file given"
 msgstr "ingen innfil angitt"


@@ -1509,11 +1603,6 @@ msgstr ""
 msgid "write to stdout failed"
 msgstr ""
 
 msgid "write to stdout failed"
 msgstr ""
 

-#: src/msgexec.c:389
-#, c-format
-msgid "write to %s subprocess failed"
-msgstr ""
-

 #: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"
 #: src/msgfilter.c:289
 #, fuzzy, c-format
 msgid "missing filter name"


@@ -1594,7 +1683,7 @@ msgid "invalid endianness: %s"
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.
 msgstr ""
 
 #. This is a proper name. See the gettext manual, section Names.

-#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590
+#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:605

 msgid "Ulrich Drepper"
 msgstr ""
 
 msgid "Ulrich Drepper"
 msgstr ""
 


@@ -1621,117 +1710,117 @@ msgstr ""
 
 #. TRANSLATORS: The prefix before a statistics message.  The argument
 #. is a file name or a comma separated list of file names.
 
 #. 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
+#: src/msgfmt.c:620

 #, c-format
 msgid "%s: "
 msgstr ""
 
 #, c-format
 msgid "%s: "
 msgstr ""
 

-#: src/msgfmt.c:620
+#: src/msgfmt.c:624

 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 
 #, c-format
 msgid "%d translated message"
 msgid_plural "%d translated messages"
 msgstr[0] "%d oversatt melding"
 msgstr[1] "%d oversatte meldinger"
 

-#: src/msgfmt.c:625
+#: src/msgfmt.c:629

 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 
 #, c-format
 msgid ", %d fuzzy translation"
 msgid_plural ", %d fuzzy translations"
 msgstr[0] ", %d antatt oversettelse"
 msgstr[1] ", %d antatte oversettelser"
 

-#: src/msgfmt.c:630
+#: src/msgfmt.c:634

 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 
 #, c-format
 msgid ", %d untranslated message"
 msgid_plural ", %d untranslated messages"
 msgstr[0] ", %d uoversatt melding"
 msgstr[1] ", %d uoversatte meldinger"
 

-#: src/msgfmt.c:650
+#: src/msgfmt.c:654

 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION] filename.po ...\n"
 msgstr ""
 

-#: src/msgfmt.c:654
+#: src/msgfmt.c:658

 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 
 #, c-format
 msgid "Generate binary message catalog from textual translation description.\n"
 msgstr ""
 

-#: src/msgfmt.c:659 src/xgettext.c:825
+#: src/msgfmt.c:663 src/xgettext.c:841

 #, c-format, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
 #, 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:666
+#: src/msgfmt.c:670

 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 
 #, c-format
 msgid "  filename.po ...             input files\n"
 msgstr ""
 

-#: src/msgfmt.c:673 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:873
+#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:890

 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 
 #, c-format
 msgid "Operation mode:\n"
 msgstr ""
 

-#: src/msgfmt.c:675
+#: src/msgfmt.c:679

 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -j, --java                  Java mode: generate a Java ResourceBundle "
 "class\n"
 msgstr ""
 

-#: src/msgfmt.c:677
+#: src/msgfmt.c:681

 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --java2                 like --java, and assume Java2 (JDK 1.2 or "
 "higher)\n"
 msgstr ""
 

-#: src/msgfmt.c:679
+#: src/msgfmt.c:683

 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 
 #, c-format
 msgid "      --csharp                C# mode: generate a .NET .dll file\n"
 msgstr ""
 

-#: src/msgfmt.c:681
+#: src/msgfmt.c:685

 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --csharp-resources      C# resources mode: generate a .NET .resources "
 "file\n"
 msgstr ""
 

-#: src/msgfmt.c:683
+#: src/msgfmt.c:687

 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --tcl                   Tcl mode: generate a tcl/msgcat .msg file\n"
 msgstr ""
 

-#: src/msgfmt.c:685
+#: src/msgfmt.c:689

 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 
 #, c-format
 msgid "      --qt                    Qt mode: generate a Qt .qm file\n"
 msgstr ""
 

-#: src/msgfmt.c:692
+#: src/msgfmt.c:696

 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 
 #, c-format
 msgid "      --strict                enable strict Uniforum mode\n"
 msgstr ""
 

-#: src/msgfmt.c:694 src/xgettext.c:849
+#: src/msgfmt.c:698 src/xgettext.c:865

 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 
 #, c-format
 msgid "If output file is -, output is written to standard output.\n"
 msgstr ""
 

-#: src/msgfmt.c:697
+#: src/msgfmt.c:701

 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 
 #, c-format
 msgid "Output file location in Java mode:\n"
 msgstr ""
 

-#: src/msgfmt.c:699 src/msgfmt.c:713 src/msgunfmt.c:458 src/msgunfmt.c:469
+#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469

 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 
 #, c-format
 msgid "  -r, --resource=RESOURCE     resource name\n"
 msgstr ""
 

-#: src/msgfmt.c:701 src/msgfmt.c:715 src/msgfmt.c:725 src/msgunfmt.c:460
+#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460

 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""
 #: src/msgunfmt.c:471 src/msgunfmt.c:481
 #, c-format
 msgid ""


@@ -1739,13 +1828,13 @@ msgid ""
 "language_COUNTRY\n"
 msgstr ""
 
 "language_COUNTRY\n"
 msgstr ""
 

-#: src/msgfmt.c:703
+#: src/msgfmt.c:707

 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory of classes directory hierarchy\n"
 msgstr ""
 

-#: src/msgfmt.c:705
+#: src/msgfmt.c:709

 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "
 #, c-format
 msgid ""
 "The class name is determined by appending the locale name to the resource "


@@ -1754,48 +1843,48 @@ msgid ""
 "written under the specified directory.\n"
 msgstr ""
 
 "written under the specified directory.\n"
 msgstr ""
 

-#: src/msgfmt.c:711
+#: src/msgfmt.c:715

 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 
 #, fuzzy, c-format
 msgid "Output file location in C# mode:\n"
 msgstr "ingen innfil angitt"
 

-#: src/msgfmt.c:717 src/msgunfmt.c:473
+#: src/msgfmt.c:721 src/msgunfmt.c:473

 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -d DIRECTORY                base directory for locale dependent .dll "
 "files\n"
 msgstr ""
 

-#: src/msgfmt.c:719
+#: src/msgfmt.c:723

 #, 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 ""
 
 #, 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:723
+#: src/msgfmt.c:727

 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 
 #, c-format
 msgid "Output file location in Tcl mode:\n"
 msgstr ""
 

-#: src/msgfmt.c:727 src/msgunfmt.c:483
+#: src/msgfmt.c:731 src/msgunfmt.c:483

 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 
 #, c-format
 msgid "  -d DIRECTORY                base directory of .msg message catalogs\n"
 msgstr ""
 

-#: src/msgfmt.c:729
+#: src/msgfmt.c:733

 #, c-format
 msgid ""
 "The -l and -d options are mandatory.  The .msg file is written in the\n"
 "specified directory.\n"
 msgstr ""
 
 #, 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:741 src/xgettext.c:865
+#: src/msgfmt.c:745 src/xgettext.c:882

 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 
 #, c-format
 msgid "Input file interpretation:\n"
 msgstr ""
 

-#: src/msgfmt.c:743
+#: src/msgfmt.c:747

 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"
 #, c-format
 msgid ""
 "  -c, --check                 perform all the checks implied by\n"


@@ -1803,33 +1892,33 @@ msgid ""
 "domain\n"
 msgstr ""
 
 "domain\n"
 msgstr ""
 

-#: src/msgfmt.c:746
+#: src/msgfmt.c:750

 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 
 #, c-format
 msgid "      --check-format          check language dependent format strings\n"
 msgstr ""
 

-#: src/msgfmt.c:748
+#: src/msgfmt.c:752

 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --check-header          verify presence and contents of the header "
 "entry\n"
 msgstr ""
 

-#: src/msgfmt.c:750
+#: src/msgfmt.c:754

 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --check-domain          check for conflicts between domain directives\n"
 "                                and the --output-file option\n"
 msgstr ""
 

-#: src/msgfmt.c:753
+#: src/msgfmt.c:757

 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -C, --check-compatibility   check that GNU msgfmt behaves like X/Open "
 "msgfmt\n"
 msgstr ""
 

-#: src/msgfmt.c:755
+#: src/msgfmt.c:759

 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "
 #, c-format
 msgid ""
 "      --check-accelerators[=CHAR]  check presence of keyboard accelerators "


@@ -1837,96 +1926,106 @@ msgid ""
 "                                menu items\n"
 msgstr ""
 
 "                                menu items\n"
 msgstr ""
 

-#: src/msgfmt.c:758
+#: src/msgfmt.c:762

 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 
 #, c-format
 msgid "  -f, --use-fuzzy             use fuzzy entries in output\n"
 msgstr ""
 

-#: src/msgfmt.c:763
+#: src/msgfmt.c:767

 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -a, --alignment=NUMBER      align strings to NUMBER bytes (default: %d)\n"
 msgstr ""
 

-#: src/msgfmt.c:765
+#: src/msgfmt.c:769
+#, c-format
+msgid ""
+"      --endianness=BYTEORDER  write out 32-bit numbers in the given byte "
+"order\n"
+"                                (big or little, default depends on "
+"platform)\n"
+msgstr ""
+
+#: src/msgfmt.c:772

 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --no-hash               binary file will not include the hash table\n"
 msgstr ""
 

-#: src/msgfmt.c:774
+#: src/msgfmt.c:781

 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 
 #, c-format
 msgid "      --statistics            print statistics about translations\n"
 msgstr ""
 

-#: src/msgfmt.c:776 src/msgmerge.c:607 src/msgunfmt.c:533
+#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533

 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 
 #, c-format
 msgid "  -v, --verbose               increase verbosity level\n"
 msgstr ""
 

-#: src/msgfmt.c:890
+#: src/msgfmt.c:897

 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
 #, fuzzy, c-format
 msgid "warning: PO file header missing or invalid\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 

-#: src/msgfmt.c:893
+#: src/msgfmt.c:900

 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
 #, fuzzy, c-format
 msgid "warning: charset conversion will not work\n"
 msgstr ""
 "Tegnsettet mangler i headeren.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 

-#: src/msgfmt.c:903
+#: src/msgfmt.c:910

 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 
 #, fuzzy, c-format
 msgid "warning: PO file header fuzzy\n"
 msgstr ""
 "%s: advarsel: PO-filheader mangler, fuzzy, eller ugyldig\n"
 "%*s  advarsel: tegnsettkonvertering vil ikke virke"
 

-#: src/msgfmt.c:905
+#: src/msgfmt.c:912

 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 
 #, c-format
 msgid "warning: older versions of msgfmt will give an error on this\n"
 msgstr ""
 

-#: src/msgfmt.c:929
+#: src/msgfmt.c:936

 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet «%s» passer ikke som filnavn"
 
 #, c-format
 msgid "domain name \"%s\" not suitable as file name"
 msgstr "domenenavnet «%s» passer ikke som filnavn"
 

-#: src/msgfmt.c:934
+#: src/msgfmt.c:941

 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 
 #, c-format
 msgid "domain name \"%s\" not suitable as file name: will use prefix"
 msgstr "domenenavnet «%s» passer ikke som filnavn: bruker prefiks"
 

-#: src/msgfmt.c:948
-#, c-format
-msgid "`domain %s' directive ignored"
+#: src/msgfmt.c:955
+#, fuzzy, c-format
+msgid "'domain %s' directive ignored"

 msgstr "nøkkelord «domain %s» ignorert"
 
 msgstr "nøkkelord «domain %s» ignorert"
 

-#: src/msgfmt.c:1008
-#, c-format
-msgid "empty `msgstr' entry ignored"
+#: src/msgfmt.c:1015
+#, fuzzy, c-format
+msgid "empty 'msgstr' entry ignored"

 msgstr "tom «msgstr»-linje ignorert"
 
 msgstr "tom «msgstr»-linje ignorert"
 

-#: src/msgfmt.c:1009
-#, c-format
-msgid "fuzzy `msgstr' entry ignored"
+#: src/msgfmt.c:1016
+#, fuzzy, c-format
+msgid "fuzzy 'msgstr' entry ignored"

 msgstr "antatt «msgstr»-linje ignorert"
 
 msgstr "antatt «msgstr»-linje ignorert"
 

-#: src/msgfmt.c:1058
+#: src/msgfmt.c:1065

 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139
 #, c-format
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "%s: advarselL: kildefil har antatte oversettelser"
 
 #: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86
 #: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139

-#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c: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
+#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:834
+#: src/x-java.c:181 src/x-javascript.c:172 src/x-librep.c:147 src/x-lisp.c:212
+#: src/x-lua.c:173 src/x-perl.c:227 src/x-perl.c:302 src/x-perl.c:395
+#: src/x-php.c:163 src/x-python.c:176 src/x-rst.c:233 src/x-scheme.c:171
+#: src/x-sh.c:155 src/x-smalltalk.c:91 src/x-tcl.c:150 src/x-vala.c:174
+#: src/x-ycp.c:91

 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"
 #, c-format
 msgid "error while reading \"%s\""
 msgstr "feil under lesing av «%s»"


@@ -2118,13 +2217,13 @@ msgstr ""
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""
 #: src/msgl-cat.c:203
 #, c-format
 msgid ""

-"input file `%s' doesn't contain a header entry with a charset specification"
+"input file '%s' doesn't contain a header entry with a charset specification"

 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""
 msgstr ""
 
 #: src/msgl-cat.c:207
 #, c-format
 msgid ""

-"domain \"%s\" in input file `%s' doesn't contain a header entry with a "
+"domain \"%s\" in input file '%s' doesn't contain a header entry with a "

 "charset specification"
 msgstr ""
 
 "charset specification"
 msgstr ""
 


@@ -2134,8 +2233,8 @@ msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92
 msgstr ""
 
 #: 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:3015
+#: src/msgl-charset.c:127 src/po-xerror.c:122 src/po-xerror.c:147
+#: src/xgettext.c:3073

 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "
 #, fuzzy, c-format
 msgid "warning: "
 msgstr "%s: advarsel: "


@@ -2232,113 +2331,106 @@ msgstr ""
 msgid "Try using the following, valid for %s:"
 msgstr ""
 
 msgid "Try using the following, valid for %s:"
 msgstr ""
 

-#: src/msgl-check.c:352 src/msgl-check.c:376
+#: src/msgl-check.c:358 src/msgl-check.c:382

 msgid "message catalog has plural form translations"
 msgstr ""
 
 msgid "message catalog has plural form translations"
 msgstr ""
 

-#: src/msgl-check.c:354
+#: src/msgl-check.c:360

 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 
 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute"
 msgstr ""
 

-#: src/msgl-check.c:378
+#: src/msgl-check.c:384

 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 
 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute"
 msgstr ""
 

-#: src/msgl-check.c:414
+#: src/msgl-check.c:420

 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 
 #, fuzzy
 msgid "invalid nplurals value"
 msgstr "ulovlig kontrollsekvens"
 

-#: src/msgl-check.c:436
+#: src/msgl-check.c:442

 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 
 #, fuzzy
 msgid "invalid plural expression"
 msgstr "ulovlig kontrollsekvens"
 

-#: src/msgl-check.c:466 src/msgl-check.c:482
+#: src/msgl-check.c:472 src/msgl-check.c:488

 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 
 #, fuzzy, c-format
 msgid "nplurals = %lu"
 msgstr "ulovlig kontrollsekvens"
 

-#: src/msgl-check.c:468
+#: src/msgl-check.c:474

 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
 #, fuzzy, c-format
 msgid "but some messages have only one plural form"
 msgid_plural "but some messages have only %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 

-#: src/msgl-check.c:484
+#: src/msgl-check.c:490

 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 
 #, fuzzy, c-format
 msgid "but some messages have one plural form"
 msgid_plural "but some messages have %lu plural forms"
 msgstr[0] "denne meldingen er brukt, men ikke definert i %s"
 msgstr[1] "denne meldingen er brukt, men ikke definert i %s"
 

-#: src/msgl-check.c:508
+#: src/msgl-check.c:514

 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 
 msgid ""
 "message catalog has plural form translations, but lacks a header entry with "
 "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\""
 msgstr ""
 

-#: src/msgl-check.c:602
-msgid "`msgid' and `msgid_plural' entries do not both begin with '\\n'"
+#: src/msgl-check.c:611
+#, fuzzy
+msgid "'msgid' and 'msgid_plural' entries do not both begin with '\\n'"

 msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
 
 msgstr "«msgid»- og «msgid_plural»-innslagene begynner ikke med `\\n'"
 

-#: src/msgl-check.c:610
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both begin with '\\n'"
+#: src/msgl-check.c:619
+#, fuzzy, c-format
+msgid "'msgid' and 'msgstr[%u]' entries do not both begin with '\\n'"

 msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
 
 msgstr "«msgid»- og «msgstr[%u]»-innslagene begynner ikke med `\\n'"
 

-#: src/msgl-check.c:625
-msgid "`msgid' and `msgstr' entries do not both begin with '\\n'"
+#: src/msgl-check.c:634
+#, fuzzy
+msgid "'msgid' and 'msgstr' entries do not both begin with '\\n'"

 msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
 
 msgstr "«msgid»- og «msgstr»-innslagene begynner ikke med `\\n'"
 

-#: src/msgl-check.c:643
+#: src/msgl-check.c:652

 #, fuzzy
 #, fuzzy

-msgid "`msgid' and `msgid_plural' entries do not both end with '\\n'"
+msgid "'msgid' and 'msgid_plural' entries do not both end with '\\n'"

 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 

-#: src/msgl-check.c:651
-#, c-format
-msgid "`msgid' and `msgstr[%u]' entries do not both end with '\\n'"
+#: src/msgl-check.c:660
+#, fuzzy, c-format
+msgid "'msgid' and 'msgstr[%u]' entries do not both end with '\\n'"

 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 
 msgstr "«msgid»- og «msgstr[%u]»-innslagene slutter ikke med `\\n'"
 

-#: src/msgl-check.c:666
-msgid "`msgid' and `msgstr' entries do not both end with '\\n'"
+#: src/msgl-check.c:675
+#, fuzzy
+msgid "'msgid' and 'msgstr' entries do not both end with '\\n'"

 msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
 
 msgstr "«msgid»- og «msgstr»-innslagene slutter ikke med `\\n'"
 

-#: src/msgl-check.c:678
+#: src/msgl-check.c:687

 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 
 msgid "plural handling is a GNU gettext extension"
 msgstr ""
 

-#: src/msgl-check.c:720
+#: src/msgl-check.c:729

 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 
 #, c-format
 msgid "msgstr lacks the keyboard accelerator mark '%c'"
 msgstr ""
 

-#: src/msgl-check.c:730
+#: src/msgl-check.c:739

 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 
 #, c-format
 msgid "msgstr has too many keyboard accelerator marks '%c'"
 msgstr ""
 

-#: src/msgl-check.c:776
+#: src/msgl-check.c:801

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "header field `%s' missing in header\n"
-msgstr "filhodefelt «%s» mangler i filhode"
-
-#: src/msgl-check.c:784
-#, fuzzy, c-format
-msgid "header field `%s' should start at beginning of line\n"
-msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
-
-#: src/msgl-check.c:809
-#, fuzzy
-msgid "some header fields still have the initial default value\n"
+msgid "header field '%s' still has the initial default value\n"

 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 
 msgstr "noen filhodefelt har fremdeles sin initielle verdi"
 

-#: src/msgl-check.c:826
+#: src/msgl-check.c:816

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "header field `%s' still has the initial default value\n"
-msgstr "noen filhodefelt har fremdeles sin initielle verdi"
+msgid "header field '%s' missing in header\n"
+msgstr "filhodefelt «%s» mangler i filhode"

 
 #: src/msgl-iconv.c:65
 #, c-format
 
 #: src/msgl-iconv.c:65
 #, c-format


@@ -2354,8 +2446,8 @@ msgstr "feil under 
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 
 msgid "input file doesn't contain a header entry with a charset specification"
 msgstr ""
 

-#: 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:692
+#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293
+#: src/x-python.c:665 src/xgettext.c:708

 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does "


@@ -2371,8 +2463,8 @@ msgid ""
 "msgids become equal."
 msgstr ""
 
 "msgids become equal."
 msgstr ""
 

-#: src/msgl-iconv.c:341 src/recode-sr-latin.c:301 src/x-python.c:629
-#: src/xgettext.c:699
+#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:672
+#: src/xgettext.c:715

 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "
 #, fuzzy, c-format
 msgid ""
 "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was "


@@ -2474,7 +2566,7 @@ msgstr ""
 #: src/msgmerge.c:541
 #, c-format
 msgid ""
 #: src/msgmerge.c:541
 #, c-format
 msgid ""

-"The backup suffix is `~', unless set with --suffix or the "
+"The backup suffix is '~', unless set with --suffix or the "

 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""
 "SIMPLE_BACKUP_SUFFIX\n"
 "environment variable.\n"
 msgstr ""


@@ -2646,7 +2738,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 
 "Tegnsettet \"%s\" er ikke et portabelt innkodingsnavn.\n"
 "Meldingskonvertering til brukerens tegnsett kan ikke virke.\n"
 

-#: src/po-charset.c:556
+#: src/po-charset.c:557

 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv(),\n"


@@ -2655,7 +2747,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv(),\n"
 "og iconv() støtter ikke \"%s\".\n"
 

-#: src/po-charset.c:563 src/po-charset.c:611
+#: src/po-charset.c:564 src/po-charset.c:612

 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"
 msgid ""
 "Installing GNU libiconv and then reinstalling GNU gettext\n"
 "would fix this problem.\n"


@@ -2663,15 +2755,15 @@ msgstr ""
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 
 "Installasjon av GNU libiconv og deretter reinstallasjon av GNU gettext\n"
 "vil rette dette problemet.\n"
 

-#: src/po-charset.c:577 src/po-charset.c:615
+#: src/po-charset.c:578 src/po-charset.c:616

 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 
 msgid "Continuing anyway, expect parse errors."
 msgstr "Fortsetter likevel, forvent parsefeil."
 

-#: src/po-charset.c:579
+#: src/po-charset.c:580

 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 
 msgid "Continuing anyway."
 msgstr "Fortsetter likevel."
 

-#: src/po-charset.c:606
+#: src/po-charset.c:607

 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"
 #, c-format
 msgid ""
 "Charset \"%s\" is not supported. %s relies on iconv().\n"


@@ -2680,7 +2772,7 @@ msgstr ""
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 
 "Tegnsettet \"%s\" er ikke støttet. %s er avhengig av iconv().\n"
 "Denne versjonen ble blygget uten iconv().\n"
 

-#: src/po-charset.c:643
+#: src/po-charset.c:644

 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"
 msgid ""
 "Charset missing in header.\n"
 "Message conversion to user's charset will not work.\n"


@@ -2694,18 +2786,18 @@ msgid "inconsistent use of #~"
 msgstr "inkonsistent bruk av #~"
 
 #: src/po-gram-gen.y:240
 msgstr "inkonsistent bruk av #~"
 
 #: src/po-gram-gen.y:240

-#, c-format
-msgid "missing `msgstr[]' section"
+#, fuzzy, c-format
+msgid "missing 'msgstr[]' section"

 msgstr "mangler «msgstr[]»-seksjon"
 
 #: src/po-gram-gen.y:249
 msgstr "mangler «msgstr[]»-seksjon"
 
 #: src/po-gram-gen.y:249

-#, c-format
-msgid "missing `msgid_plural' section"
+#, fuzzy, c-format
+msgid "missing 'msgid_plural' section"

 msgstr "mangler «msgid_plural»-seksjon"
 
 #: src/po-gram-gen.y:257
 msgstr "mangler «msgid_plural»-seksjon"
 
 #: src/po-gram-gen.y:257

-#, c-format
-msgid "missing `msgstr' section"
+#, fuzzy, c-format
+msgid "missing 'msgstr' section"

 msgstr "mangler «msgstr»-seksjon"
 
 #: src/po-gram-gen.y:396
 msgstr "mangler «msgstr»-seksjon"
 
 #: src/po-gram-gen.y:396


@@ -2723,7 +2815,7 @@ msgstr "flertallsform har feil indeks"
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 
 msgid "too many errors, aborting"
 msgstr "for mange feil, avbryter"
 

-#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:739 src/write-po.c:868
+#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869

 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"
 #, c-format
 msgid "invalid multibyte sequence"
 msgstr "ulovlig multibytesekvens"


@@ -2767,7 +2859,7 @@ msgstr "slutt-p
 msgid "context separator <EOT> within string"
 msgstr ""
 
 msgid "context separator <EOT> within string"
 msgstr ""
 

-#: src/read-catalog.c:332 src/xgettext.c:1003
+#: src/read-catalog.c:332 src/xgettext.c:1023

 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"
 #, c-format
 msgid "this file may not contain domain directives"
 msgstr "denne filen kan ikke inneholde domene-direktiver"


@@ -2856,12 +2948,12 @@ msgid ""
 "standard output.\n"
 msgstr ""
 
 "standard output.\n"
 msgstr ""
 

-#: src/recode-sr-latin.c:338
+#: src/recode-sr-latin.c:339

 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 
 #, c-format
 msgid "input is not valid in \"%s\" encoding"
 msgstr ""
 

-#: src/recode-sr-latin.c:366
+#: src/recode-sr-latin.c:367

 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under åpning av «%s» for lesing"
 #, fuzzy, c-format
 msgid "error while converting from \"%s\" encoding to \"%s\" encoding"
 msgstr "feil under åpning av «%s» for lesing"


@@ -2883,11 +2975,21 @@ msgid ""
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 
 "the locally accessible FILE is used instead.\n"
 msgstr ""
 

+#: src/urlget.c:228
+#, fuzzy, c-format
+msgid "error reading \"%s\""
+msgstr "feil under lesing av «%s»"
+

 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av filen «%s»"
 
 #: src/urlget.c:234
 #, fuzzy, c-format
 msgid "error writing stdout"
 msgstr "feil under skriving av filen «%s»"
 

+#: src/urlget.c:238
+#, fuzzy, c-format
+msgid "error after reading \"%s\""
+msgstr "feil under lesing av «%s»"
+

 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."
 #: src/urlget.c:264
 #, c-format
 msgid "Retrieving %s..."


@@ -2978,14 +3080,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under åpning av «%s» for skriving"
 

-#: src/write-po.c:802
-#, c-format
+#: src/write-po.c:803
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"internationalized messages should not contain the `\\%c' escape sequence"
+"internationalized messages should not contain the '\\%c' escape sequence"

 msgstr ""
 "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 
 msgstr ""
 "internasjonaliserte meldinger bør ikke inneholde escape-sekvensen «\\%c»"
 

-#: src/write-po.c:1253 src/write-po.c:1382
+#: src/write-po.c:1254 src/write-po.c:1383

 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"
 #, c-format
 msgid ""
 "The following msgctxt contains non-ASCII characters.\n"


@@ -2994,7 +3096,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
 "%s\n"
 msgstr ""
 

-#: src/write-po.c:1265 src/write-po.c:1394
+#: src/write-po.c:1266 src/write-po.c:1395

 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"


@@ -3053,7 +3155,7 @@ msgid ""
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 
 "but the Tcl message catalog format doesn't support plural handling\n"
 msgstr ""
 

-#: src/x-awk.c:341 src/x-python.c:1074
+#: src/x-awk.c:341 src/x-javascript.c:988 src/x-python.c:1128

 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 #, fuzzy, c-format
 msgid "%s:%d: warning: unterminated string"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"


@@ -3063,17 +3165,17 @@ msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
 msgid "%s:%d: warning: unterminated regular expression"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 

-#: src/x-c.c:1223 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 src/x-vala.c:762

 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 
 #, c-format
 msgid "%s:%d: warning: unterminated character constant"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 

-#: src/x-c.c:1247
+#: src/x-c.c:1247 src/x-vala.c:832

 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
 #, c-format
 msgid "%s:%d: warning: unterminated string literal"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 

-#: src/x-csharp.c:224 src/xgettext.c:2020
+#: src/x-csharp.c:224 src/xgettext.c:2055

 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 
 msgid "Please specify the source encoding through --from-code."
 msgstr ""
 


@@ -3105,7 +3207,7 @@ msgid ""
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 
 "Please specify the correct source encoding through --from-code.\n"
 msgstr ""
 

-#: src/x-csharp.c:315 src/x-python.c:332
+#: src/x-csharp.c:315 src/x-javascript.c:321 src/x-python.c:374

 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""
 #, c-format
 msgid "%s:%d: iconv failure"
 msgstr ""


@@ -3117,7 +3219,7 @@ msgid ""
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 
 "Please specify the source encoding through --from-code.\n"
 msgstr ""
 

-#: src/x-csharp.c:1390 src/x-python.c:1281
+#: src/x-csharp.c:1390 src/x-python.c:1335

 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"
 #, fuzzy, c-format
 msgid "%s:%d: warning: invalid Unicode character"
 msgstr "%s:%d: advarsel: uavsluttet tegnkonstant"


@@ -3137,12 +3239,22 @@ msgstr ""
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 
 msgid "%s:%d: warning: '}' found where ')' was expected"
 msgstr ""
 

-#: src/x-glade.c:623 src/x-glade.c:630
+#: src/x-glade.c:561
+#, c-format
+msgid "Missing context for the string extracted from '%s' element"
+msgstr ""
+
+#: src/x-glade.c:686
+#, c-format
+msgid "The root element <%s> is not allowed in a valid Glade file"
+msgstr ""
+
+#: src/x-glade.c:841 src/x-glade.c:848

 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 
 #, c-format
 msgid "%s:%lu:%lu: %s"
 msgstr ""
 

-#: src/x-glade.c:657
+#: src/x-glade.c:875

 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"
 #, fuzzy, c-format
 msgid ""
 "Language \"glade\" is not supported. %s relies on expat.\n"


@@ -3156,6 +3268,50 @@ msgstr ""
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 
 msgid "%s:%d: warning: lone surrogate U+%04X"
 msgstr "%s:%d: advarsel: uavsluttet strengliteral"
 

+#: src/x-javascript.c:230
+msgid "Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:275
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:291
+#, c-format
+msgid ""
+"%s:%d: Long incomplete multibyte sequence.\n"
+"Please specify the correct source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:303
+#, 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-javascript.c:312
+#, 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-javascript.c:344
+#, c-format
+msgid ""
+"%s:%d: Invalid multibyte sequence.\n"
+"Please specify the source encoding through --from-code\n"
+msgstr ""
+
+#: src/x-javascript.c:1147
+#, fuzzy, c-format
+msgid "%s:%d: warning: RegExp literal terminated too early"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+

 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"
 #: src/x-perl.c:308
 #, c-format
 msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF"


@@ -3191,13 +3347,13 @@ msgstr ""
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 
 msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\""
 msgstr ""
 

-#: src/x-python.c:236
+#: src/x-python.c:278

 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 msgid ""
 "Please specify the source encoding through --from-code or through a comment\n"
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:282
+#: src/x-python.c:324

 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"


@@ -3205,7 +3361,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:299
+#: src/x-python.c:341

 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"
 #, c-format
 msgid ""
 "%s:%d: Long incomplete multibyte sequence.\n"


@@ -3213,7 +3369,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:312
+#: src/x-python.c:354

 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of file.\n"


@@ -3221,7 +3377,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:322
+#: src/x-python.c:364

 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"
 #, c-format
 msgid ""
 "%s:%d: Incomplete multibyte sequence at end of line.\n"


@@ -3229,7 +3385,7 @@ msgid ""
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 "comment as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:355
+#: src/x-python.c:397

 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"
 #, c-format
 msgid ""
 "%s:%d: Invalid multibyte sequence.\n"


@@ -3237,7 +3393,7 @@ msgid ""
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 
 "as specified in http://www.python.org/peps/pep-0263.html.\n"
 msgstr ""
 

-#: src/x-python.c:679
+#: src/x-python.c:722

 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""
 #, c-format
 msgid "Unknown encoding \"%s\". Proceeding with ASCII instead."
 msgstr ""


@@ -3264,51 +3420,56 @@ msgid ""
 "use eval_gettext instead"
 msgstr ""
 
 "use eval_gettext instead"
 msgstr ""
 

-#: src/xgettext.c:621
+#: src/x-vala.c:558
+#, fuzzy, c-format
+msgid "%s:%d: warning: regular expression literal terminated too early"
+msgstr "%s:%d: advarsel: uavsluttet strengliteral"
+
+#: src/xgettext.c:636

 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
 
 #, c-format
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikke brukes når utdata blir skrevet til standard ut"
 

-#: src/xgettext.c:626
+#: src/xgettext.c:641

 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 
 #, c-format
 msgid "xgettext cannot work without keywords to look for"
 msgstr "xgettext kan ikke arbeide uten å finne nøkkelord"
 

-#: src/xgettext.c:769
-#, c-format
-msgid "warning: file `%s' extension `%s' is unknown; will try C"
+#: src/xgettext.c:785
+#, fuzzy, c-format
+msgid "warning: file '%s' extension '%s' is unknown; will try C"

 msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 
 msgstr "advarsel: typen til fil «%s» med utvidelsen «%s» er ukjent, forsøker C"
 

-#: src/xgettext.c:820
+#: src/xgettext.c:836

 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
 #, c-format
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 

-#: src/xgettext.c:843
+#: src/xgettext.c:859

 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -d, --default-domain=NAME   use NAME.po for output (instead of messages."
 "po)\n"
 msgstr ""
 

-#: src/xgettext.c:845
+#: src/xgettext.c:861

 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 
 #, c-format
 msgid "  -o, --output=FILE           write output to specified file\n"
 msgstr ""
 

-#: src/xgettext.c:847
+#: src/xgettext.c:863

 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -p, --output-dir=DIR        output files will be placed in directory DIR\n"
 msgstr ""
 

-#: src/xgettext.c:852
+#: src/xgettext.c:868

 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 
 #, fuzzy, c-format
 msgid "Choice of input file language:\n"
 msgstr "ingen innfil angitt"
 

-#: src/xgettext.c:854
+#: src/xgettext.c:870

 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"
 #, c-format
 msgid ""
 "  -L, --language=NAME         recognise the specified language\n"


@@ -3317,44 +3478,45 @@ msgid ""
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"
 "                                EmacsLisp, librep, Scheme, Smalltalk, Java,\n"
 "                                JavaProperties, C#, awk, YCP, Tcl, Perl, "
 "PHP,\n"

-"                                GCC-source, NXStringTable, RST, Glade)\n"
+"                                GCC-source, NXStringTable, RST, Glade, Lua,\n"
+"                                JavaScript, Vala)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/xgettext.c:860
+#: src/xgettext.c:877

 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 
 #, c-format
 msgid "  -C, --c++                   shorthand for --language=C++\n"
 msgstr ""
 

-#: src/xgettext.c:862
+#: src/xgettext.c:879

 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "By default the language is guessed depending on the input file name "
 "extension.\n"
 msgstr ""
 

-#: src/xgettext.c:867
+#: src/xgettext.c:884

 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --from-code=NAME        encoding of input files\n"
 "                                (except for Python, Tcl, Glade)\n"
 msgstr ""
 

-#: src/xgettext.c:870
+#: src/xgettext.c:887

 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 
 #, c-format
 msgid "By default the input files are assumed to be in ASCII.\n"
 msgstr ""
 

-#: src/xgettext.c:875
+#: src/xgettext.c:892

 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 
 #, c-format
 msgid "  -j, --join-existing         join messages with existing file\n"
 msgstr ""
 

-#: src/xgettext.c:877
+#: src/xgettext.c:894

 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 
 #, c-format
 msgid "  -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"
 msgstr ""
 

-#: src/xgettext.c:879
+#: src/xgettext.c:896

 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"
 #, c-format
 msgid ""
 "  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n"


@@ -3364,33 +3526,34 @@ msgid ""
 "                                in output file\n"
 msgstr ""
 
 "                                in output file\n"
 msgstr ""
 

-#: src/xgettext.c:885
+#: src/xgettext.c:902

 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 
 #, c-format
 msgid "Language specific options:\n"
 msgstr ""
 

-#: src/xgettext.c:887
+#: src/xgettext.c:904

 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 
 #, c-format
 msgid "  -a, --extract-all           extract all strings\n"
 msgstr ""
 

-#: src/xgettext.c:889 src/xgettext.c:896
+#: src/xgettext.c:906 src/xgettext.c:914

 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"

-"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"
+"                                C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n"
+"                                Lua, JavaScript, Vala)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/xgettext.c:893
+#: src/xgettext.c:911

 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n"
 "  -k, --keyword               do not to use default keywords\n"
 msgstr ""
 

-#: src/xgettext.c:900
+#: src/xgettext.c:919

 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "
 #, c-format
 msgid ""
 "      --flag=WORD:ARG:FLAG    additional flag for strings inside the "


@@ -3398,84 +3561,85 @@ msgid ""
 "                              number ARG of keyword WORD\n"
 msgstr ""
 
 "                              number ARG of keyword WORD\n"
 msgstr ""
 

-#: src/xgettext.c:903
+#: src/xgettext.c:922

 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"
 #, c-format
 msgid ""
 "                                (only languages C, C++, ObjectiveC, Shell,\n"
 "                                Python, Lisp, EmacsLisp, librep, Scheme, "
 "Java,\n"

-"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source)\n"
+"                                C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n"
+"                                Lua, JavaScript, Vala)\n"

 msgstr ""
 
 msgstr ""
 

-#: src/xgettext.c:907
+#: src/xgettext.c:927

 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 
 #, c-format
 msgid "  -T, --trigraphs             understand ANSI C trigraphs for input\n"
 msgstr ""
 

-#: src/xgettext.c:909
+#: src/xgettext.c:929

 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 
 #, c-format
 msgid "                                (only languages C, C++, ObjectiveC)\n"
 msgstr ""
 

-#: src/xgettext.c:911
+#: src/xgettext.c:931

 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 
 #, c-format
 msgid "      --qt                    recognize Qt format strings\n"
 msgstr ""
 

-#: src/xgettext.c:913 src/xgettext.c:917 src/xgettext.c:921
+#: src/xgettext.c:933 src/xgettext.c:937 src/xgettext.c:941

 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 
 #, c-format
 msgid "                                (only language C++)\n"
 msgstr ""
 

-#: src/xgettext.c:915
+#: src/xgettext.c:935

 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 
 #, c-format
 msgid "      --kde                   recognize KDE 4 format strings\n"
 msgstr ""
 

-#: src/xgettext.c:919
+#: src/xgettext.c:939

 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 
 #, c-format
 msgid "      --boost                 recognize Boost format strings\n"
 msgstr ""
 

-#: src/xgettext.c:923
+#: src/xgettext.c:943

 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --debug                 more detailed formatstring recognition result\n"
 msgstr ""
 

-#: src/xgettext.c:948
+#: src/xgettext.c:968

 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 
 #, c-format
 msgid "      --properties-output     write out a Java .properties file\n"
 msgstr ""
 

-#: src/xgettext.c:963
+#: src/xgettext.c:983

 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 
 #, c-format
 msgid "      --copyright-holder=STRING  set copyright holder in output\n"
 msgstr ""
 

-#: src/xgettext.c:965
+#: src/xgettext.c:985

 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --foreign-user          omit FSF copyright in output for foreign user\n"
 msgstr ""
 

-#: src/xgettext.c:967
+#: src/xgettext.c:987

 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 
 #, c-format
 msgid "      --package-name=PACKAGE  set package name in output\n"
 msgstr ""
 

-#: src/xgettext.c:969
+#: src/xgettext.c:989

 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 
 #, c-format
 msgid "      --package-version=VERSION  set package version in output\n"
 msgstr ""
 

-#: src/xgettext.c:971
+#: src/xgettext.c:991

 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "      --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"
 msgstr ""
 

-#: src/xgettext.c:973
+#: src/xgettext.c:993

 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "
 #, c-format
 msgid ""
 "  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for "


@@ -3483,7 +3647,7 @@ msgid ""
 "                                values\n"
 msgstr ""
 
 "                                values\n"
 msgstr ""
 

-#: src/xgettext.c:976
+#: src/xgettext.c:996

 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "
 #, c-format
 msgid ""
 "  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for "


@@ -3491,52 +3655,52 @@ msgid ""
 "                                values\n"
 msgstr ""
 
 "                                values\n"
 msgstr ""
 

-#: src/xgettext.c:1782
+#: src/xgettext.c:1817

 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 
 #, c-format
 msgid ""
 "A --flag argument doesn't have the <keyword>:<argnum>:[pass-]<flag> syntax: "
 "%s"
 msgstr ""
 

-#: src/xgettext.c:1881
+#: src/xgettext.c:1916

 msgid "standard input"
 msgstr "standard inn"
 
 msgid "standard input"
 msgstr "standard inn"
 

-#: src/xgettext.c:1985
+#: src/xgettext.c:2020

 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 
 #, c-format
 msgid "Non-ASCII character at %s%s."
 msgstr ""
 

-#: src/xgettext.c:1989
+#: src/xgettext.c:2024

 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 
 #, c-format
 msgid "Non-ASCII comment at or before %s%s."
 msgstr ""
 

-#: src/xgettext.c:1994
+#: src/xgettext.c:2029

 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 
 #, c-format
 msgid "Non-ASCII string at %s%s."
 msgstr ""
 

-#: src/xgettext.c:2100 src/xgettext.c:2133 src/xgettext.c:2195
+#: src/xgettext.c:2135 src/xgettext.c:2168 src/xgettext.c:2230

 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 
 #, fuzzy, c-format
 msgid "%s%s: warning: "
 msgstr "%s: advarsel: "
 

-#: src/xgettext.c:2103
+#: src/xgettext.c:2138

 #, c-format
 msgid ""
 "Although being used in a format string position, the %s is not a valid %s "
 "format string. Reason: %s\n"
 msgstr ""
 
 #, 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:2104
+#: src/xgettext.c:2139

 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Although declared as such, the %s is not a valid %s format string. Reason: "
 "%s\n"
 msgstr ""
 

-#: src/xgettext.c:2135
+#: src/xgettext.c:2170

 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"
 #, c-format
 msgid ""
 "'%s' format string with unnamed arguments cannot be properly localized:\n"


@@ -3545,50 +3709,58 @@ msgid ""
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 
 "and a mapping instead of a tuple for the arguments.\n"
 msgstr ""
 

-#: src/xgettext.c:2197
+#: src/xgettext.c:2232

 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 ""
 "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:2834
+#: src/xgettext.c:2891

 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "ambiguous argument specification for keyword '%.*s'"
 msgstr ""
 

-#: src/xgettext.c:2861
+#: src/xgettext.c:2918

 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "warning: missing context for keyword '%.*s'"
 msgstr ""
 

-#: src/xgettext.c:2886
+#: src/xgettext.c:2943

 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 
 #, c-format
 msgid "warning: missing context for plural argument of keyword '%.*s'"
 msgstr ""
 

-#: src/xgettext.c:2907
+#: src/xgettext.c:2964

 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 
 #, c-format
 msgid "context mismatch between singular and plural form"
 msgstr ""
 

-#: src/xgettext.c:3016
+#: src/xgettext.c:3074

 msgid ""
 "The option --msgid-bugs-address was not specified.\n"
 msgid ""
 "The option --msgid-bugs-address was not specified.\n"

-"If you are using a `Makevars' file, please specify\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 ""
 
 "the MSGID_BUGS_ADDRESS variable there; otherwise please\n"
 "specify an --msgid-bugs-address command line option.\n"
 msgstr ""
 

-#: src/xgettext.c:3226
-#, c-format
-msgid "language `%s' unknown"
+#: src/xgettext.c:3289
+#, fuzzy, c-format
+msgid "language '%s' unknown"

 msgstr "språket «%s» er ukjent"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 
 msgstr "språket «%s» er ukjent"
 
 #: libgettextpo/gettext-po.c:84
 msgid "<unnamed>"
 msgstr ""
 

+#, fuzzy
+#~ msgid "header field '%s' should start at beginning of line\n"
+#~ msgstr "filhodefelt «%s» skulle ha startet ved begynnelsen av linjen"
+
+#, fuzzy
+#~ msgid "some header fields still have the initial default value\n"
+#~ msgstr "noen filhodefelt har fremdeles sin initielle verdi"
+

 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ulovlig flagg -- %c\n"
 
 #~ msgid "%s: illegal option -- %c\n"
 #~ msgstr "%s: ulovlig flagg -- %c\n"