merge two more strings

1 files changed, 60 insertions, 53 deletions

diff --git a/po/bs.po b/po/bs.po
index 202ffc64..57878dba 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-09-09 16:17+0200\n"
+"POT-Creation-Date: 2002-09-11 15:17+0200\n"
 "PO-Revision-Date: 2002-09-07 10:17+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -104,15 +104,15 @@ msgstr "Tip izvora:"
 
 #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:867
-#: ../rpmdrake_.c:894
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
+#: ../rpmdrake_.c:899
 msgid "Ok"
 msgstr "U redu"
 
 #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
 #: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:899
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -210,7 +210,7 @@ msgstr "Snimi i izađi"
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1005
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -744,23 +744,23 @@ msgstr "Pretraga"
 msgid "Install"
 msgstr "Instaliraj"
 
-#: ../rpmdrake_.c:690
+#: ../rpmdrake_.c:691
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
 
-#: ../rpmdrake_.c:691 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "Uklanjanje softverskih paketa"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "Instalacija softverskih paketa"
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:726
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -772,25 +772,25 @@ msgstr ""
 "\n"
 "Mogu li nastaviti?"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "Molim sačekajte, kontaktiram mirror za update informacija o paketima."
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "Greška u osvježavanju medija"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 "Došlo je do nepopravljive greške prilikom update-ovanja informacija o "
 "paketima."
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "Kako da ručno izaberete vaš mirror"
 
-#: ../rpmdrake_.c:739
+#: ../rpmdrake_.c:740
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -804,15 +804,15 @@ msgstr ""
 "\n"
 "Onda restartujte MandrakeUpdate."
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "Molim sačekajte, kontaktiram mirror za inicijalizaciju update paketa."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "Greška u dodavanju update medija"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -833,63 +833,63 @@ msgstr ""
 "\n"
 "Želite li probati neki drugi mirror?"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../rpmdrake_.c:808
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../rpmdrake_.c:811
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "Ispitujem %s"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr "Ukloni .%s"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Koristi .%s kao glavnu datoteku"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "Ne radi ništa"
 
-#: ../rpmdrake_.c:834
+#: ../rpmdrake_.c:835
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
-#: ../rpmdrake_.c:851
+#: ../rpmdrake_.c:852
 msgid "Inspect..."
 msgstr "Ispitaj..."
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "Ne mogu da dobavim izvorne pakete, žalim."
 
-#: ../rpmdrake_.c:892
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "Promjeni medij"
 
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -897,20 +897,20 @@ msgstr ""
 "Instalacija nije uspjela, nedostaju neke od datoteka.\n"
 "Vjerovatno trebate update-ovati vašu bazu izvora."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Molim sačekajte, uklanjam pakete kako bi drugi mogli biti unaprijeđeni..."
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "Program nedostaje"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Nedostaje jedan potreban program (grpmi). Provjerite vašu instalaciju."
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -924,7 +924,7 @@ msgstr ""
 "rpmsave',\n"
 "sada ih možete ispitati kako biste preduzeli neke akcije:"
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -932,35 +932,48 @@ msgstr ""
 "neki paketi nisu uspješno\n"
 "instalirani"
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:933
 msgid "everything was installed correctly"
 msgstr "sve je uspješno instalirano"
 
-#: ../rpmdrake_.c:930
+#: ../rpmdrake_.c:935
 msgid "Everything installed successfully"
 msgstr "Sve je uspješno instalirano"
 
-#: ../rpmdrake_.c:931
+#: ../rpmdrake_.c:936
 msgid "All requested packages were installed successfully."
 msgstr "Svi traženi paketi su uspješno instalirani."
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "Sve je već instalirano."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Sve je već instalirano (da li se ovo uopšte smije desiti?)."
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:942
+#, fuzzy
+msgid "Problem during installation"
+msgstr "Došlo je do problema prilikom instalacije"
+
+#: ../rpmdrake_.c:943
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Došlo je do problema prilikom instalacije."
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "Molim sačekajte, čitam bazu paketa..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "Molim sačekajte, uklanjam pakete..."
 
-#: ../rpmdrake_.c:1009
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -972,7 +985,7 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
 "računara."
 
-#: ../rpmdrake_.c:1014
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -984,7 +997,7 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
 "vaš računar."
 
-#: ../rpmdrake_.c:1019
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1060,9 +1073,6 @@ msgstr "Instaliraj softver"
 #~ "Žalim, uklanjanje ovog paketa bi izazvalo rušenje sistema:\n"
 #~ "\n"
 
-#~ msgid "There was a problem during installation."
-#~ msgstr "Došlo je do problema prilikom instalacije."
-
 #~ msgid "Installing/Upgrading Progress"
 #~ msgstr "Proces Instalacije/Unaprijeđenja"
 
@@ -1253,9 +1263,6 @@ msgstr "Instaliraj softver"
 #~ msgid "Force"
 #~ msgstr "Na silu"
 
-#~ msgid "Problems occured during installation"
-#~ msgstr "Došlo je do problema prilikom instalacije"
-
 #~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
 #~ msgstr "upotreba: grpmi <[-noupgrade] rpmovi>\n"