sync with code

1 files changed, 107 insertions, 100 deletions

diff --git a/po/bs.po b/po/bs.po
index 9abd6b37..ad568781 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: 2008-02-25 11:14+0100\n"
+"POT-Creation-Date: 2008-03-03 18:01+0100\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"
@@ -108,12 +108,7 @@ msgstr "_Odustani"
 msgid "Choose location to save file"
 msgstr "Izaberi lokaciju za snimanje"
 
-#: ../gurpmi.pm:80
-#, c-format
-msgid "Unknown option %s"
-msgstr "Nepoznata opcija '%s'"
-
-#: ../gurpmi.pm:90
+#: ../gurpmi.pm:86
 #, c-format
 msgid "No packages specified"
 msgstr "Nije naveden paket"
@@ -225,12 +220,12 @@ msgstr "Pripremam..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:260 ../urpmi:620
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+#: ../gurpmi2:264 ../urpmi:622
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:271
+#: ../gurpmi2:275
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
@@ -422,6 +417,16 @@ msgstr "Previše argumenata\n"
 msgid "Copying failed"
 msgstr "Kopiranje nije uspjelo"
 
+#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
+msgstr "medij \"%s\" nije izabran"
+
+#: ../urpm/cdrom.pm:206
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+
 #: ../urpm/cfg.pm:81
 #, fuzzy, c-format
 msgid "syntax error in config file at line %s"
@@ -730,7 +735,12 @@ msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpm/main_loop.pm:264
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
+#, c-format
+msgid "Error"
+msgstr ""
+
+#: ../urpm/main_loop.pm:267
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -745,11 +755,6 @@ msgstr[0] "%d instalacionih transakcija nije uspjelo"
 msgstr[1] "%d instalacionih transakcija nije uspjelo"
 msgstr[2] "%d instalacionih transakcija nije uspjelo"
 
-#: ../urpm/main_loop.pm:281
-#, c-format
-msgid "Installation is possible"
-msgstr "Instalacija nije moguća"
-
 #: ../urpm/main_loop.pm:286
 #, c-format
 msgid "Packages are up to date"
@@ -775,6 +780,11 @@ msgstr "sve je već instalirano"
 msgid "Packages %s can not be installed"
 msgstr "sve je već instalirano"
 
+#: ../urpm/main_loop.pm:307
+#, c-format
+msgid "Installation is possible"
+msgstr "Instalacija nije moguća"
+
 #: ../urpm/md5sum.pm:20
 #, fuzzy, c-format
 msgid "examining %s file"
@@ -807,28 +817,8 @@ msgstr "pokušavam prepisati postojeći medij \"%s\", preskačem"
 
 #: ../urpm/media.pm:409
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
-
-#: ../urpm/media.pm:410
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam izmjenjivi uređaj kao \"%s\""
-
-#: ../urpm/media.pm:413
-#, c-format
-msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr "Medij \"%s\" je ISO imidž, biće automatski montiran"
-
-#: ../urpm/media.pm:416
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
-
-#: ../urpm/media.pm:421 ../urpm/media.pm:424
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
+msgid "failed to migrate removable device, ignoring media"
+msgstr ""
 
 #: ../urpm/media.pm:452 ../urpm/media.pm:458
 #, c-format
@@ -889,12 +879,7 @@ msgstr "dobavljam zaglavlja sa medija \"%s\""
 msgid "adding medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:750
-#, fuzzy, c-format
-msgid "unable to mount the distribution medium"
-msgstr "ne mogu pristupiti prvom instalacionom mediju"
-
-#: ../urpm/media.pm:753
+#: ../urpm/media.pm:759
 #, fuzzy, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda da ovaj URL ne sadrži distrib"
@@ -1011,18 +996,7 @@ msgstr "ispitujem hdlist datoteku [%s]"
 msgid "comparing %s and %s"
 msgstr "Instaliram %s na %s..."
 
-#: ../urpm/media.pm:1257
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"ne mogu pristupiti mediju \"%s\",\n"
-"ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
-"medija."
-
-#: ../urpm/media.pm:1270
+#: ../urpm/media.pm:1268
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
@@ -1189,36 +1163,21 @@ msgstr "pronašao paralelni držač za čvorove: %s"
 msgid "unable to use parallel option \"%s\""
 msgstr "ne mogu koristiti paralelnu opciju \"%s\""
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:26
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\"."
+msgstr "ne mogu pristupiti mediju \"%s\""
+
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
 #, c-format
 msgid "mounting %s"
 msgstr "montiram %s"
 
-#: ../urpm/removable.pm:56
+#: ../urpm/removable.pm:97
 #, c-format
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, fuzzy, c-format
-msgid "medium \"%s\" is not available"
-msgstr "medij \"%s\" nije izabran"
-
-#: ../urpm/removable.pm:143
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-
-#: ../urpm/removable.pm:151
-#, c-format
-msgid "inconsistent medium \"%s\" marked removable but not really"
-msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
-
-#: ../urpm/removable.pm:163
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
-
 #: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
