summaryrefslogtreecommitdiffstats
path: root/po/af.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/af.po')
-rw-r--r--po/af.po583
1 files changed, 295 insertions, 288 deletions
diff --git a/po/af.po b/po/af.po
index 372be6cd..279e3165 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: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+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"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
msgid "_Save"
msgstr "_Stoor"
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
#, c-format
msgid "_Cancel"
msgstr "Kanselleer"
@@ -109,9 +109,8 @@ msgstr ""
msgid "Options:"
msgstr ""
-#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
-#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
-#: ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -142,17 +141,17 @@ msgid ""
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr ""
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr ""
@@ -190,7 +189,22 @@ msgstr "Asseblief wag..."
msgid "Must be root"
msgstr "Muispoort"
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "Begin %s:"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Installasievoorbereiding..."
+
+#: ../gurpmi2:111
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -203,37 +217,37 @@ msgstr "Sommige pakkette kan nie geïnstalleer word nie"
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:171
+#: ../gurpmi2:170
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Opgradeer"
-#: ../gurpmi2:172
+#: ../gurpmi2:171
#, fuzzy, c-format
msgid " (to install)"
msgstr "Verlaat installasie"
-#: ../gurpmi2:175
+#: ../gurpmi2:174
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:176
+#: ../gurpmi2:175
#, c-format
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../gurpmi2:200
+#: ../gurpmi2:199
#, c-format
msgid "_Abort"
msgstr "Staak"
-#: ../gurpmi2:222
+#: ../gurpmi2:221
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -244,7 +258,7 @@ msgstr ""
"%s\n"
"Kan ons voort gaan?"
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
@@ -253,7 +267,7 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -262,49 +276,44 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:244
+#: ../gurpmi2:243
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d pakket, %d MB)"
msgstr[1] "(%d pakkette, %d MB)"
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Installasievoorbereiding..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
#, fuzzy, c-format
msgid "Preparing..."
msgstr "Herlaaistelsel word voorberei..."
-#: ../gurpmi2:270
+#: ../gurpmi2:269
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installeer tans pakket %s (%s/%s)...."
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:298
+#: ../gurpmi2:297
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../gurpmi2:324
+#: ../gurpmi2:323
#, c-format
msgid "_Done"
msgstr "_Klaar"
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -315,28 +324,28 @@ msgstr ""
"%s\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
#, fuzzy, c-format
msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:343
+#: ../gurpmi2:342
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:345
+#: ../gurpmi2:344
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
#, c-format
msgid "removing %s"
msgstr "verwyder %s"
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -375,7 +384,7 @@ msgstr ""
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -v - woordryke modus.\n"
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
#, fuzzy, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Daar was 'n fout met die installasie van die pakkette:"
@@ -385,134 +394,143 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:112
#, fuzzy, c-format
msgid "fail to create directory %s"
msgstr "Probleme met skep van media."
-#: ../urpm.pm:112
+#: ../urpm.pm:113
#, c-format
msgid "invalid owner for directory %s"
msgstr ""
-#: ../urpm.pm:124
+#: ../urpm.pm:125
#, fuzzy, c-format
msgid "Can not download packages into %s"
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm.pm:305
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:288
+#: ../urpm.pm:319
#, fuzzy, c-format
msgid "invalid rpm file name [%s]"
msgstr "in lêername"
-#: ../urpm.pm:294
+#: ../urpm.pm:325
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm.pm:304
+#: ../urpm.pm:335
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:309
+#: ../urpm.pm:340
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:317
+#: ../urpm.pm:348
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Laat \"%s\" toe om die lêer te skryf"
-#: ../urpm.pm:319
+#: ../urpm.pm:350
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:323
+#: ../urpm.pm:354
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "Daar was 'n fout met pakkette:"
-#: ../urpm.pm:410
+#: ../urpm.pm:441
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr ""
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "kan nie kieslyslêer:%s lees nie"
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
#, c-format
msgid "unexpected expression %s"
msgstr ""
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
#, fuzzy, c-format
msgid "missing expression before %s"
msgstr "Ontbrekende velde"
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr ""
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
#, c-format
msgid "no expression to close"
msgstr ""
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
#, c-format
msgid "chroot directory doesn't exist"
msgstr ""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
#, fuzzy, c-format
msgid "Copying failed"
msgstr "Aanteken gevaal"
@@ -559,122 +577,122 @@ msgstr ""
msgid "unable to write config file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr ""
+
+#: ../urpm/download.pm:157
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr ""
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "User name:"
msgstr "Gebruiker naam:"
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
#, c-format
msgid "Password:"
msgstr "Wagwoord:"
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr ""
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
#, c-format
msgid "%s failed: exited with signal %d"
msgstr ""
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
#, c-format
msgid "%s failed: exited with %d"
msgstr ""
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
#, fuzzy, c-format
msgid "copy failed"
msgstr "Aanteken gevaal"
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
#, fuzzy, c-format
msgid "wget is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
#, fuzzy, c-format
msgid "curl is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
#, c-format
msgid "curl failed: download canceled\n"
msgstr ""
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
#, c-format
msgid "rsync is missing\n"
msgstr ""
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
#, c-format
msgid "ssh is missing\n"
msgstr ""
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
#, c-format
msgid "prozilla is missing\n"
msgstr ""
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr ""
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
#, fuzzy, c-format
msgid "aria2 is missing\n"
msgstr "deur %s wat soek is"
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr ""
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
#, c-format
msgid " %s%% completed, speed = %s"
msgstr ""
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
#, fuzzy, c-format
msgid "retrieving %s"
msgstr "Verwyder %s"
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
#, fuzzy, c-format
msgid "retrieved %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
#, c-format
msgid "unknown protocol defined for %s"
msgstr ""
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr ""
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr ""
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
#, fuzzy, c-format
msgid "unable to handle protocol: %s"
msgstr "Aktiveer Network Time Protocol"
@@ -694,58 +712,58 @@ msgstr "%s is nie gevind nie...\n"
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr ""
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
#, fuzzy, c-format
msgid "unable to create transaction"
msgstr "Probleme met die skep van 'n ssh identiteit"
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
#, fuzzy, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
#, fuzzy, c-format
msgid "unable to install package %s"
msgstr "Probleme met Installasue van pakket %s"
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
#, fuzzy, c-format
msgid "removing bad rpm (%s) from %s"
msgstr "%s word installeer\n"
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
#, fuzzy, c-format
msgid "removing %s failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "Verwyder pakkette..."
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
#, fuzzy, c-format
msgid "removing package %s"
msgstr "Verwyder pakkette..."
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
#, fuzzy, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "%s word installeer\n"
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "Meer inligting rakende pakket..."
@@ -790,90 +808,80 @@ msgstr "Waarskuwing"
msgid "%s database is locked (another program is already using it)"
msgstr ""
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
#, c-format
msgid "Installation failed"
msgstr "Installasie het misluk"
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
#, c-format
msgid "Try to go on anyway? (y/N) "
msgstr ""
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
#, fuzzy, c-format
msgid ""
"Installation failed, bad rpms:\n"
"%s"
msgstr "Installasie het misluk"
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Wil u op hierdie knoppie klik?"
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
#, fuzzy, c-format
msgid "removing installed rpms (%s)"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Begin %s:"
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s word installeer\n"
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Installasie probleem"
#: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "Ondersoek medialêer '%s'....."
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr ""
@@ -945,228 +953,228 @@ msgstr "Probleme met Installasue van pakket %s"
msgid "medium \"%s\" already exists"
msgstr "Rekening bestaan reeds\n"
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
#, c-format
msgid "directory %s does not exist"
msgstr ""
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
#, c-format
msgid "skipping non compatible media `%s' (for %s)"
msgstr ""
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "Maak /etc/hosts ...\n"
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigureer drukker \"%s\" ..."
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfigurasie-lêer"
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Bedienerkonfigurasie"
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
#, fuzzy, c-format
msgid "...copying done"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
#, c-format
msgid "computing md5sum of retrieved source synthesis"
msgstr ""
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
#, fuzzy, c-format
msgid "retrieval of [%s] failed (md5sum mismatch)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
#, fuzzy, c-format
msgid "genhdlist2 failed on %s"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
#, fuzzy, c-format
msgid "comparing %s and %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
#, fuzzy, c-format
msgid "copying MD5SUM file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
#, fuzzy, c-format
msgid "invalid MD5SUM file (downloaded from %s)"
msgstr "in lêername"
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "Ondersoek die afgeleë medialêer '%s'..."
-
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr ""
+msgid "no metadata found for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
#, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Ondersoek medialêer '%s'....."
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpm/media.pm:1612
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Voeg media by"
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
#, c-format
msgid "retrieval of [%s] failed"
msgstr ""
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
#, c-format
msgid "trying again with mirror %s"
msgstr ""
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
#, c-format
msgid "Could not find a mirror from mirrorlist %s"
msgstr ""
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
#, c-format
msgid "found geolocalisation %s %.2f %.2f from timezone %s"
msgstr ""
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
#, fuzzy, c-format
msgid "getting mirror list from %s"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
#, c-format
msgid "Nn"
msgstr "Nn"
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
#: ../urpmi.addmedia:141
#, c-format
msgid "Yy"
@@ -1237,7 +1245,7 @@ msgstr ""
msgid "TB"
msgstr ""
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
#, c-format
msgid ""
"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1595,11 +1603,6 @@ msgstr " -v - woordryke modus.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
#: ../urpm/search.pm:290 ../urpmf:291
#, fuzzy, c-format
msgid "no hdlist available for medium \"%s\""
@@ -1615,118 +1618,142 @@ msgstr "Kopieer die lêer vir media '%s'..."
msgid "no xml-info available for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
msgstr ""
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
#, c-format
msgid ""
"urpmi was restarted, and the list of priority packages did change: %s vs %s"
msgstr ""
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
#, fuzzy, c-format
msgid "No package named %s"
msgstr "Teruglus lêernaam: %s"
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr ""
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
#, fuzzy, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Alles is alreeds installeer"
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
#: ../urpm/select.pm:607
#, fuzzy, c-format
+msgid ""
+"The following package has 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?"
+
+#: ../urpm/select.pm:608
+#, 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?"
+
+#: ../urpm/select.pm:635
+#, fuzzy, c-format
msgid "in order to install %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "deur %s wat soek is"
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
#, fuzzy, c-format
msgid "Invalid signature (%s)"
msgstr "Ontbrekende velde"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
#, c-format
msgid "Invalid Key ID (%s)"
msgstr ""
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
#, fuzzy, c-format
msgid "Missing signature (%s)"
msgstr "Ontbrekende velde"
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
#, c-format
msgid "system"
msgstr ""
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
#, c-format
msgid "You should restart %s for %s"
msgstr ""
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't write file"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
#, fuzzy, c-format
msgid "Can't open file"
msgstr "Aanteken gevaal"
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
#, fuzzy, c-format
msgid "Can't move file %s to %s"
msgstr "Aanteken gevaal"
@@ -1768,7 +1795,7 @@ msgstr ""
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
#, fuzzy, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --help - druk hierdie help boodskap.\n"
@@ -1795,7 +1822,7 @@ msgid ""
" to (un)install a chroot with --root option.\n"
msgstr ""
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
#, fuzzy, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " -v - woordryke modus.\n"
@@ -1869,7 +1896,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Verwyder pakkette..."
msgstr[1] "Verwyder pakkette..."
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (J/n) "
@@ -2103,140 +2130,140 @@ msgstr " --help - druk hierdie help boodskap.\n"
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr ""
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid " --replacefiles - ignore file conflicts\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr ""
-#: ../urpmi:143
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr ""
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr ""
-#: ../urpmi:147
+#: ../urpmi:148
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, fuzzy, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, fuzzy, c-format
msgid " --debug - very verbose mode.\n"
msgstr " --verbose - woordryke modus.\n"
-#: ../urpmi:154
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
-#: ../urpmi:182
+#: ../urpmi:183
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr ""
-#: ../urpmi:189
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-#: ../urpmi:219
+#: ../urpmi:220
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi:220
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr ""
-#: ../urpmi:227
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:232
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
-#: ../urpmi:252
+#: ../urpmi:253
#, fuzzy, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
msgstr "Groep bestaan alreeds, Gebruik asb. 'n ander Groepnaam"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr ""
-
-#: ../urpmi:287
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:361
+#: ../urpmi:349
#, c-format
msgid "Updating media...\n"
msgstr ""
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Verlaat installasie"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Verlaat installasie"
-#: ../urpmi:462
+#: ../urpmi:450
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
@@ -2246,12 +2273,12 @@ msgstr ""
"geïnstalleer word:\n"
"\n"
-#: ../urpmi:465
+#: ../urpmi:453
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: ../urpmi:507
+#: ../urpmi:495
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2259,7 +2286,7 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:509
+#: ../urpmi:497
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2267,40 +2294,40 @@ msgid ""
"%s"
msgstr ""
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Wil u in elk geval voortgaan?"
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
-#: ../urpmi:524
+#: ../urpmi:512
#, fuzzy, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:525
+#: ../urpmi:513
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:542
+#: ../urpmi:530
#, fuzzy, c-format
msgid "removing package %s will break your system"
msgstr ""
"Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
"\n"
-#: ../urpmi:551
+#: ../urpmi:538
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2313,7 +2340,7 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:553
+#: ../urpmi:540
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2326,36 +2353,12 @@ msgstr ""
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has 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:561
-#, 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:563
+#: ../urpmi:548
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:583
+#: ../urpmi:568
#, fuzzy, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2363,7 +2366,7 @@ msgid ""
"%s\n"
msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
-#: ../urpmi:594
+#: ../urpmi:579
#, fuzzy, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
@@ -2376,39 +2379,39 @@ msgstr[1] ""
"geïnstalleer word:\n"
"\n"
-#: ../urpmi:610
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:617
+#: ../urpmi:602
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:618
+#: ../urpmi:603
#, c-format
msgid "%s of packages will be retrieved."
msgstr ""
-#: ../urpmi:619
+#: ../urpmi:604
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:640
+#: ../urpmi:625
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
-#: ../urpmi:648
+#: ../urpmi:633
#, fuzzy, c-format
msgid "Press Enter when mounted..."
msgstr "Druk ENTER wanneer u reg is..."
@@ -3103,6 +3106,10 @@ msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "Ondersoek medialêer '%s'....."
+
+#, fuzzy
#~ msgid " --update - create an update medium.\n"
#~ msgstr " --help - druk hierdie help boodskap.\n"