Regenerated. Merged po files with pot.

1 files changed, 61 insertions, 61 deletions

diff --git a/po/nn.po b/po/nn.po
index bd607f262..1e824f195 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: 2007-03-20 23:55+0200\n"
+"POT-Creation-Date: 2007-05-08 04:15+0300\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"
@@ -1180,27 +1180,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:1093
+#: src/archives.c:1092
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
 
-#: src/archives.c:1098
+#: src/archives.c:1097
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
 
-#: src/archives.c:1112
+#: src/archives.c:1111
 #, 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:1124
+#: src/archives.c:1121
 #, 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:1130
+#: src/archives.c:1127
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""
@@ -4267,7 +4267,7 @@ msgid "try deleting %s"
 msgstr ""
 
 #: scripts/cleanup-info.pl:107 scripts/install-info.pl:312
-#: scripts/update-alternatives.pl:166
+#: scripts/update-alternatives.pl:167
 #, fuzzy, perl-format
 msgid "unable to open %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4294,7 +4294,7 @@ msgid "unable to close %s after read: %s"
 msgstr "klarte ikkje lukka etter lesing: «%.255s»"
 
 #: scripts/cleanup-info.pl:165 scripts/install-info.pl:486
-#: scripts/update-alternatives.pl:517
+#: scripts/update-alternatives.pl:518
 #, fuzzy, perl-format
 msgid "unable to close %s: %s"
 msgstr "klarte ikkje køyra %s"
@@ -4536,7 +4536,7 @@ msgstr "lesefeil i omdirigeringsfila [i]"
 msgid "install new diversions: %s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:708
+#: scripts/dpkg-divert.pl:310 scripts/update-alternatives.pl:709
 #, fuzzy, perl-format
 msgid "internal error: %s corrupt: %s"
 msgstr "%s: Intern gzip-feil: Skreiv: «%s»"
@@ -4943,11 +4943,6 @@ msgid ""
 "alternatives."
 msgstr ""
 
-#: scripts/update-alternatives.pl:168
-#, perl-format
-msgid "No alternatives for %s."
-msgstr ""
-
 #: scripts/update-alternatives.pl:187
 #, perl-format
 msgid "%s - status is %s."
@@ -5044,154 +5039,159 @@ msgstr ""
 msgid "--slave only allowed with --install"
 msgstr ""
 
-#: scripts/update-alternatives.pl:342
+#: scripts/update-alternatives.pl:297
+#, perl-format
+msgid "No alternatives for %s."
+msgstr ""
+
+#: scripts/update-alternatives.pl:343
 #, perl-format
 msgid "Setting up automatic selection of %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:345 scripts/update-alternatives.pl:347
-#: scripts/update-alternatives.pl:459 scripts/update-alternatives.pl:461
-#: scripts/update-alternatives.pl:524 scripts/update-alternatives.pl:526
-#: scripts/update-alternatives.pl:528 scripts/update-alternatives.pl:530
-#: scripts/update-alternatives.pl:586 scripts/update-alternatives.pl:588
-#: scripts/update-alternatives.pl:655 scripts/update-alternatives.pl:691
+#: scripts/update-alternatives.pl:346 scripts/update-alternatives.pl:348
+#: scripts/update-alternatives.pl:460 scripts/update-alternatives.pl:462
+#: scripts/update-alternatives.pl:525 scripts/update-alternatives.pl:527
+#: scripts/update-alternatives.pl:529 scripts/update-alternatives.pl:531
+#: scripts/update-alternatives.pl:587 scripts/update-alternatives.pl:589
+#: scripts/update-alternatives.pl:656 scripts/update-alternatives.pl:692
 #, fuzzy, perl-format
 msgid "unable to remove %s: %s"
 msgstr "klarte ikkje køyra %s"
 
-#: scripts/update-alternatives.pl:358
+#: scripts/update-alternatives.pl:359
 #, perl-format
 msgid ""
 "%s has been changed (manually or by a script).\n"
 "Switching to manual updates only."
 msgstr ""
 
