sync with code

1 files changed, 79 insertions, 71 deletions

diff --git a/po/bs.po b/po/bs.po
index 3f65c9c0..88356055 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-11 21:49+0200\n"
+"POT-Creation-Date: 2014-09-13 21:15+0200\n"
 "PO-Revision-Date: 2006-09-13 21:02+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -63,7 +63,7 @@ msgstr "Instaliram paket `%s' (%s/%s)..."
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpm/RPMProgressDialog.pm:349
+#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
@@ -75,22 +75,22 @@ msgstr "Odustani"
 msgid "...retrieving failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../gurpmi:45
+#: ../gurpmi:49
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalacija"
 
-#: ../gurpmi:59
+#: ../gurpmi:63
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199
+#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
 
-#: ../gurpmi:80
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -111,7 +111,7 @@ msgstr ""
 "\n"
 "Šta želite uraditi?"
 
-#: ../gurpmi:88 ../gurpmi:99
+#: ../gurpmi:92 ../gurpmi:103
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "Da nastavim?"
 
-#: ../gurpmi:94
+#: ../gurpmi:98
 #, c-format
 msgid ""
 "You are about to install the following software package on your computer:\n"
@@ -141,26 +141,31 @@ msgstr ""
 "\n"
 "Možda želite da ih samo snimite. Šta je vaš izbor?"
 
-#: ../gurpmi:112
+#: ../gurpmi:116
 #, c-format
 msgid "_Install"
 msgstr "_Instaliraj"
 
-#: ../gurpmi:113
+#: ../gurpmi:117
 #, c-format
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:114 ../gurpmi2:169
+#: ../gurpmi:118 ../gurpmi2:173
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../gurpmi:122
+#: ../gurpmi:126
 #, c-format
 msgid "Choose location to save file"
 msgstr "Izaberi lokaciju za snimanje"
 
+#: ../gurpmi:126 ../gurpmi2:119
+#, c-format
+msgid "Ok"
+msgstr "U redu"
+
 #: ../gurpmi.pm:56
 #, c-format
 msgid "Options:"
@@ -244,17 +249,17 @@ msgstr "  --searchmedia  - koristi samo navedene medije za pretragu paketa.\n"
 msgid "No packages specified"
 msgstr "Nije naveden paket"
 
-#: ../gurpmi2:42
+#: ../gurpmi2:46
 #, c-format
 msgid "Must be root"
 msgstr "Morate biti root"
 
-#: ../gurpmi2:72
+#: ../gurpmi2:76
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripremam instalaciju paketa..."
 
-#: ../gurpmi2:87 ../urpmi:506
+#: ../gurpmi2:91 ../urpmi:506
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -263,7 +268,7 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../gurpmi2:95
+#: ../gurpmi2:99
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -274,42 +279,37 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:115
+#: ../gurpmi2:119
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:115
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../gurpmi2:165
+#: ../gurpmi2:169
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:170
 #, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:169
+#: ../gurpmi2:173
 #, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:170
+#: ../gurpmi2:174
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../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"
@@ -320,22 +320,22 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:246 ../urpmi:615
+#: ../gurpmi2:250 ../urpmi:615
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../gurpmi2:247 ../urpmi:616
+#: ../gurpmi2:251 ../urpmi:616
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../gurpmi2:248 ../urpmi:617
+#: ../gurpmi2:252 ../urpmi:617
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../gurpmi2:249 ../urpmi:618
+#: ../gurpmi2:253 ../urpmi:618
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -343,46 +343,46 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 
-#: ../gurpmi2:255 ../urpmi:606
+#: ../gurpmi2:259 ../urpmi:606
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
 
-#: ../gurpmi2:256 ../urpmi:607
+#: ../gurpmi2:260 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
 
-#: ../gurpmi2:266 ../urpm/main_loop.pm:467
+#: ../gurpmi2:270 ../urpm/main_loop.pm:467
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:283 ../urpmi:634
+#: ../gurpmi2:287 ../urpmi:634
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:303
+#: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
 msgstr ""
 
-#: ../gurpmi2:315
+#: ../gurpmi2:319
 #, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:82
+#: ../gurpmi2:336 ../urpm/main_loop.pm:82
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
 msgstr "Instalacija nije uspjela na čvoru %s"
 
-#: ../gurpmi2:335
+#: ../gurpmi2:339
 #, fuzzy, c-format
 msgid "You may want to update your urpmi database."
 msgstr ""
@@ -390,22 +390,22 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../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 "Instalacija nije uspjela:"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:348
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:350
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../gurpmi2:359 ../urpmi:692
+#: ../gurpmi2:363 ../urpmi:692
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -479,7 +479,7 @@ msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 msgid "Environment directory %s does not exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim navedenu okolinu na %s\n"
@@ -534,62 +534,62 @@ msgstr "greška pri registrovanju lokalnih paketa"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
 
-#: ../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 "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpm/args.pm:310
+#: ../urpm/args.pm:321
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:378
+#: ../urpm/args.pm:389
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:379
+#: ../urpm/args.pm:390
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:396
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:400
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:398
+#: ../urpm/args.pm:409
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:472
+#: ../urpm/args.pm:483
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:506
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:520
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
 
-#: ../urpm/args.pm:517
+#: ../urpm/args.pm:528
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -605,7 +605,7 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:534
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s %s"
@@ -652,7 +652,7 @@ msgstr "ne mogu da zapišem konf. datoteku [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../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 "ne mogu da zapišem konf. datoteku [%s]"
@@ -1343,7 +1343,7 @@ msgstr ""
 
 #: ../urpm/msg.pm:170
 #, c-format
-msgid "(suggested)"
+msgid "(recommended)"
 msgstr ""
 
 #: ../urpm/msg.pm:185
@@ -2010,8 +2010,8 @@ msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
 
 #: ../urpmf:75
 #, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+msgid "  --recommends   - recommends tags\n"
+msgstr "  --requires     - tag 'zahtijeva'\n"
 
 #: ../urpmf:76
 #, c-format
@@ -2038,27 +2038,27 @@ msgstr "  -m             - medij na kojem je paket pronađen\n"
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:148
+#: ../urpmf:149
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpmf:193
+#: ../urpmf:194
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
 
-#: ../urpmf:286
+#: ../urpmf:287
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpmf:293
+#: ../urpmf:294
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
 
-#: ../urpmf:302
+#: ../urpmf:303
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "ispisujem list datoteku za medij \"%s\""
@@ -2086,7 +2086,7 @@ msgstr ""
 
 #: ../urpmi:80 ../urpmq:52
 #, fuzzy, c-format
-msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
+msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
 msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
 
 #: ../urpmi:81
@@ -2186,7 +2186,7 @@ msgstr ""
 
 #: ../urpmi:105
 #, fuzzy, c-format
-msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
+msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
 msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
 
 #: ../urpmi:109
@@ -2998,8 +2998,8 @@ msgstr "  --requires     - tag 'zahtijeva'\n"
 
 #: ../urpmq:84
 #, fuzzy, c-format
-msgid "  --suggests     - print suggests.\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+msgid "  --recommends   - print recommends.\n"
+msgstr "  --requires     - tag 'zahtijeva'\n"
 
 #: ../urpmq:85
 #, fuzzy, c-format
@@ -3167,6 +3167,14 @@ msgid "Authentication is required to run Mageia Package Installer"
 msgstr ""
 
 #, fuzzy
+#~ msgid "  --suggests     - suggests tags\n"
+#~ msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#, fuzzy
+#~ msgid "  --suggests     - print suggests.\n"
+#~ msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#, fuzzy
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d paketa, %d MB)"