Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c
	lib/libalpm/sync.c

1 files changed, 14 insertions, 19 deletions

diff --git a/src/pacman/po/sr.po b/src/pacman/po/sr.po
index f70f7156..d4768930 100644
--- a/src/pacman/po/sr.po
+++ b/src/pacman/po/sr.po
@@ -9,11 +9,11 @@ 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-02-06 05:42-0600\n"
-"PO-Revision-Date: 2011-11-14 11:06+0000\n"
-"Last-Translator: Xabre <githzerai06@gmail.com>\n"
+"POT-Creation-Date: 2012-03-05 11:35-0600\n"
+"PO-Revision-Date: 2012-03-05 17:48+0000\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/archlinux-pacman/"
-"team/sr/)\n"
+"language/sr/)\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -494,11 +494,6 @@ msgid "      --needed         do not reinstall up to date packages\n"
 msgstr "      --needed         ажурне пакете не инсталирај поново\n"
 
 #, c-format
-msgid "      --recursive      reinstall all dependencies of target packages\n"
-msgstr ""
-"      --recursive      поново инсталирај све зависности циљаног пакета\n"
-
-#, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr " -c, --changelog      приказује дневник измена пакета\n"
 
@@ -872,16 +867,12 @@ msgid "failed to commit transaction (%s)\n"
 msgstr "неуспело извршавање преноса (%s)\n"
 
 #, c-format
-msgid "could not access database directory\n"
-msgstr "не могу да приступим фасцикли базе\n"
-
-#, c-format
-msgid "could not remove %s\n"
-msgstr "не могу да уконим %s\n"
+msgid "could not remove %s: %s\n"
+msgstr ""
 
 #, c-format
-msgid "Do you want to remove %s?"
-msgstr "Желите ли да уклоните %s?"
+msgid "could not access database directory\n"
+msgstr "не могу да приступим фасцикли базе\n"
 
 #, c-format
 msgid "Database directory: %s\n"
@@ -892,8 +883,8 @@ msgid "Do you want to remove unused repositories?"
 msgstr "Желите ли да уклоните некоришћене ризнице?"
 
 #, c-format
-msgid "Database directory cleaned up\n"
-msgstr "Фасцикла базе је очишћена\n"
+msgid "removing unused sync repositories...\n"
+msgstr ""
 
 #, c-format
 msgid "Cache directory: %s\n"
@@ -1032,6 +1023,10 @@ msgid "failed to init transaction (%s)\n"
 msgstr "неуспело започињање преноса (%s)\n"
 
 #, c-format
+msgid "could not lock database: %s\n"
+msgstr ""
+
+#, c-format
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"