-#: scripts/update-alternatives.pl:370
+#: scripts/update-alternatives.pl:371
 #, perl-format
 msgid ""
 "Checking available versions of %s, updating links in %s ...\n"
 "(You may modify the symlinks there yourself if desired - see `man ln'.)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:376
+#: scripts/update-alternatives.pl:377
 #, fuzzy, perl-format
 msgid "Renaming %s link from %s to %s."
 msgstr "Pakkar ut %s (frå %s) ...\n"
 
-#: scripts/update-alternatives.pl:379 scripts/update-alternatives.pl:403
-#: scripts/update-alternatives.pl:485 scripts/update-alternatives.pl:559
+#: scripts/update-alternatives.pl:380 scripts/update-alternatives.pl:404
+#: scripts/update-alternatives.pl:486 scripts/update-alternatives.pl:560
 #, fuzzy, perl-format
 msgid "unable to rename %s to %s: %s"
 msgstr "finn ikkje %s «%.250s»"
 
-#: scripts/update-alternatives.pl:398
+#: scripts/update-alternatives.pl:399
 #, perl-format
 msgid "slave link name %s duplicated"
 msgstr ""
 
-#: scripts/update-alternatives.pl:400
+#: scripts/update-alternatives.pl:401
 #, perl-format
 msgid "Renaming %s slave link from %s to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:415
+#: scripts/update-alternatives.pl:416
 msgid "Removing manually selected alternative - switching to auto mode"
 msgstr ""
 
-#: scripts/update-alternatives.pl:429
+#: scripts/update-alternatives.pl:430
 #, perl-format
 msgid "Alternative %s for %s not registered, not removing."
 msgstr ""
 
-#: scripts/update-alternatives.pl:456
+#: scripts/update-alternatives.pl:457
 #, perl-format
 msgid "Discarding obsolete slave link %s (%s)."
 msgstr ""
 
-#: scripts/update-alternatives.pl:477
+#: scripts/update-alternatives.pl:478
 #, perl-format
 msgid "Automatic updates of %s are disabled, leaving it alone."
 msgstr ""
 
-#: scripts/update-alternatives.pl:479
+#: scripts/update-alternatives.pl:480
 #, perl-format
 msgid "To return to automatic updates use `update-alternatives --auto %s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:483
+#: scripts/update-alternatives.pl:484
 #, perl-format
 msgid "Recovering from previous failed update of %s ..."
 msgstr ""
 
-#: scripts/update-alternatives.pl:498
+#: scripts/update-alternatives.pl:499
 #, fuzzy, perl-format
 msgid "unable to open %s for write: %s"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
-#: scripts/update-alternatives.pl:521
+#: scripts/update-alternatives.pl:522
 #, perl-format
 msgid "Last package providing %s (%s) removed, deleting it."
 msgstr ""
 
-#: scripts/update-alternatives.pl:534
+#: scripts/update-alternatives.pl:535
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a symlink to %s\n"
 " (or nonexistent); however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:539 scripts/update-alternatives.pl:553
-#: scripts/update-alternatives.pl:573 scripts/update-alternatives.pl:581
+#: scripts/update-alternatives.pl:540 scripts/update-alternatives.pl:554
+#: scripts/update-alternatives.pl:574 scripts/update-alternatives.pl:582
 #, fuzzy, perl-format
 msgid "unable to ensure %s nonexistent: %s"
 msgstr "klarte ikkje køyra nytt %s"
 
-#: scripts/update-alternatives.pl:541 scripts/update-alternatives.pl:575
-#: scripts/update-alternatives.pl:598 scripts/update-alternatives.pl:641
-#: scripts/update-alternatives.pl:677 scripts/update-alternatives.pl:716
+#: scripts/update-alternatives.pl:542 scripts/update-alternatives.pl:576
+#: scripts/update-alternatives.pl:599 scripts/update-alternatives.pl:642
+#: scripts/update-alternatives.pl:678 scripts/update-alternatives.pl:717
 #, fuzzy, perl-format
 msgid "unable to make %s a symlink to %s: %s"
 msgstr "klarte ikkje laga sikringskopi av den symbolske lenkja «%.255s»"
 
