Merge branch 'maint'

Conflicts:
	scripts/makepkg.sh.in

1 files changed, 80 insertions, 20 deletions

diff --git a/scripts/po/nb.po b/scripts/po/nb.po
index ea7c0762..b7cfddaa 100644
--- a/scripts/po/nb.po
+++ b/scripts/po/nb.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Alexander Rødseth <rodseth@gmail.com>, 2011.
+# Alexander Rødseth <rodseth@gmail.com>, 2011, 2012.
 # Jon Gjengset <jon@thesquareplanet.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-01-05 16:57-0600\n"
-"PO-Revision-Date: 2011-11-14 07:33+0000\n"
-"Last-Translator: Jonhoo <jon@thesquareplanet.com>\n"
+"POT-Creation-Date: 2012-01-30 21:40-0600\n"
+"PO-Revision-Date: 2012-01-21 12:07+0000\n"
+"Last-Translator: Alexander Rødseth <rodseth@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/nb/)\n"
 "Language: nb\n"
@@ -415,7 +415,7 @@ msgstr "  -s, --syncdeps   Installer manglende avhengigheter med %s"
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
 msgstr ""
-"-S, --source     Opprett en .tar fil med kildekode, men uten nedlastede "
+"  -S, --source     Opprett en .tar fil med kildekode, men uten nedlastede "
 "kilder"
 
 msgid ""
@@ -481,8 +481,9 @@ msgstr "      --noprogressbar  Ikke vis framdrift ved nedlasting av filer "
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Dersom %s ikke er spesifisert vil %s se etter '%s'"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
 "free software; see the source for copying conditions.\\nThere is NO "
 "WARRANTY, to the extent permitted by law.\\n"
@@ -634,8 +635,9 @@ msgstr "Bygget ferdig: %s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Bruk: %s [pacman_db_root]"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -759,6 +761,10 @@ msgstr ""
 "  --refresh-keys [nøkkelid(er)]  Oppdater de angitte, eller alle, nøklene "
 "fra en nøkkelserver"
 
+#, fuzzy
+msgid "The key identified by %s could not be found locally."
+msgstr "Nøkkelen identifisert ved %s eksisterer ikke"
+
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr "Du har ikke tilgang til å lese nøkkelringen %s..."
 
@@ -810,9 +816,58 @@ msgstr "Deaktiverer tilbaketrukne nøkler i nøkkelknippet..."
 msgid "Disabling key %s..."
 msgstr "Deaktiverer nøkkel %s..."
 
-msgid "The key identified by %s does not exist."
+msgid "A specified keyfile could not be added to the gpg keychain."
+msgstr ""
+
+msgid "A specified key could not be removed from the gpg keychain."
+msgstr ""
+
+#, fuzzy
+msgid "The key identified by %s could not be edited."
+msgstr "Nøkkelen identifisert ved %s eksisterer ikke"
+
+msgid "A specified key could not be exported from the gpg keychain."
+msgstr ""
+
+msgid "The fingerprint of a specified key could not be determined."
+msgstr ""
+
+#, fuzzy
+msgid "%s could not be imported."
+msgstr "Forskjellene kunne ikke avdekkes."
+
+#, fuzzy
+msgid "File %s does not exist and could not be imported."
+msgstr "%s finnes ikke, eller er ikke en mappe."
+
+#, fuzzy
+msgid "A specified key could not be listed."
+msgstr "Kunne ikke opprette pakkebrønnfil '%s'."
+
+#, fuzzy
+msgid "A specified signature could not be listed."
+msgstr "En eller flere PGP signaturer kunne ikke verifiseres!"
+
+msgid "A specified key could not be locally signed."
+msgstr ""
+
+msgid "Remote key not fetched correctly from keyserver."
+msgstr ""
+
+msgid "A specified local key could not be updated from a keyserver."
+msgstr ""
+
+#, fuzzy
+msgid "The signature identified by %s could not be verified."
 msgstr "Nøkkelen identifisert ved %s eksisterer ikke"
 
+msgid "Updating trust database..."
+msgstr "Oppdaterer databasen med betrodde kilder..."
+
+#, fuzzy
+msgid "Trust database could not be updated."
+msgstr "Forskjellene kunne ikke avdekkes."
+
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
 "Kunne ikke finne %s programmet som er nødvendig for alle %s operasjoner."
@@ -832,9 +887,6 @@ msgstr "Flere operasjoner oppgitt."
 msgid "Please run %s with each operation separately."
 msgstr "Vennligst kjør %s med hver oppgave for seg."
 
-msgid "Updating trust database..."
-msgstr "Oppdaterer databasen med betrodde kilder..."
-
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
@@ -947,9 +999,10 @@ msgstr "Kan ikke finne xdelta3 programmet! Er xdelta3 installert?"
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "Bruk: repo-add [alternativer] <sti-til-db> <pakke|endring> ...\\n"
 
+#, fuzzy
 msgid ""
 "repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n\\n"
+"\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 "repo-add vil oppdatere en pakkedatabase ved å lese inn en pakkefil.\\nDersom "
 "flere pakker skal legges til kan de angis på kommandolinjen.\\n\\n"
@@ -964,19 +1017,24 @@ msgstr ""
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files        oppdater databasens filliste\\n"
 
-msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
+#, fuzzy
+msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 "Bruk: repo-remove [alternativer] <sti-til-db> <pakkenavn|endring> ...\\n\\n"
 
+#, fuzzy
 msgid ""
 "repo-remove will update a package database by removing the package name"
 "\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n\\n"
+"\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 "repo-remove vil oppdatere en pakkedatabase ved å fjerne pakkenavnet som"
 "\\nhar blitt spesifisert på kommandolinjene fra den gitte databasen. Flere"
 "\\npakker kan fjernes ved å spesifisere dem på kommandolinjen.\\n\\n"
 
+msgid "Please move along, there is nothing to see here.\\n"
+msgstr ""
+
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet        minimer utskrift\\n"
 
@@ -990,23 +1048,26 @@ msgstr ""
 msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr "  -v, --verify       verifiser databasens signatur før oppdatering\\n"
 
+#, fuzzy
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-"\\n"
 msgstr ""
 "\\nSe %s(8) for ytterligere detaljer og beskrivelser av tilgjengelige "
 "atlernativer.\\n\\n"
 
+#, fuzzy
 msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
+"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
 "Eksempel:  repo-add /sti/til/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+#, fuzzy
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "Eksempel: repo-remove /sti/til/repo.db.tar.gz kernel26"
 
+#, fuzzy
 msgid ""
-"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
@@ -1050,9 +1111,8 @@ msgstr "'%s' har ikke en gyldig filendelse for at arkiv."
 msgid "An entry for '%s' already existed"
 msgstr "En oppføring for '%s' finnes allerede"
 
-#, fuzzy
 msgid "Invalid package signature file '%s'."
-msgstr "Ugyldig pakkefil '%s'."
+msgstr "Ugyldig pakkesignaturfil '%s'."
 
 msgid "Adding package signature..."
 msgstr "Legger til pakkesignatur..."