sync with code

1 files changed, 305 insertions, 294 deletions

diff --git a/po/nl.po b/po/nl.po
index f49f9d85..97548037 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
 "PO-Revision-Date: 2008-09-05 00:58+0200\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -35,7 +35,7 @@ msgstr "RPM-installatie"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fout opgetreden: kan bestand %s niet vinden, operatie wordt afgebroken"
 
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -104,7 +104,7 @@ msgstr "_Installeren"
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuleren"
@@ -136,9 +136,8 @@ msgstr ""
 msgid "Options:"
 msgstr "Opties:"
 
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - geeft deze hulptekst.\n"
@@ -178,18 +177,18 @@ msgstr ""
 "                   (--no-verify-rpm schakelt dit uit, standaard "
 "ingeschakeld).\n"
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - alleen de aangegeven media, kommagescheiden.\n"
 
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 "  -p             - staat zoeken toe in 'provides' om een pakket te vinden.\n"
 
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
@@ -233,7 +232,22 @@ msgstr "Even geduld..."
 msgid "Must be root"
 msgstr "Dient 'root' te zijn"
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribueren van %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Pakket-installatie..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Pakket-installatie..."
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -249,37 +263,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr " (op te waarderen)"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr "(te installeren)"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr "Pakketkeuze"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:199
 #, c-format
 msgid "_Abort"
 msgstr "_Afbreken"
 
-#: ../gurpmi2:222
+#: ../gurpmi2:221
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -291,7 +305,7 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -299,7 +313,7 @@ msgstr ""
 "Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
 
 # Should use ngettext plural forms :-/
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -307,49 +321,44 @@ msgstr ""
 "Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
 "geïnstalleerd:"
 