-#: scripts/update-alternatives.pl:543 scripts/update-alternatives.pl:563
-#: scripts/update-alternatives.pl:577 scripts/update-alternatives.pl:600
-#: scripts/update-alternatives.pl:643 scripts/update-alternatives.pl:679
-#: scripts/update-alternatives.pl:721
+#: scripts/update-alternatives.pl:544 scripts/update-alternatives.pl:564
+#: scripts/update-alternatives.pl:578 scripts/update-alternatives.pl:601
+#: scripts/update-alternatives.pl:644 scripts/update-alternatives.pl:680
+#: scripts/update-alternatives.pl:722
 #, fuzzy, perl-format
 msgid "unable to install %s as %s: %s"
 msgstr "klarte ikkje installera «%.250s» som «%.250s»"
 
-#: scripts/update-alternatives.pl:546 scripts/update-alternatives.pl:591
+#: scripts/update-alternatives.pl:547 scripts/update-alternatives.pl:592
 #, perl-format
 msgid "Leaving %s (%s) pointing to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:549 scripts/update-alternatives.pl:594
+#: scripts/update-alternatives.pl:550 scripts/update-alternatives.pl:595
 #, perl-format
 msgid "Updating %s (%s) to point to %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:568
+#: scripts/update-alternatives.pl:569
 #, perl-format
 msgid ""
 "warning: %s is supposed to be a slave symlink to\n"
 " %s, or nonexistent; however, readlink failed: %s"
 msgstr ""
 
-#: scripts/update-alternatives.pl:583 scripts/update-alternatives.pl:652
-#: scripts/update-alternatives.pl:688
+#: scripts/update-alternatives.pl:584 scripts/update-alternatives.pl:653
+#: scripts/update-alternatives.pl:689
 #, perl-format
 msgid "Removing %s (%s), not appropriate with %s."
 msgstr ""
 
-#: scripts/update-alternatives.pl:608
+#: scripts/update-alternatives.pl:609
 #, perl-format
 msgid ""
 "There is only 1 program which provides %s\n"
 "(%s). Nothing to configure.\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:613
+#: scripts/update-alternatives.pl:614
 #, perl-format
 msgid ""
 "There are %s alternatives which provide `%s'.\n"
@@ -5200,41 +5200,41 @@ msgid ""
 "-----------------------------------------------\n"
 msgstr ""
 
-#: scripts/update-alternatives.pl:623
+#: scripts/update-alternatives.pl:624
 msgid "Press enter to keep the default[*], or type selection number: "
 msgstr ""
 
-#: scripts/update-alternatives.pl:638 scripts/update-alternatives.pl:675
+#: scripts/update-alternatives.pl:639 scripts/update-alternatives.pl:676
 #, perl-format
 msgid "Using `%s' to provide `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:673
+#: scripts/update-alternatives.pl:674
 #, perl-format
 msgid "Cannot find alternative `%s'."
 msgstr ""
 
-#: scripts/update-alternatives.pl:696 scripts/update-alternatives.pl:699
+#: scripts/update-alternatives.pl:697 scripts/update-alternatives.pl:700
 #, fuzzy, perl-format
 msgid "error writing stdout: %s"
 msgstr "feil ved skriving av «%s»"
 
-#: scripts/update-alternatives.pl:698
+#: scripts/update-alternatives.pl:699
 #, perl-format
 msgid "newlines prohibited in update-alternatives files (%s)"
 msgstr ""
 
-#: scripts/update-alternatives.pl:703
+#: scripts/update-alternatives.pl:704
 #, fuzzy, perl-format
 msgid "error or eof reading %s for %s (%s)"
 msgstr "klarte ikkje lesa %s frå %.255s"
 
-#: scripts/update-alternatives.pl:704
+#: scripts/update-alternatives.pl:705
 #, fuzzy, perl-format
 msgid "missing newline after %s"
 msgstr "fila «%.250s» er øydelagd - manglar linjeskift etter %.250s"
 
-#: scripts/update-alternatives.pl:724
+#: scripts/update-alternatives.pl:725
 #, perl-format
 msgid "Serious problem: %s"
 msgstr ""