summaryrefslogtreecommitdiff
path: root/po/nn.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-20 16:32:48 +0100
committerMichael Vogt <mvo@debian.org>2014-02-20 16:32:48 +0100
commitbef425ae689899d3add1f6a26b888012803a7308 (patch)
tree79ba0268c02129fbaaa1fb32c58904cb37ca1167 /po/nn.po
parent74ac981563c6ccfd5291b6b6b83e193afa8aa40b (diff)
parent1c93747533dcf1cbbb2c743d0028ad157a7684a4 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: configure.ac debian/changelog test/integration/test-kernel-helper-autoremove
Diffstat (limited to 'po/nn.po')
-rw-r--r--po/nn.po71
1 files changed, 41 insertions, 30 deletions
diff --git a/po/nn.po b/po/nn.po
index 37c373e18..6061ad8ba 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_nn\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-13 10:19+0100\n"
+"POT-Creation-Date: 2014-02-20 14:43+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -117,7 +117,7 @@ msgstr "Du må oppgi nøyaktig eitt mnster"
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
#, c-format
msgid "Unable to locate package %s"
msgstr "Finn ikkje pakken %s"
@@ -703,7 +703,8 @@ msgid ""
" remove - remove packages\n"
"\n"
" upgrade - upgrade the system by installing/upgrading packages\n"
-"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
@@ -880,7 +881,7 @@ msgstr "Tidsavbrot på tilkopling til datasokkel"
msgid "Unable to accept connection"
msgstr "Klarte ikkje godta tilkoplinga"
-#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312
+#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nøkkel for fil"
@@ -1065,15 +1066,15 @@ msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/server.cc:490
+#: methods/server.cc:494
msgid "Bad header data"
msgstr "Øydelagde hovuddata"
-#: methods/server.cc:507 methods/server.cc:563
+#: methods/server.cc:511 methods/server.cc:567
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/server.cc:655
+#: methods/server.cc:659
msgid "Internal error"
msgstr "Intern feil"
@@ -1568,33 +1569,33 @@ msgstr "Klarte ikkje endra namnet på %s til %s"
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
-#: apt-private/acqprogress.cc:60
+#: apt-private/acqprogress.cc:63
msgid "Hit "
msgstr "Treff "
-#: apt-private/acqprogress.cc:84
+#: apt-private/acqprogress.cc:87
msgid "Get:"
msgstr "Hent:"
-#: apt-private/acqprogress.cc:115
+#: apt-private/acqprogress.cc:118
msgid "Ign "
msgstr "Ign "
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:122
msgid "Err "
msgstr "Feil "
-#: apt-private/acqprogress.cc:140
+#: apt-private/acqprogress.cc:143
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Henta %sB på %s (%sB/s)\n"
-#: apt-private/acqprogress.cc:230
+#: apt-private/acqprogress.cc:233
#, c-format
msgid " [Working]"
msgstr " [Arbeider]"
-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:294
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -2557,22 +2558,22 @@ msgstr "lese, har framleis %lu att å lesa, men ingen att"
msgid "write, still have %llu to write but couldn't"
msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
-#: apt-pkg/contrib/fileutl.cc:1732
+#: apt-pkg/contrib/fileutl.cc:1723
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Problem ved låsing av fila"
-#: apt-pkg/contrib/fileutl.cc:1744
+#: apt-pkg/contrib/fileutl.cc:1735
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Problem ved synkronisering av fila"
-#: apt-pkg/contrib/fileutl.cc:1755
+#: apt-pkg/contrib/fileutl.cc:1746
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Problem ved oppheving av lenkje til fila"
-#: apt-pkg/contrib/fileutl.cc:1768
+#: apt-pkg/contrib/fileutl.cc:1759
msgid "Problem syncing the file"
msgstr "Problem ved synkronisering av fila"
@@ -2856,17 +2857,22 @@ msgstr ""
msgid "Retrieving file %li of %li"
msgstr "Les filliste"
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
msgstr "Finn ikkje metodedrivaren %s."
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:115
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:166
#, c-format
msgid "Method %s did not start correctly"
msgstr "Metoden %s starta ikkje rett"
-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/acquire-worker.cc:452
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -3204,49 +3210,54 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Feil MD5-sum"
-#: apt-pkg/cacheset.cc:469
+#: apt-pkg/cacheset.cc:479
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgåva «%s» av «%s»"
-#: apt-pkg/cacheset.cc:472
+#: apt-pkg/cacheset.cc:482
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Fann ikkje versjonen «%s» av «%s»"
-#: apt-pkg/cacheset.cc:583
+#: apt-pkg/cacheset.cc:593
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:589
+#: apt-pkg/cacheset.cc:599
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Fann ikkje pakken %s"
-#: apt-pkg/cacheset.cc:600
+#: apt-pkg/cacheset.cc:605
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-pkg/cacheset.cc:616
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614
+#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:621
+#: apt-pkg/cacheset.cc:637
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:629
+#: apt-pkg/cacheset.cc:645
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:637
+#: apt-pkg/cacheset.cc:653
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""