sync with code

1 files changed, 358 insertions, 388 deletions

diff --git a/po/nl.po b/po/nl.po
index ca002dab..14f7767b 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-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\n"
 "PO-Revision-Date: 2009-03-23 22:26+0100\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:47 ../gurpmi2:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -104,7 +104,7 @@ msgstr "_Installeren"
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuleren"
@@ -137,7 +137,7 @@ msgid "Options:"
 msgstr "Opties:"
 
 #: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - geeft deze hulptekst.\n"
@@ -263,37 +263,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:182
+#: ../gurpmi2:183
 #, c-format
 msgid " (to upgrade)"
 msgstr " (op te waarderen)"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:184
 #, c-format
 msgid " (to install)"
 msgstr "(te installeren)"
 
-#: ../gurpmi2:186
+#: ../gurpmi2:187
 #, c-format
 msgid "Package choice"
 msgstr "Pakketkeuze"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:188
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../gurpmi2:211
+#: ../gurpmi2:213
 #, c-format
 msgid "_Abort"
 msgstr "_Afbreken"
 
-#: ../gurpmi2:234
+#: ../gurpmi2:248
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -305,7 +305,7 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -313,7 +313,7 @@ msgstr ""
 "Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
 
 # Should use ngettext plural forms :-/
-#: ../gurpmi2:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -321,51 +321,51 @@ msgstr ""
 "Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
 "geïnstalleerd:"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:270
 #, 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:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../gurpmi2:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Voorbereiden..."
 
-#: ../gurpmi2:302
+#: ../gurpmi2:316
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
 
