Merge branch 'maint'

1 files changed, 28 insertions, 25 deletions

diff --git a/po/sr@latin.po b/po/sr@latin.po
index 51333f60..dfa6844a 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.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: 2011-03-23 02:03-0500\n"
-"PO-Revision-Date: 2011-03-22 15:36+0000\n"
+"POT-Creation-Date: 2011-04-18 11:23-0500\n"
+"PO-Revision-Date: 2011-04-12 10:02+0000\n"
 "Last-Translator: Xabre <githzerai06@gmail.com>\n"
 "Language-Team: Serbian (Latin) <None>\n"
 "Language: sr@latin\n"
@@ -242,7 +242,7 @@ msgstr "Vel. preuzimanja  : %6.2f K\n"
 
 #, c-format
 msgid "Compressed Size: %6.2f K\n"
-msgstr "Vel. arhive      : %6.2f K\n"
+msgstr "Vel. arhive    : %6.2f K\n"
 
 #, c-format
 msgid "Installed Size : %6.2f K\n"
@@ -347,23 +347,20 @@ msgstr ""
 " -c, --cascade        uklanja paketa i sve pakete koji zavise od njih\n"
 
 #, c-format
-msgid "  -n, --nosave         remove configuration files as well\n"
-msgstr " -n, --nosave         uklanja i sve fajlove postavki\n"
+msgid "  -n, --nosave         remove configuration files\n"
+msgstr "  -n, --nosave         uklanja fajlove postavki\n"
 
 #, c-format
 msgid ""
-"  -s, --recursive      remove dependencies also (that won't break packages)\n"
-"                       (-ss includes explicitly installed dependencies too)\n"
+"  -s, --recursive      remove unnecessary dependencies\n"
+"                       (-ss includes explicitly installed dependencies)\n"
 msgstr ""
-"  -s, --resursive      uklanja i sve zavisnosti (koje neće polomiti pakete)\n"
-"                      (-ss uključuje i eksplicitno instalirane zavisnosti)\n"
+"  -s, --recursive      uklanja nepotrebne zavisnosti\n"
+"                       (-ss uključuje i eksplicitno instalirane zavisnosti)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-" -u, --unneeded       ukanja nepotrebne pakete (koji neće polomiti druge "
-"pakete)\n"
+msgid "  -u, --unneeded       remove unneeded packages\n"
+msgstr "  -u, --unneeded       uklanja nepotrebne pakete\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -529,8 +526,12 @@ msgstr ""
 "puta)\n"
 
 #, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         preskače proveru zavisnosti\n"
+msgid ""
+"  -d, --nodeps         skip dependency version checks (-dd to skip all "
+"checks)\n"
+msgstr ""
+"  -d, --nodeps         preskače provere verzija zavisnosti (-dd preskače sve "
+"provere)\n"
 
 #, c-format
 msgid ""
@@ -551,10 +552,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"      --print          only print the targets instead of performing the "
+"      --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"      --print          samo štampa ciljeve imesto izvršavanja operacije\n"
+msgstr "      --print          štampa ciljeve umesto izvršavanja operacije\n"
 
 #, c-format
 msgid ""
@@ -720,6 +720,10 @@ msgid "no operation specified (use -h for help)\n"
 msgstr "nije naznačena operacija (upotrebite -h za pomoć)\n"
 
 #, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s je u sastavu %s %s\n"
+
+#, c-format
 msgid "no file was specified for --owns\n"
 msgstr "nije određen fajl za --owns\n"
 
@@ -744,10 +748,6 @@ msgid "path too long: %s%s\n"
 msgstr "preduga putanja: %s%s\n"
 
 #, c-format
-msgid "%s is owned by %s %s\n"
-msgstr "%s je u sastavu %s %s\n"
-
-#, c-format
 msgid "No package owns %s\n"
 msgstr "Nijedan paket ne sadrži %s\n"
 
@@ -970,8 +970,8 @@ msgid ""
 ":: Do you want to cancel the current operation\n"
 ":: and upgrade these packages now?"
 msgstr ""
-":: Želite li da otkažete trenutnu radnju\n"
-":: i nadoradite ove pakete odmah?"
+":: Želite li da otkažete trenutnu operaciju\n"
+":: i nadogradite ove pakete odmah?"
 
 #, c-format
 msgid "failed to init transaction (%s)\n"
@@ -1621,6 +1621,9 @@ msgstr ""
 msgid "%s does not exist or is not a directory."
 msgstr "%s ne postoji ili nije u fascikli."
 
+msgid "%s is not a pacman database directory."
+msgstr "%s nije fascikla pacmanove baze."
+
 msgid "You must have correct permissions to upgrade the database."
 msgstr "Morate imati odgovarajuće dozvole za nadogradnju baze."