re-sync after the big svn loss

1 files changed, 369 insertions, 401 deletions

diff --git a/po/af.po b/po/af.po
index c56f9f8f..c7278252 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-27 16:38+0200\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KTranslator v 0.6.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Stelsel-installasie"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
 #, c-format
 msgid "_Cancel"
 msgstr "Kanselleer"
@@ -87,27 +87,27 @@ msgstr "Kanselleer"
 msgid "Choose location to save file"
 msgstr "Kies 'n lêer"
 
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
 #, fuzzy, c-format
 msgid "Unknown option %s"
 msgstr "Onbekende konneksie tipe"
 
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
 #, fuzzy, c-format
 msgid "No packages specified"
 msgstr "Geen opdrag gespesifiseer nie"
 
-#: ../gurpmi2:43
+#: ../gurpmi2:44
 #, c-format
 msgid "Please wait..."
 msgstr "Asseblief wag..."
 
-#: ../gurpmi2:52
+#: ../gurpmi2:53
 #, fuzzy, c-format
 msgid "Must be root"
 msgstr "Muispoort"
 
-#: ../gurpmi2:87
+#: ../gurpmi2:88
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -115,95 +115,98 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:148
+#: ../gurpmi2:149
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Opgradeer"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:150
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Verlaat installasie"
 
-#: ../gurpmi2:152
+#: ../gurpmi2:153
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../gurpmi2:176
-#, fuzzy, c-format
+#: ../gurpmi2:177
+#, c-format
 msgid "_Abort"
 msgstr "Staak"
 
-#: ../gurpmi2:196
-#, fuzzy, c-format
+#: ../gurpmi2:197
+#, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
 "Continue installation anyway?"
 msgstr ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
-"\n"
 "%s\n"
-"\n"
 "Kan ons voort gaan?"
 
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
 "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
 "geïnstalleer word:\n"
 "\n"
-msgstr[1] ""
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
 "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
 #, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakket, %d MB)"
+msgstr[1] "(%d pakkette, %d MB)"
 
-#: ../gurpmi2:223
+#: ../gurpmi2:225
 #, c-format
 msgid "Package installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:264
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../gurpmi2:271
+#: ../gurpmi2:279
 #, fuzzy, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -217,8 +220,8 @@ msgstr ""
 "\n"
 "Wil u hulle steeds installeer?"
 
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
-#, fuzzy, c-format
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -226,40 +229,39 @@ msgid ""
 msgstr ""
 "Installasie probleme, van die lêers is soek:\n"
 "%s\n"
-"\n"
 "Probeer u media se databasis opdateer."
 
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
-#, fuzzy, c-format
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
+#, c-format
 msgid "removing %s"
-msgstr "Verwyder %s"
+msgstr "verwyder %s"
 
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "Herlaaistelsel word voorberei..."
 
-#: ../gurpmi2:294
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#: ../gurpmi2:326
-#, fuzzy, c-format
+#: ../gurpmi2:334
+#, c-format
 msgid "_Done"
-msgstr "Klaar"
+msgstr "_Klaar"
 
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
 msgstr "Installasie het misluk"
 
-#: ../gurpmi2:336
+#: ../gurpmi2:344
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../gurpmi2:338
+#: ../gurpmi2:346
 #, c-format
 msgid "Installation finished"
 msgstr "Geïnstalleer"
@@ -308,63 +310,63 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:93
+#: ../urpm.pm:91
 #, fuzzy, c-format
 msgid "unable to open rpmdb"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:110
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr ""
 
-#: ../urpm.pm:128
+#: ../urpm.pm:126
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "in lêername"
 
-#: ../urpm.pm:134
+#: ../urpm.pm:132
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
 #, c-format
 msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../urpm.pm:144
+#: ../urpm.pm:142
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:149
+#: ../urpm.pm:147
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm.pm:159
+#: ../urpm.pm:157
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "Laat \"%s\" toe om die lêer te skryf"
 
-#: ../urpm.pm:161
+#: ../urpm.pm:159
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr ""
 
-#: ../urpm.pm:165
+#: ../urpm.pm:163
 #, fuzzy, c-format
 msgid "error registering local packages"
 msgstr "Daar was 'n fout met pakkette:"
 
-#: ../urpm.pm:261
+#: ../urpm.pm:259
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
@@ -384,27 +386,27 @@ msgstr ""
 msgid "You need to be root to use --use-distrib"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "kan nie kieslyslêer:%s lees nie"
 
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
 #, fuzzy, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