-#: ../gurpmi2:333
+#: ../gurpmi2:347
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloaden van pakket `%s'..."
 
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ontvangst mislukt: %s"
 
-#: ../gurpmi2:361
+#: ../gurpmi2:375
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -376,27 +376,27 @@ msgstr ""
 "%s\n"
 "Misschien moet u de urpmi database opwaarderen"
 
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
 #, c-format
 msgid "Installation failed:"
 msgstr "Installatie mislukt:"
 
-#: ../gurpmi2:380
+#: ../gurpmi2:402
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "De pakketten zijn reeds geïnstalleerd"
 
-#: ../gurpmi2:382
+#: ../gurpmi2:404
 #, c-format
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "verwijderen van %s"
 
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi herstarten"
@@ -486,7 +486,7 @@ msgstr "ongeldige rpm-bestandsnaam [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr "...klaar met ontvangst"
@@ -516,7 +516,7 @@ msgstr "Niet-compatibele architectuur voor rpm [%s]"
 msgid "error registering local packages"
 msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm:438
+#: ../urpm.pm:439
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
@@ -531,59 +531,59 @@ msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "onverwachte uitdrukking %s"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "uitdrukking vóór %s ontbreekt"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "onverwachte uitdrukking %s (suggestie: gebruik -a of -o)"
 
-#: ../urpm/args.pm:394
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "geen afsluitbare uitdrukking"
 
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
 #, 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:472
+#: ../urpm/args.pm:460
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-map bestaat niet"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan %s niet gebruiken zonder %s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan %s niet gebruiken samen met %s"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Te veel argumenten\n"
 
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiëren mislukt"
 
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
 #, c-format
 msgid ""
 "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
@@ -592,17 +592,17 @@ msgstr ""
 "U dient de cd-rom zelf aan te koppeken (of perl-Hal-Cdroms te installeren om "
 "het automatisch te laten doen)"
 
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "HAL-voorziening (hald) is niet actief of onklaar"
 
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "medium \"%s\" is niet beschikbaar."
 
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
@@ -622,7 +622,7 @@ msgstr "kan configuratiebestand [%s] niet lezen"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "medium \"%s\" is twee keer gedefinieerd, afbreken"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kon configuratiebestand [%s] niet wegschrijven"
@@ -752,27 +752,27 @@ msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "kon protocol niet verwerken: %s"
 
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "Opschonen van %s en %s"
 
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
 #, c-format
 msgid "package %s is not found."
 msgstr "pakket %s is niet gevonden."
 
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
 #, c-format
 msgid "[repackaging]"
 msgstr "[opnieuw verpakken]"
 
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -780,67 +780,67 @@ msgstr ""
 "transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
 "d, vernieuwen=%d)"
 
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr "Niet in staat om transactie aan te maken."
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
 #, 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:206
+#: ../urpm/install.pm:209
 #, c-format
 msgid "unable to install package %s"
 msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "verwijderen van onjuiste rpm (%s) uit %s"
 
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "verwijderen van %s mislukt: %s"
 
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
 #, c-format
 msgid "Removing package %s"
 msgstr "Verwijderen van pakket %s"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
 #, c-format
 msgid "removing package %s"
 msgstr "bezig met verwijderen van pakket %s"
 
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "geïnstalleerde rpms (%s) worden verwijderd uit %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
 #, c-format
 msgid "More information on package %s"
 msgstr "Meer informatie over pakket %s"
 
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "Kan ldap-buffermap niet aanmaken"
 
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "Kan bufferbestand voor ldap niet schrijven\n"
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Geen server gedefinieerd, uri of hostcomputer ontbreekt"
 
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No base defined"
 msgstr "Geen basis gedefinieerd"
@@ -850,17 +850,17 @@ msgstr "Geen basis gedefinieerd"
 msgid "Cannot connect to ldap uri:"
 msgstr "Kan geen verbinding maken ldap-uri:"
 
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
 #, c-format
 msgid "%s database is locked. Waiting..."
 msgstr "%s-database gesloten. Wachten..."
 
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
 #, c-format
 msgid "aborting"
 msgstr "afbreken"
 
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
 #, c-format
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s-database is gesloten (een ander programma gebruikt hem al)"
@@ -870,18 +870,24 @@ msgstr "%s-database is gesloten (een ander programma gebruikt hem al)"
 msgid "Retry?"
 msgstr "Opnieuw proberen?"
 
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr ""
+"Installatie mislukt, onjuiste rpms:\n"
+"%s"
 
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
-#, c-format
-msgid "Try to go on anyway?"
-msgstr "Toch proberen om door te gaan?"
+#: ../urpm/main_loop.pm:121
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr ""
+"Installatie is mislukt, sommige bestanden missen:\n"
+"%s\n"
+"Misschien moet u de urpmi database opwaarderen"
 
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -890,108 +896,118 @@ msgstr ""
 "Installatie mislukt, onjuiste rpms:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "Installatie mislukt"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "Try to go on anyway?"
+msgstr "Toch proberen om door te gaan?"
+
+#: ../urpm/main_loop.pm:156
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Het volgende pakket is voorzien van een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "De volgende pakketten bevatten een onjuiste handtekening"
 
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wilt u doorgaan met de installatie?"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "verwijderen van geïnstalleerde rpms (%s)"
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "distributing %s"
 msgstr "distribueren van %s"
 
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
 #, c-format
 msgid "installing %s from %s"
 msgstr "installeren van %s vanaf %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
 #, c-format
 msgid "installing %s"
 msgstr "installeren van %s"
 
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
 #, c-format
 msgid "Try installation without checking dependencies?"
-msgstr ""
-"Proberen te installeren zonder de afhankelijkheden te controleren?"
+msgstr "Proberen te installeren zonder de afhankelijkheden te controleren?"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Installatie trachten te forceren (--force)?"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Packages are up to date"
 msgstr "Pakketten zijn bijgewerkt"
 
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "Installatie is mogelijk"
 
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "waarschuwing: md5sum voor %s niet beschikbaar in MD5SUM-bestand"
 
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtueel medium \"%s\" dient een lege url te hebben, medium genegeerd"
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "kon synthesisbestand van \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "overslaan, vanwege poging om bestaand medium \"%s\" te omzeilen"
 
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "migreren van verwisselbaar apparaat mislukt, media wordt genegeerd"
 
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "config-bestand [%s] wegschrijven"
 
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan parallelle modus niet tegelijk met use-distrib modus gebruiken"
 
-#: ../urpm/media.pm:556
+#: ../urpm/media.pm:529
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
 
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -1000,219 +1016,214 @@ msgstr ""
 "--synthesis kan niet gebruikt worden met --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib of --parallel"
 
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "Zoek begin: %s eind: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
 #, c-format
 msgid "skipping package %s"
 msgstr "pakket %s overslaan"
 
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Zou pakket %s installeren, niet opwaarderen"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" bestaat al"
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
 #, c-format
 msgid "(ignored by default)"
 msgstr "(standaard niet in aanmerking genomen)"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "toevoegen medium \"%s\" voor medium op afstand \"%s\""
 
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "toevoegen van medium \"%s\""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
 #, c-format
 msgid "directory %s does not exist"
 msgstr "map %s bestaat niet"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "deze locatie lijkt geen distributie te bevatten"
 
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "kon media.cfg niet analyseren"
 
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
 #, 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:849
+#: ../urpm/media.pm:829
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "overslaan incompatibele media '%s' (voor %s)"
 
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ontvangen van media.cfg-bestand..."
 
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "probeert een niet-bestaand medium \"%s\" te selecteren"
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecteren van meerdere media: %s"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "bezig met verwijderen van medium \"%s\""
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "herconfigureren van urpmi voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...herconfiguratie mislukt"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
 #, c-format
 msgid "reconfiguration done"
 msgstr "herconfiguratie voltooid"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
 #, 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:1124
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medium \"%s\" is bijgewerkt"
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "onderzoeken van het synthesis-bestand [%s]"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopiëren van bestand [%s] voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiëren mislukt"
 
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
 #, c-format
 msgid "...copying done"
 msgstr "...kopiëren is klaar"
 
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berekenen md5sum van ontvangen bronsynthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "ophalen van [%s] mislukt (md5sum onjuist)"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 mislukt op %s"
 
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
 #, c-format
 msgid "comparing %s and %s"
 msgstr "vergelijken van %s en %s"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
 
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiëren MD5SUM-bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ongeldig MD5SUM-bestand (gedownload van %s)"
 
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "geen metadata gevonden voor medium \"%s\""
 
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "bronsynthesis van \"%s\" ontvangen..."
 
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpm/media.pm:1557
+#: ../urpm/media.pm:1537
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
 
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bijgewerkt medium \"%s\""
 
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "ophalen van [%s] mislukt"
@@ -1237,19 +1248,19 @@ msgstr "geolocalisatie %s %.2f %.2f gevonden uit tijdzone %s"
 msgid "getting mirror list from %s"
 msgstr "ophalen mirrorlijst van %s"
 
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
@@ -1319,14 +1330,19 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
 #, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
+#, fuzzy, c-format
 msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
 msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
 msgstr[0] ""
 "Het volgende pakket is nu wees, gebruik \"urpme --auto-orphans\" om het te "
 "verwijderen."
@@ -1334,32 +1350,32 @@ msgstr[1] ""
 "De volgende pakketten zijn nu wees, gebruik \"urpme --auto-orphans\" om ze "
 "te verwijderen."
 
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
 
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
 
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "parallelle handler gevonden voor knooppunten: %s"
 
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
 
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
 #, c-format
 msgid "on node %s"
 msgstr "op knooppunt %s"
 
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "Installatie mislukt op knooppunt %s"
@@ -1393,90 +1409,90 @@ msgstr ""
 "%s mislukt op hostcomputer %s (misschien heeft hij niet de juiste urpmi-"
 "versie?) (afsluitcode: %d)"
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "kon medium \"%s\" niet benaderen."
 
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
 #, c-format
 msgid "mounting %s"
 msgstr "%s koppelen..."
 
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
 #, c-format
 msgid "unmounting %s"
 msgstr "%s afkoppelen..."
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
 #, 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:32
+#: ../urpm/select.pm:33
 #, 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:170
+#: ../urpm/select.pm:176
 #, c-format
 msgid "No package named %s"
 msgstr "Geen pakket genaamd %s"
 
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Gebruik \"-a\" om ze allemaal te gebruiken"
 
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
 #, 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:537
+#: ../urpm/select.pm:545
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakket %s is reeds geïnstalleerd"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "De pakketten %s zijn reeds geïnstalleerd"
 
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
 #, c-format
 msgid "due to missing %s"
 msgstr "vanwege ontbrekende %s"
 
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
 #, c-format
 msgid "due to already installed %s"
 msgstr "vanwege reeds geïnstalleerde %s"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vanwege onvoldane %s"
 
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer %s op te waarderen"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
 #, c-format
 msgid "in order to keep %s"
 msgstr "Om %s te behouden"
 
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1485,7 +1501,7 @@ msgstr ""
 "Het volgende pakket moet worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1495,27 +1511,27 @@ msgstr ""
 "opwaarderen:\n"
 "%s"
 
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
 #, c-format
 msgid "in order to install %s"
 msgstr "in volgorde om %s te installeren"
 
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
 
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ongeldige ondertekening (%s)"
 
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ongeldig sleutel-ID (%s)"
 
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Geen ondertekening aanwezig (%s)"
@@ -1597,7 +1613,7 @@ msgstr ""
 "  --root         - gebruik andere hoofdmap (root) voor rpm-verwijdering.\n"
 
 #: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -2368,30 +2384,30 @@ msgstr ""
 "Gebruik --allow-force om de opdracht te forceren."
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (op te waarderen)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (op te waarderen)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (te installeren)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (te installeren)"
 
-#: ../urpmi:437
+#: ../urpmi:442
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2400,12 +2416,12 @@ msgstr ""
 "Om aan de afhankelijkheid '%s' te voldoen, is één van de volgende pakketten "
 "nodig:"
 
-#: ../urpmi:440
+#: ../urpmi:445
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpmi:482
+#: ../urpmi:487
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2416,7 +2432,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:484
+#: ../urpmi:489
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2427,7 +2443,7 @@ msgstr ""
 "van pakketten die ouder zijn dan de reeds geïnstalleerde pakketten:\n"
 "%s"
 
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2436,12 +2452,12 @@ msgstr ""
 "\n"
 "Toch doorgaan met de installatie?"
 
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:499
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2450,7 +2466,7 @@ msgstr ""
 "Een verlangd pakket kan niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2459,12 +2475,12 @@ msgstr ""
 "Enkele gevraagde pakketten kunnen niet worden geïnstalleerd:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:522
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpmi:525
+#: ../urpmi:530
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2475,7 +2491,7 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:527
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2486,12 +2502,12 @@ msgstr ""
 "moeten worden verwijderd om andere te kunnen opwaarderen:\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:540
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(alleen test, verwijdering zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:555
+#: ../urpmi:560
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2502,46 +2518,46 @@ msgstr ""
 "afhankelijkheden te installeren:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:571
 #, 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."
 
-#: ../urpmi:582
+#: ../urpmi:596
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(alleen test, installatie zal niet daadwerkelijk plaatsvinden)"
 
-#: ../urpmi:588
+#: ../urpmi:602
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "%s aan extra schijfruimte zal worden gebruikt."
 
-#: ../urpmi:589
+#: ../urpmi:603
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "%s aan schijfruimte zal vrijkomen."
 
-#: ../urpmi:590
+#: ../urpmi:604
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "%s aan pakketten zal worden opgehaald."
 
-#: ../urpmi:591
+#: ../urpmi:605
 #, 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:612
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../urpmi:620
+#: ../urpmi:634
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Druk op Enter wanneer de koppeling tot stand is gebracht..."
@@ -2672,83 +2688,73 @@ msgstr "  --all-media    - met --distrib, elke media in de lijst toevoegen.\n"
 
 #: ../urpmi.addmedia:77
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - gebruik aangegeven url voor lijst van mirrors, de "
-"standaard\n"
-"                   is %s\n"
-
-#: ../urpmi.addmedia:79
-#, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - maakt virtueel medium aan dat altijd bijgewerkt is.\n"
 
-#: ../urpmi.addmedia:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM bestandscontrole uitschakelen.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - publieke sleutel van toegevoegde media niet importeren\n"
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - media toevoegen in configuratie, maar niet bijwerken.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 'extra informatie'-modus.\n"
 
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "bekende soorten xml-infobeleid zijn %s"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "geen argument nodig voor --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "ongeldige <url> (voor een lokale map dient het pad absoluut te zijn)"
 
-#: ../urpmi.addmedia:124
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Alleen de beheerder mag media toevoegen"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "creating config file [%s]"
 msgstr "aanmaken config-bestand [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Niet mogelijk config-bestand [%s] te maken"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "niet nodig om <relatief pad van synthesis> te geven met --distrib"
 
-#: ../urpmi.addmedia:144
+#: ../urpmi.addmedia:135
 #, c-format
 msgid ""
 "\n"
@@ -2757,161 +2763,20 @@ msgstr ""
 "\n"
 "Wilt u media '%s' toevoegen?"
 
-#: ../urpmi.addmedia:170
-#, c-format
-msgid "<relative path of synthesis> missing\n"
-msgstr "<relatief pad van syntesis> ontbreekt\n"
-
-#: ../urpmi.addmedia:173
-#, c-format
-msgid "Can't use %s with remote medium"
-msgstr "Kan %s niet met medium op afstand gebruiken"
-
-#: ../urpmi.addmedia:185
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
 #, c-format
 msgid "unable to add medium"
 msgstr "kon medium niet toevoegen"
 
-#: ../urpmi.recover:28
-#, c-format
-msgid ""
-"urpmi.recover version %s\n"
-"Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi.recover versie %s\n"
-"Copyright © 2006 Mandriva.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../urpmi.recover:34
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr "  --checkpoint   - stel starttijd opnieuw verpakken in op nu\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr ""
-"  --noclean      - opnieuw-verpakkenmap niet opschonen bij checkpoint.\n"
-
-#: ../urpmi.recover:37
-#, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr ""
-"  --list         - transacties tonen sinds aangegeven datum/tijdsduur\n"
-
-#: ../urpmi.recover:38
-#, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - alle transacties in rpmdb opsommen (lang).\n"
-
-#: ../urpmi.recover:39
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe    - transacties sinds checkpoint opsommen.\n"
-
-#: ../urpmi.recover:40
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr ""
-"  --rollback     - terugdraaien tot aangegeven datum,\n"
-"                   of het gegeven aantal transacties terugdraaien\n"
-
-#: ../urpmi.recover:42
-#, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr "  --disable      - opnieuw verpakken uitschakelen\n"
-
-#: ../urpmi.recover:57
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "Ongeldige datum of tijdsduur [%s]\n"
-
-#: ../urpmi.recover:65
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr "Opnieuw-verpakken-map niet gedefinieerd\n"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "Kan niet schrijven naar opnieuw-verpakken-map [%s]\n"
-
-#: ../urpmi.recover:70
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "Opschonen opnieuw-verpakken-map [%s]...\n"
-
-#: ../urpmi.recover:72
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "%d bestand verwijderd\n"
-msgstr[1] "%d bestanden verwijderd\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "Vreemde opdrachtregel-argumenten [%s]\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "U kunt --checkpoint en --rollback niet tegelijkertijd gebruiken\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "U kunt --checkpoint en --list niet tegelijkertijd gebruiken\n"
-
-#: ../urpmi.recover:88
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "U kunt --rollback en --list niet tegelijkertijd gebruiken\n"
-
-#: ../urpmi.recover:90
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "U kunt --disable niet tegelijkertijd met een andere optie gebruiken"
-
-#: ../urpmi.recover:115
+#: ../urpmi.addmedia:161
 #, c-format
-msgid "No transaction found since %s\n"
-msgstr "Geen transactie gevonden sinds %s\n"
-
-#: ../urpmi.recover:130
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "U dient beheerder te zijn om dit te doen"
-
-#: ../urpmi.recover:143 ../urpmi.recover:209
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "Schrijven van rpm-macro's-bestand [%s]...\n"
-
-#: ../urpmi.recover:185
-#, c-format
-msgid "No rollback date found\n"
-msgstr "Geen terugdraaidatum gevonden\n"
-
-#: ../urpmi.recover:188
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr "Terugdraaien tot aan %s...\n"
+msgid "<relative path of synthesis> missing\n"
+msgstr "<relatief pad van syntesis> ontbreekt\n"
 
-#: ../urpmi.recover:195
+#: ../urpmi.addmedia:164
 #, c-format
-msgid "Disabling repackaging\n"
-msgstr "Opnieuw verpakken wordt uitgeschakeld\n"
+msgid "Can't use %s with remote medium"
+msgstr "Kan %s niet met medium op afstand gebruiken"
 
 #: ../urpmi.removemedia:38
 #, c-format
@@ -3007,13 +2872,13 @@ msgstr "  -ff             - het bijwerken van synthesis echt afdwingen\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Alleen de beheerder mag media bijwerken"
 
-#: ../urpmi.update:82
+#: ../urpmi.update:86
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi.update:91
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3022,17 +2887,17 @@ msgstr ""
 "de invoer om op te waarderen ontbreekt\n"
 "(één van %s)\n"
 
-#: ../urpmi.update:106
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "negeren van medium \"%s\":"
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr "activeren van medium \"%s\""
@@ -3313,11 +3178,116 @@ msgstr ""
 "geen xml-info voor medium \"%s\", niet in staat een resultaat te geven voor "
 "pakketten %s"
 
-#: ../urpmq:473
+#: ../urpmq:476
 #, c-format
 msgid "No changelog found\n"
 msgstr "Geen wijzigingslogboek gevonden\n"
 
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "Zoek begin: %s eind: %s"
+
+#~ msgid ""
+#~ "  --from         - use specified url for list of mirrors, the default is\n"
+#~ "                   %s\n"
+#~ msgstr ""
+#~ "  --from         - gebruik aangegeven url voor lijst van mirrors, de "
+#~ "standaard\n"
+#~ "                   is %s\n"
+
+#~ msgid ""
+#~ "urpmi.recover version %s\n"
+#~ "Copyright (C) 2006 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi.recover versie %s\n"
+#~ "Copyright © 2006 Mandriva.\n"
+#~ "Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "gebruik:\n"
+
+#~ msgid "  --checkpoint   - set repackaging start now\n"
+#~ msgstr "  --checkpoint   - stel starttijd opnieuw verpakken in op nu\n"
+
+#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+#~ msgstr ""
+#~ "  --noclean      - opnieuw-verpakkenmap niet opschonen bij checkpoint.\n"
+
+#~ msgid ""
+#~ "  --list         - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr ""
+#~ "  --list         - transacties tonen sinds aangegeven datum/tijdsduur\n"
+
+#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+#~ msgstr "  --list-all     - alle transacties in rpmdb opsommen (lang).\n"
+
+#~ msgid "  --list-safe    - list transactions since checkpoint\n"
+#~ msgstr "  --list-safe    - transacties sinds checkpoint opsommen.\n"
+
+#~ msgid ""
+#~ "  --rollback     - rollback until specified date,\n"
+#~ "                   or rollback the specified number of transactions\n"
+#~ msgstr ""
+#~ "  --rollback     - terugdraaien tot aangegeven datum,\n"
+#~ "                   of het gegeven aantal transacties terugdraaien\n"
+
+#~ msgid "  --disable      - turn off repackaging\n"
+#~ msgstr "  --disable      - opnieuw verpakken uitschakelen\n"
+
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "Ongeldige datum of tijdsduur [%s]\n"
+
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "Opnieuw-verpakken-map niet gedefinieerd\n"
+
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "Kan niet schrijven naar opnieuw-verpakken-map [%s]\n"
+
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "Opschonen opnieuw-verpakken-map [%s]...\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "%d bestand verwijderd\n"
+#~ msgstr[1] "%d bestanden verwijderd\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "Vreemde opdrachtregel-argumenten [%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr "U kunt --checkpoint en --rollback niet tegelijkertijd gebruiken\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "U kunt --checkpoint en --list niet tegelijkertijd gebruiken\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "U kunt --rollback en --list niet tegelijkertijd gebruiken\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "U kunt --disable niet tegelijkertijd met een andere optie gebruiken"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "Geen transactie gevonden sinds %s\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "U dient beheerder te zijn om dit te doen"
+
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "Schrijven van rpm-macro's-bestand [%s]...\n"
+
+#~ msgid "No rollback date found\n"
+#~ msgstr "Geen terugdraaidatum gevonden\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "Terugdraaien tot aan %s...\n"
+
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "Opnieuw verpakken wordt uitgeschakeld\n"
+
 #~ msgid "Updating media...\n"
 #~ msgstr "Bijwerken van media...\n"