merge two more strings

1 files changed, 59 insertions, 47 deletions

diff --git a/po/nl.po b/po/nl.po
index 84e87f58..1c1005af 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\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-08-30 13:26+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -108,15 +108,15 @@ msgstr "Brontype:"
 
 #: ../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 "Annuleren"
 
@@ -218,7 +218,7 @@ msgstr "Opslaan en afsluiten"
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1005
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -759,23 +759,23 @@ msgstr "Zoeken"
 msgid "Install"
 msgstr "Installeren"
 
-#: ../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 Vernieuwingen"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "Softwarepakketten verwijderen"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "Softwarepakketten installeren"
 
-#: ../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"
@@ -788,26 +788,26 @@ msgstr ""
 "\n"
 "Is het goed om door te gaan?"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 "Even geduld, bezig met verbinden met mirror om pakketinformatie te verversen"
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "Er is een fout opgetreden bij het verversen van het medium"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 "Er is een onherstelbare fout opgetreden bij het verversen van "
 "pakketinformatie."
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
-#: ../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"
@@ -821,17 +821,17 @@ msgstr ""
 "\n"
 "Daarna herstart u Mandrake Vernieuwingen."
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 "Even geduld, bezig met verbinden met mirror om pakketvernieuwingen te "
 "initialiseren."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "Er is een fout opgetreden bij het toevoegen van een vernieuwingsmedium"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -854,64 +854,64 @@ msgstr ""
 "\n"
 "Wilt u een andere mirror proberen?"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
 
-#: ../rpmdrake_.c:808
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../rpmdrake_.c:811
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "Bezig met inspecteren van %s"
 
 #  Removable media
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s verwijderen"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr ".%s als hoofdbestand gebruiken"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "Niets doen"
 
-#: ../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 "Inspecteren..."
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "Niet in staat bronpakketten op te halen"
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "Niet in staat bronpakketten op te halen, excuus."
 
-#: ../rpmdrake_.c:892
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "Medium veranderen"
 
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Voer het medium in met de naam \"%s\" in apparaat [%s]"
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -919,21 +919,21 @@ msgstr ""
 "Installatie mislukt, sommige bestanden missen.\n"
 "U wilt misschien uw bronnen-database verversen."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "Even geduld, bezig met verwijderen van pakketten om andere te kunnen "
 "opwaarderen..."
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "Programma mist"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Een vereist programma mist (grpmi). Controleer uw installatie."
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -946,7 +946,7 @@ msgstr ""
 "Sommige configuratiebestanden zijn gecreëerd als `.rpmnew' of `.rpmsave',\n"
 "u kunt er nu enkele inspecteren om zonodig actie te ondernemen:"
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -954,35 +954,47 @@ msgstr ""
 "Sommige pakketten kunnen niet\n"
 "correct worden geïnstalleerd"
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:933
 msgid "everything was installed correctly"
 msgstr "Alles is correct geïnstalleerd"
 
-#: ../rpmdrake_.c:930
+#: ../rpmdrake_.c:935
 msgid "Everything installed successfully"
 msgstr "Alles is succesvol geïnstalleerd"
 
-#: ../rpmdrake_.c:931
+#: ../rpmdrake_.c:936
 msgid "All requested packages were installed successfully."
 msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "Alles reeds geïnstalleerd"
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Alles reeds geïnstalleerd (wordt dit geacht ooit te gebeuren?)"
 
-#: ../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 "Even geduld, bezig met lezen van pakkettendatabase..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 
-#: ../rpmdrake_.c:1009
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -994,7 +1006,7 @@ msgstr ""
 "Dit hulpprogramma helpt u bij het kiezen welke software u van uw\n"
 "computer wilt verwijderen."
 
-#: ../rpmdrake_.c:1014
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -1006,7 +1018,7 @@ msgstr ""
 "Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
 "uw computer wilt installeren."
 
-#: ../rpmdrake_.c:1019
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"