Regenerated for 0.11.1.

1 files changed, 173 insertions, 155 deletions

diff --git a/po/nn.po b/po/nn.po
index 8581506..de351e3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gettext 0.10.12\n"
-"POT-Creation-Date: 2002-03-06 15:21+0100\n"
+"POT-Creation-Date: 2002-04-24 19:27+0200\n"
 "PO-Revision-Date: 1996-03-21 08:46 EST\n"
 "Last-Translator: Karl Anders Øygard <karlo@ifi.uio.no>\n"
 "Language-Team: Norwegian-nynorsk <no@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Valid arguments are:"
 msgstr ""
 
 #: lib/copy-file.c:61 src/file-list.c:57 src/po-lex.c:726 src/read-mo.c:171
-#: src/urlget.c:204 src/xgettext.c:823 src/xgettext.c:836 src/xgettext.c:846
+#: src/urlget.c:204 src/xgettext.c:829 src/xgettext.c:842 src/xgettext.c:852
 #, fuzzy, c-format
 msgid "error while opening \"%s\" for reading"
 msgstr "feil under skriving av fila \"%s\""
@@ -238,11 +238,11 @@ msgid ""
 "format specifications in 'msgid' and '%s' for argument '%s' are not the same"
 msgstr "format-spesifiseringane for argument %u er ulike"
 
-#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:264 src/msgcat.c:229
-#: src/msgcmp.c:133 src/msgcomm.c:232 src/msgconv.c:182 src/msgen.c:170
-#: src/msgexec.c:165 src/msgfilter.c:248 src/msgfmt.c:351 src/msggrep.c:286
-#: src/msginit.c:251 src/msgmerge.c:265 src/msgunfmt.c:199 src/msguniq.c:207
-#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:374
+#: src/gettext.c:135 src/hostname.c:172 src/msgattrib.c:269 src/msgcat.c:234
+#: src/msgcmp.c:133 src/msgcomm.c:237 src/msgconv.c:188 src/msgen.c:176
+#: src/msgexec.c:165 src/msgfilter.c:253 src/msgfmt.c:351 src/msggrep.c:291
+#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
+#: src/ngettext.c:126 src/urlget.c:135 src/xgettext.c:378
 #, c-format, no-wrap
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -250,16 +250,16 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:269 src/msgcat.c:234
-#: src/msgcmp.c:138 src/msgcomm.c:237 src/msgconv.c:187 src/msgen.c:175
-#: src/msgexec.c:170 src/msgfilter.c:253 src/msgfmt.c:356 src/msggrep.c:291
-#: src/msginit.c:256 src/msgmerge.c:270 src/msgunfmt.c:204 src/msguniq.c:212
-#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:379
+#: src/gettext.c:140 src/hostname.c:177 src/msgattrib.c:274 src/msgcat.c:239
+#: src/msgcmp.c:138 src/msgcomm.c:242 src/msgconv.c:193 src/msgen.c:181
+#: src/msgexec.c:170 src/msgfilter.c:258 src/msgfmt.c:356 src/msggrep.c:296
+#: src/msginit.c:261 src/msgmerge.c:275 src/msgunfmt.c:209 src/msguniq.c:217
+#: src/ngettext.c:131 src/urlget.c:140 src/xgettext.c:383
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:266 src/ngettext.c:143
+#: src/gettext.c:158 src/hostname.c:187 src/msginit.c:271 src/ngettext.c:143
 #, fuzzy
 msgid "too many arguments"
 msgstr "manglar argument"
@@ -268,11 +268,11 @@ msgstr "manglar argument"
 msgid "missing arguments"
 msgstr "manglar argument"
 
-#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:322 src/msgcat.c:290
-#: src/msgcmp.c:170 src/msgcomm.c:306 src/msgconv.c:241 src/msgen.c:226
-#: src/msgexec.c:223 src/msgfilter.c:346 src/msgfmt.c:528 src/msggrep.c:397
-#: src/msginit.c:342 src/msgmerge.c:380 src/msgunfmt.c:309 src/msguniq.c:269
-#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:525
+#: src/gettext.c:240 src/hostname.c:201 src/msgattrib.c:327 src/msgcat.c:295
+#: src/msgcmp.c:170 src/msgcomm.c:311 src/msgconv.c:247 src/msgen.c:232
+#: src/msgexec.c:223 src/msgfilter.c:351 src/msgfmt.c:528 src/msggrep.c:402
+#: src/msginit.c:347 src/msgmerge.c:385 src/msgunfmt.c:314 src/msguniq.c:274
+#: src/ngettext.c:210 src/urlget.c:164 src/xgettext.c:529
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for meir informasjon\n"
@@ -333,15 +333,15 @@ msgstr ""
 "staden vert meldingar som er funne i den valgte katalogen oversatt.\n"
 "Standard søkekatalog er: %s\n"
 
