merge two more strings

1 files changed, 59 insertions, 47 deletions

diff --git a/po/ro.po b/po/ro.po
index 15925825..16522e8c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,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-09 17:53GMT+2\n"
 "Last-Translator: Harald Ersch <hersch@romatsa.ro>\n"
 "Language-Team: romanian <ro@li.org>\n"
@@ -107,15 +107,15 @@ msgstr "Tipul sursei:"
 
 #: ../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 "OK"
 
 #: ../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 "Renunță"
 
@@ -213,7 +213,7 @@ msgstr "Salvare și ieșire"
 msgid "Quit"
 msgstr "Ieșire"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1005
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -746,23 +746,23 @@ msgstr "Căutare"
 msgid "Install"
 msgstr "Instalează"
 
-#: ../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-*,*-r-*"
 
-#: ../rpmdrake_.c:691 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Actualizare Mandrake"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "Ștergere pachete Software"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "Instalare pachete Software"
 
-#: ../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"
@@ -775,27 +775,27 @@ msgstr ""
 "\n"
 "Doriți să continuați?"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 "Vă rog să așteptați, contactez serverul oglindă pentru actualizarea "
 "informației pachetelor."
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "Eroare la actualizarea mediului"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 "A fost detectată o eroare majoră în timpul actualizării informației "
 "pachetelor."
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "Cum să selectați manual serverul oglindă"
 
-#: ../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"
@@ -809,17 +809,17 @@ msgstr ""
 "\n"
 "Apoi reporniți MandrakeUpdate."
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 "Vă rog să așteptați, contactez serverul oglindă pentru inițializarea "
 "actualizării pachetelor."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "Eroare la adăugarea mediului de actualizare"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -841,63 +841,63 @@ msgstr ""
 "\n"
 "Doriți să încercați alt server oglindă?"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "Vă rog să așteptați, caut pachetele disponibile..."
 
-#: ../rpmdrake_.c:808
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "Instalare terminată"
 
-#: ../rpmdrake_.c:811
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "Inspectez %s"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr "Șterg .%s"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Folosește .%s ca fișier principal"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "Nu fă nimic"
 
-#: ../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 "Inspectez..."
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "Nu pot prelua pachetele sursă."
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "Regret, nu pot prelua pachetele sursă."
 
-#: ../rpmdrake_.c:892
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "Schimbă mediul"
 
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vă rog să introduceți mediul numit \"%s\" în dispozitivul [%s]"
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "Instalare eșuată"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -905,21 +905,21 @@ msgstr ""
 "Instalare nereușită, unele fișiere lipsesc.\n"
 "Probabil ar trebui să actualizați baza de date a surselor."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Vă rog să așteptați, șterg pachetele pentru a permite altora să fie "
 "actualizate..."
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "Program lipsă"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Un program absolut necesar lipsește (grpmi).  Verificați instalarea."
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -932,7 +932,7 @@ msgstr ""
 "Unele fișiere de configurare au fost create ca `.rpmnew' sau `.rpmsave',\n"
 "le puteți inspecta acum pentru a decide acțiunile ulterioare:"
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -940,36 +940,48 @@ msgstr ""
 "Unele pachetele nu au putut fi instalate\n"
 "corect."
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:933
 msgid "everything was installed correctly"
 msgstr "Totul a fost instalat cu succes"
 
-#: ../rpmdrake_.c:930
+#: ../rpmdrake_.c:935
 msgid "Everything installed successfully"
 msgstr "Totul a fost instalat cu succes"
 
-#: ../rpmdrake_.c:931
+#: ../rpmdrake_.c:936
 msgid "All requested packages were installed successfully."
 msgstr "Toate pachetele cerute au fost instalate cu succes."
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "Toate pachetele sunt deja instalate."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 "Toate pachetele sunt deja instalate (ar trebui să se întâmple vreodată?)."
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:942
+msgid "Problem during installation"
+msgstr ""
+
+#: ../rpmdrake_.c:943
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "Vă rog să așteptați, citesc baza de date a pachetelelor..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "Vă rog să așteptați, șterg pachetele..."
 
-#: ../rpmdrake_.c:1009
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -981,7 +993,7 @@ msgstr ""
 "Acest utilitar vă va ajuta să alegeți programele pe care doriți \n"
 "să le ștergeți de pe calculatorul dvs."
 
-#: ../rpmdrake_.c:1014
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -994,7 +1006,7 @@ msgstr ""
 "care doriți \n"
 "să le actualizați ."
 
-#: ../rpmdrake_.c:1019
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"