@@ -429,7 +431,7 @@ msgstr "Kan nie lêer %s oopmaak nie\n"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -442,12 +444,12 @@ msgstr ""
 #: ../urpm/download.pm:112
 #, c-format
 msgid "User name:"
-msgstr ""
+msgstr "Gebruiker naam:"
 
 #: ../urpm/download.pm:112
 #, c-format
 msgid "Password:"
-msgstr ""
+msgstr "Wagwoord:"
 
 #: ../urpm/download.pm:185
 #, c-format
@@ -559,7 +561,7 @@ msgstr ""
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -669,7 +671,7 @@ msgstr "Geen opdrag gespesifiseer nie"
 
 #: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
 msgstr ""
 
 #: ../urpm/lock.pm:50
@@ -692,328 +694,328 @@ msgstr ""
 msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr ""
 
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
 #, fuzzy, c-format
 msgid "invalid hdlist name"
 msgstr "in lêername"
 
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
 #, fuzzy, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "Laat \"%s\" toe om die lêer te skryf"
 
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
 #, c-format
 msgid "\"synthesis\" should not be set (medium \"%s\")"
 msgstr ""
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
 #, c-format
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr ""
 
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
 #, fuzzy, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
 #, fuzzy, c-format
 msgid "unable to access list file of \"%s\""
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr ""
 
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
 #, fuzzy, c-format
 msgid "taking removable device as \"%s\""
 msgstr "Verwyderbare media"
 
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
 #, fuzzy, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "Verwyderbare media"
 
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
 #, fuzzy, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "Probleme met skep van media."
 
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
 #, c-format
 msgid "wrote %s"
 msgstr ""
 
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
 #, fuzzy, c-format
 msgid "wrote config file [%s]"
 msgstr "Partisionering het misluk: %s"
 
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
 #, c-format
 msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
 msgstr ""
 
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Opsoek na geïnstalleerde lettertipes"
 
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "Installeer pakket %s"
 
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Probleme met Installasue van pakket %s"
 
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Rekening bestaan reeds\n"
 
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr ""
 
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "%s from media %s"
 
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
 #, fuzzy, c-format
 msgid "unable to mount the distribution medium"
 msgstr "Probleme met skep van media."
 
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "Maak /etc/hosts ...\n"
 
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "Probleme met skep van media."
 
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Konfigureer drukker \"%s\" ..."
 
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Konfigurasie-lêer"
 
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Bedienerkonfigurasie"
 
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr ""
 
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr ""
 
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
 #, fuzzy, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "in beskrywings"
 
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
 #, fuzzy, c-format
 msgid "...copying done"
 msgstr "Aanteken gevaal"
 
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Installasie het misluk"
 
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
 #, fuzzy, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "Installasie het misluk"
 
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
 #, fuzzy, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "FAT-grootteverandering het gefaal: %s"
 
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
 #, fuzzy, c-format
 msgid "no rpm files found from [%s]"
 msgstr "Fout met die lees van lêer %s"
 
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Fout met die lees van lêer %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "Fout met die lees van lêer %s"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
 #, c-format
 msgid "no rpms read"
 msgstr ""
 
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1021,78 +1023,79 @@ msgid ""
 "medium."
 msgstr ""
 
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
 #, fuzzy, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
 #, fuzzy, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Voeg media by"
 
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "%s from media %s"
 
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "%s from media %s"
 
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#. -PO: Add here the keys which might be pressed in the "Yes"-case.
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:549 ../urpmi:600 ../urpmi:677
+#: ../urpmi:755 ../urpmi.addmedia:130
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Jammer, swak keuse, probeer weer\n"
@@ -1129,7 +1132,7 @@ msgstr "fout met onthegting van %s: %s"
 
 #: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
 #, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
 msgstr "Rekening bestaan reeds\n"
 
 #: ../urpm/removable.pm:143
@@ -1147,47 +1150,47 @@ msgstr ""
 msgid "unable to access medium \"%s\""
 msgstr "Probleme met skep van media."
 
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
 #, fuzzy, c-format
 msgid "No package named %s"
 msgstr "Teruglus lêernaam: %s"
 
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
 #, c-format
 msgid "due to missing %s"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deur problematiese %s"
 
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer promosie van %s"
 
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
 #, c-format
 msgid "in order to keep %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
 #, fuzzy, c-format
 msgid "unrequested"
 msgstr "Begin sodra gevra word"
