Merge branch 'maint'

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

1 files changed, 15 insertions, 46 deletions

diff --git a/scripts/po/sr@latin.po b/scripts/po/sr@latin.po
index b131f797..46195297 100644
--- a/scripts/po/sr@latin.po
+++ b/scripts/po/sr@latin.po
@@ -8,8 +8,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: Serbian (Latin) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/sr@latin/)\n"
@@ -479,17 +479,12 @@ msgstr "  --noprogressbar  Ne prikazuje traku napretka pri preuzimanju fajlova"
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "Ukoliko %s nije određeno, %s će tražiti „%s“"
 
-#, fuzzy
 msgid ""
 "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"
 msgstr ""
-"© 2006-2011 Pacmanov razvojni tim <pacman-dev@archlinux.org>.\\n© 2002-2006 "
-"Džad Vinet (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"
 
 msgid "%s signal caught. Exiting..."
 msgstr "Ухваћен је %s сигнал. Излазим..."
@@ -512,6 +507,9 @@ msgstr "Nemate dozvolu upisa da bi sačuvali pakete u %s. "
 msgid "You do not have write permission to store downloads in %s."
 msgstr "nemate dozvolu upisa da bi sačuvali preuzimanja u %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 "\\0% i %s ne mogu biti navedeni istovremeno."
 
@@ -631,15 +629,11 @@ msgstr "Završih gradnju: %s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "Upotreba: %s [pacman_db_root]"
 
-#, fuzzy
 msgid ""
 "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 ""
-"© 2010-2011 Pacmanov razvojni tim <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"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s ne postoji ili nije u fascikli."
@@ -751,9 +745,8 @@ msgstr ""
 "  --refresh-keys [id(-ovi) ključeva] Ažuriraj navedeni ili sve ključeve sa "
 "servera."
 
-#, fuzzy
 msgid "The key identified by %s could not be found locally."
-msgstr "Ključ koji je identifikovao %s ne postoji."
+msgstr ""
 
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr "Nemate odgovarajuće dozvole da bi čitali privezak %s."
@@ -812,9 +805,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 "Ključ koji je identifikovao %s ne postoji."
+msgstr ""
 
 msgid "A specified key could not be exported from the gpg keychain."
 msgstr ""
@@ -822,21 +814,17 @@ msgstr ""
 msgid "The fingerprint of a specified key could not be determined."
 msgstr ""
 
-#, fuzzy
 msgid "%s could not be imported."
-msgstr "Ne mogah da napravim deltu."
+msgstr ""
 
-#, fuzzy
 msgid "File %s does not exist and could not be imported."
-msgstr "%s ne postoji ili nije u fascikli."
+msgstr ""
 
-#, fuzzy
 msgid "A specified key could not be listed."
-msgstr "Ne mogu da napravim fajl riznice „%s“."
+msgstr ""
 
-#, fuzzy
 msgid "A specified signature could not be listed."
-msgstr "Jedan ili više PGP potpisa ne mogu biti verifikovani!"
+msgstr ""
 
 msgid "A specified key could not be locally signed."
 msgstr ""
@@ -847,16 +835,14 @@ 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 "Ključ koji je identifikovao %s ne postoji."
+msgstr ""
 
 msgid "Updating trust database..."
 msgstr "Ažuriram bazu poverljivih..."
 
-#, fuzzy
 msgid "Trust database could not be updated."
-msgstr "Ne mogah da napravim deltu."
+msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "Ne mogu da nađem izvršni fajl %s neophodan za sve %s radnje."
@@ -990,13 +976,10 @@ msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr ""
 "Upotreba: repo-remove [opcije] <putanja-do-baze> <imepaketa|delta> ...\\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"
 msgstr ""
-"repo-add će ažurirati bazu paketa čitanjem svakog fajla paketa\\nU komandnoj "
-"liniji možete navesti i više fajlova.\\n\\n"
 
 msgid "Options:\\n"
 msgstr "Opcije:\\n"
@@ -1007,20 +990,14 @@ msgstr "  -d, --delta       napravi i dodaj deltu za nadogradnju paketa\\n"
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       ažuriraj spisak fajlova baze\\n"
 
-#, fuzzy
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr ""
-"Upotreba: repo-remove [opcije] <putanja-do-baze> <imepaketa|delta> ...\\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"
 msgstr ""
-"repo-remove će ažurirati bazu paketa uklanjanjem imena paketa\\nnavedenog u "
-"komandnoj liniji iz zadate baze riznice. Možete\\nnavesti i više paketa za "
-"uklanjanje odjednom.\\n\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
@@ -1037,30 +1014,22 @@ msgstr "  -k, --key <key>   koristi navedeni ključ za potpisivanje baze\\n"
 msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr "  -v, --verify      overi potpis baze pre ažuriranja\\n"
 
-#, fuzzy
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr "\\nPogledajte %s(8) za više detalja i opise dostupnih opcija..\\n\\n"
+msgstr ""
 
-#, fuzzy
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 msgstr ""
-"Primer: repo-add /putanja/do/riznica.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
 
-#, fuzzy
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
-msgstr "Primer:   repo-remove /putanja/do/repo.db.tar.gz kernel26"
+msgstr ""
 
-#, fuzzy
 msgid ""
 "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 ""
-"© 2006-2011 Pacmanov razvojni tim <pacman-dev@archlinux.org>\\n\\nOvo je "
-"slobodan softver; uslovi umnožavanja su u izvornom kodu.\\nGarancija NE "
-"postoji, u meri koju dozvoljava zakon.\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "Nema unosa baze za paket „%s“."