Regenerate .pot files and merge .po files with them

1 files changed, 46 insertions, 39 deletions

diff --git a/po/nn.po b/po/nn.po
index 5076d8f5c..833044c49 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debconf_nn\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2008-08-17 18:05+0300\n"
+"POT-Creation-Date: 2008-11-14 10:21+0200\n"
 "PO-Revision-Date: 2006-02-17 08:52+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -264,11 +264,18 @@ msgstr ""
 msgid "failed to install `%.250s' as `%.250s' containing %s info"
 msgstr "klarte ikkje installera «%.250s» som «%.250s» med %s-info"
 
-#: lib/ehandle.c:81
+#: lib/ehandle.c:85
+#, c-format
+msgid ""
+"%s: unrecoverable fatal error, aborting:\n"
+" %s\n"
+msgstr ""
+
+#: lib/ehandle.c:101
 msgid "out of memory pushing error handler: "
 msgstr "ikkje nok minne under feilhandtering: "
 
-#: lib/ehandle.c:96
+#: lib/ehandle.c:117
 #, c-format
 msgid ""
 "%s: error while cleaning up:\n"
@@ -277,25 +284,25 @@ msgstr ""
 "%s: feil ved opprydding:\n"
 " %s\n"
 
-#: lib/ehandle.c:111
+#: lib/ehandle.c:132
 #, c-format
 msgid "dpkg: too many nested errors during error recovery !!\n"
 msgstr "dpkg: For mange samanfletta feil under feiloppretting\n"
 
-#: lib/ehandle.c:186
+#: lib/ehandle.c:207
 msgid "out of memory for new cleanup entry with many arguments"
 msgstr "ikkje nok minne til ny oppryddingsoppføring med mange parametrar"
 
-#: lib/ehandle.c:198
+#: lib/ehandle.c:219
 msgid "out of memory for new cleanup entry"
 msgstr "ikkje nok minne til ny oppryddingsoppføring"
 
-#: lib/ehandle.c:284
+#: lib/ehandle.c:309
 #, c-format
 msgid "error writing `%s'"
 msgstr "feil ved skriving av «%s»"
 
-#: lib/ehandle.c:288
+#: lib/ehandle.c:313
 #, c-format
 msgid "%s:%d: internal error `%s'\n"
 msgstr "%s:%d: intern feil «%s»\n"
@@ -1460,27 +1467,27 @@ msgstr "søkte, men fann ingen pakkar (filer med namn *.deb)"
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s treng minst éi pakkearkivfil som parameter"
 
-#: src/archives.c:1238
+#: src/archives.c:1239
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
 
-#: src/archives.c:1243
+#: src/archives.c:1244
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
 
-#: src/archives.c:1260
+#: src/archives.c:1261
 #, c-format
 msgid "Version %.250s of %.250s already installed, skipping.\n"
 msgstr "Versjon %.250s av %.250s er installert frå før, hoppar over.\n"
 
-#: src/archives.c:1270
+#: src/archives.c:1271
 #, c-format
 msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n"
 msgstr "%s - Åtvaring: Nedgraderer %.250s frå %.250s til %.250s.\n"
 
-#: src/archives.c:1276
+#: src/archives.c:1277
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -2110,7 +2117,7 @@ msgstr "--compare-versions ugyldig relasjon"
 msgid "dpkg: version '%s' has bad syntax: %s\n"
 msgstr "versjon b har ugyldig syntaks: %s\n"
 
-#: src/errors.c:56
+#: src/errors.c:57
 #, c-format
 msgid ""
 "%s: error processing %s (--%s):\n"
@@ -2119,34 +2126,34 @@ msgstr ""
 "%s: Feil ved behandling av %s (--%s):\n"
 " %s\n"
 
-#: src/errors.c:63
+#: src/errors.c:64
 msgid ""
 "dpkg: failed to allocate memory for new entry in list of failed packages."
 msgstr ""
 "dpkg: Klarte ikkje tildela minne for ny oppføring i lista over mislukka "
 "pakkar."
 
-#: src/errors.c:73
+#: src/errors.c:74
 #, c-format
 msgid "dpkg: too many errors, stopping\n"
 msgstr "dpkg: For mange feil, stoppar\n"
 
-#: src/errors.c:79
+#: src/errors.c:80
 msgid "Errors were encountered while processing:\n"
 msgstr "Det oppstod feil ved behandlinga av:\n"
 
-#: src/errors.c:86
+#: src/errors.c:87
 msgid "Processing was halted because there were too many errors.\n"
 msgstr "Behandlinga vart stoppa på grunn av for mange feil.\n"
 