-#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:402 src/msgcat.c:371
-#: src/msgcmp.c:215 src/msgcomm.c:384 src/msgconv.c:305 src/msgen.c:286
-#: src/msgexec.c:267 src/msgfilter.c:419 src/msgfmt.c:622 src/msggrep.c:485
-#: src/msginit.c:393 src/msgmerge.c:478 src/msgunfmt.c:388 src/msguniq.c:343
-#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:620
+#: src/gettext.c:277 src/hostname.c:231 src/msgattrib.c:409 src/msgcat.c:378
+#: src/msgcmp.c:215 src/msgcomm.c:391 src/msgconv.c:313 src/msgen.c:294
+#: src/msgexec.c:267 src/msgfilter.c:426 src/msgfmt.c:622 src/msggrep.c:492
+#: src/msginit.c:400 src/msgmerge.c:485 src/msgunfmt.c:395 src/msguniq.c:350
+#: src/ngettext.c:244 src/urlget.c:186 src/xgettext.c:626
 msgid "Report bugs to <bug-gnu-gettext@gnu.org>.\n"
 msgstr ""
 
-#: src/hostname.c:206 src/msginit.c:347
+#: src/hostname.c:206 src/msginit.c:352
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION]\n"
 msgstr ""
@@ -361,9 +361,9 @@ msgid ""
 "  -i, --ip-address      addresses for the hostname\n"
 msgstr ""
 
-#: src/hostname.c:225 src/msgattrib.c:396 src/msgcmp.c:209 src/msgconv.c:299
-#: src/msgen.c:280 src/msgexec.c:261 src/msgfilter.c:413 src/msggrep.c:479
-#: src/msginit.c:387 src/urlget.c:180
+#: src/hostname.c:225 src/msgattrib.c:403 src/msgcmp.c:209 src/msgconv.c:307
+#: src/msgen.c:288 src/msgexec.c:261 src/msgfilter.c:420 src/msggrep.c:486
+#: src/msginit.c:394 src/urlget.c:180
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -375,43 +375,43 @@ msgstr ""
 msgid "could not get host name"
 msgstr ""
 
-#: src/msgattrib.c:284 src/msgconv.c:202 src/msgexec.c:145 src/msgfilter.c:198
-#: src/msggrep.c:306 src/msginit.c:209 src/msguniq.c:227
+#: src/msgattrib.c:289 src/msgconv.c:208 src/msgexec.c:145 src/msgfilter.c:199
+#: src/msggrep.c:311 src/msginit.c:210 src/msguniq.c:232
 msgid "at most one input file allowed"
 msgstr ""
 
-#: src/msgattrib.c:290 src/msgattrib.c:294 src/msgcat.c:244 src/msgcat.c:248
-#: src/msgcomm.c:247 src/msgcomm.c:251 src/msgconv.c:208 src/msgconv.c:212
-#: src/msgen.c:197 src/msgen.c:201 src/msgfilter.c:268 src/msgfilter.c:272
-#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:312
-#: src/msggrep.c:316 src/msgmerge.c:295 src/msgmerge.c:316 src/msgmerge.c:320
-#: src/msgunfmt.c:214 src/msguniq.c:233 src/msguniq.c:237 src/xgettext.c:389
-#: src/xgettext.c:393
+#: src/msgattrib.c:295 src/msgattrib.c:299 src/msgcat.c:249 src/msgcat.c:253
+#: src/msgcomm.c:252 src/msgcomm.c:256 src/msgconv.c:214 src/msgconv.c:218
+#: src/msgen.c:203 src/msgen.c:207 src/msgfilter.c:273 src/msgfilter.c:277
+#: src/msgfmt.c:373 src/msgfmt.c:379 src/msgfmt.c:394 src/msggrep.c:317
+#: src/msggrep.c:321 src/msgmerge.c:300 src/msgmerge.c:321 src/msgmerge.c:325
+#: src/msgunfmt.c:219 src/msguniq.c:238 src/msguniq.c:242 src/xgettext.c:393
+#: src/xgettext.c:397
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgattrib.c:327 src/msgconv.c:246 src/msggrep.c:402 src/msguniq.c:274
+#: src/msgattrib.c:332 src/msgconv.c:252 src/msggrep.c:407 src/msguniq.c:279
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]\n"
 msgstr ""
 
-#: src/msgattrib.c:332
+#: src/msgattrib.c:337
 #, no-wrap
 msgid ""
 "Filters the messages of a translation catalog according to their attributes,\n"
 "and manipulates the attributes.\n"
 msgstr ""
 
-#: src/msgattrib.c:338 src/msgcat.c:313 src/msgcmp.c:190 src/msgcomm.c:328
-#: src/msgconv.c:256 src/msgen.c:244 src/msgexec.c:248 src/msgfilter.c:361
-#: src/msgfmt.c:543 src/msggrep.c:413 src/msginit.c:358 src/msgmerge.c:403
-#: src/msgunfmt.c:324 src/msguniq.c:291
+#: src/msgattrib.c:343 src/msgcat.c:318 src/msgcmp.c:190 src/msgcomm.c:333
+#: src/msgconv.c:262 src/msgen.c:250 src/msgexec.c:248 src/msgfilter.c:366
+#: src/msgfmt.c:543 src/msggrep.c:418 src/msginit.c:363 src/msgmerge.c:408
+#: src/msgunfmt.c:329 src/msguniq.c:296
 #, no-wrap
 msgid "Mandatory arguments to long options are mandatory for short options too.\n"
 msgstr ""
 