@@ -2304,7 +2263,12 @@ msgstr ""
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:604
+#, c-format
+msgid "%s of packages will be retrieved."
+msgstr ""
+
+#: ../urpmi:605
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2312,12 +2276,7 @@ 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)"
 
-#: ../urpmi:621
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada budete spremni..."
-
-#: ../urpmi:626
+#: ../urpmi:627
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
@@ -2338,7 +2297,7 @@ msgid ""
 "       ftp://<login>:<password>@<host>/<path>\n"
 "       ftp://<host>/<path>\n"
 "       http://<host>/<path>\n"
-"       removable://<path>\n"
+"       cdrom://<path>\n"
 "\n"
 "usage: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
 "usage: urpmi.addmedia [options] --mirrorlist <url> <name> <relative path>\n"
@@ -2456,12 +2415,7 @@ msgstr "  --nopubkey     - nemoj uvoziti pubkey dodanog medija\n"
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - dodaj medij u konfiguraciju, ali bez ažuriranja.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.removemedia:42 ../urpmi.update:49
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
-
-#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
@@ -2891,20 +2845,30 @@ msgstr "  --changelog    - ispiši dnevnik izmjena.\n"
 
 #: ../urpmq:81
 #, fuzzy, c-format
+msgid "  --conflicts    - print conflicts.\n"
+msgstr "  --conflicts    - tagovi za konflikte\n"
+
+#: ../urpmq:82
+#, fuzzy, c-format
 msgid "  --provides     - print provides.\n"
 msgstr "  --provides     - tag 'pruža'\n"
 
-#: ../urpmq:82
+#: ../urpmq:83
+#, fuzzy, c-format
+msgid "  --requires     - print requires.\n"
+msgstr "  --requires     - tag 'zahtijeva'\n"
+
+#: ../urpmq:84
 #, fuzzy, c-format
 msgid "  --sourcerpm    - print sourcerpm.\n"
 msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
 
-#: ../urpmq:83
+#: ../urpmq:85
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - ispiši sažetak.\n"
 
-#: ../urpmq:85
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid ""
 "  --requires-recursive, -d\n"
@@ -2998,7 +2962,12 @@ msgstr "  imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes se može koristiti samo sa --parallel"
 
-#: ../urpmq:360
+#: ../urpmq:206
+#, fuzzy, c-format
+msgid "use -l to list files"
+msgstr "ne mogu zapisati list datoteku za \"%s\""
+
+#: ../urpmq:363
 #, fuzzy, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr ""
@@ -3033,6 +3002,47 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#~ msgid "Unknown option %s"
+#~ msgstr "Nepoznata opcija '%s'"
+
+#~ msgid "too many mount points for removable medium \"%s\""
+#~ msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
+
+#~ msgid "taking removable device as \"%s\""
+#~ msgstr "uzimam izmjenjivi uređaj kao \"%s\""
+
+#~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
+#~ msgstr "Medij \"%s\" je ISO imidž, biće automatski montiran"
+
+#~ msgid "using different removable device [%s] for \"%s\""
+#~ msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
+
+#~ msgid "unable to retrieve pathname for removable medium \"%s\""
+#~ msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
+
+#, fuzzy
+#~ msgid "unable to mount the distribution medium"
+#~ msgstr "ne mogu pristupiti prvom instalacionom mediju"
+
+#~ msgid ""
+#~ "unable to access medium \"%s\",\n"
+#~ "this could happen if you mounted manually the directory when creating the "
+#~ "medium."
+#~ msgstr ""
+#~ "ne mogu pristupiti mediju \"%s\",\n"
+#~ "ovo se moglo desiti ako ste ručno montirali direktorij prilikom "
+#~ "pravljenja medija."
+
+#~ msgid "inconsistent medium \"%s\" marked removable but not really"
+#~ msgstr ""
+#~ "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
+
+#~ msgid "Press Enter when ready..."
+#~ msgstr "Pritisnite Enter kada budete spremni..."
+
+#~ msgid "  -c             - clean headers cache directory.\n"
+#~ msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "virtuelni medij mora biti lokalan"
 
@@ -3338,9 +3348,6 @@ msgstr "Nije pronađen changelog\n"
 #~ msgid "file [%s] already used in the same medium \"%s\""
 #~ msgstr "datoteka [%s] se već koristi na istom mediju \"%s\""
 
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "ne mogu zapisati list datoteku za \"%s\""
-
 #~ msgid "nothing written in list file for \"%s\""
 #~ msgstr "ništa nije zapisano u list datoteku za \"%s\""