-#: src/errors.c:94
+#: src/errors.c:95
 #, c-format
 msgid "Package %s was on hold, processing it anyway as you request\n"
 msgstr ""
 "Pakken %s var halden tilbake, men blir behandla likevel sidan du ønskjer "
 "det\n"
 
-#: src/errors.c:98
+#: src/errors.c:99
 #, c-format
 msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
@@ -2154,7 +2161,7 @@ msgstr ""
 "Pakken %s er halden tilbake, og vert ikkje rørt. Bruk --force-hold for å "
 "tvinga gjennom behandling.\n"
 
-#: src/errors.c:107
+#: src/errors.c:108
 msgid ""
 "dpkg - warning, overriding problem because --force enabled:\n"
 " "
@@ -2801,12 +2808,12 @@ msgid ""
 msgstr ""
 "du må gi sjølve namnet på pakkane, ikkje namna på filene som pakkane ligg i"
 
-#: src/packages.c:188
+#: src/packages.c:191
 #, c-format
 msgid "Package %s listed more than once, only processing once.\n"
 msgstr "Pakken %s er nemnt fleire gonger, behandlar berre éin gong.\n"
 
-#: src/packages.c:192
+#: src/packages.c:195
 #, c-format
 msgid ""
 "More than one copy of package %s has been unpacked\n"
@@ -2815,7 +2822,7 @@ msgstr ""
 "Fleire kopiar av pakken %s er pakka ut i denne\n"
 " omgangen. Set berre opp éin gong.\n"
 
-#: src/packages.c:239
+#: src/packages.c:242
 #, fuzzy, c-format
 msgid ""
 "package %.250s is not ready for trigger processing\n"
@@ -2824,76 +2831,76 @@ msgstr ""
 "pakken %.250s er ikkje klar for oppsett\n"
 " kan ikkje setja opp (noverande status «%.250s»)"
 
-#: src/packages.c:335
+#: src/packages.c:338
 #, fuzzy, c-format
 msgid "  Package %s which provides %s is to be removed.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernast.\n"
 
-#: src/packages.c:338
+#: src/packages.c:341
 #, fuzzy, c-format
 msgid "  Package %s is to be removed.\n"
 msgstr "  %.250s vil verta fjerna.\n"
 
-#: src/packages.c:355
+#: src/packages.c:358
 #, c-format
 msgid "  Version of %s on system is %s.\n"
 msgstr ""
 
-#: src/packages.c:376
+#: src/packages.c:379
 #, fuzzy, c-format
 msgid "  Package %s which provides %s awaits trigger processing.\n"
 msgstr "  %.250s tilbyr %.250s, men skal fjernast.\n"
 
-#: src/packages.c:380
+#: src/packages.c:383
 #, fuzzy, c-format
 msgid "  Package %s awaits trigger processing.\n"
 msgstr "  %.250s vil verta fjerna.\n"
 
-#: src/packages.c:411
+#: src/packages.c:414
 #, c-format
 msgid "dpkg: also configuring `%s' (required by `%s')\n"
 msgstr "dpkg: set òg opp «%s» (kravd av «%s»)\n"
 
-#: src/packages.c:417
+#: src/packages.c:420
 #, fuzzy, c-format
 msgid "  Package %s which provides %s is not configured yet.\n"
 msgstr "  %.250s tilbyr %.250s, men oppsettet skal fjernast.\n"
 
-#: src/packages.c:420
+#: src/packages.c:423
 #, fuzzy, c-format
 msgid "  Package %s is not configured yet.\n"
 msgstr " er ikkje sett opp enno.\n"
 
-#: src/packages.c:431
+#: src/packages.c:434
 #, fuzzy, c-format
 msgid "  Package %s which provides %s is not installed.\n"
 msgstr "Pakken «%s» er ikkje installert.\n"
 
-#: src/packages.c:434
+#: src/packages.c:437
 #, fuzzy, c-format
 msgid "  Package %s is not installed.\n"
 msgstr "Pakken «%s» er ikkje installert.\n"
 
-#: src/packages.c:472
+#: src/packages.c:475
 #, fuzzy, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
 msgstr "  %.250s tilbyr %.250s og er %s.\n"
 
-#: src/packages.c:480
+#: src/packages.c:483
 #, fuzzy, c-format
 msgid "  %s (%s) provides %s.\n"
 msgstr "%s (underprosess): %s\n"
 
-#: src/packages.c:485
+#: src/packages.c:488
 #, fuzzy, c-format
 msgid "  Version of %s to be configured is %s.\n"
 msgstr "  Oppsettet av %.250s vil verta fjerna.\n"
 
-#: src/packages.c:585
+#: src/packages.c:588
 msgid " depends on "
 msgstr " krev "
 
-#: src/packages.c:591
+#: src/packages.c:594
 msgid "; however:\n"
 msgstr ". Men:\n"