-#: src/msgattrib.c:343 src/msgconv.c:261 src/msggrep.c:418 src/msguniq.c:296
+#: src/msgattrib.c:348 src/msgconv.c:267 src/msggrep.c:423 src/msguniq.c:301
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -420,8 +420,8 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgattrib.c:351 src/msgconv.c:269 src/msgen.c:257 src/msgfilter.c:374
-#: src/msggrep.c:426 src/msgmerge.c:425
+#: src/msgattrib.c:356 src/msgconv.c:275 src/msgen.c:263 src/msgfilter.c:379
+#: src/msggrep.c:431 src/msgmerge.c:430
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -430,7 +430,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgattrib.c:359
+#: src/msgattrib.c:364
 #, no-wrap
 msgid ""
 "Message selection:\n"
@@ -442,7 +442,7 @@ msgid ""
 "      --only-obsolete         keep obsolete #~ messages\n"
 msgstr ""
 
-#: src/msgattrib.c:370
+#: src/msgattrib.c:375
 #, no-wrap
 msgid ""
 "Attribute manipulation:\n"
@@ -454,7 +454,7 @@ msgid ""
 "      --obsolete              synonym for --only-obsolete --clear-obsolete\n"
 msgstr ""
 
-#: src/msgattrib.c:381
+#: src/msgattrib.c:386
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -466,6 +466,8 @@ msgid ""
 "  -n, --add-location          generate '#: filename:line' lines (default)\n"
 "      --strict                write out strict Uniforum conforming .po file\n"
 "  -w, --width=NUMBER          set output page width\n"
+"      --no-wrap               do not break long message lines, longer than\n"
+"                              the output page width, into several lines\n"
 "  -s, --sort-output           generate sorted output\n"
 "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -479,17 +481,17 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgcat.c:254 src/msgcomm.c:277
+#: src/msgcat.c:259 src/msgcomm.c:282
 #, c-format
 msgid "impossible selection criteria specified (%d < n < %d)"
 msgstr ""
 
-#: src/msgcat.c:295 src/msgcomm.c:311 src/xgettext.c:530
+#: src/msgcat.c:300 src/msgcomm.c:316 src/xgettext.c:534
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [INPUTFILE]...\n"
 msgstr ""
 
-#: src/msgcat.c:300
+#: src/msgcat.c:305
 #, no-wrap
 msgid ""
 "Concatenates and merges the specified PO files.\n"
@@ -503,7 +505,7 @@ msgid ""
 "File positions from all PO files will be cumulated.\n"
 msgstr ""
 
-#: src/msgcat.c:318 src/msgcomm.c:333 src/xgettext.c:546
+#: src/msgcat.c:323 src/msgcomm.c:338 src/xgettext.c:550
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -513,7 +515,7 @@ msgid ""
 "If input file is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgcat.c:327 src/msgcomm.c:342 src/msguniq.c:304
+#: src/msgcat.c:332 src/msgcomm.c:347 src/msguniq.c:309
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -522,7 +524,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgcat.c:335
+#: src/msgcat.c:340
 #, no-wrap
 msgid ""
 "Message selection:\n"
@@ -535,7 +537,7 @@ msgid ""
 "                                 that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcat.c:347 src/msguniq.c:319
+#: src/msgcat.c:352 src/msguniq.c:324
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -550,6 +552,8 @@ msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
 "      --strict                   write out strict Uniforum conforming .po file\n"
 "  -w, --width=NUMBER             set output page width\n"
+"      --no-wrap                  do not break long message lines, longer than\n"
+"                                 the output page width, into several lines\n"
 "  -s, --sort-output              generate sorted output\n"
 "  -F, --sort-by-file             sort output by file location\n"
 msgstr ""
@@ -563,7 +567,7 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgcat.c:365 src/msgcomm.c:378 src/msguniq.c:337 src/xgettext.c:614
+#: src/msgcat.c:372 src/msgcomm.c:385 src/msguniq.c:344 src/xgettext.c:620
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -571,16 +575,16 @@ msgid ""
 "  -V, --version                  output version information and exit\n"
 msgstr ""
 
-#: src/msgcmp.c:149 src/msgmerge.c:281
+#: src/msgcmp.c:149 src/msgmerge.c:286
 #, fuzzy
 msgid "no input files given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgcmp.c:154 src/msgmerge.c:286
+#: src/msgcmp.c:154 src/msgmerge.c:291
 msgid "exactly 2 input files required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgcmp.c:175 src/msgmerge.c:385
+#: src/msgcmp.c:175 src/msgmerge.c:390
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] def.po ref.pot\n"
 msgstr ""
@@ -616,22 +620,22 @@ msgid ""
 "  -D, --directory=DIRECTORY   add DIRECTORY to list for input files search\n"
 msgstr ""
 
