Regenerate .pot files and merge .po files with them

1 files changed, 36 insertions, 36 deletions

diff --git a/po/nn.po b/po/nn.po
index dc47ec7ac..8afae1550 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-04-01 07:21+0300\n"
+"POT-Creation-Date: 2008-04-29 06:58+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"
@@ -1288,12 +1288,12 @@ msgstr ""
 "klarte ikkje laga sikringskopi av lenkja «%.255s» før ein ny versjon skulle "
 "installerast"
 
-#: src/archives.c:809
+#: src/archives.c:810
 #, c-format
 msgid "unable to install new version of `%.255s'"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: src/archives.c:856
+#: src/archives.c:857
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with %s:\n"
@@ -1302,7 +1302,7 @@ msgstr ""
 "dpkg: Åtvaring - ignorerer kravproblem ved fjerning av %s:\n"
 "%s"
 
-#: src/archives.c:863
+#: src/archives.c:864
 #, fuzzy, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
@@ -1311,7 +1311,7 @@ msgstr ""
 "dpkg: Åtvaring - vurderer fjerning av oppsett for den nødvendige\n"
 " pakken %s for å kunna fjerna %s.\n"
 
-#: src/archives.c:867
+#: src/archives.c:868
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
@@ -1320,7 +1320,7 @@ msgstr ""
 "dpkg: Nei, %s er nødvendig. Vil ikkje fjerna oppsettet\n"
 " for å kunna fjerna %s.\n"
 
-#: src/archives.c:881
+#: src/archives.c:882
 #, fuzzy, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
@@ -1329,28 +1329,28 @@ msgstr ""
 "dpkg: Nei, kan ikkje fjerna %s (--auto-deconfigure kan hjelpa):\n"
 "%s"
 
-#: src/archives.c:891
+#: src/archives.c:892
 #, fuzzy, c-format
 msgid "removal of %.250s"
 msgstr "lesefeil i %.250s"
 
-#: src/archives.c:918
+#: src/archives.c:919
 #, fuzzy, c-format
 msgid "installation of %.250s"
 msgstr "klarte ikkje installera ny versjon av «%.255s»"
 
-#: src/archives.c:919
+#: src/archives.c:920
 #, fuzzy, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
 msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
 
-#: src/archives.c:926
+#: src/archives.c:927
 #, fuzzy, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
 msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
 
-#: src/archives.c:930 src/archives.c:1055
+#: src/archives.c:931 src/archives.c:1056
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s:\n"
@@ -1359,39 +1359,39 @@ msgstr ""
 "dpkg: Knytt til %s, som inneheld %s:\n"
 "%s"
 
-#: src/archives.c:938
+#: src/archives.c:939
 #, fuzzy, c-format
 msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n"
 msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
 
-#: src/archives.c:944
+#: src/archives.c:945
 #, c-format
 msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
 
-#: src/archives.c:948
+#: src/archives.c:949
 #, c-format
 msgid "installing %.250s would break existing software"
 msgstr ""
 
-#: src/archives.c:981
+#: src/archives.c:982
 #, c-format
 msgid "dpkg: considering removing %s in favour of %s ...\n"
 msgstr "dpkg: Vurderer å fjerna %s til fordel for %s ...\n"
 
-#: src/archives.c:987
+#: src/archives.c:988
 #, c-format
 msgid "%s is not properly installed - ignoring any dependencies on it.\n"
 msgstr "%s er ikkje skikkeleg installert - ignorerer pakkekrav.\n"
 
-#: src/archives.c:1016
+#: src/archives.c:1017
 #, c-format
 msgid "dpkg: may have trouble removing %s, as it provides %s ...\n"
 msgstr "dpkg: Kan få problem med å fjerna %s, sidan han tilbyr %s ...\n"
 
-#: src/archives.c:1031
+#: src/archives.c:1032
 #, c-format
 msgid ""
 "dpkg: package %s requires reinstallation, but will remove anyway as you "
@@ -1400,87 +1400,87 @@ msgstr ""
 "dpkg: Pakken %s krev installasjon på nytt, men vert fjerna likevel, sidan du "
 "ønskjer det.\n"
 
-#: src/archives.c:1034
+#: src/archives.c:1035
 #, c-format
 msgid "dpkg: package %s requires reinstallation, will not remove.\n"
 msgstr "dpkg: Pakken %s krev installasjon på nytt, så han vert ikkje fjerna.\n"
 
-#: src/archives.c:1041
+#: src/archives.c:1042
 #, c-format
 msgid "package %s has too many Conflicts/Replaces pairs"
 msgstr ""
 
-#: src/archives.c:1047
+#: src/archives.c:1048
 #, c-format
 msgid "dpkg: yes, will remove %s in favour of %s.\n"
 msgstr "dpkg: Ja, fjernar %s til fordel for %s.\n"
 
-#: src/archives.c:1058
+#: src/archives.c:1059
 #, c-format
 msgid "conflicting packages - not installing %.250s"
 msgstr "pakkar i konflikt - installerer ikkje %.250s"
 
-#: src/archives.c:1059
+#: src/archives.c:1060
 #, c-format
 msgid "dpkg: warning - ignoring conflict, may proceed anyway !\n"
 msgstr "dpkg: Åtvaring - ignorerer konflikt, men kan halda fram likevel.\n"
 
-#: src/archives.c:1100
+#: src/archives.c:1101
 #, c-format
 msgid "--%s --recursive needs at least one path argument"
 msgstr "--%s --recursive treng minst éin stigparameter"
 
-#: src/archives.c:1132
+#: src/archives.c:1133
 msgid "failed to exec find for --recursive"
 msgstr "klarte ikkje køyra «find» for --recursive"
 
-#: src/archives.c:1137
+#: src/archives.c:1138
 msgid "failed to fdopen find's pipe"
 msgstr "klarte ikkje utføra «fdopen» på find-røyret"
 
-#: src/archives.c:1143
+#: src/archives.c:1144
 msgid "error reading find's pipe"
 msgstr "klarte ikkje lesa find-røyret"
 
-#: src/archives.c:1144
+#: src/archives.c:1145
 msgid "error closing find's pipe"
 msgstr "klarte ikkje lukka find-røyret"
 
-#: src/archives.c:1147
+#: src/archives.c:1148
 #, c-format
 msgid "find for --recursive returned unhandled error %i"
 msgstr "find for --recursive returnerte den uforutsette feilen %i"
 
-#: src/archives.c:1150
+#: src/archives.c:1151
 msgid "searched, but found no packages (files matching *.deb)"
 msgstr "søkte, men fann ingen pakkar (filer med namn *.deb)"
 
-#: src/archives.c:1166
+#: src/archives.c:1167
 #, c-format
 msgid "--%s needs at least one package archive file argument"
 msgstr "--%s treng minst éi pakkearkivfil som parameter"
 
-#: src/archives.c:1237
+#: src/archives.c:1238
 #, c-format
 msgid "Selecting previously deselected package %s.\n"
 msgstr "Tek i bruk pakken %s (tidlegare ikkje i bruk).\n"
 
-#: src/archives.c:1242
+#: src/archives.c:1243
 #, c-format
 msgid "Skipping deselected package %s.\n"
 msgstr "Hoppar over pakken %s. (Ikkje valt)\n"
 
-#: src/archives.c:1259
+#: src/archives.c:1260
 #, 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:1269
+#: src/archives.c:1270
 #, 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:1275
+#: src/archives.c:1276
 #, c-format
 msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n"
 msgstr ""