sync with code

1 files changed, 85 insertions, 76 deletions

diff --git a/po/sl.po b/po/sl.po
index 92760dae..7e62c31e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
 "PO-Revision-Date: 2014-05-13 09:43+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -64,7 +64,7 @@ msgstr "Nameščanje paketa »%s« (%s/%s) ..."
 msgid "Downloading package `%s'..."
 msgstr "Prenos paketa »%s« ..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
@@ -76,22 +76,22 @@ msgstr "Prekliči"
 msgid "...retrieving failed: %s"
 msgstr "... prenos je spodletel: %s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "Namestitev RPM"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Napaka: ni bilo možno najti datoteke %s, prekinitev"
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "V _redu"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -112,7 +112,7 @@ msgstr ""
 "\n"
 "Kaj želite narediti?"
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -127,7 +127,7 @@ msgstr ""
 "\n"
 "Nadaljevanje?"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -142,26 +142,31 @@ msgstr ""
 "\n"
 "Mogoče bi ga raje samo shranili. Kakšna je vaša izbira?"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "_Namesti"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "Izberite mesto za shranjevanje datoteke"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "V redu"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -245,17 +250,17 @@ msgstr ""
 msgid "No packages specified"
 msgstr "Noben paket ni bil določen"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "Za to morate biti skrbnik"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripravljam namestitev paketov ..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -264,7 +269,7 @@ msgstr ""
 "Nekaterih zahtevanih paketov ni mogoče namestiti:\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -275,42 +280,37 @@ msgstr ""
 "%s\n"
 "Ali naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "V redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za nadgradnjo)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr " (za namestitev)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr "Izbira paketov"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreben je eden od naslednjih paketov:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:204
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:239
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -321,22 +321,22 @@ msgstr ""
 "%s\n"
 "Naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Uporabljenega bo %s dodatnega prostora na disku."
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Sproščenega bo %s prostora na disku."
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Prenesenih bo %s paketov."
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -345,39 +345,39 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "paketov z izvorno kodo ni mogoče dobiti, predčasna prekinitev"
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vstavite vir imenovan »%s«"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr "Prišlo je do napake:"
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "_Opravljeno"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -386,27 +386,27 @@ msgstr ""
 "Namestitev ni uspela, ker manjkajo nekatere datoteke:\n"
 "%s"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, c-format
 msgid "You may want to update your urpmi database."
 msgstr "Poskusite posodobiti podatkovno zbirko urpmi."
 
-#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
+#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580
 #, c-format
 msgid "Installation failed:"
 msgstr "Namestitev ni uspela:"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paket(-i) so že nameščeni"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "Namestitev je končana"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponovno zaganjanje urpmi"
@@ -482,7 +482,7 @@ msgstr "V mapo %s ni mogoče prenašati paketov"
 msgid "Environment directory %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uporabljam specifično okolje pri %s\n"
@@ -537,63 +537,63 @@ msgstr "napaka pri registraciji krajevnih paketov"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ta postopek ni dovoljen v omejenem načinu"
 
-#: ../urpm/args.pm:150 ../urpm/args.pm:159
+#: ../urpm/args.pm:157 ../urpm/args.pm:166
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "napačna deklaracija posredniškega strežnika v ukazni vrstici\n"
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: datoteke rpm »%s« ni mogoče brati\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, c-format
 msgid "unexpected expression %s"
 msgstr "nepričakovan izraz %s"
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, c-format
 msgid "missing expression before %s"
 msgstr "manjkajoč izraz pred %s"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "nepričakovan izraz %s (predlog: uporabite -a ali -o ?)"
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, c-format
 msgid "no expression to close"
 msgstr "ni izraza za zaprtje"
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "Privzeto urpmf pričakuje regularni izraz. Uporabite argument »--literal«"
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "mapa za chroot ne obstaja"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ni mogoče uporabiti %s brez %s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155
+#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ni mogoče uporabiti %s z/s %s"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Preveč argumentov\n"
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -610,7 +610,7 @@ msgstr ""
 "\n"
 "Uporaba:\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Avtorske pravice (C) %s %s"
@@ -659,7 +659,7 @@ msgstr "branje datoteke nastavitvene datoteke [%s] ni možno"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "vir »%s« je naveden dvakrat, prekinjam"
 
-#: ../urpm/cfg.pm:245 ../urpm/media.pm:556
+#: ../urpm/cfg.pm:249 ../urpm/media.pm:556
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "zapisovanje nastavitvene datoteke [%s] ni možno"
@@ -1359,8 +1359,8 @@ msgstr "Arhit."
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
-msgstr "(predlagan)"
+msgid "(recommended)"
+msgstr ""
 
 #: ../urpm/msg.pm:185
 #, c-format
@@ -2065,9 +2065,9 @@ msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - ime izvornega paketa rpm\n"
 
 #: ../urpmf:75
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - oznake priporočenih paketov\n"
+#, fuzzy, c-format
+msgid "  --recommends   - recommends tags\n"
+msgstr "  --requires     - oznake zahtevanih paketov\n"
 
 #: ../urpmf:76
 #, c-format
@@ -2095,27 +2095,27 @@ msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - izpis različice, izdaje in arhitekture z vsakim imenom.\n"
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "nezaključen izraz (%s)"
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Nepravilen format: uporabite lahko samo eno oznako z več vrednostmi"
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ni bilo možno najti datoteke hdlist za vir »%s«"
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ni bilo možno najti datoteke synthesis za vir »%s«"
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "ni bilo možno najti datoteke xml-info za vir »%s«"
@@ -2141,8 +2141,8 @@ msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - samodejno odstrani osirotele pakete\n"
 
 #: ../urpmi:80 ../urpmq:52
-#, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr "  --no-suggests  - brez samodejne izbire priporočenih paketov.\n"
 
 #: ../urpmi:81
@@ -2245,8 +2245,8 @@ msgstr ""
 "                   preverjanja odvisnosti in integritete.\n"
 
 #: ../urpmi:105
-#, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+#, fuzzy, c-format
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr "  --allow-suggests - samodejno izbere »priporočene« pakete.\n"
 
 #: ../urpmi:109
@@ -3091,9 +3091,9 @@ msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - izpiše zahtevano.\n"
 
 #: ../urpmq:84
-#, c-format
-msgid "  --suggests     - print suggests.\n"
-msgstr "  --suggests     - prikaže priporočene pakete.\n"
+#, fuzzy, c-format
+msgid "  --recommends   - print recommends.\n"
+msgstr "  --requires     - izpiše zahtevano.\n"
 
 #: ../urpmq:85
 #, c-format
@@ -3268,6 +3268,15 @@ msgstr "Zagon  programa za namestitev paketov Mageje"
 msgid "Authentication is required to run Mageia Package Installer"
 msgstr "Za zagon nameščanja paketov Mageje je potrebno overjanje"
 
+#~ msgid "(suggested)"
+#~ msgstr "(predlagan)"
+
+#~ msgid "  --suggests     - suggests tags\n"
+#~ msgstr "  --suggests     - oznake priporočenih paketov\n"
+
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --suggests     - prikaže priporočene pakete.\n"
+
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d paket, %d MiB)"