merge two more strings

1 files changed, 60 insertions, 50 deletions

diff --git a/po/eu.po b/po/eu.po
index 333bf126..1bac3de8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,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-08 22:36+0200\n"
 "Last-Translator: Iņigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -106,15 +106,15 @@ msgstr "Sorburu-mota:"
 
 #: ../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 "Ados"
 
 #: ../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 "Utzi"
 
@@ -212,7 +212,7 @@ msgstr "Gorde eta irten"
 msgid "Quit"
 msgstr "Irten"
 
-#: ../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 "Bilatu"
 msgid "Install"
 msgstr "Instalatu"
 
-#: ../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 "Mandrake Eguneratu"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "Software Paketeen Ezabaketa"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "Software Paketeen instalazioa"
 
-#: ../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,24 +775,24 @@ msgstr ""
 "\n"
 "Jarraitu dezaket?"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 "Itxoin mesedez, ispiluarekin kontaktatzen paketeen informazioa eguneratzeko."
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "Okerra euskarria eguneratzen"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "Oker zuzenezina gertatu da paketeen informazioa eguneratzekoan."
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "Nola hautatu eskuz zure ispilua"
 
-#: ../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"
@@ -806,16 +806,16 @@ msgstr ""
 "\n"
 "Gero, berrabiarazi MandrakeUpdate"
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 "Itxoin mesedez, ispiluarekin kontaktatzen eguneratze paketeak hasieratzeko."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "Okerra eguneratze euskarria gehitzerakoan"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -837,63 +837,63 @@ msgstr ""
 "\n"
 "Beste ispilu batekin froga egin nahi duzu?"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
 
-#: ../rpmdrake_.c:808
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
-#: ../rpmdrake_.c:811
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "%s ikertzen"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr "Ezabatu .%s"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Erabili %s fitxategi nagusi gisa"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "Ez egin ezer"
 
-#: ../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 "Ikertu..."
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "Ezin dira sorburuko paketeak jaso."
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "Barkatu, ezin dira sorburuko paketeak jaso."
 
-#: ../rpmdrake_.c:892
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "Aldatu euskarria"
 
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -901,20 +901,20 @@ msgstr ""
 "Instalazioak hutsegin du, zenbait fitxategi falta dira.\n"
 "Zure sorburuen datubasea eguneratu nahia izan dezakezu."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Itxoin mesedez, paketeak ezabatzen beste batzu eguneratu ahal daitezen..."
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "Programa falta da"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Behar den programa bat falta da (grpmi). Egiaztatu zure instalazioa."
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -927,7 +927,7 @@ msgstr ""
 "Zenbait konfigurazio fitxategi `.rpmnew' edo `.rpmsave' bezala\n"
 "gorde dira, orain aztertu ditzakezu behar diren ekintzak burutzeko:"
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -935,35 +935,48 @@ msgstr ""
 "Zenbait pakete ezin dira ondo\n"
 "instalatu"
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:933
 msgid "everything was installed correctly"
 msgstr "guztia ondo instalatu da"
 
-#: ../rpmdrake_.c:930
+#: ../rpmdrake_.c:935
 msgid "Everything installed successfully"
 msgstr "Guztia ondo instalatu da."
 
-#: ../rpmdrake_.c:931
+#: ../rpmdrake_.c:936
 msgid "All requested packages were installed successfully."
 msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "Guztia instalatuta dago."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Guztia dagoeneko instalatuta (hau gertatu daiteke?)"
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:942
+#, fuzzy
+msgid "Problem during installation"
+msgstr "Arazoak izan dira instalazioan zehar"
+
+#: ../rpmdrake_.c:943
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "Arazoak izan dira instalazioan zehar"
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "Itxaoin mesedez, paketeak ezabatzen..."
 
-#: ../rpmdrake_.c:1009
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -975,7 +988,7 @@ msgstr ""
 "Tresna honek zure konputagailutik ezabatu nahi duzun softwarea aukeratzen\n"
 "lagunduko dizu."
 
-#: ../rpmdrake_.c:1014
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -988,7 +1001,7 @@ msgstr ""
 "aukeratzen\n"
 "lagunduko dizu."
 
-#: ../rpmdrake_.c:1019
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1279,9 +1292,6 @@ msgstr "Instalatu Softwarea"
 #~ msgid "Force"
 #~ msgstr "Behartu"
 
-#~ msgid "Problems occured during installation"
-#~ msgstr "Arazoak izan dira instalazioan zehar"
-
 #~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
 #~ msgstr "erabilera: grpmi <[-noupgrade] rpms>\n"