-#: src/msgcmp.c:203 src/msgmerge.c:449
+#: src/msgcmp.c:203 src/msgmerge.c:454
 #, no-wrap
 msgid ""
 "Operation modifiers:\n"
 "  -m, --multi-domain          apply ref.pot to each of the domains in def.po\n"
 msgstr ""
 
-#: src/msgcmp.c:252 src/msgmerge.c:848
+#: src/msgcmp.c:252 src/msgmerge.c:855
 msgid "this message is used but not defined..."
 msgstr "denne meldinga er brukt, men ikkje definert..."
 
-#: src/msgcmp.c:254 src/msgmerge.c:850
+#: src/msgcmp.c:254 src/msgmerge.c:857
 msgid "...but this definition is similar"
 msgstr "... men denne definisjonen liknar"
 
-#: src/msgcmp.c:259 src/msgmerge.c:877
+#: src/msgcmp.c:259 src/msgmerge.c:884
 #, c-format
 msgid "this message is used but not defined in %s"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
@@ -655,11 +659,11 @@ msgstr ""
 msgid "...this is the location of the first definition"
 msgstr "den første definisjonen finst her"
 
-#: src/msgcomm.c:266
+#: src/msgcomm.c:271
 msgid "at least two files must be specified"
 msgstr ""
 
-#: src/msgcomm.c:316
+#: src/msgcomm.c:321
 #, no-wrap
 msgid ""
 "Find messages which are common to two or more of the specified PO files.\n"
@@ -672,7 +676,7 @@ msgid ""
 "cumulated.\n"
 msgstr ""
 
-#: src/msgcomm.c:350
+#: src/msgcomm.c:355
 #, no-wrap
 msgid ""
 "Message selection:\n"
@@ -685,7 +689,7 @@ msgid ""
 "                                 that only unique messages be printed\n"
 msgstr ""
 
-#: src/msgcomm.c:362
+#: src/msgcomm.c:367
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -697,6 +701,8 @@ msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
 "      --strict                   write out strict Uniforum conforming .po file\n"
 "  -w, --width=NUMBER             set output page width\n"
+"      --no-wrap                  do not break long message lines, longer than\n"
+"                                 the output page width, into several lines\n"
 "  -s, --sort-output              generate sorted output\n"
 "  -F, --sort-by-file             sort output by file location\n"
 "      --omit-header              don't write header with `msgid \"\"' entry\n"
@@ -711,12 +717,12 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgconv.c:251
+#: src/msgconv.c:257
 #, no-wrap
 msgid "Converts a translation catalog to a different character encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:277
+#: src/msgconv.c:283
 #, no-wrap
 msgid ""
 "Conversion target:\n"
@@ -724,7 +730,7 @@ msgid ""
 "The default encoding is the current locale's encoding.\n"
 msgstr ""
 
-#: src/msgconv.c:284 src/msgen.c:265 src/msgmerge.c:455
+#: src/msgconv.c:290 src/msgen.c:271 src/msgmerge.c:460
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -736,6 +742,8 @@ msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 "      --strict                strict Uniforum output style\n"
 "  -w, --width=NUMBER          set output page width\n"
+"      --no-wrap               do not break long message lines, longer than\n"
+"                              the output page width, into several lines\n"
 "  -s, --sort-output           generate sorted output\n"
 "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -749,21 +757,21 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgen.c:186 src/msgfmt.c:367 src/xgettext.c:410
+#: src/msgen.c:192 src/msgfmt.c:367 src/xgettext.c:414
 msgid "no input file given"
 msgstr "inga innfil spesifisert"
 
-#: src/msgen.c:191
+#: src/msgen.c:197
 #, fuzzy
 msgid "exactly one input file required"
 msgstr "treng nøyaktig to innfiler"
 
-#: src/msgen.c:231
+#: src/msgen.c:237
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] INPUTFILE\n"
 msgstr ""
 
-#: src/msgen.c:236
+#: src/msgen.c:242
 #, no-wrap
 msgid ""
 "Creates an English translation catalog.  The input file is the last\n"
@@ -772,7 +780,7 @@ msgid ""
 "identical to the msgid, and are marked fuzzy.\n"
 msgstr ""
 
-#: src/msgen.c:249
+#: src/msgen.c:255
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -808,7 +816,7 @@ msgid ""
 "null byte.  The output of \"msgexec 0\" is suitable as input for \"xargs -0\".\n"
 msgstr ""
 
-#: src/msgexec.c:253 src/msgfilter.c:366
+#: src/msgexec.c:253 src/msgfilter.c:371
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -821,38 +829,38 @@ msgstr ""
 msgid "write to stdout failed"
 msgstr ""
 
-#: src/msgexec.c:337 src/msgfilter.c:603
+#: src/msgexec.c:337 src/msgfilter.c:610
 #, c-format
 msgid "write to %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:263
+#: src/msgfilter.c:268
 #, fuzzy
 msgid "missing filter name"
 msgstr "manglar argument"
 