@@ -1208,7 +1211,7 @@ msgid "Missing signature (%s)"
 msgstr "Ontbrekende velde"
 
 #: ../urpme:39
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
@@ -1217,8 +1220,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpme uitgawe %s\n"
+"Kopiereg (C) 1999-2006 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -1331,26 +1334,38 @@ msgstr "Geen etiket om te verwyder nie!"
 msgid "Checking to remove the following packages"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpme:132
+#: ../urpme:133
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
+"geïnstalleer word:\n"
+"\n"
+msgstr[1] ""
 "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
 #, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "Verwyder pakkette..."
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Verwyder pakkette..."
+msgstr[1] "Verwyder pakkette..."
 
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:156
+#: ../urpme:159
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Aanteken gevaal"
@@ -1365,8 +1380,8 @@ msgid ""
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmf uitgawe %s\n"
+"Kopiereg (C) 2002-2006 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -1420,9 +1435,9 @@ msgid "  --update       - use only update media.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
 #: ../urpmf:46
-#, fuzzy, c-format
+#, c-format
 msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - woordryke modus.\n"
+msgstr "  --verbose       - woordryke modus.\n"
 
 #: ../urpmf:47
 #, fuzzy, c-format
@@ -1603,7 +1618,7 @@ msgstr "  -v             - woordryke modus.\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
 #, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -v             - woordryke modus.\n"
@@ -1613,25 +1628,25 @@ msgstr "  -v             - woordryke modus.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:226
+#: ../urpmf:223
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
 msgstr ""
 
-#: ../urpmf:227
+#: ../urpmf:224
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr ""
 
 #: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
@@ -1640,8 +1655,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmi uitgawe %s\n"
+"Kopiereg (C) 1999-2006 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -1893,7 +1908,7 @@ msgstr ""
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
 #, fuzzy, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -v             - woordryke modus.\n"
@@ -1959,59 +1974,62 @@ msgid ""
 "Use --allow-force to force operation."
 msgstr ""
 
-#: ../urpmi:364
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr ""
 
-#: ../urpmi:439
+#: ../urpmi:437
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "Opgradeer"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr "Opgradeer"
 
-#: ../urpmi:443
+#: ../urpmi:441
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr "Verlaat installasie"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr "Verlaat installasie"
 
-#: ../urpmi:452
+#: ../urpmi:450
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpmi:482
+#: ../urpmi:481
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Wil u in elk geval voortgaan?"
 
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2021,167 +2039,189 @@ msgstr " (J/n) "
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
-msgid_plural ""
+msgstr "Sommige pakkette kan nie geïnstalleer word nie"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr[0] "Sommige pakkette kan nie geïnstalleer word nie"
-msgstr[1] "Sommige pakkette kan nie geïnstalleer word nie"
+msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../urpmi:534
+#: ../urpmi:535
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
 "has to be removed for others to be upgraded:\n"
 "%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:541
+#: ../urpmi:544
 #, fuzzy, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
 "Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
 "\n"
 "%s\n"
 "\n"
 "Kan ons voort gaan?"
 
-#: ../urpmi:544
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:586
+#: ../urpmi:589
 #, fuzzy, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpmi:592
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:594
+#: ../urpmi:597
 #, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../urpmi:618
+#: ../urpmi:623
 #, fuzzy, c-format
 msgid "Press Enter when ready..."
 msgstr "Druk ENTER wanneer u reg is..."
 
-#: ../urpmi:624
+#: ../urpmi:628
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../urpmi:666
+#: ../urpmi:671
 #, fuzzy, c-format
 msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Die volgende pakkette geïnstalleer word:\n"
-msgstr[1] "Die volgende pakkette geïnstalleer word:\n"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpmi:668
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
+
+#: ../urpmi:673
 #, fuzzy, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Wil u op hierdie knoppie klik?"
 
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: ../urpmi:711
 #, fuzzy, c-format
 msgid "distributing %s"
 msgstr "Begin %s:"
 
-#: ../urpmi:729
+#: ../urpmi:725
 #, fuzzy, c-format
 msgid "installing %s from %s"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:731
+#: ../urpmi:727
 #, fuzzy, c-format
 msgid "installing %s"
 msgstr "%s word installeer\n"
 
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Installasie het misluk"
-
-#: ../urpmi:763
+#: ../urpmi:759
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: ../urpmi:780
+#: ../urpmi:776
 #, fuzzy, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
 
-#: ../urpmi:819
+#: ../urpmi:815
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "installasie instruksies"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "installasie instruksies"
+msgstr[1] "installasie instruksies"
 
-#: ../urpmi:828
+#: ../urpmi:825
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Installasie probleem"
 
-#: ../urpmi:833
+#: ../urpmi:830
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpmi:840
+#: ../urpmi:838
 #, fuzzy, c-format
 msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Alles is alreeds installeer"
