Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	src/util/pactree.c

1 files changed, 12 insertions, 23 deletions

diff --git a/scripts/po/da.po b/scripts/po/da.po
index f18e7a53..d6d67778 100644
--- a/scripts/po/da.po
+++ b/scripts/po/da.po
@@ -7,8 +7,8 @@ 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-30 21:40-0600\n"
-"PO-Revision-Date: 2012-01-05 23:01+0000\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"PO-Revision-Date: 2012-02-02 06:07+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/da/)\n"
@@ -493,6 +493,9 @@ msgstr "Du har ikke skriverettigheder til at gemme pakker i %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Du har ikke skriverettigheder til at gemme overførsler i %s."
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr ""
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr ""
 
@@ -768,9 +771,8 @@ 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 "Arkivfil »%s« kunne ikke oprettes."
+msgstr ""
 
 msgid "A specified key could not be exported from the gpg keychain."
 msgstr ""
@@ -778,17 +780,14 @@ msgstr ""
 msgid "The fingerprint of a specified key could not be determined."
 msgstr ""
 
-#, fuzzy
 msgid "%s could not be imported."
-msgstr "Arkivfil »%s« kunne ikke oprettes."
+msgstr ""
 
-#, fuzzy
 msgid "File %s does not exist and could not be imported."
-msgstr "%s findes ikke elelr er ikke en mappe."
+msgstr ""
 
-#, fuzzy
 msgid "A specified key could not be listed."
-msgstr "Arkivfil »%s« kunne ikke oprettes."
+msgstr ""
 
 msgid "A specified signature could not be listed."
 msgstr ""
@@ -802,9 +801,8 @@ 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 "Arkivfil »%s« kunne ikke oprettes."
+msgstr ""
 
 msgid "Updating trust database..."
 msgstr ""
@@ -938,13 +936,10 @@ msgstr "Kan ikke finde den binære fil xdelta3! Er xdelta3 installeret?"
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr ""
 
-#, 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"
 msgstr ""
-"repo-add til opdatere en pakkedatabase ved at læse en pakkefil.\\nFlere "
-"pakker at tilføje kan angives på kommandlinjen.\\n\\n"
 
 msgid "Options:\\n"
 msgstr ""
@@ -958,15 +953,11 @@ msgstr ""
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
 
-#, 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"
 msgstr ""
-"repo-remove vil opdatatere en pakkedatabase ved at fjerne pakkenavnet"
-"\\nspecificeret på kommandolinjen fra den angive arkivdatabase. Flere"
-"\\npakker til fjernelse kan specificeres på kommandolinje.\\n\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
@@ -987,14 +978,12 @@ msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr "Eksempel: repo-remove /sti/til/repo.db.tar.gz kernel26"
+msgstr ""
 
-#, fuzzy
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
-msgstr "Eksempel: repo-remove /sti/til/repo.db.tar.gz kernel26"
+msgstr ""
 
 msgid ""
 "Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"