-#: src/msgfilter.c:287
+#: src/msgfilter.c:292
 msgid "at least one sed script must be specified"
 msgstr ""
 
-#: src/msgfilter.c:351
+#: src/msgfilter.c:356
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n"
 msgstr ""
 
-#: src/msgfilter.c:356
+#: src/msgfilter.c:361
 #, no-wrap
 msgid "Applies a filter to all translations of a translation catalog.\n"
 msgstr ""
 
-#: src/msgfilter.c:382
+#: src/msgfilter.c:387
 #, no-wrap
 msgid ""
 "The FILTER can be any program that reads a translation from standard input\n"
 "and writes a modified translation to standard output.\n"
 msgstr ""
 
-#: src/msgfilter.c:388
+#: src/msgfilter.c:393
 #, no-wrap
 msgid ""
 "Useful FILTER-OPTIONs when the FILTER is 'sed':\n"
@@ -862,7 +870,7 @@ msgid ""
 "  -n, --quiet, --silent       suppress automatic printing of pattern space\n"
 msgstr ""
 
-#: src/msgfilter.c:397
+#: src/msgfilter.c:402
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -875,6 +883,8 @@ msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 "      --strict                strict Uniforum output style\n"
 "  -w, --width=NUMBER          set output page width\n"
+"      --no-wrap               do not break long message lines, longer than\n"
+"                              the output page width, into several lines\n"
 "  -s, --sort-output           generate sorted output\n"
 "  -F, --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -888,22 +898,22 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msgfilter.c:555
+#: src/msgfilter.c:562
 #, c-format
 msgid "cannot set up nonblocking I/O to %s subprocess"
 msgstr ""
 
-#: src/msgfilter.c:583
+#: src/msgfilter.c:590
 #, c-format
 msgid "communication with %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:634
+#: src/msgfilter.c:641
 #, c-format
 msgid "read from %s subprocess failed"
 msgstr ""
 
-#: src/msgfilter.c:650
+#: src/msgfilter.c:657
 #, c-format
 msgid "%s subprocess terminated with exit code %d"
 msgstr ""
@@ -913,18 +923,18 @@ msgstr ""
 msgid "the argument to %s should be a single punctuation character"
 msgstr ""
 
-#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:243
+#: src/msgfmt.c:385 src/msgfmt.c:407 src/msgunfmt.c:248
 #, c-format
 msgid "%s requires a \"-d directory\" specification"
 msgstr ""
 
-#: src/msgfmt.c:400 src/msgunfmt.c:236
+#: src/msgfmt.c:400 src/msgunfmt.c:241
 #, c-format
 msgid "%s requires a \"-l locale\" specification"
 msgstr ""
 
-#: src/msgfmt.c:416 src/msgmerge.c:303 src/msgmerge.c:309 src/msgunfmt.c:252
-#: src/msgunfmt.c:258
+#: src/msgfmt.c:416 src/msgmerge.c:308 src/msgmerge.c:314 src/msgunfmt.c:257
+#: src/msgunfmt.c:263
 #, c-format
 msgid "%s is only valid with %s"
 msgstr ""
@@ -1234,19 +1244,19 @@ msgstr ""
 msgid "%s: warning: source file contains fuzzy translation"
 msgstr "ADVARSEL: kildefila har «fuzzy» oversetjingar"
 
-#: src/msggrep.c:385
+#: src/msggrep.c:390
 #, c-format
 msgid "option '%c' cannot be used before 'K' or 'T' has been specified"
 msgstr ""
 
-#: src/msggrep.c:407
+#: src/msggrep.c:412
 #, no-wrap
 msgid ""
 "Extracts all messages of a translation catalog that match a given pattern\n"
 "or belong to some given source files.\n"
 msgstr ""
 
-#: src/msggrep.c:434
+#: src/msggrep.c:439
 #, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1277,7 +1287,7 @@ msgid ""
 "  -i, --ignore-case           ignore case distinctions\n"
 msgstr ""
 
-#: src/msggrep.c:464
+#: src/msggrep.c:469
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1289,6 +1299,8 @@ msgid ""
 "      --add-location          preserve '#: filename:line' lines (default)\n"
 "      --strict                strict Uniforum output style\n"
 "  -w, --width=NUMBER          set output page width\n"
+"      --no-wrap               do not break long message lines, longer than\n"
+"                              the output page width, into several lines\n"
 "      --sort-output           generate sorted output\n"
 "      --sort-by-file          sort output by file location\n"
 msgstr ""
@@ -1302,18 +1314,18 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/msggrep.c:554
+#: src/msggrep.c:561
 msgid "write to grep subprocess failed"
 msgstr ""
 
-#: src/msginit.c:279
+#: src/msginit.c:284
 msgid ""
 "You are in a language indifferent environment.  Please set\n"
 "your LANG environment variable, as described in the ABOUT-NLS\n"
 "file.  This is necessary so you can test your translations.\n"
 msgstr ""
 
-#: src/msginit.c:307
+#: src/msginit.c:312
 #, c-format
 msgid ""
 "Output file %s already exists.\n"
