Merge branch 'maint'

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

1 files changed, 12 insertions, 24 deletions

diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 844b350e..4a23ddf9 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.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:08+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/archlinux-pacman/"
 "team/sv/)\n"
@@ -490,6 +490,9 @@ msgstr "Du har inte skrivrättigheter för att spara paket i %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Du har inte skrivrättigheter för att spara nerladdningar 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 ""
 
@@ -762,9 +765,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 "Förrådsfilen '%s' kunde inte skapas."
+msgstr ""
 
 msgid "A specified key could not be exported from the gpg keychain."
 msgstr ""
@@ -772,17 +774,14 @@ msgstr ""
 msgid "The fingerprint of a specified key could not be determined."
 msgstr ""
 
-#, fuzzy
 msgid "%s could not be imported."
-msgstr "Förrådsfilen '%s' kunde inte skapas."
+msgstr ""
 
-#, fuzzy
 msgid "File %s does not exist and could not be imported."
-msgstr "%s existerar inte eller är inte en katalog."
+msgstr ""
 
-#, fuzzy
 msgid "A specified key could not be listed."
-msgstr "Förrådsfilen '%s' kunde inte skapas."
+msgstr ""
 
 msgid "A specified signature could not be listed."
 msgstr ""
@@ -796,9 +795,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 "Förrådsfilen '%s' kunde inte skapas."
+msgstr ""
 
 msgid "Updating trust database..."
 msgstr ""
@@ -932,13 +930,10 @@ msgstr "Kan inte gitta xdelta3 binär! Är xdelta3 installerat?"
 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 kommer uppdatera en paketdatabas genom att läsa en paketfil.\\nAtt "
-"lägga till flera paket kan specifieras via kommandotolken.\\n\\n"
 
 msgid "Options:\\n"
 msgstr ""
@@ -952,16 +947,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 kommer att uppdatera en paketdatabas genom att ta bort "
-"paketnamnet\\nsom angetts via kommandotolken från den givna "
-"förrådsdatabasen. Flera\\npaket att tas bort kan anges via kommandotolken.\\n"
-"\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
@@ -982,14 +972,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 "Exampel:  repo-remove /sökväg/till/repo.db.tar.gz kernel26"
+msgstr ""
 
-#, fuzzy
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
-msgstr "Exampel:  repo-remove /sökväg/till/repo.db.tar.gz kernel26"
+msgstr ""
 
 msgid ""
 "Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"