-msgstr[1] "Alles is alreeds installeer"
+msgstr "Alles is alreeds installeer"
 
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpmi:842
 #, fuzzy, c-format
 msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Alles is alreeds installeer"
-msgstr[1] "Alles is alreeds installeer"
+msgstr "Alles is alreeds installeer"
 
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpmi:862
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Begin slurpd: "
 
-#: ../urpmi.addmedia:36
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
+#: ../urpmi.addmedia:35
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
@@ -2266,17 +2306,17 @@ msgstr ""
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
 #, fuzzy, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
@@ -2334,7 +2374,7 @@ msgid "unable to create medium \"%s\"\n"
 msgstr "Probleme met skep van media."
 
 #: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
@@ -2343,8 +2383,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmi.recover uitgawe %s\n"
+"Kopiereg (C) 2006 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -2410,8 +2450,10 @@ msgstr ""
 
 #: ../urpmi.recover:72
 #, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../urpmi.recover:82
 #, c-format
@@ -2530,49 +2572,55 @@ msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 
 #: ../urpmi.update:47
+#, c-format
+msgid ""
+"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
 #, fuzzy, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.update:49
+#: ../urpmi.update:50
 #, fuzzy, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "  -f             - force updating synthesis/hdlist\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:71
 #, fuzzy, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:79
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:96
+#: ../urpmi.update:97
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "%s word installeer\n"
 
 #: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
@@ -2581,8 +2629,8 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmq uitgawe %s\n"
+"Kopiereg (C) 2000-2006 Mandriva.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -2664,176 +2712,121 @@ msgstr "  --help         - druk hierdie help boodskap.\n"
 msgid "  --summary, -S  - print summary.\n"
 msgstr ""
 
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid "  --whatrequires - reverse search to what requires package.\n"
+msgstr "  -v             - woordryke modus.\n"
+
 #: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+"  --whatrequires-recursive\n"
+"                   - extended reverse search (includes virtual packages).\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+"  --whatprovides, -p\n"
+"                   - search in provides to find package.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpmq:93
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmq:89
+#: ../urpmq:94
 #, fuzzy, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:91
+#: ../urpmq:96
 #, fuzzy, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:92
+#: ../urpmq:97
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmq:93
+#: ../urpmq:98
 #, fuzzy, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:94
-#, c-format
-msgid ""
-"  -P             - do not search in provides to find package (default).\n"
-msgstr ""
-
-#: ../urpmq:95
+#: ../urpmq:99
 #, fuzzy, c-format
-msgid "  -p             - search in provides to find package.\n"
+msgid "  -m             - equivalent to -du\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:96
+#: ../urpmq:100
 #, fuzzy, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-"  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:100
+#: ../urpmq:102
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmq:101
+#: ../urpmq:103
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmq:102
+#: ../urpmq:104
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 
-#: ../urpmq:103
+#: ../urpmq:105
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq:178
+#: ../urpmq:180
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmq:350
+#: ../urpmq:361
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
 
-#: ../urpmq:353
+#: ../urpmq:365
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
 
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Geen prente beskikbaar"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
 
-#: ../urpmq:417
+#: ../urpmq:427
 #, fuzzy, c-format
 msgid "No changelog found\n"
 msgstr "Geen beeld gevind nie"
 
 #, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-#~ msgstr[1] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-#~ msgstr[1] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Installasie het misluk"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Installeer tans pakket %s (%s/%s)...."
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "Begin %s:"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Installasievoorbereiding..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Installasievoorbereiding..."
-
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Die volgende pakkette geïnstalleer word:\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Geen prente beskikbaar"
 
 #~ msgid "Search"
 #~ msgstr "Soek"
@@ -2841,35 +2834,10 @@ msgstr "Geen beeld gevind nie"
 #~ msgid "Is this OK?"
 #~ msgstr "Is dit aanvaarbaar?"
 
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed (%d MB)"
-#~ msgstr ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
 #~ msgid "installing %s\n"
 #~ msgstr "%s word installeer\n"
 
 #, fuzzy
-#~ msgid "%s: command not found\n"
-#~ msgstr "%s is nie gevind nie...\n"
-
-#, fuzzy
-#~ msgid "md5sum mismatch"
-#~ msgstr "Ongepaard"
-
-#, fuzzy
-#~ msgid "  --all          - print all tags.\n"
-#~ msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#, fuzzy
-#~ msgid "  --files        - print tag files: all files.\n"
-#~ msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Continue?"