@@ -1321,19 +1333,19 @@ msgid ""
 "the output .po file through the --output-file option.\n"
 msgstr ""
 
-#: src/msginit.c:330
+#: src/msginit.c:335
 #, c-format
 msgid "Created %s.\n"
 msgstr ""
 
-#: src/msginit.c:352
+#: src/msginit.c:357
 #, no-wrap
 msgid ""
 "Creates a new PO file, initializing the meta information with values from the\n"
 "user's environment.\n"
 msgstr ""
 
-#: src/msginit.c:363
+#: src/msginit.c:368
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -1342,7 +1354,7 @@ msgid ""
 "If it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msginit.c:371
+#: src/msginit.c:376
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -1351,48 +1363,50 @@ msgid ""
 "locale setting.  If it is -, the results are written to standard output.\n"
 msgstr ""
 
-#: src/msginit.c:379
+#: src/msginit.c:384
 #, no-wrap
 msgid ""
 "Output details:\n"
 "  -l, --locale=LL_CC          set target locale\n"
 "      --no-translator         assume the PO file is automatically generated\n"
 "  -w, --width=NUMBER          set output page width\n"
+"      --no-wrap               do not break long message lines, longer than\n"
+"                              the output page width, into several lines\n"
 msgstr ""
 
-#: src/msginit.c:430
+#: src/msginit.c:437
 msgid ""
 "Found more than one .pot file.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:438 src/msginit.c:443
+#: src/msginit.c:445 src/msginit.c:450
 msgid "error reading current directory"
 msgstr ""
 
-#: src/msginit.c:451
+#: src/msginit.c:458
 msgid ""
 "Found no .pot file in the current directory.\n"
 "Please specify the input .pot file through the --input option.\n"
 msgstr ""
 
-#: src/msginit.c:898 src/msginit.c:950 src/msginit.c:1088 src/msginit.c:1155
+#: src/msginit.c:908 src/msginit.c:960 src/msginit.c:1098 src/msginit.c:1165
 #: src/read-java.c:80
 msgid "fdopen() failed"
 msgstr ""
 
-#: src/msginit.c:903 src/msginit.c:955 src/msginit.c:1093
+#: src/msginit.c:913 src/msginit.c:965 src/msginit.c:1103
 #, c-format
 msgid "%s subprocess I/O error"
 msgstr ""
 
-#: src/msginit.c:912 src/msginit.c:964 src/msginit.c:1102 src/msginit.c:1169
+#: src/msginit.c:922 src/msginit.c:974 src/msginit.c:1112 src/msginit.c:1179
 #: src/read-java.c:90
 #, c-format
 msgid "%s subprocess failed with exit code %d"
 msgstr ""
 
-#: src/msginit.c:1078
+#: src/msginit.c:1088
 msgid ""
 "The new message catalog should contain your email address, so that users "
 "can\n"
@@ -1404,7 +1418,7 @@ msgstr ""
 #. TRANSLATORS: "English" needs to be replaced by your language.
 #. For example in it.po write "Traduzioni italiani ...",
 #. *not* "Traduzioni inglesi ...".
-#: src/msginit.c:1422
+#: src/msginit.c:1432
 #, c-format
 msgid "English translations for %s package"
 msgstr ""
@@ -1438,7 +1452,7 @@ msgid "target charset \"%s\" is not a portable encoding name."
 msgstr ""
 
 #: src/msgl-cat.c:410 src/msgl-cat.c:416 src/msgl-charset.c:92
-#: src/msgl-charset.c:127 src/write-po.c:757 src/write-po.c:851
+#: src/msgl-charset.c:127 src/write-po.c:769 src/write-po.c:863
 msgid "warning: "
 msgstr ""
 
@@ -1518,11 +1532,11 @@ msgid ""
 "built without iconv()."
 msgstr ""
 
-#: src/msgmerge.c:353
+#: src/msgmerge.c:358
 msgid "backup type"
 msgstr ""
 
-#: src/msgmerge.c:390
+#: src/msgmerge.c:395
 #, fuzzy, no-wrap
 msgid ""
 "Merges two Uniforum style .po files together.  The def.po file is an\n"
@@ -1547,7 +1561,7 @@ msgstr ""
 "resultat.  Resultatet vert skrive til standard ut, med mindre ei utfil er\n"
 "spesifisert.\n"
 
-#: src/msgmerge.c:408
+#: src/msgmerge.c:413
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -1558,7 +1572,7 @@ msgid ""
 "                              may be specified more than once\n"
 msgstr ""
 
-#: src/msgmerge.c:418
+#: src/msgmerge.c:423
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -1566,7 +1580,7 @@ msgid ""
 "                              do nothing if def.po already up to date\n"
 msgstr ""
 
-#: src/msgmerge.c:433
+#: src/msgmerge.c:438
 #, no-wrap
 msgid ""
 "Output file location in update mode:\n"
@@ -1583,7 +1597,7 @@ msgid ""
 "environment variable.\n"
 msgstr ""
 