-#: ../gurpmi2:244
+#: ../gurpmi2:243
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakket, %d MB)"
 msgstr[1] "(%d pakketten, %d MB)"
 
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Pakket-installatie..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Voorbereiden..."
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloaden van pakket `%s'..."
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -360,28 +369,28 @@ msgstr ""
 "%s\n"
 "Misschien moet u de urpmi database opwaarderen"
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
 #, c-format
 msgid "Installation failed:"
 msgstr "Installatie mislukt:"
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "De pakketten zijn reeds geïnstalleerd"
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "verwijderen van %s"
 
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi herstarten"
@@ -421,7 +430,7 @@ msgstr "                    standaard is %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - volledige rpm-naam tonen (NVRA).\n"
 
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Alleen de beheerder mag pakketten installeren"
@@ -431,136 +440,145 @@ msgstr "Alleen de beheerder mag pakketten installeren"
 msgid "Running urpmi in restricted mode..."
 msgstr "Urpmi uitvoeren in beperkte modus..."
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, c-format
 msgid "fail to create directory %s"
 msgstr "aanmaken van map %s mislukt"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "ongeldige eigenaar van map %s"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:125
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "kan pakketten niet naar %s downloaden"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Omgevingsmap %s bestaat niet"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "maakt gebruik van aangegeven omgeving op %s\n"
+
+#: ../urpm.pm:305
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "kon rpmdb niet openen"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:319
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpm.pm:294
+#: ../urpm.pm:325
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...klaar met ontvangst"
 
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ontvangst mislukt: %s"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:335
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kon rpm-bestand [%s] niet benaderen"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:340
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "niet in staat spec-bestand %s te analyseren [%s]"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to register rpm file"
 msgstr "kon rpm-bestand niet registreren"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:350
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Niet-compatibele architectuur voor rpm [%s]"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:354
 #, c-format
 msgid "error registering local packages"
 msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm:410
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
 
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
 
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
 
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s"
 msgstr "onverwachte uitdrukking %s"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
 #, c-format
 msgid "missing expression before %s"
 msgstr "uitdrukking vóór %s ontbreekt"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "onverwachte uitdrukking %s (suggestie: gebruik -a of -o)"
 
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
 #, c-format
 msgid "no expression to close"
 msgstr "geen afsluitbare uitdrukking"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "standaard verwacht urpmf een regexp, u dient de optie \"--literal\" te "
 "gebruiken"
 
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-map bestaat niet"
 
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan %s niet gebruiken zonder %s"
 
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan %s niet gebruiken samen met %s"
 
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Te veel argumenten\n"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiëren mislukt"
@@ -609,122 +627,122 @@ msgstr "medium \"%s\" is twee keer gedefinieerd, afbreken"
 msgid "unable to write config file [%s]"
 msgstr "kon configuratiebestand [%s] niet wegschrijven"
 
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s is niet beschikbaar, terugvallen op %s"
+
+#: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr "kan proxy-instellingen niet lezen (onvoldoende rechten om %s te lezen)"
 
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Voer uw aanmeldgegevens in voor toegang tot de proxy\n"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "User name:"
 msgstr "Gebruikersnaam:"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "Onbekend downloadprogramma '%s'!\n"
 
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s mislukt: afgesloten met signaal %d"
 
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s mislukt: afgesloten met %d"
 
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
 #, c-format
 msgid "copy failed"
 msgstr "kopiëren is mislukt"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
 #, c-format
 msgid "wget is missing\n"
 msgstr "wget ontbreekt\n"
 
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
 #, c-format
 msgid "curl is missing\n"
 msgstr "curl ontbreekt\n"
 
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl is mislukt: download geannuleerd\n"
 
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ontbreekt\n"
 
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ontbreekt\n"
 
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ontbreekt\n"
 
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Kan prozilla niet uitvoeren\n"
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ontbreekt\n"
 
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% van %s voltooid, verwacht = %s, snelheid = %s"
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% voltooid, snelheid = %s"
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
 #, c-format
 msgid "retrieving %s"
 msgstr "ophalen van %s"
 
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
 #, c-format
 msgid "retrieved %s"
 msgstr "%s opgehaald"
 
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "onbekend protocol gedefinieerd voor %s"
 
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s is niet beschikbaar, terugvallen op %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
 
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kon protocol niet verwerken: %s"
@@ -744,12 +762,12 @@ msgstr "pakket %s is niet gevonden."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[opnieuw verpakken]"
 
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -757,47 +775,47 @@ msgstr ""
 "transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
 "d, vernieuwen=%d)"
 
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr "Niet in staat om transactie aan te maken."
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "kan rpm niet uit delta-rpm-pakket %s uitpakken"
 
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "verwijderen van onjuiste rpm (%s) uit %s"
 
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "verwijderen van %s mislukt: %s"
 
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
 #, c-format
 msgid "Removing package %s"
 msgstr "Verwijderen van pakket %s"
 
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr "bezig met verwijderen van pakket %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "geïnstalleerde rpms (%s) worden verwijderd uit %s"
 
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr "Meer informatie over pakket %s"
@@ -842,18 +860,18 @@ msgstr "afbreken"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s-database is gesloten (een ander programma gebruikt hem al)"
 
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
 #, c-format
 msgid "Installation failed"
 msgstr "Installatie mislukt"
 
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Toch proberen om door te gaan? (j/N) "
 
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -862,74 +880,64 @@ msgstr ""
 "Installatie mislukt, onjuiste rpms:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De volgende pakketten bevatten een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wilt u doorgaan met de installatie?"
 
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "verwijderen van geïnstalleerde rpms (%s)"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
 #, c-format
 msgid "distributing %s"
 msgstr "distribueren van %s"
 
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
 #, c-format
 msgid "installing %s from %s"
 msgstr "installeren van %s vanaf %s"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "installing %s"
 msgstr "installeren van %s"
 
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 "Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Installatie trachten te forceren (--force)? (j/N) "
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakketten zijn bijgewerkt"
 
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installatie is mogelijk"
 
 #: ../urpm/md5sum.pm:26
 #, c-format
-msgid "examining %s file"
-msgstr "onderzoeken van bestand %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "ongeldig MD5SUM-bestand"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "waarschuwing: md5sum voor %s niet beschikbaar in MD5SUM-bestand"
 
@@ -1002,230 +1010,230 @@ msgstr "Zou pakket %s installeren, niet opwaarderen"
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" bestaat al"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
 #, c-format
 msgid "(ignored by default)"
 msgstr "(standaard niet in aanmerking genomen)"
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "toevoegen medium \"%s\" voor medium op afstand \"%s\""
 
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "toevoegen van medium \"%s\""
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
 #, c-format
 msgid "directory %s does not exist"
 msgstr "map %s bestaat niet"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "deze locatie lijkt geen distributie te bevatten"
 
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "kon media.cfg niet analyseren"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "kon het installatiemedium niet vinden (geen media.cfg bestand gevonden)"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "overslaan incompatibele media '%s' (voor %s)"
 
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ontvangen van media.cfg-bestand..."
 
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "probeert een niet-bestaand medium \"%s\" te selecteren"
 
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecteren van meerdere media: %s"
 
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "bezig met verwijderen van medium \"%s\""
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "herconfigureren van urpmi voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...herconfiguratie mislukt"
 
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "reconfiguration done"
 msgstr "herconfiguratie voltooid"
 
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 "Fout bij het genereren van namenbestand: afhankelijkheid %d niet gevonden"
 
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medium \"%s\" is bijgewerkt"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "onderzoeken van het synthesis-bestand [%s]"
 
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopiëren van bestand [%s] voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiëren mislukt"
 
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...kopiëren is klaar"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berekenen md5sum van ontvangen bronsynthesis"
 
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "ophalen van [%s] mislukt (md5sum onjuist)"
 
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 mislukt op %s"
 
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
 #, c-format
 msgid "comparing %s and %s"
 msgstr "vergelijken van %s en %s"
 
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
 
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiëren MD5SUM-bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ongeldig MD5SUM-bestand (gedownload van %s)"
 
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
+
+#: ../urpm/media.pm:1475
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "bronsynthesis van \"%s\" ontvangen..."
 
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "afgezochte synthesis gevonden als %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
+
+#: ../urpm/media.pm:1612
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bijgewerkt medium \"%s\""
 
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "ophalen van [%s] mislukt"
 
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "opnieuw proberen met mirror %s"
 
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Kan geen mirror vinden uit de mirrorlijst %s"
 
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "geolocalisatie %s %.2f %.2f gevonden uit tijdzone %s"
 
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "ophalen mirrorlijst van %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1296,7 +1304,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1304,11 +1312,12 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Het volgende pakket is nu wees, gebruik \"urpme --auto-orphans\" om "
-"het te verwijderen."
+msgstr[0] ""
+"Het volgende pakket is nu wees, gebruik \"urpme --auto-orphans\" om het te "
+"verwijderen."
 msgstr[1] ""
-"De volgende pakketten zijn nu wees, gebruik \"urpme --auto-orphans\" om "
-"ze te verwijderen."
+"De volgende pakketten zijn nu wees, gebruik \"urpme --auto-orphans\" om ze "
+"te verwijderen."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1366,8 +1375,8 @@ msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
 msgstr ""
-"%s mislukt op hostcomputer %s (misschien heeft hij niet de juiste urpmi-versie?) "
-"(afsluitcode: %d)"
+"%s mislukt op hostcomputer %s (misschien heeft hij niet de juiste urpmi-"
+"versie?) (afsluitcode: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1669,11 +1678,6 @@ msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
 
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "maakt gebruik van aangegeven omgeving op %s\n"
-
 #: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
@@ -1689,120 +1693,139 @@ msgstr "geen synthesis beschikbaar voor medium \"%s\""
 msgid "no xml-info available for medium \"%s\""
 msgstr "geen xml-info beschikbaar voor medium \"%s\""
 
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 "urpmi is herstart en de prioriteitslijst van pakketten is niet gewijzigd"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi is herstart en de prioriteitslijst van pakketten is gewijzigd: %s vs %s"
 
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "Geen pakket genaamd %s"
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Gebruik \"-a\" om ze allemaal te gebruiken"
 
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "pakket(ten) %s gevonden in urpmi-db, maar geen ervan is geïnstalleerd"
 
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakket %s is reeds geïnstalleerd"
 
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "De pakketten %s zijn reeds geïnstalleerd"
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
 msgid "due to missing %s"
 msgstr "vanwege ontbrekende %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
 #, c-format
 msgid "due to already installed %s"
 msgstr "vanwege reeds geïnstalleerde %s"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vanwege onvoldane %s"
 
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer %s op te waarderen"
 
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
 #, c-format
 msgid "in order to keep %s"
 msgstr "Om %s te behouden"
 
 #: ../urpm/select.pm:607
 #, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"De volgende pakketten moeten worden verwijderd om andere te kunnen "
+"opwaarderen:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
 msgid "in order to install %s"
 msgstr "in volgorde om %s te installeren"
 
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ongeldige ondertekening (%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ongeldig sleutel-ID (%s)"
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Geen ondertekening aanwezig (%s)"
 
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
 #, c-format
 msgid "system"
 msgstr "systeem"
 
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "U dient %s te herstarten voor %s"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't write file"
 msgstr "Kan niet naar bestand schrijven"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't open file"
 msgstr "Openen van bestand mislukt"
 
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "Kan bestand %s niet verplaatsen naar %s"
@@ -1846,7 +1869,7 @@ msgstr ""
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
@@ -1878,7 +1901,7 @@ msgstr ""
 "  --use-distrib  - urpme dynamisch configureren vanuit distrib-boom, handig\n"
 "                   om een chroot te (de)installeren met de --root optie.\n"
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 'uitgebreid verslag'-modus.\n"
@@ -1947,7 +1970,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Eén pakket verwijderen?"
 msgstr[1] "%d Pakketten verwijderen?"
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
@@ -2215,19 +2238,24 @@ msgstr ""
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - de pakketscriptlet(s) niet uivoeren\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid "  --replacefiles - ignore file conflicts\n"
+msgstr "  --conflicts     - conflict-tags afdrukken.\n"
+
+#: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr ""
 "  --skip         - pakketten waarvan de installatie moet worden "
 "overgeslagen\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - pakketten die de voorkeur dienen te krijgen\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2237,44 +2265,44 @@ msgstr ""
 "keuzemogelijkheden\n"
 "                   aanbieden dan gewoonlijk.\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - rpm-database niet op slot zetten.\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - waardeer alleen pakketten op met dezelfde architectuur.\n"
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - selecteer alle resultaten van console.\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q             - stille modus.\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug      - 'zeer uitgebreid verslag'-modus.\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  namen of rpm bestanden gegeven via opdrachtregel worden geïnstalleerd.\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Fout: kan --auto-select niet gebruiken samen met pakketlijst.\n"
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2283,31 +2311,31 @@ msgstr ""
 "Fout: Om een programmafoutrapport te genereren, geeft u de gebruikelijke \n"
 "opdrachtregel-argumenten samen met --bug.\n"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr ""
 "U kunt geen binaire rpm-bestanden installeren wanneer u --install-src "
 "gebruikt"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr "U kunt geen spec-bestanden installeren"
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "terugvallen op --buildrequires"
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "gebruik a.u.b. --buildrequires of --install-src, gaat uit van --buildrequires"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2316,17 +2344,12 @@ msgstr ""
 "De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
 "verwijder hem"
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
 
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Omgevingsmap %s bestaat niet"
-
-#: ../urpmi:287
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2335,36 +2358,36 @@ msgstr ""
 "Fout: %s lijkt als alleen-lezen gekoppeld te zijn.\n"
 "Gebruik --allow-force om de opdracht te forceren."
 
-#: ../urpmi:361
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr "Bijwerken van media...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (op te waarderen)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (op te waarderen)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (te installeren)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (te installeren)"
 
-#: ../urpmi:462
+#: ../urpmi:450
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2373,12 +2396,12 @@ msgstr ""
 "Om aan de afhankelijkheid '%s' te voldoen, is één van de volgende pakketten "
 "nodig:"
 
-#: ../urpmi:465
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi:507
+#: ../urpmi:495
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2389,7 +2412,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:509
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2400,7 +2423,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
@@ -2409,12 +2432,12 @@ msgstr ""
 "\n"
 "Toch doorgaan met de installatie?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:524
+#: ../urpmi:512
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2423,7 +2446,7 @@ msgstr ""
 "Een verlangd pakket kan niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2432,12 +2455,12 @@ msgstr ""
 "Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:542
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpmi:551
+#: ../urpmi:538
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2448,7 +2471,7 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2459,31 +2482,12 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"De volgende pakketten moeten worden verwijderd om andere te kunnen "
-"opwaarderen:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(alleen test, verwijdering zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:583
+#: ../urpmi:568
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2494,48 +2498,46 @@ msgstr ""
 "afhankelijkheden te installeren:\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:579
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
-msgstr[0] ""
-"Het volgende weespakket wordt verwijderd."
-msgstr[1] ""
-"De volgende weespakketten worden verwijderd."
+msgstr[0] "Het volgende weespakket wordt verwijderd."
+msgstr[1] "De volgende weespakketten worden verwijderd."
 
-#: ../urpmi:610
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(alleen test, installatie zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:616
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s aan extra schijfruimte zal worden gebruikt."
 
-#: ../urpmi:617
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s aan schijfruimte zal vrijkomen."
 
-#: ../urpmi:618
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s aan pakketten zal worden opgehaald."
 
-#: ../urpmi:619
+#: ../urpmi:604
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Verdergaan met de installatie van 1 pakket?"
 msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
 
-#: ../urpmi:640
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../urpmi:648
+#: ../urpmi:633
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Druk op Enter wanneer de koppeling tot stand is gebracht..."
@@ -2614,7 +2616,8 @@ msgid ""
 "                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 "  --update       - een bijwerkmedium aanmaken, \n"
-"                   of niet-bijwerkmedia weggooien (als gebruikt met --distrib)\n"
+"                   of niet-bijwerkmedia weggooien (als gebruikt met --"
+"distrib)\n"
 
 #: ../urpmi.addmedia:67
 #, c-format
@@ -3311,3 +3314,11 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Geen wijzigingslogboek gevonden\n"
 
+#~ msgid "examining %s file"
+#~ msgstr "onderzoeken van bestand %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "ongeldig MD5SUM-bestand"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "afgezochte synthesis gevonden als %s"