-#: src/msgmerge.c:470
+#: src/msgmerge.c:477
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -1593,17 +1607,17 @@ msgid ""
 "  -q, --quiet, --silent       suppress progress indicators\n"
 msgstr ""
 
-#: src/msgmerge.c:930
+#: src/msgmerge.c:937
 #, fuzzy
 msgid "this message should define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:953
+#: src/msgmerge.c:960
 #, fuzzy
 msgid "this message should not define plural forms"
 msgstr "denne meldinga er brukt, men ikkje definert i %s"
 
-#: src/msgmerge.c:1084
+#: src/msgmerge.c:1091
 #, fuzzy, c-format
 msgid ""
 "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, "
@@ -1612,26 +1626,26 @@ msgstr ""
 "%sLeste %d gamle + %d referansar, fletta inn %d, «fuzzya» %d, manglar %d,\n"
 "utdaterte %d.\n"
 
-#: src/msgmerge.c:1092
+#: src/msgmerge.c:1099
 msgid " done.\n"
 msgstr ""
 
-#: src/msgunfmt.c:221 src/msgunfmt.c:230
+#: src/msgunfmt.c:226 src/msgunfmt.c:235
 #, fuzzy, c-format
 msgid "%s and explicit file names are mutually exclusive"
 msgstr "%s og %s utelukker kvarandre"
 
-#: src/msgunfmt.c:314
+#: src/msgunfmt.c:319
 #, c-format, no-wrap
 msgid "Usage: %s [OPTION] [FILE]...\n"
 msgstr ""
 
-#: src/msgunfmt.c:319
+#: src/msgunfmt.c:324
 #, no-wrap
 msgid "Convert binary message catalog to Uniforum style .po file.\n"
 msgstr ""
 
-#: src/msgunfmt.c:329
+#: src/msgunfmt.c:334
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -1639,7 +1653,7 @@ msgid ""
 "      --tcl                Tcl mode: input is a tcl/msgcat .msg file\n"
 msgstr ""
 
-#: src/msgunfmt.c:336
+#: src/msgunfmt.c:341
 #, no-wrap
 msgid ""
 "Input file location:\n"
@@ -1647,7 +1661,7 @@ msgid ""
 "If no input file is given or if it is -, standard input is read.\n"
 msgstr ""
 
-#: src/msgunfmt.c:343
+#: src/msgunfmt.c:348
 #, no-wrap
 msgid ""
 "Input file location in Java mode:\n"
@@ -1657,7 +1671,7 @@ msgid ""
 "separated with an underscore.  The class is located using the CLASSPATH.\n"
 msgstr ""
 
-#: src/msgunfmt.c:352
+#: src/msgunfmt.c:357
 #, no-wrap
 msgid ""
 "Input file location in Tcl mode:\n"
@@ -1667,7 +1681,7 @@ msgid ""
 "specified directory.\n"
 msgstr ""
 
-#: src/msgunfmt.c:361
+#: src/msgunfmt.c:366
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -1676,7 +1690,7 @@ msgid ""
 "or if it is -.\n"
 msgstr ""
 
-#: src/msgunfmt.c:369
+#: src/msgunfmt.c:374
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -1686,6 +1700,8 @@ msgid ""
 "  -i, --indent             write indented output style\n"
 "      --strict             write strict uniforum style\n"
 "  -w, --width=NUMBER       set output page width\n"
+"      --no-wrap            do not break long message lines, longer than\n"
+"                           the output page width, into several lines\n"
 "  -s, --sort-output        generate sorted output\n"
 msgstr ""
 "Usage: %s [OPTION] [FILE]...\n"
@@ -1698,7 +1714,7 @@ msgstr ""
 "      --strict             write strict uniforum style\n"
 "  -V, --version            output version information and exit\n"
 
-#: src/msgunfmt.c:381
+#: src/msgunfmt.c:388
 #, no-wrap
 msgid ""
 "Informative output:\n"
@@ -1707,7 +1723,7 @@ msgid ""
 "  -v, --verbose            increase verbosity level\n"
 msgstr ""
 
-#: src/msguniq.c:279
+#: src/msguniq.c:284
 #, no-wrap
 msgid ""
 "Unifies duplicate translations in a translation catalog.\n"
@@ -1720,7 +1736,7 @@ msgid ""
 "will be cumulated.  When using the --unique option, duplicates are discarded.\n"
 msgstr ""
 
-#: src/msguniq.c:312
+#: src/msguniq.c:317
 #, no-wrap
 msgid ""
 "Message selection:\n"
@@ -1869,7 +1885,7 @@ msgstr ""
 msgid "too many errors, aborting"
 msgstr "for mange feil, avsluttar"
 
-#: src/po-lex.c:515 src/write-po.c:339 src/write-po.c:441
+#: src/po-lex.c:515 src/write-po.c:351 src/write-po.c:453
 msgid "invalid multibyte sequence"
 msgstr ""
 
@@ -1970,7 +1986,7 @@ msgstr ""
 msgid "failed to create \"%s\""
 msgstr ""
 
-#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1000
+#: src/write-java.c:1210 src/write-mo.c:289 src/write-po.c:1012
 #, c-format
 msgid "error while writing \"%s\" file"
 msgstr "feil under skriving av fila \"%s\""
@@ -1984,14 +2000,14 @@ msgstr ""
 msgid "error while opening \"%s\" for writing"
 msgstr "feil under skriving av fila \"%s\""
 
-#: src/write-po.c:390
+#: src/write-po.c:402
 #, c-format
 msgid ""
 "internationalized messages should not contain the `\\%c' escape sequence"
 msgstr ""
 "internasjonaliserte meldingar skal ikkje innehalde escape-sekvensen «\\%c»"
 
-#: src/write-po.c:758 src/write-po.c:852
+#: src/write-po.c:770 src/write-po.c:864
 #, c-format
 msgid ""
 "The following msgid contains non-ASCII characters.\n"
@@ -2000,12 +2016,12 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: src/write-po.c:919
+#: src/write-po.c:931
 #, c-format
 msgid "cannot create output file \"%s\""
 msgstr "kan ikkje opprette utfila \"%s\""
 
-#: src/write-po.c:926
+#: src/write-po.c:938
 #, no-c-format
 msgid "standard output"
 msgstr ""
@@ -2020,7 +2036,7 @@ msgstr ""
 msgid "%s:%d: warning: unterminated string literal"
 msgstr ""
 
-#: src/x-po.c:106 src/xgettext.c:634
+#: src/x-po.c:106 src/xgettext.c:640
 msgid "this file may not contain domain directives"
 msgstr "denne fila kan ikkje innehalde domene-nøkkelord"
 
@@ -2039,33 +2055,33 @@ msgstr ""
 msgid "%s:%d: invalid string expression"
 msgstr ""
 
-#: src/xgettext.c:397
+#: src/xgettext.c:401
 msgid "--join-existing cannot be used when output is written to stdout"
 msgstr ""
 "--join-existing kan ikkje brukast når utdata vert skrive til standard ut"
 
-#: src/xgettext.c:402
+#: src/xgettext.c:406
 msgid "xgettext cannot work without keywords to look for"
 msgstr ""
 
-#: src/xgettext.c:490
+#: src/xgettext.c:494
 #, c-format
 msgid "warning: file `%s' extension `%s' is unknown; will try C"
 msgstr ""
 
-#: src/xgettext.c:535
+#: src/xgettext.c:539
 #, no-wrap
 msgid "Extract translatable strings from given input files.\n"
 msgstr ""
 
-#: src/xgettext.c:540
+#: src/xgettext.c:544
 #, no-wrap
 msgid ""
 "Mandatory arguments to long options are mandatory for short options too.\n"
 "Similarly for optional arguments.\n"
 msgstr ""
 
-#: src/xgettext.c:555
+#: src/xgettext.c:559
 #, no-wrap
 msgid ""
 "Output file location:\n"
@@ -2075,7 +2091,7 @@ msgid ""
 "If output file is -, output is written to standard output.\n"
 msgstr ""
 
-#: src/xgettext.c:564
+#: src/xgettext.c:568
 #, no-wrap
 msgid ""
 "Choice of input file language:\n"
@@ -2087,7 +2103,7 @@ msgid ""
 "By default the language is guessed depending on the input file name extension.\n"
 msgstr ""
 
-#: src/xgettext.c:575
+#: src/xgettext.c:579
 #, no-wrap
 msgid ""
 "Operation mode:\n"
@@ -2097,7 +2113,7 @@ msgid ""
 "                                 preceding keyword lines) in output file\n"
 msgstr ""
 
-#: src/xgettext.c:584
+#: src/xgettext.c:588
 #, no-wrap
 msgid ""
 "Language=C/C++ specific options:\n"
@@ -2108,7 +2124,7 @@ msgid ""
 "      --debug                    more detailed formatstring recognition result\n"
 msgstr ""
 
-#: src/xgettext.c:594
+#: src/xgettext.c:598
 #, fuzzy, no-wrap
 msgid ""
 "Output details:\n"
@@ -2120,6 +2136,8 @@ msgid ""
 "  -n, --add-location             generate '#: filename:line' lines (default)\n"
 "      --strict                   write out strict Uniforum conforming .po file\n"
 "  -w, --width=NUMBER             set output page width\n"
+"      --no-wrap                  do not break long message lines, longer than\n"
+"                                 the output page width, into several lines\n"
 "  -s, --sort-output              generate sorted output\n"
 "  -F, --sort-by-file             sort output by file location\n"
 "      --omit-header              don't write header with `msgid \"\"' entry\n"
@@ -2138,18 +2156,18 @@ msgstr ""
 "      --strict             lag strengt Uniforum-konformt utdata\n"
 "  -V, --version            vis programversjon og avslutt\n"
 
-#: src/xgettext.c:814
+#: src/xgettext.c:820
 msgid "standard input"
 msgstr ""
 
-#: src/xgettext.c:929
+#: src/xgettext.c:935
 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:1285
+#: src/xgettext.c:1291
 #, c-format
 msgid "language `%s' unknown"
 msgstr ""