package list_modules; # $Id$
use MDK::Common;
our @ISA = qw(Exporter);
our @EXPORT = qw(load_dependencies dependencies_closure category2modules module2category sub_categories kernel_is_26 module_extension);
# the categories have 2 purposes
# - choosing modules to include on stage1's (cf update_kernel and mdk-stage1/pci-resource/update-pci-ids.pl)
# - performing a load_category or probe_category (modules.pm and many files in perl-install)
our %l = (
################################################################################
network =>
{
atm => [ qw(ambassador eni firestream fore_200e he horizon idt77252 iphase lanai nicstar zatm) ],
main => [
if_(arch() =~ /ppc/, qw(bmac ibm_emac mace oaknet sungem)),
if_(arch() =~ /^sparc/, qw(sunbmac sunhme sunqe)),
if_(arch() !~ /alpha|sparc/,
qw(3c501 3c503 3c505 3c507 3c509 3c515 3c990 3c990fx),
qw(82596 ac3200 acenic aironet4500_card amd8111e at1700 atp),
qw(b44 bcm4400 com20020-pci cs89x0 de2104x de600 de620),
qw(defxx), # most unused
qw(depca dgrs dmfe e100 e2100 eepro eepro100 eexpress epic100 eth16i),
qw(ewrk3 fealnx hamachi hp hp-plus hp100),
qw(iph5526), #- fibre channel
qw(lance natsemi ne ne2k-pci ni5010 ni52 ni65 nvnet),
qw(pcnet32 plip prism2_plx rcpci rhineget),
qw(sb1000 sis900 skfp smc-ultra smc9194 starfire),
qw(tc35815 tlan tulip typhoon uli526x via-rhine),
qw(wd winbond-840 forcedeth),
qw(sungem sunhme), # drivers for ultrasparc, but compiled in ix86 kernels...
),
qw(3c59x 8139too 8139cp sundance), #rtl8139
],
firewire => [ qw(eth1394 pcilynx) ],
gigabit => [
qw(bnx2 cxgb dl2k e1000 ixgb myri_sbus ns83820 r8169 s2io sis190 sk98lin skge spidernet tg3 via-velocity yellowfin),
qw(bcm5820 bcm5700), #- encrypted
],
raw => [
qw(ppp_generic ppp_async ppp_deflate bsd_comp),
],
pcmcia => [
qw(3c574_cs 3c589_cs axnet_cs fmvj18x_cs),
qw(ibmtr_cs nmclan_cs pcnet_cs smc91c92_cs),
qw(xirc2ps_cs xircom_cb xircom_tulip_cb),
],
#- generic NIC detection for USB seems broken (class, subclass,
#- protocol reported are not accurate) so we match network adapters against
#- known drivers :-(
usb => [
qw(catc CDCEther kaweth pegasus rtl8150 usbnet),
],
wireless => [
qw(acx100_pci adm8211 airo airo_cs aironet4500_cs aironet_cs),
qw(at76c503-i3861 at76c503-i3863 at76c503-rfmd at76c503-rfmd-acc at76c505-rfmd at76c505-rfmd2958 at76c505a-rfmd2958),
qw(ath_pci atmel_cs atmel_pci dyc_ar5),
qw(hostap_pci hostap_plx ipw2100 ipw2200 madwifi_pci netwave_cs orinoco orinoco_cs orinoco_pci orinoco_plx orinoco_tmd),
qw(prism2_cs prism2_pci prism2_usb prism54 r8180 ray_cs rt2400 rt2500 usbvnet_rfmd vt_ar5k wavelan_cs wvlan_cs zd1201),
if_(arch() =~ /ppc/, qw(airport)),
],
isdn => [
qw(avmfritz c4 cdc-acm b1pci divas hfc4s8s_l1 hfc_usb hfc4s8s_l1 hisax hisax_st5481 hisax_fcpcipnp hysdn sedlfax t1pci tpam w6692pci),
qw(fcpci fcdsl fcdsl fcdsl2 fcdslsl fcdslslusb fcdslusb fcdslusba fcusb fcusb2 fxusb fxusb_CZ)
],
modem => [
qw(ltmodem mwave ),
],
slmodem => [
qw(slamr slusb snd-ali5451 snd-atiixp-modem snd-intel8x0m snd-via82xx-modem),
],
tokenring => [ qw(3c359 abyss ibmtr lanstreamer olympic proteon skisa smctr tms380tr tmspci) ],
wan => [ qw(c101 cosa cyclomx cycx_drv dlci farsync hdlc hostess_sv11 n2 pc300 pci200syn sbni sdla sdladrv sealevel syncppp wanxl z85230) ],
usb_dsl => [ qw(cxacru eagle-usb speedtch usbatm xusbatm) ],
},
################################################################################
disk =>
{
# ide drivers compiled as modules:
ide => [ qw(aec62xx cs5520 cs5530 delkin_cb ide-generic rz1000 sc1200 slc90e66 triflex trm290) ],
# ide drivers compiled in core kernel:
all_ide => [
qw(ali14xx amd74xx dtc2278 ht6560b qd65xx umc8672 aec62xx alim15x3 atiixp cmd64x cs5520 cs5530 cy82c693),
qw(hpt34x hpt366 ns87415 opti621 pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks),
qw(siimage sis5513 slc90e66 triflex trm290 via82cxxx),
],
scsi => [
if_(arch() =~ /ppc/, qw(mesh mac53c94)),
if_(arch() =~ /^sparc/, qw(qlogicpti)),
if_(arch() !~ /alpha/ && arch() !~ /sparc/,
'53c7,8xx',
qw(AM53C974 BusLogic NCR53c406a a100u2w advansys aha152x aha1542 aha1740),
qw(atp870u dc395x dc395x_trm dmx3191d dtc g_NCR5380 in2000 initio pas16 pci2220i psi240i fdomain),
qw(qla1280 qla2x00 qla2xxx qlogicfas qlogicfc),
qw(seagate wd7000 sim710 sym53c416 t128 tmscsim u14-34f ultrastor),
qw(eata eata_pio eata_dma nsp32),
),
qw(aic7xxx aic7xxx_old aic79xx pci2000 qlogicisp sym53c8xx lpfc lpfcdd), # ncr53c8xx
],
sata => [
# note that ata_piix manage RAID devices on ICH6R
qw(ahci ata_adma ata_piix pata_pdc2027x sata_nv sata_promise sata_qstor sata_sil sata_sil24 sata_sis sata_svw sata_sx4 sata_uli sata_via sata_vsc sx8),
],
hardware_raid => [
if_(arch() =~ /^sparc/, qw(pluto)),
if_(arch() !~ /alpha/ && arch() !~ /sparc/,
# 3w-xxxx drives ATA-RAID, 3w-9xxx and arcmsr drive SATA-RAID
qw(a320raid),
qw(3w-9xxx 3w-xxxx aacraid arcmsr cciss cpqfc cpqarray DAC960 dpt_i2o gdth i2o_block ipr it821x it8212),
qw(iteraid megaraid megaraid_mbox megaraid_sas mptscsih qla2100 qla2200 qla2300 qla2322 qla4xxx qla6312 qla6322 pdc-ultra),
qw(ips ppa imm),
if_(c::kernel_version =~ /^\Q2.4/,
qw(ataraid hptraid silraid pdcraid)
),
),
],
pcmcia => [ qw(aha152x_cs fdomain_cs nsp_cs qlogic_cs ide-cs) ], #ide_cs
raw => [ qw(sd_mod) ],
usb => [ qw(usb-storage) ],
firewire => [ qw(sbp2) ],
cdrom => [ qw(ide-cd sr_mod) ],
},
################################################################################
bus =>
{
usb => [ qw(usb-uhci usb-ohci ehci-hcd uhci-hcd ohci-hcd) ],
bluetooth => [ qw(bcm203x bfusb bpa10x hci_usb) ],
firewire => [ qw(ohci1394) ],
i2c => [
qw(i2c-ali1535 i2c-ali1563 i2c-ali15x3 i2c-amd756 i2c-amd8111 i2c-i801 i2c-i810 i2c-nforce2),
qw(i2c-piix4 i2c-prosavage i2c-savage4 i2c-sis5595 i2c-sis630 i2c-sis96x i2c-via i2c-viapro i2c-voodoo3),
if_(arch() !~ /^ppc/, qw(i2c-hydra i2c-ibm_iic i2c-mpc)),
],
pcmcia => [
if_(arch() !~ /^sparc/, qw(au1x00_ss i82365 i82092 pd6729 tcic vrc4171_card vrc4173_cardu yenta_socket)), # cb_enabler
],
usb_keyboard => [ qw(usbkbd keybdev) ],
#serial_cs
#ftl_cs 3c575_cb apa1480_cb epic_cb serial_cb tulip_cb iflash2+_mtd iflash2_mtd
#cb_enabler
},
fs =>
{
network => [ qw(af_packet nfs) ],
cdrom => [ qw(isofs) ],
loopback => [ qw(isofs loop cryptoloop gzloop), if_($ENV{MOVE}, qw(supermount)) ],
local => [
if_(arch() =~ /^i.86|x86_64/, qw(vfat ntfs)),
if_(arch() =~ /^ppc/, qw(hfs)),
qw(reiserfs),
],
various => [ qw(smbfs romfs ext3 xfs jfs ufs ntfs) ],
},
################################################################################
multimedia =>
{
sound => [
if_(arch() =~ /ppc/, qw(dmasound_pmac snd-powermac)),
if_(arch() =~ /sparc/, qw(snd-sun-amd7930 snd-sun-cs4231 snd-sun-dbri)),
if_(arch() !~ /^sparc/,
qw(ad1816 ad1848 ad1889 ali5455 audigy audio awe_wave cmpci cs4232 cs4281 cs46xx),
qw(emu10k1 es1370 es1371 esssolo1 forte gus i810_audio ice1712 kahlua mad16 maestro),
qw(maestro3 mpu401 msnd_pinnacle nm256_audio nvaudio opl3 opl3sa opl3sa2 pas2 pss),
qw(rme96xx sam9407 sb sgalaxy snd-ad1816a snd-ad1848 snd-ad1889 snd-ali5451 snd-als100),
qw(snd-als4000 snd-atiixp snd-au8810 snd-au8820 snd-au8830 snd-audigyls snd-azt2320 snd-azt3328 snd-azx),
qw(snd-bt87x snd-ca0106 snd-cmi8330 snd-cmipci snd-cs4231 snd-cs4232 snd-cs4236 snd-cs4281),
qw(snd-cs46xx snd-darla20 snd-darla24 snd-dt019x snd-emu10k1 snd-emu10k1x snd-ens1370 snd-ens1371 snd-es1688 snd-es18xx),
qw(snd-es1938 snd-es1968 snd-es968 snd-fm801 snd-gina20 snd-gina24 snd-gina3g snd-gusclassic snd-gusextreme),
qw(snd-gusmax snd-hda-intel snd-hdsp snd-hdspm snd-ice1712 snd-ice1724 snd-indi snd-indigo snd-indigodj snd-indigoio snd-intel8x0 snd-interwave),
qw(snd-interwave-stb snd-korg1212 snd-layla20 snd-layla24 snd-layla3g snd-maestro3 snd-mia snd-mixart snd-mona snd-mpu401 snd-nm256),
qw(snd-opl3sa2 snd-opti92x-ad1848 snd-opti92x-cs4231 snd-opti93x snd-pcxhr snd-riptide snd-rme32),
qw(snd-rme96 snd-rme9652 snd-sb16 snd-sb8 snd-sbawe snd-sgalaxy snd-sonicvibes),
qw(snd-sscape snd-trident snd-via82xx snd-vx222 snd-vxp440 snd-vxpocket snd-wavefront),
qw(snd-ymfpci sonicvibes sscape trident via82cxxx_audio wavefront ymfpci),
),
],
tv => [ qw(bt878 bttv cx8800 cx88-blackbird dpc7146 ivtv saa7134 zr36067) ],
dvb => [ qw(budget budget-av budget-ci cinergyT2 dvb-ttusb-budget dvb-usb-a800 dvb-dibusb dvb-usb-dibusb-mb dvb-ttpci dvb-usb-digitv dvb-usb-dtt200u dvb-usb-nova-t-usb2 dvb-usb-umt-010 dvb-usb-vp7045 hexium_orion hexium_gemini pluto2 skystar2) ],
photo => [ qw(dc2xx mdc800) ],
radio => [ qw(radio-gemtek-pci radio-maxiradio) ],
scanner => [ qw(scanner microtek) ],
gameport => [ qw(cs461x ns558 emu10k1-gp fm801-gp lightning ns558 vortex) ],
usb_sound => [ qw(audio dabusb dsbr100 snd-usb-audio snd-usb-usx2y usb-midi) ],
webcam => [ qw(cpia_usb cyber2000fb ibmcam konicawc mod_quickcam ov511 ov511-alt ov518_decomp ovfx2 pwc quickcam se401 stv680 sn9c102 ultracam usbvideo usbvision vicam w9968cf) ],
},
# USB input stuff get automagically loaded by hotplug and thus
# magically work through /dev/input/mice multiplexing:
input => {
joystick => [
qw(iforce xpad),
# there're more drivers in drivers/input/joystick but they support non USB or PCI devices
# and thus cannot be detected but by slow (and maybe dangerous?) load_category:
qw(a3d adi analog cobra db9 gamecon gf2k grip grip_mp guillemot interact),
qw(joydump magellan sidewinder spaceball spaceorb stinger tmdc turbografx warrior)
],
remote => [ qw(ati_remote) ],
# USB tablets and touchscreens:
tablet => [ qw(acecad aiptek wacom kbtab) ],
touchscreen => [ qw(ads7846_ts gunze hp680_ts_input itmtouch mk712 mtouch mtouchusb touchkitusb) ],
},
various =>
# just here for classification, unused categories (nor auto-detect, nor load_thiskind)
{
raid => [
qw(dm-crypt dm-mirror dm-mod linear lvm-mod multipath raid0 raid1 raid10 raid5),
],
mouse => [
qw(atixlmouse busmouse generic_serial inport logibm logibusmouse msbusmouse pcips2 qpmouse synclinkmp),
if_(arch() =~ /ppc/, 'macserial'),
qw(hid mousedev usbhid usbmouse),
],
char => [
if_(arch() =~ /ia64/, qw(efivars)),
qw(applicom n_r3964 nvram pc110pad ppdev),
qw(wdt_pci i810-tco sx), #- what are these???
],
crypto => [
qw(amd768_rng amd7xx_tco i810_rng hw_random leedslite padlock),
],
laptop => [
qw(i8k sonypi toshiba),
],
serial => [
qw(8250_pci 8250 epca esp isicom istallion moxa mxser stallion sx synclink synclinkmp),
],
other => [
qw(defxx i810fb ide-floppy ide-scsi ide-tape loop lp nbd sg st),
qw(parport_pc parport_serial),
qw(btaudio),
arch() =~ /i.86/ ? 'aes-i586' : 'aes',
if_(arch() =~ /sparc/, 'openprom'),
qw(evdev), qw(usblp printer), 'floppy',
#- these need checking
qw(rrunner meye),
],
agpgart => [
if_(arch() =~ /alpha/, qw(alpha-agp)),
if_(arch() =~ /ia64/, qw(hp-agp i460-agp)),
if_(arch() =~ /ppc/, qw(uninorth-agp)),
qw(ali-agp amd64-agp amd-k7-agp ati-agp efficeon-agp intel-agp),
qw(k7-agp mch-agp nvidia-agp sis-agp sworks-agp via-agp),
],
},
);
my %dependencies;
sub load_dependencies {
my ($file) = @_;
%dependencies = map {
my ($f, $deps) = split ':';
$f => [ split ' ', $deps ];
} cat_($file);
}
sub dependencies_closure {
my @l = map { dependencies_closure($_) } @{$dependencies{$_[0]} || []};
(@l, $_[0]);
}
sub category2modules {
map {
my ($t1, $t2s) = m|(.*)/(.*)|;
my @sub = $t2s eq '*' ? keys %{$l{$t1}} : split('\|', $t2s);
map {
my $l = $l{$t1}{$_} or die "bad category $t1/$_\n" . backtrace();
@$l;
} @sub;
} split(' ', $_[0]);
}
sub all_modules() {
map { @$_ } map { values %$_ } values %l;
}
sub module2category {
my ($module) = @_;
foreach my $t1 (keys %l) {
my $h = $l{$t1};
foreach my $t2 (keys %$h) {
$module eq $_ and return "$t1/$t2" foreach @{$h->{$t2}};
}
}
return;
}
sub ethernet_categories() {
'network/main|gigabit|pcmcia|tokenring|usb|wireless|firewire';
}
sub sub_categories {
my ($t1) = @_;
keys %{$l{$t1}};
}
sub kernel_is_26 { $_[0] =~ /^2\.6/ }
sub module_extension { kernel_is_26($_[0]) ? 'ko' : 'o' }
1;
printerdrake.pm:1151 printer/printerdrake.pm:1195 printer/printerdrake.pm:1199 printer/printerdrake.pm:1213 printer/printerdrake.pm:1303 printer/printerdrake.pm:1383 printer/printerdrake.pm:1387 printer/printerdrake.pm:1391 printer/printerdrake.pm:1440 printer/printerdrake.pm:1497 printer/printerdrake.pm:1501 printer/printerdrake.pm:1515 printer/printerdrake.pm:1625 printer/printerdrake.pm:1629 printer/printerdrake.pm:1666 printer/printerdrake.pm:1731 printer/printerdrake.pm:1749 printer/printerdrake.pm:1758 printer/printerdrake.pm:1767 printer/printerdrake.pm:1778 printer/printerdrake.pm:1840 printer/printerdrake.pm:2285 printer/printerdrake.pm:2551 printer/printerdrake.pm:2557 printer/printerdrake.pm:3010 printer/printerdrake.pm:3014 printer/printerdrake.pm:3018 printer/printerdrake.pm:3421 printer/printerdrake.pm:3665 printer/printerdrake.pm:3678 printer/printerdrake.pm:3818 printer/printerdrake.pm:3910 standalone/drakTermServ:400 standalone/drakTermServ:753 standalone/drakTermServ:760 standalone/drakTermServ:955 standalone/drakTermServ:1425 standalone/drakTermServ:1430 standalone/drakTermServ:1437 standalone/drakTermServ:1448 standalone/drakTermServ:1470 standalone/drakauth:36 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1822 standalone/drakbackup:2431 standalone/drakbackup:4121 standalone/drakbackup:4341 standalone/drakboot:244 standalone/drakbug:236 standalone/drakbug:255 standalone/drakbug:261 standalone/drakconnect:620 standalone/drakconnect:623 standalone/drakconnect:642 standalone/drakfloppy:296 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:602 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:105 standalone/logdrake:168 standalone/logdrake:436 standalone/logdrake:441 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:688 standalone/scannerdrake:699 standalone/scannerdrake:838 standalone/scannerdrake:849 standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121+#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664 diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:221 diskdrake/interactive.pm:234 diskdrake/interactive.pm:375 diskdrake/interactive.pm:390 diskdrake/interactive.pm:513 diskdrake/interactive.pm:518 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:161 install_steps.pm:82 install_steps_interactive.pm:39 interactive/http.pm:117 interactive/http.pm:118 network/netconnect.pm:933 network/netconnect.pm:936 network/netconnect.pm:975 network/netconnect.pm:979 network/netconnect.pm:1072 network/netconnect.pm:1077 network/netconnect.pm:1095 network/netconnect.pm:1279 printer/printerdrake.pm:210 printer/printerdrake.pm:217 printer/printerdrake.pm:242 printer/printerdrake.pm:388 printer/printerdrake.pm:393 printer/printerdrake.pm:406 printer/printerdrake.pm:416 printer/printerdrake.pm:1048 printer/printerdrake.pm:1095 printer/printerdrake.pm:1132 printer/printerdrake.pm:1176 printer/printerdrake.pm:1180 printer/printerdrake.pm:1194 printer/printerdrake.pm:1284 printer/printerdrake.pm:1364 printer/printerdrake.pm:1368 printer/printerdrake.pm:1372 printer/printerdrake.pm:1421 printer/printerdrake.pm:1478 printer/printerdrake.pm:1482 printer/printerdrake.pm:1496 printer/printerdrake.pm:1606 printer/printerdrake.pm:1610 printer/printerdrake.pm:1647 printer/printerdrake.pm:1712 printer/printerdrake.pm:1730 printer/printerdrake.pm:1739 printer/printerdrake.pm:1748 printer/printerdrake.pm:1759 printer/printerdrake.pm:1821 printer/printerdrake.pm:2266 printer/printerdrake.pm:2530 printer/printerdrake.pm:2536 printer/printerdrake.pm:2989 printer/printerdrake.pm:2993 printer/printerdrake.pm:2997 printer/printerdrake.pm:3400 printer/printerdrake.pm:3646 printer/printerdrake.pm:3659 printer/printerdrake.pm:3792 printer/printerdrake.pm:3879 standalone/drakTermServ:400 standalone/drakTermServ:753 standalone/drakTermServ:760 standalone/drakTermServ:955 standalone/drakTermServ:1425 standalone/drakTermServ:1430 standalone/drakTermServ:1437 standalone/drakTermServ:1448 standalone/drakTermServ:1470 standalone/drakauth:36 standalone/drakbackup:512 standalone/drakbackup:626 standalone/drakbackup:1128 standalone/drakbackup:1161 standalone/drakbackup:1665 standalone/drakbackup:1822 standalone/drakbackup:2431 standalone/drakbackup:4121 standalone/drakbackup:4341 standalone/drakbug:235 standalone/drakbug:254 standalone/drakbug:260 standalone/drakconnect:620 standalone/drakconnect:623 standalone/drakconnect:642 standalone/drakfloppy:296 standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223 standalone/drakfont:259 standalone/drakfont:602 standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:105 standalone/logdrake:168 standalone/logdrake:436 standalone/logdrake:441 standalone/scannerdrake:58 standalone/scannerdrake:200 standalone/scannerdrake:259 standalone/scannerdrake:688 standalone/scannerdrake:699 standalone/scannerdrake:838 standalone/scannerdrake:849 standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
msgstr ""
@@ -339,12 +339,12 @@ msgid ""
"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
msgstr ""
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:860
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:891
#, c-format
msgid "Custom"
msgstr ""
-#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:82 printer/printerdrake.pm:608 printer/printerdrake.pm:4077 standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:173 standalone/net_applet:143 standalone/scannerdrake:450
+#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14 install_steps_interactive.pm:89 printer/printerdrake.pm:603 printer/printerdrake.pm:4039 standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:173 standalone/net_applet:140 standalone/scannerdrake:450
#, c-format
msgid "Quit"
msgstr ""
@@ -470,17 +470,17 @@ msgstr ""
msgid "Graphics card: %s"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:283 interactive.pm:403 interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:3978 standalone/drakbackup:4038 standalone/drakbackup:4082 standalone/drakconnect:164 standalone/drakconnect:797 standalone/drakconnect:884 standalone/drakconnect:983 standalone/drakroam:346 standalone/drakups:194 standalone/net_monitor:353 ugtk2.pm:417 ugtk2.pm:515 ugtk2.pm:1117 ugtk2.pm:1140
+#: Xconfig/resolution_and_depth.pm:283 interactive.pm:403 interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:156 interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172 standalone/drakbackup:3978 standalone/drakbackup:4038 standalone/drakbackup:4082 standalone/drakconnect:164 standalone/drakconnect:797 standalone/drakconnect:884 standalone/drakconnect:983 standalone/drakroam:388 standalone/drakups:194 standalone/net_monitor:352 ugtk2.pm:417 ugtk2.pm:515 ugtk2.pm:1120 ugtk2.pm:1143
#, c-format
msgid "Ok"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:283 any.pm:910 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:487 install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:764 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3088 standalone/drakautoinst:217 standalone/drakbackup:3904 standalone/drakbackup:3908 standalone/drakbackup:3966 standalone/drakconnect:163 standalone/drakconnect:882 standalone/drakconnect:982 standalone/drakfont:665 standalone/drakfont:742 standalone/drakups:201 standalone/logdrake:173 standalone/net_monitor:352 ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1117
+#: Xconfig/resolution_and_depth.pm:283 any.pm:941 diskdrake/smbnfs_gtk.pm:81 help.pm:89 help.pm:444 install_steps_gtk.pm:449 install_steps_interactive.pm:794 interactive.pm:404 interactive/gtk.pm:764 interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:307 interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142 interactive/stdio.pm:176 printer/printerdrake.pm:3067 standalone/drakautoinst:217 standalone/drakbackup:3904 standalone/drakbackup:3908 standalone/drakbackup:3966 standalone/drakconnect:163 standalone/drakconnect:882 standalone/drakconnect:982 standalone/drakfont:665 standalone/drakfont:742 standalone/drakups:201 standalone/logdrake:173 standalone/net_monitor:351 ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1120
#, c-format
msgid "Cancel"
msgstr ""
-#: Xconfig/resolution_and_depth.pm:283 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:266 install_steps_gtk.pm:673 interactive.pm:498 interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:300 standalone/drakbackup:3900 standalone/drakbug:129 standalone/drakconnect:159 standalone/drakconnect:238 standalone/drakfont:512 standalone/drakperm:133 standalone/draksec:309 standalone/harddrake2:261 ugtk2.pm:1230 ugtk2.pm:1231
+#: Xconfig/resolution_and_depth.pm:283 diskdrake/hd_gtk.pm:153 install_steps_gtk.pm:228 install_steps_gtk.pm:651 interactive.pm:498 interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:300 standalone/drakbackup:3900 standalone/drakbug:128 standalone/drakconnect:159 standalone/drakconnect:238 standalone/drakfont:512 standalone/drakperm:133 standalone/draksec:309 standalone/harddrake2:261 ugtk2.pm:1233 ugtk2.pm:1234
#, c-format
msgid "Help"
msgstr ""
@@ -624,17 +624,33 @@ msgstr ""
msgid "What norm is your TV using?"
msgstr ""
-#: any.pm:97 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:228 standalone/drakconnect:166 standalone/draksec:64 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:211 standalone/service_harddrake:163
+#: any.pm:114 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227 standalone/drakconnect:166 standalone/draksec:64 standalone/drakups:90 standalone/drakxtv:90 standalone/harddrake2:211 standalone/service_harddrake:166
#, c-format
msgid "Please wait"
msgstr ""
-#: any.pm:97
+#: any.pm:114
#, c-format
msgid "Bootloader installation in progress"
msgstr ""
-#: any.pm:136
+#: any.pm:123
+#, c-format
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr ""
+
+#: any.pm:128
+#, c-format
+msgid ""
+"You may need to change your Open Firmware boot-device to\n"
+" enable the bootloader. If you don't see the bootloader prompt at\n"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+
+#: any.pm:165
#, c-format
msgid ""
"You decided to install the bootloader on a partition.\n"
@@ -643,391 +659,391 @@ msgid ""
"On which drive are you booting?"
msgstr ""
-#: any.pm:159 help.pm:739
+#: any.pm:188 help.pm:739
#, c-format
msgid "First sector of drive (MBR)"
msgstr ""
-#: any.pm:160
+#: any.pm:189
#, c-format
msgid "First sector of the root partition"
msgstr ""
-#: any.pm:162
+#: any.pm:191
#, c-format
msgid "On Floppy"
msgstr ""
-#: any.pm:164 help.pm:739 printer/printerdrake.pm:3418
+#: any.pm:193 help.pm:739 printer/printerdrake.pm:3397
#, c-format
msgid "Skip"
msgstr ""
-#: any.pm:168
+#: any.pm:197
#, c-format
msgid "LILO/grub Installation"
msgstr ""
-#: any.pm:169
+#: any.pm:198
#, c-format
msgid "Where do you want to install the bootloader?"
msgstr ""
-#: any.pm:195
+#: any.pm:223 standalone/drakboot:296
#, c-format
msgid "Boot Style Configuration"
msgstr ""
-#: any.pm:197 any.pm:232
+#: any.pm:225 any.pm:259
#, c-format
msgid "Bootloader main options"
msgstr ""
-#: any.pm:201
+#: any.pm:229
#, c-format
msgid "Give the ram size in MB"
msgstr ""
-#: any.pm:203
+#: any.pm:231
#, c-format
msgid "Option ``Restrict command line options'' is of no use without a password"
msgstr ""
-#: any.pm:204 any.pm:532 install_steps_interactive.pm:1163
+#: any.pm:232 any.pm:562 install_steps_interactive.pm:1173
#, c-format
msgid "The passwords do not match"
msgstr ""
-#: any.pm:204 any.pm:532 diskdrake/interactive.pm:1259 install_steps_interactive.pm:1163
+#: any.pm:232 any.pm:562 diskdrake/interactive.pm:1259 install_steps_interactive.pm:1173
#, c-format
msgid "Please try again"
msgstr ""
-#: any.pm:209 any.pm:235
+#: any.pm:237 any.pm:262
#, c-format
msgid "Bootloader to use"
msgstr ""
-#: any.pm:211 any.pm:237
+#: any.pm:239 any.pm:264
#, c-format
msgid "Boot device"
msgstr ""
-#: any.pm:213
+#: any.pm:241
#, c-format
msgid "Delay before booting default image"
msgstr ""
-#: any.pm:214
+#: any.pm:242
#, c-format
msgid "Enable ACPI"
msgstr ""
-#: any.pm:216
+#: any.pm:244
#, c-format
msgid "Force no APIC"
msgstr ""
-#: any.pm:218
+#: any.pm:246
#, c-format
msgid "Force No Local APIC"
msgstr ""
-#: any.pm:220 any.pm:559 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1168 network/netconnect.pm:565 printer/printerdrake.pm:1374 printer/printerdrake.pm:1494 standalone/drakbackup:1647 standalone/drakbackup:3506 standalone/drakups:278
+#: any.pm:248 any.pm:589 diskdrake/smbnfs_gtk.pm:180 install_steps_interactive.pm:1178 network/netconnect.pm:569 printer/printerdrake.pm:1355 printer/printerdrake.pm:1475 standalone/drakbackup:1647 standalone/drakbackup:3506 standalone/drakups:278
#, c-format
msgid "Password"
msgstr ""
-#: any.pm:221 any.pm:560 install_steps_interactive.pm:1169
+#: any.pm:249 any.pm:590 install_steps_interactive.pm:1179
#, c-format
msgid "Password (again)"
msgstr ""
-#: any.pm:222
+#: any.pm:250
#, c-format
msgid "Restrict command line options"
msgstr ""
-#: any.pm:222
+#: any.pm:250
#, c-format
msgid "restrict"
msgstr ""
-#: any.pm:224
+#: any.pm:252
#, c-format
msgid "Clean /tmp at each boot"
msgstr ""
-#: any.pm:225
+#: any.pm:253
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr ""
-#: any.pm:227
-#, c-format
-msgid "Enable multiple profiles"
-msgstr ""
-
-#: any.pm:236
+#: any.pm:263
#, c-format
msgid "Init Message"
msgstr ""
-#: any.pm:238
+#: any.pm:265
#, c-format
msgid "Open Firmware Delay"
msgstr ""
-#: any.pm:239
+#: any.pm:266
#, c-format
msgid "Kernel Boot Timeout"
msgstr ""
-#: any.pm:240
+#: any.pm:267
#, c-format
msgid "Enable CD Boot?"
msgstr ""
-#: any.pm:241
+#: any.pm:268
#, c-format
msgid "Enable OF Boot?"
msgstr ""
-#: any.pm:242
+#: any.pm:269
#, c-format
msgid "Default OS?"
msgstr ""
-#: any.pm:288
+#: any.pm:316
#, c-format
msgid "Image"
msgstr ""
-#: any.pm:289 any.pm:298
+#: any.pm:317 any.pm:327
#, c-format
msgid "Root"
msgstr ""
-#: any.pm:290 any.pm:311
+#: any.pm:318 any.pm:340
#, c-format
msgid "Append"
msgstr ""
-#: any.pm:292
+#: any.pm:320 standalone/drakboot:298 standalone/drakboot:302
#, c-format
msgid "Video mode"
msgstr ""
-#: any.pm:294
+#: any.pm:322
#, c-format
msgid "Initrd"
msgstr ""
-#: any.pm:303 any.pm:308 any.pm:310
+#: any.pm:323
+#, c-format
+msgid "Network profile"
+msgstr ""
+
+#: any.pm:332 any.pm:337 any.pm:339
#, c-format
msgid "Label"
msgstr ""
-#: any.pm:305 any.pm:315 harddrake/v4l.pm:275 standalone/drakfloppy:83 standalone/drakfloppy:89 standalone/draksec:48
+#: any.pm:334 any.pm:344 harddrake/v4l.pm:275 standalone/drakfloppy:83 standalone/drakfloppy:89 standalone/draksec:48
#, c-format
msgid "Default"
msgstr ""
-#: any.pm:312
+#: any.pm:341
#, c-format
msgid "Initrd-size"
msgstr ""
-#: any.pm:314
+#: any.pm:343
#, c-format
msgid "NoVideo"
msgstr ""
-#: any.pm:325
+#: any.pm:354
#, c-format
msgid "Empty label not allowed"
msgstr ""
-#: any.pm:326
+#: any.pm:355
#, c-format
msgid "You must specify a kernel image"
msgstr ""
-#: any.pm:326
+#: any.pm:355
#, c-format
msgid "You must specify a root partition"
msgstr ""
-#: any.pm:327
+#: any.pm:356
#, c-format
msgid "This label is already used"
msgstr ""
-#: any.pm:340
+#: any.pm:370
#, c-format
msgid "Which type of entry do you want to add?"
msgstr ""
-#: any.pm:341
+#: any.pm:371
#, c-format
msgid "Linux"
msgstr ""
-#: any.pm:341
+#: any.pm:371
#, c-format
msgid "Other OS (SunOS...)"
msgstr ""
-#: any.pm:342
+#: any.pm:372
#, c-format
msgid "Other OS (MacOS...)"
msgstr ""
-#: any.pm:342
+#: any.pm:372
#, c-format
msgid "Other OS (Windows...)"
msgstr ""
-#: any.pm:370
+#: any.pm:400
#, c-format
msgid ""
"Here are the entries on your boot menu so far.\n"
"You can create additional entries or change the existing ones."
msgstr ""
-#: any.pm:518
+#: any.pm:548
#, c-format
msgid "access to X programs"
msgstr ""
-#: any.pm:519
+#: any.pm:549
#, c-format
msgid "access to rpm tools"
msgstr ""
-#: any.pm:520
+#: any.pm:550
#, c-format
msgid "allow \"su\""
msgstr ""
-#: any.pm:521
+#: any.pm:551
#, c-format
msgid "access to administrative files"
msgstr ""
-#: any.pm:522
+#: any.pm:552
#, c-format
msgid "access to network tools"
msgstr ""
-#: any.pm:523
+#: any.pm:553
#, c-format
msgid "access to compilation tools"
msgstr ""
-#: any.pm:528
+#: any.pm:558
#, c-format
msgid "(already added %s)"
msgstr ""
-#: any.pm:533
+#: any.pm:563
#, c-format
msgid "This password is too simple"
msgstr ""
-#: any.pm:534
+#: any.pm:564
#, c-format
msgid "Please give a user name"
msgstr ""
-#: any.pm:535
+#: any.pm:565
#, c-format
msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
-#: any.pm:536
+#: any.pm:566
#, c-format
msgid "The user name is too long"
msgstr ""
-#: any.pm:537
+#: any.pm:567
#, c-format
msgid "This user name has already been added"
msgstr ""
-#: any.pm:541
+#: any.pm:571
#, c-format
msgid "Add user"
msgstr ""
-#: any.pm:542
+#: any.pm:572
#, c-format
msgid ""
"Enter a user\n"
"%s"
msgstr ""
-#: any.pm:545 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:165 printer/printerdrake.pm:352 printer/printerdrake.pm:4077 standalone/drakbackup:2719 standalone/scannerdrake:641 standalone/scannerdrake:791
+#: any.pm:575 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157 diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530 interactive/http.pm:151 printer/printerdrake.pm:163 printer/printerdrake.pm:348 printer/printerdrake.pm:4039 standalone/drakbackup:2719 standalone/scannerdrake:641 standalone/scannerdrake:791
#, c-format
msgid "Done"
msgstr ""
-#: any.pm:546 help.pm:51
+#: any.pm:576 help.pm:51
#, c-format
msgid "Accept user"
msgstr ""
-#: any.pm:557
+#: any.pm:587
#, c-format
msgid "Real name"
msgstr ""
-#: any.pm:558 help.pm:51 printer/printerdrake.pm:1373 printer/printerdrake.pm:1493
+#: any.pm:588 help.pm:51 printer/printerdrake.pm:1354 printer/printerdrake.pm:1474
#, c-format
msgid "User name"
msgstr ""
-#: any.pm:561
+#: any.pm:591
#, c-format
msgid "Shell"
msgstr ""
-#: any.pm:563
+#: any.pm:593
#, c-format
msgid "Icon"
msgstr ""
-#: any.pm:610 security/l10n.pm:14
+#: any.pm:640 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr ""
-#: any.pm:611
+#: any.pm:641
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr ""
-#: any.pm:612 help.pm:51
+#: any.pm:642 help.pm:51
#, c-format
msgid "Do you want to use this feature?"
msgstr ""
-#: any.pm:613
+#: any.pm:643
#, c-format
msgid "Choose the default user:"
msgstr ""
-#: any.pm:614
+#: any.pm:644
#, c-format
msgid "Choose the window manager to run:"
msgstr ""
-#: any.pm:626
+#: any.pm:656
#, c-format
msgid "Please choose a language to use."
msgstr ""
-#: any.pm:653
+#: any.pm:683
#, c-format
msgid ""
"Mandrakelinux can support multiple languages. Select\n"
@@ -1035,57 +1051,57 @@ msgid ""
"when your installation is complete and you restart your system."
msgstr ""
-#: any.pm:671 help.pm:647
+#: any.pm:701 help.pm:647
#, c-format
msgid "Use Unicode by default"
msgstr ""
-#: any.pm:672 help.pm:647
+#: any.pm:702 help.pm:647
#, c-format
msgid "All languages"
msgstr ""
-#: any.pm:711 help.pm:566 help.pm:855 install_steps_interactive.pm:907
+#: any.pm:742 help.pm:566 help.pm:855 install_steps_interactive.pm:914
#, c-format
msgid "Country / Region"
msgstr ""
-#: any.pm:712
+#: any.pm:743
#, c-format
msgid "Please choose your country."
msgstr ""
-#: any.pm:714
+#: any.pm:745
#, c-format
msgid "Here is the full list of available countries"
msgstr ""
-#: any.pm:715
+#: any.pm:746
#, c-format
msgid "Other Countries"
msgstr ""
-#: any.pm:723
+#: any.pm:754
#, c-format
msgid "Input method:"
msgstr ""
-#: any.pm:724 install_any.pm:376 printer/printerdrake.pm:93
+#: any.pm:755 install_any.pm:374 printer/printerdrake.pm:92
#, c-format
msgid "None"
msgstr ""
-#: any.pm:860
+#: any.pm:891
#, c-format
msgid "No sharing"
msgstr ""
-#: any.pm:860
+#: any.pm:891
#, c-format
msgid "Allow all users"
msgstr ""
-#: any.pm:864
+#: any.pm:895
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -1095,27 +1111,27 @@ msgid ""
""
msgstr ""
-#: any.pm:876
+#: any.pm:907
#, c-format
msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
msgstr ""
-#: any.pm:879
+#: any.pm:910
#, c-format
msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
msgstr ""
-#: any.pm:887
+#: any.pm:918
#, c-format
msgid "You can export using NFS or SMB. Please select which you would like to use."
msgstr ""
-#: any.pm:910
+#: any.pm:941
#, c-format
msgid "Launch userdrake"
msgstr ""
-#: any.pm:912
+#: any.pm:943
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -1252,7 +1268,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: authentication.pm:86 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:86 diskdrake/dav.pm:63 help.pm:146 share/compssUsers.pl:8
#, c-format
msgid "Server"
msgstr ""
@@ -1338,7 +1354,7 @@ msgid "Can't use broadcast with no NIS domain"
msgstr ""
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:644
+#: bootloader.pm:658
#, c-format
msgid ""
"Welcome to the operating system chooser!\n"
@@ -1349,49 +1365,49 @@ msgid ""
""
msgstr ""
-#: bootloader.pm:758
+#: bootloader.pm:772
#, c-format
msgid "LILO with graphical menu"
msgstr ""
-#: bootloader.pm:759
+#: bootloader.pm:773
#, c-format
msgid "LILO with text menu"
msgstr ""
-#: bootloader.pm:760
+#: bootloader.pm:774
#, c-format
msgid "Grub"
msgstr ""
-#: bootloader.pm:761
+#: bootloader.pm:775
#, c-format
msgid "Yaboot"
msgstr ""
-#: bootloader.pm:842
+#: bootloader.pm:837
#, c-format
msgid "not enough room in /boot"
msgstr ""
-#: bootloader.pm:1255
+#: bootloader.pm:1250
#, c-format
msgid ""
"You can't install the bootloader on a %s partition\n"
""
msgstr ""
-#: bootloader.pm:1300
+#: bootloader.pm:1295
#, c-format
msgid "Your bootloader configuration must be updated because partition has been renumbered"
msgstr ""
-#: bootloader.pm:1315
+#: bootloader.pm:1310
#, c-format
msgid "The bootloader can't be installed correctly. You have to boot rescue and choose \"%s\""
msgstr ""
-#: bootloader.pm:1316
+#: bootloader.pm:1311
#, c-format
msgid "Re-install Boot Loader"
msgstr ""
@@ -1451,62 +1467,62 @@ msgstr ""
msgid "consolehelper missing"
msgstr ""
-#: crypto.pm:14 crypto.pm:28 lang.pm:241 network/adsl_consts.pm:133 network/adsl_consts.pm:144 network/adsl_consts.pm:154 network/adsl_consts.pm:164 network/adsl_consts.pm:174 network/adsl_consts.pm:185 network/adsl_consts.pm:196 network/adsl_consts.pm:206 network/adsl_consts.pm:216 network/netconnect.pm:47
+#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:133 network/adsl_consts.pm:144 network/adsl_consts.pm:154 network/adsl_consts.pm:164 network/adsl_consts.pm:174 network/adsl_consts.pm:185 network/adsl_consts.pm:196 network/adsl_consts.pm:206 network/adsl_consts.pm:216 network/netconnect.pm:47
#, c-format
msgid "France"
msgstr ""
-#: crypto.pm:15 lang.pm:217
+#: crypto.pm:15 lang.pm:229
#, c-format
msgid "Costa Rica"
msgstr ""
-#: crypto.pm:16 crypto.pm:29 lang.pm:189 network/adsl_consts.pm:43 network/adsl_consts.pm:50 network/adsl_consts.pm:61 network/adsl_consts.pm:69 network/netconnect.pm:50
+#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:43 network/adsl_consts.pm:50 network/adsl_consts.pm:61 network/adsl_consts.pm:69 network/netconnect.pm:50
#, c-format
msgid "Belgium"
msgstr ""
-#: crypto.pm:17 crypto.pm:30 lang.pm:222
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
#, c-format
msgid "Czech Republic"
msgstr ""
-#: crypto.pm:18 crypto.pm:31 lang.pm:223 network/adsl_consts.pm:234 network/adsl_consts.pm:242
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:234 network/adsl_consts.pm:242
#, c-format
msgid "Germany"
msgstr ""
-#: crypto.pm:19 crypto.pm:32 lang.pm:254 network/adsl_consts.pm:252
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:252
#, c-format
msgid "Greece"
msgstr ""
-#: crypto.pm:20 crypto.pm:33 lang.pm:327
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
#, c-format
msgid "Norway"
msgstr ""
-#: crypto.pm:21 crypto.pm:34 lang.pm:356 network/adsl_consts.pm:358
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:358
#, c-format
msgid "Sweden"
msgstr ""
-#: crypto.pm:22 crypto.pm:36 lang.pm:326 network/adsl_consts.pm:303 network/netconnect.pm:48
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:303 network/netconnect.pm:48
#, c-format
msgid "Netherlands"
msgstr ""
-#: crypto.pm:23 crypto.pm:37 lang.pm:274 network/adsl_consts.pm:276 network/adsl_consts.pm:286 network/adsl_consts.pm:293 network/netconnect.pm:49 standalone/drakxtv:45
+#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:276 network/adsl_consts.pm:286 network/adsl_consts.pm:293 network/netconnect.pm:49 standalone/drakxtv:45
#, c-format
msgid "Italy"
msgstr ""
-#: crypto.pm:24 crypto.pm:38 lang.pm:182 network/adsl_consts.pm:28 network/adsl_consts.pm:36
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:28 network/adsl_consts.pm:36
#, c-format
msgid "Austria"
msgstr ""
-#: crypto.pm:35 crypto.pm:65 lang.pm:390 network/netconnect.pm:51
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
#, c-format
msgid "United States"
msgstr ""
@@ -1600,7 +1616,7 @@ msgstr ""
msgid "Please click on a partition"
msgstr ""
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474 standalone/drakbackup:2954 standalone/drakbackup:3014
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:471 standalone/drakbackup:2954 standalone/drakbackup:3014
#, c-format
msgid "Details"
msgstr ""
@@ -1640,7 +1656,7 @@ msgstr ""
msgid "Windows"
msgstr ""
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:326 mouse.pm:167 services.pm:164 standalone/drakbackup:1603 standalone/drakperm:249
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:287 mouse.pm:167 services.pm:164 standalone/drakbackup:1603 standalone/drakperm:249
#, c-format
msgid "Other"
msgstr ""
@@ -1731,7 +1747,7 @@ msgstr ""
msgid "Do you want to save /etc/fstab modifications"
msgstr ""
-#: diskdrake/interactive.pm:283 install_steps_interactive.pm:306
+#: diskdrake/interactive.pm:283 install_steps_interactive.pm:313
#, c-format
msgid "You need to reboot for the partition table modifications to take place"
msgstr ""
@@ -1746,7 +1762,7 @@ msgstr ""
msgid "Auto allocate"
msgstr ""
-#: diskdrake/interactive.pm:298 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:117
+#: diskdrake/interactive.pm:298 help.pm:530 help.pm:566 help.pm:606 help.pm:855 install_steps_interactive.pm:124
#, c-format
msgid "More"
msgstr ""
@@ -1808,7 +1824,7 @@ msgid ""
"Still continue?"
msgstr ""
-#: diskdrake/interactive.pm:384 harddrake/sound.pm:246 keyboard.pm:340 network/netconnect.pm:444 network/netconnect.pm:463 printer/printerdrake.pm:936 printer/printerdrake.pm:1891 printer/printerdrake.pm:1953 printer/printerdrake.pm:1987 printer/printerdrake.pm:2291 printer/printerdrake.pm:3149 printer/printerdrake.pm:3426 printer/printerdrake.pm:3546 printer/printerdrake.pm:4544 standalone/drakTermServ:336 standalone/drakTermServ:1067 standalone/drakTermServ:1123 standalone/drakTermServ:1796 standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:154 standalone/drakclock:218 standalone/drakconnect:919 standalone/drakfloppy:290 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:913
+#: diskdrake/interactive.pm:384 harddrake/sound.pm:246 keyboard.pm:340 network/netconnect.pm:448 network/netconnect.pm:467 printer/printerdrake.pm:907 printer/printerdrake.pm:1872 printer/printerdrake.pm:1934 printer/printerdrake.pm:1968 printer/printerdrake.pm:2272 printer/printerdrake.pm:3128 printer/printerdrake.pm:3405 printer/printerdrake.pm:3527 printer/printerdrake.pm:4461 standalone/drakTermServ:336 standalone/drakTermServ:1067 standalone/drakTermServ:1123 standalone/drakTermServ:1796 standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:154 standalone/drakclock:218 standalone/drakconnect:919 standalone/drakfloppy:290 standalone/drakups:27 standalone/scannerdrake:50 standalone/scannerdrake:913
#, c-format
msgid "Warning"
msgstr ""
@@ -2191,7 +2207,7 @@ msgstr ""
msgid "Type: "
msgstr ""
-#: diskdrake/interactive.pm:1165 install_steps_gtk.pm:338
+#: diskdrake/interactive.pm:1165 install_steps_gtk.pm:299
#, c-format
msgid "Name: "
msgstr ""
@@ -2380,7 +2396,7 @@ msgstr ""
msgid "The encryption keys do not match"
msgstr ""
-#: diskdrake/interactive.pm:1262 network/netconnect.pm:964 standalone/drakconnect:403
+#: diskdrake/interactive.pm:1262 network/netconnect.pm:970 standalone/drakconnect:403
#, c-format
msgid "Encryption key"
msgstr ""
@@ -2455,27 +2471,27 @@ msgstr ""
msgid "Removing packages..."
msgstr ""
-#: fs.pm:437 fs.pm:486
+#: fs.pm:436 fs.pm:485
#, c-format
msgid "Mounting partition %s"
msgstr ""
-#: fs.pm:438 fs.pm:487
+#: fs.pm:437 fs.pm:486
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr ""
-#: fs.pm:458 fs.pm:465
+#: fs.pm:457 fs.pm:464
#, c-format
msgid "Checking %s"
msgstr ""
-#: fs.pm:503 partition_table.pm:370
+#: fs.pm:502 partition_table.pm:370
#, c-format
msgid "error unmounting %s: %s"
msgstr ""
-#: fs.pm:535
+#: fs.pm:534
#, c-format
msgid "Enabling swap partition %s"
msgstr ""
@@ -2565,12 +2581,12 @@ msgstr ""
msgid "Give read-only access to ordinary users"
msgstr ""
-#: fs/type.pm:342
+#: fs/type.pm:343
#, c-format
msgid "You can't use JFS for partitions smaller than 16MB"
msgstr ""
-#: fs/type.pm:343
+#: fs/type.pm:344
#, c-format
msgid "You can't use ReiserFS for partitions smaller than 32MB"
msgstr ""
@@ -2747,87 +2763,92 @@ msgstr ""
msgid "Ethernetcard"
msgstr ""
-#: harddrake/data.pm:214 network/netconnect.pm:458
+#: harddrake/data.pm:215 network/netconnect.pm:462
#, c-format
msgid "Modem"
msgstr ""
-#: harddrake/data.pm:223
+#: harddrake/data.pm:224
#, c-format
msgid "ADSL adapters"
msgstr ""
-#: harddrake/data.pm:236
+#: harddrake/data.pm:237
#, c-format
msgid "AGP controllers"
msgstr ""
-#: harddrake/data.pm:245
+#: harddrake/data.pm:246
#, c-format
msgid "Bridges and system controllers"
msgstr ""
-#: harddrake/data.pm:254 help.pm:186 help.pm:855 install_steps_interactive.pm:939 printer/printerdrake.pm:687 printer/printerdrake.pm:4176
+#: harddrake/data.pm:255 help.pm:186 help.pm:855 install_steps_interactive.pm:946 printer/printerdrake.pm:745
#, c-format
msgid "Printer"
msgstr ""
-#: harddrake/data.pm:263 help.pm:855 install_steps_interactive.pm:932
+#: harddrake/data.pm:264 help.pm:855 install_steps_interactive.pm:939
#, c-format
msgid "Mouse"
msgstr ""
-#: harddrake/data.pm:276
+#: harddrake/data.pm:277
#, c-format
msgid "Joystick"
msgstr ""
-#: harddrake/data.pm:286
+#: harddrake/data.pm:287
#, c-format
msgid "(E)IDE/ATA controllers"
msgstr ""
-#: harddrake/data.pm:295
+#: harddrake/data.pm:296
#, c-format
msgid "SATA controllers"
msgstr ""
-#: harddrake/data.pm:304
+#: harddrake/data.pm:305
#, c-format
msgid "Firewire controllers"
msgstr ""
-#: harddrake/data.pm:313
+#: harddrake/data.pm:314
+#, c-format
+msgid "PCMCIA controllers"
+msgstr ""
+
+#: harddrake/data.pm:327
#, c-format
msgid "SCSI controllers"
msgstr ""
-#: harddrake/data.pm:322
+#: harddrake/data.pm:336
#, c-format
msgid "USB controllers"
msgstr ""
-#: harddrake/data.pm:331
+#: harddrake/data.pm:345
#, c-format
msgid "USB ports"
msgstr ""
-#: harddrake/data.pm:340
+#: harddrake/data.pm:354
#, c-format
msgid "SMBus controllers"
msgstr ""
-#: harddrake/data.pm:349
+#: harddrake/data.pm:363
#, c-format
msgid "Scanner"
msgstr ""
-#: harddrake/data.pm:359 standalone/harddrake2:431
+#: harddrake/data.pm:373 standalone/harddrake2:431
#, c-format
msgid "Unknown/Others"
msgstr ""
-#: harddrake/data.pm:387
+#: harddrake/data.pm:401
#, c-format
msgid "cpu # "
msgstr ""
@@ -3054,7 +3075,7 @@ msgid ""
"button will reboot your computer."
msgstr ""
-#: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:87 install_steps_interactive.pm:700 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:574 install_steps_interactive.pm:94 install_steps_interactive.pm:707 standalone/drakautoinst:216
#, c-format
msgid "Accept"
msgstr ""
@@ -3099,7 +3120,7 @@ msgid ""
"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
msgstr ""
-#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:274 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:277 network/tools.pm:178 printer/printerdrake.pm:3090 standalone/drakTermServ:393 standalone/drakbackup:3957 standalone/drakbackup:4051 standalone/drakbackup:4068 standalone/drakbackup:4086 ugtk2.pm:515
+#: help.pm:51 help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:236 interactive.pm:403 interactive/newt.pm:308 network/netconnect.pm:278 network/tools.pm:178 printer/printerdrake.pm:3069 standalone/drakTermServ:393 standalone/drakbackup:3957 standalone/drakbackup:4051 standalone/drakbackup:4068 standalone/drakbackup:4086 ugtk2.pm:515
#, c-format
msgid "Next"
msgstr ""
@@ -3213,22 +3234,22 @@ msgid ""
"megabytes."
msgstr ""
-#: help.pm:146
+#: help.pm:146 share/compssUsers.pl:48
#, c-format
msgid "Workstation"
msgstr ""
-#: help.pm:146
+#: help.pm:146 share/compssUsers.pl:32 share/compssUsers.pl:34
#, c-format
msgid "Development"
msgstr ""
-#: help.pm:146
+#: help.pm:146 share/compssUsers.pl:85
#, c-format
msgid "Graphical Environment"
msgstr ""
-#: help.pm:146 install_steps_gtk.pm:269 install_steps_interactive.pm:603
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:610
#, c-format
msgid "Individual package selection"
msgstr ""
@@ -3238,7 +3259,7 @@ msgstr ""
msgid "Upgrade"
msgstr ""
-#: help.pm:146 install_steps_interactive.pm:557
+#: help.pm:146 install_steps_interactive.pm:564
#, c-format
msgid "With X"
msgstr ""
@@ -3290,12 +3311,12 @@ msgid ""
"such a floppy."
msgstr ""
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:612 interactive.pm:149 modules/interactive.pm:71 standalone/draksec:50 standalone/harddrake2:299 ugtk2.pm:1116 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:637 interactive.pm:149 modules/interactive.pm:71 standalone/draksec:50 standalone/harddrake2:299 ugtk2.pm:1119 wizards.pm:156
#, c-format
msgid "No"
msgstr ""
-#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:612 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:51 standalone/harddrake2:298 ugtk2.pm:1116 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 help.pm:444 install_any.pm:637 interactive.pm:149 modules/interactive.pm:71 printer/printerdrake.pm:602 standalone/drakgw:290 standalone/drakgw:291 standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:51 standalone/harddrake2:298 ugtk2.pm:1119 wizards.pm:156
#, c-format
msgid "Yes"
msgstr ""
@@ -3314,7 +3335,7 @@ msgid ""
"manual is similar to the one used during installation."
msgstr ""
-#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:651 standalone/drakbackup:2325 standalone/drakbackup:2333 standalone/drakbackup:2341 standalone/drakbackup:2349
+#: help.pm:186 help.pm:566 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 help.pm:855 install_steps_gtk.pm:629 standalone/drakbackup:2325 standalone/drakbackup:2333 standalone/drakbackup:2341 standalone/drakbackup:2349
#, c-format
msgid "Configure"
msgstr ""
@@ -3356,7 +3377,7 @@ msgid ""
"server which can be used by other machines on your local network as well."
msgstr ""
-#: help.pm:217 install_steps_interactive.pm:834
+#: help.pm:217 install_steps_interactive.pm:841
#, c-format
msgid "Hardware clock set to GMT"
msgstr ""
@@ -3617,17 +3638,17 @@ msgstr ""
msgid "Generate auto-install floppy"
msgstr ""
-#: help.pm:409 install_steps_interactive.pm:1326
+#: help.pm:409 install_steps_interactive.pm:1321
#, c-format
msgid "Replay"
msgstr ""
-#: help.pm:409 install_steps_interactive.pm:1326
+#: help.pm:409 install_steps_interactive.pm:1321
#, c-format
msgid "Automated"
msgstr ""
-#: help.pm:409 install_steps_interactive.pm:1329
+#: help.pm:409 install_steps_interactive.pm:1324
#, c-format
msgid "Save packages selection"
msgstr ""
@@ -3657,7 +3678,7 @@ msgid ""
"bad blocks on the disk."
msgstr ""
-#: help.pm:431 install_steps_gtk.pm:430 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3088 standalone/drakTermServ:372 standalone/drakbackup:3917 standalone/drakbackup:3956 standalone/drakbackup:4067 standalone/drakbackup:4082 ugtk2.pm:513
+#: help.pm:431 install_steps_gtk.pm:391 interactive.pm:404 interactive/newt.pm:307 printer/printerdrake.pm:3067 standalone/drakTermServ:372 standalone/drakbackup:3917 standalone/drakbackup:3956 standalone/drakbackup:4067 standalone/drakbackup:4082 ugtk2.pm:513
#, c-format
msgid "Previous"
msgstr ""
@@ -3678,7 +3699,7 @@ msgid ""
"the selected package(s), or \"%s\" to abort."
msgstr ""
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:429 install_steps_interactive.pm:151 standalone/drakbackup:4114
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:390 install_steps_interactive.pm:158 standalone/drakbackup:4114
#, c-format
msgid "Install"
msgstr ""
@@ -4027,7 +4048,7 @@ msgid "authentication"
msgstr ""
#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1159
+#: help.pm:722 install_steps_interactive.pm:1169
#, c-format
msgid "No password"
msgstr ""
@@ -4125,7 +4146,7 @@ msgid ""
"system, you can click on the button and choose a different driver."
msgstr ""
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:966 install_steps_interactive.pm:983
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:973 install_steps_interactive.pm:990
#, c-format
msgid "Sound card"
msgstr ""
@@ -4200,17 +4221,17 @@ msgid ""
"idea to review this setup."
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:113 install_steps_interactive.pm:899 standalone/keyboarddrake:23
+#: help.pm:855 install_steps_interactive.pm:120 install_steps_interactive.pm:906 standalone/keyboarddrake:23
#, c-format
msgid "Keyboard"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:925 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:932 standalone/drakclock:75
#, c-format
msgid "Timezone"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:999
+#: help.pm:855 install_steps_interactive.pm:1006
#, c-format
msgid "TV card"
msgstr ""
@@ -4225,32 +4246,32 @@ msgstr ""
msgid "Graphical Interface"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1017 standalone/drakbackup:2031
+#: help.pm:855 install_steps_interactive.pm:1024 standalone/drakbackup:2031
#, c-format
msgid "Network"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1032
+#: help.pm:855 install_steps_interactive.pm:1039
#, c-format
msgid "Proxies"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1043
+#: help.pm:855 install_steps_interactive.pm:1050
#, c-format
msgid "Security Level"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1057
+#: help.pm:855 install_steps_interactive.pm:1064
#, c-format
msgid "Firewall"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1071
+#: help.pm:855 install_steps_interactive.pm:1078
#, c-format
msgid "Bootloader"
msgstr ""
-#: help.pm:855 install_steps_interactive.pm:1081 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1091 services.pm:195
#, c-format
msgid "Services"
msgstr ""
@@ -4285,58 +4306,63 @@ msgstr ""
msgid "<- Previous"
msgstr ""
-#: install2.pm:118
+#: install2.pm:117
#, c-format
msgid "Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)"
msgstr ""
-#: install2.pm:168
+#: install2.pm:167
#, c-format
msgid "You must also format %s"
msgstr ""
-#: install_any.pm:375
+#. -PO: keep the double empty lines between sections, this is formated a la LaTeX
+#: install_any.pm:369
#, c-format
-msgid "Do you have a supplementary installation media to configure?"
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
msgstr ""
-#: install_any.pm:376 printer/printerdrake.pm:2531 printer/printerdrake.pm:2538 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246
+#: install_any.pm:374 printer/printerdrake.pm:2510 printer/printerdrake.pm:2517 standalone/scannerdrake:180 standalone/scannerdrake:188 standalone/scannerdrake:239 standalone/scannerdrake:246
#, c-format
msgid "CD-ROM"
msgstr ""
-#: install_any.pm:376
+#: install_any.pm:374
#, c-format
msgid "Network (http)"
msgstr ""
-#: install_any.pm:376
+#: install_any.pm:374
#, c-format
msgid "Network (ftp)"
msgstr ""
-#: install_any.pm:395
+#: install_any.pm:401
#, c-format
msgid "Insert the CD"
msgstr ""
-#: install_any.pm:422
+#: install_any.pm:432
#, c-format
msgid "URL of the mirror?"
msgstr ""
-#: install_any.pm:434
+#: install_any.pm:445
#, c-format
msgid "Can't find hdlist file on this mirror"
msgstr ""
-#: install_any.pm:504
+#: install_any.pm:533
#, c-format
msgid "Insert the CD 1 again"
msgstr ""
-#. -PO: keep the doble empty lines between sections, this is formated a la LaTeX
-#: install_any.pm:603
+#. -PO: keep the double empty lines between sections, this is formated a la LaTeX
+#: install_any.pm:628
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -4351,8 +4377,8 @@ msgid ""
""
msgstr ""
-#. -PO: keep the doble empty lines between sections, this is formated a la LaTeX
-#: install_any.pm:626
+#. -PO: keep the double empty lines between sections, this is formated a la LaTeX
+#: install_any.pm:651
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -4362,27 +4388,27 @@ msgid ""
""
msgstr ""
-#: install_any.pm:995
+#: install_any.pm:1020
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr ""
-#: install_any.pm:999
+#: install_any.pm:1024
#, c-format
msgid "This floppy is not FAT formatted"
msgstr ""
-#: install_any.pm:1011
+#: install_any.pm:1036
#, c-format
msgid "To use this saved packages selection, boot installation with ``linux defcfg=floppy''"
msgstr ""
-#: install_any.pm:1039 partition_table.pm:578
+#: install_any.pm:1064 partition_table.pm:578
#, c-format
msgid "Error reading file %s"
msgstr ""
-#: install_any.pm:1176
+#: install_any.pm:1204
#, c-format
msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"
msgstr ""
@@ -4742,7 +4768,7 @@ msgstr ""
msgid "Duplicate mount point %s"
msgstr ""
-#: install_steps.pm:459
+#: install_steps.pm:461
#, c-format
msgid ""
"Some important packages didn't get installed properly.\n"
@@ -4751,7 +4777,7 @@ msgid ""
""
msgstr ""
-#: install_steps.pm:585
+#: install_steps.pm:587
#, c-format
msgid "No floppy drive available"
msgstr ""
@@ -4771,171 +4797,181 @@ msgid ""
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
-#: install_steps_gtk.pm:229 install_steps_interactive.pm:585
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:592
#, c-format
msgid "Package Group Selection"
msgstr ""
-#: install_steps_gtk.pm:291 install_steps_interactive.pm:524
+#: install_steps_gtk.pm:253 install_steps_interactive.pm:531
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: install_steps_gtk.pm:337
+#: install_steps_gtk.pm:298
#, c-format
msgid "Bad package"
msgstr ""
-#: install_steps_gtk.pm:339
+#: install_steps_gtk.pm:300
#, c-format
msgid "Version: "
msgstr ""
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:301
#, c-format
msgid "Size: "
msgstr ""
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:301
#, c-format
msgid ""
"%d KB\n"
""
msgstr ""
-#: install_steps_gtk.pm:341
+#: install_steps_gtk.pm:302
#, c-format
msgid "Importance: "
msgstr ""
-#: install_steps_gtk.pm:374
+#: install_steps_gtk.pm:335
#, c-format
msgid "You can't select/unselect this package"
msgstr ""
-#: install_steps_gtk.pm:378
+#: install_steps_gtk.pm:339
#, c-format
msgid "due to missing %s"
msgstr ""
-#: install_steps_gtk.pm:379
+#: install_steps_gtk.pm:340
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: install_steps_gtk.pm:380
+#: install_steps_gtk.pm:341
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:342
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:347
#, c-format
msgid "You can't select this package as there is not enough space left to install it"
msgstr ""
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:350
#, c-format
msgid "The following packages are going to be installed"
msgstr ""
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:351
#, c-format
msgid "The following packages are going to be removed"
msgstr ""
-#: install_steps_gtk.pm:414
+#: install_steps_gtk.pm:375
#, c-format
msgid "This is a mandatory package, it can't be unselected"
msgstr ""
-#: install_steps_gtk.pm:416
+#: install_steps_gtk.pm:377
#, c-format
msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:380
#, c-format
msgid ""
"This package must be upgraded.\n"
"Are you sure you want to deselect it?"
msgstr ""
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:383
#, c-format
msgid "You can't unselect this package. It must be upgraded"
msgstr ""
-#: install_steps_gtk.pm:427
+#: install_steps_gtk.pm:388
#, c-format
msgid "Show automatically selected packages"
msgstr ""
-#: install_steps_gtk.pm:432
+#: install_steps_gtk.pm:393
#, c-format
msgid "Load/Save on floppy"
msgstr ""
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:394
#, c-format
msgid "Updating package selection"
msgstr ""
-#: install_steps_gtk.pm:438
+#: install_steps_gtk.pm:399
#, c-format
msgid "Minimal install"
msgstr ""
-#: install_steps_gtk.pm:452 install_steps_interactive.pm:432
+#: install_steps_gtk.pm:413 install_steps_interactive.pm:445
#, c-format
msgid "Choose the packages you want to install"
msgstr ""
-#: install_steps_gtk.pm:468 install_steps_interactive.pm:675
+#: install_steps_gtk.pm:429 install_steps_interactive.pm:682
#, c-format
msgid "Installing"
msgstr ""
-#: install_steps_gtk.pm:474
-#, c-format
-msgid "No details"
-msgstr ""
-
-#: install_steps_gtk.pm:475
+#: install_steps_gtk.pm:438
#, c-format
msgid "Estimating"
msgstr ""
-#: install_steps_gtk.pm:481
+#: install_steps_gtk.pm:444
#, c-format
msgid "Time remaining "
msgstr ""
-#: install_steps_gtk.pm:493
+#: install_steps_gtk.pm:458
#, c-format
msgid "Please wait, preparing installation..."
msgstr ""
-#: install_steps_gtk.pm:554
+#: install_steps_gtk.pm:471
+#, c-format
+msgid "No details"
+msgstr ""
+
+#: install_steps_gtk.pm:472
+#, c-format
+msgid "Hide Release Notes"
+msgstr ""
+
+#: install_steps_gtk.pm:472
+#, c-format
+msgid "Release Notes"
+msgstr ""
+
+#: install_steps_gtk.pm:534
#, c-format
msgid "%d packages"
msgstr ""
-#: install_steps_gtk.pm:559
+#: install_steps_gtk.pm:539
#, c-format
msgid "Installing package %s"
msgstr ""
-#: install_steps_gtk.pm:596 install_steps_interactive.pm:87 install_steps_interactive.pm:700
+#: install_steps_gtk.pm:574 install_steps_interactive.pm:94 install_steps_interactive.pm:707
#, c-format
msgid "Refuse"
msgstr ""
-#: install_steps_gtk.pm:600 install_steps_interactive.pm:704
+#: install_steps_gtk.pm:578 install_steps_interactive.pm:711
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -4943,246 +4979,246 @@ msgid ""
"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: install_steps_gtk.pm:615 install_steps_interactive.pm:715
+#: install_steps_gtk.pm:593 install_steps_interactive.pm:722
#, c-format
msgid "There was an error ordering packages:"
msgstr ""
-#: install_steps_gtk.pm:615 install_steps_gtk.pm:619 install_steps_interactive.pm:715 install_steps_interactive.pm:719
+#: install_steps_gtk.pm:593 install_steps_gtk.pm:597 install_steps_interactive.pm:722 install_steps_interactive.pm:726
#, c-format
msgid "Go on anyway?"
msgstr ""
-#: install_steps_gtk.pm:619 install_steps_interactive.pm:719
+#: install_steps_gtk.pm:597 install_steps_interactive.pm:726
#, c-format
msgid "There was an error installing packages:"
msgstr ""
-#: install_steps_gtk.pm:661 install_steps_interactive.pm:881 install_steps_interactive.pm:1033
+#: install_steps_gtk.pm:639 install_steps_interactive.pm:888 install_steps_interactive.pm:1040
#, c-format
msgid "not configured"
msgstr ""
-#: install_steps_interactive.pm:80
+#: install_steps_interactive.pm:87
#, c-format
msgid "Do you want to recover your system?"
msgstr ""
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:88
#, c-format
msgid "License agreement"
msgstr ""
-#: install_steps_interactive.pm:114
+#: install_steps_interactive.pm:121
#, c-format
msgid "Please choose your keyboard layout."
msgstr ""
-#: install_steps_interactive.pm:116
+#: install_steps_interactive.pm:123
#, c-format
msgid "Here is the full list of available keyboards"
msgstr ""
-#: install_steps_interactive.pm:146
+#: install_steps_interactive.pm:153
#, c-format
msgid "Install/Upgrade"
msgstr ""
-#: install_steps_interactive.pm:147
+#: install_steps_interactive.pm:154
#, c-format
msgid "Is this an install or an upgrade?"
msgstr ""
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:160
#, c-format
msgid "Upgrade %s"
msgstr ""
-#: install_steps_interactive.pm:163
+#: install_steps_interactive.pm:170
#, c-format
msgid "Encryption key for %s"
msgstr ""
-#: install_steps_interactive.pm:180
+#: install_steps_interactive.pm:187
#, c-format
msgid "Please choose your type of mouse."
msgstr ""
-#: install_steps_interactive.pm:189 standalone/mousedrake:45
+#: install_steps_interactive.pm:196 standalone/mousedrake:45
#, c-format
msgid "Mouse Port"
msgstr ""
-#: install_steps_interactive.pm:190 standalone/mousedrake:46
+#: install_steps_interactive.pm:197 standalone/mousedrake:46
#, c-format
msgid "Please choose which serial port your mouse is connected to."
msgstr ""
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:207
#, c-format
msgid "Buttons emulation"
msgstr ""
-#: install_steps_interactive.pm:202
+#: install_steps_interactive.pm:209
#, c-format
msgid "Button 2 Emulation"
msgstr ""
-#: install_steps_interactive.pm:203
+#: install_steps_interactive.pm:210
#, c-format
msgid "Button 3 Emulation"
msgstr ""
-#: install_steps_interactive.pm:224
+#: install_steps_interactive.pm:231
#, c-format
msgid "PCMCIA"
msgstr ""
-#: install_steps_interactive.pm:224
+#: install_steps_interactive.pm:231
#, c-format
msgid "Configuring PCMCIA cards..."
msgstr ""
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:238
#, c-format
msgid "IDE"
msgstr ""
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:238
#, c-format
msgid "Configuring IDE"
msgstr ""
-#: install_steps_interactive.pm:251 network/tools.pm:167
+#: install_steps_interactive.pm:258 network/tools.pm:167
#, c-format
msgid "No partition available"
msgstr ""
-#: install_steps_interactive.pm:254
+#: install_steps_interactive.pm:261
#, c-format
msgid "Scanning partitions to find mount points"
msgstr ""
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:268
#, c-format
msgid "Choose the mount points"
msgstr ""
-#: install_steps_interactive.pm:293
+#: install_steps_interactive.pm:300
#, c-format
msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-#: install_steps_interactive.pm:330
+#: install_steps_interactive.pm:337
#, c-format
msgid "Choose the partitions you want to format"
msgstr ""
-#: install_steps_interactive.pm:332
+#: install_steps_interactive.pm:339
#, c-format
msgid "Check bad blocks?"
msgstr ""
-#: install_steps_interactive.pm:364
+#: install_steps_interactive.pm:371
#, c-format
msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)"
msgstr ""
-#: install_steps_interactive.pm:367
+#: install_steps_interactive.pm:374
#, c-format
msgid "Not enough swap space to fulfill installation, please add some"
msgstr ""
-#: install_steps_interactive.pm:374
+#: install_steps_interactive.pm:381
#, c-format
msgid "Looking for available packages and rebuilding rpm database..."
msgstr ""
-#: install_steps_interactive.pm:375 install_steps_interactive.pm:394
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:406
#, c-format
msgid "Looking for available packages..."
msgstr ""
-#: install_steps_interactive.pm:378
+#: install_steps_interactive.pm:385
#, c-format
msgid "Looking at packages already installed..."
msgstr ""
-#: install_steps_interactive.pm:382
+#: install_steps_interactive.pm:389
#, c-format
msgid "Finding packages to upgrade..."
msgstr ""
-#: install_steps_interactive.pm:403
+#: install_steps_interactive.pm:415
#, c-format
msgid "Your system does not have enough space left for installation or upgrade (%d > %d)"
msgstr ""
-#: install_steps_interactive.pm:444
+#: install_steps_interactive.pm:457
#, c-format
msgid ""
"Please choose load or save package selection on floppy.\n"
"The format is the same as auto_install generated floppies."
msgstr ""
-#: install_steps_interactive.pm:446
+#: install_steps_interactive.pm:459
#, c-format
msgid "Load from floppy"
msgstr ""
-#: install_steps_interactive.pm:446
+#: install_steps_interactive.pm:459
#, c-format
msgid "Save on floppy"
msgstr ""
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:463
#, c-format
msgid "Package selection"
msgstr ""
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:463
#, c-format
msgid "Loading from floppy"
msgstr ""
-#: install_steps_interactive.pm:455
+#: install_steps_interactive.pm:468
#, c-format
msgid "Insert a floppy containing package selection"
msgstr ""
-#: install_steps_interactive.pm:538
+#: install_steps_interactive.pm:545
#, c-format
msgid "Selected size is larger than available space"
msgstr ""
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:560
#, c-format
msgid "Type of install"
msgstr ""
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:561
#, c-format
msgid ""
"You haven't selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr ""
-#: install_steps_interactive.pm:558
+#: install_steps_interactive.pm:565
#, c-format
msgid "With basic documentation (recommended!)"
msgstr ""
-#: install_steps_interactive.pm:559
+#: install_steps_interactive.pm:566
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr ""
-#: install_steps_interactive.pm:602 standalone/drakxtv:50
+#: install_steps_interactive.pm:609 standalone/drakxtv:50
#, c-format
msgid "All"
msgstr ""
-#: install_steps_interactive.pm:649
+#: install_steps_interactive.pm:656
#, c-format
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
@@ -5190,34 +5226,34 @@ msgid ""
"If only some CDs are missing, unselect them, then click Ok."
msgstr ""
-#: install_steps_interactive.pm:654
+#: install_steps_interactive.pm:661
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr ""
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:682
#, c-format
msgid "Preparing installation"
msgstr ""
-#: install_steps_interactive.pm:684
+#: install_steps_interactive.pm:691
#, c-format
msgid ""
"Installing package %s\n"
"%d%%"
msgstr ""
-#: install_steps_interactive.pm:733
+#: install_steps_interactive.pm:740
#, c-format
msgid "Post-install configuration"
msgstr ""
-#: install_steps_interactive.pm:739
+#: install_steps_interactive.pm:746
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr ""
-#: install_steps_interactive.pm:760
+#: install_steps_interactive.pm:767
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -5227,166 +5263,166 @@ msgid ""
"To download these packages, you will need to have a working Internet \n"
"connection.\n"
"\n"
-"Do you want to install the updates?"
+"Do you want to install the updates ?"
msgstr ""
-#: install_steps_interactive.pm:781
+#: install_steps_interactive.pm:788
#, c-format
msgid "Contacting Mandrakelinux web site to get the list of available mirrors..."
msgstr ""
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:793
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr ""
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:807
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr ""
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:811
#, c-format
msgid "Unable to contact mirror %s"
msgstr ""
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:811
#, c-format
msgid "Would you like to try again?"
msgstr ""
-#: install_steps_interactive.pm:830 standalone/drakclock:45
+#: install_steps_interactive.pm:837 standalone/drakclock:45
#, c-format
msgid "Which is your timezone?"
msgstr ""
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:842
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr ""
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:850
#, c-format
msgid "NTP Server"
msgstr ""
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:892 steps.pm:30
#, c-format
msgid "Summary"
msgstr ""
-#: install_steps_interactive.pm:898 install_steps_interactive.pm:906 install_steps_interactive.pm:924 install_steps_interactive.pm:931 install_steps_interactive.pm:1080 services.pm:135 standalone/drakbackup:1593
+#: install_steps_interactive.pm:905 install_steps_interactive.pm:913 install_steps_interactive.pm:931 install_steps_interactive.pm:938 install_steps_interactive.pm:1090 services.pm:135 standalone/drakbackup:1593
#, c-format
msgid "System"
msgstr ""
-#: install_steps_interactive.pm:938 install_steps_interactive.pm:965 install_steps_interactive.pm:982 install_steps_interactive.pm:998 install_steps_interactive.pm:1009
+#: install_steps_interactive.pm:945 install_steps_interactive.pm:972 install_steps_interactive.pm:989 install_steps_interactive.pm:1005 install_steps_interactive.pm:1016
#, c-format
msgid "Hardware"
msgstr ""
-#: install_steps_interactive.pm:944 install_steps_interactive.pm:953
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:960
#, c-format
msgid "Remote CUPS server"
msgstr ""
-#: install_steps_interactive.pm:944
+#: install_steps_interactive.pm:951
#, c-format
msgid "No printer"
msgstr ""
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:993
#, c-format
msgid "Do you have an ISA sound card?"
msgstr ""
-#: install_steps_interactive.pm:988
+#: install_steps_interactive.pm:995
#, c-format
msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
msgstr ""
-#: install_steps_interactive.pm:990
+#: install_steps_interactive.pm:997
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: install_steps_interactive.pm:1010
+#: install_steps_interactive.pm:1017
#, c-format
msgid "Graphical interface"
msgstr ""
-#: install_steps_interactive.pm:1016 install_steps_interactive.pm:1031
+#: install_steps_interactive.pm:1023 install_steps_interactive.pm:1038
#, c-format
msgid "Network & Internet"
msgstr ""
-#: install_steps_interactive.pm:1033
+#: install_steps_interactive.pm:1040
#, c-format
msgid "configured"
msgstr ""
-#: install_steps_interactive.pm:1042 install_steps_interactive.pm:1056 steps.pm:20
+#: install_steps_interactive.pm:1049 install_steps_interactive.pm:1063 steps.pm:20
#, c-format
msgid "Security"
msgstr ""
-#: install_steps_interactive.pm:1061
+#: install_steps_interactive.pm:1068
#, c-format
msgid "activated"
msgstr ""
-#: install_steps_interactive.pm:1061
+#: install_steps_interactive.pm:1068
#, c-format
msgid "disabled"
msgstr ""
-#: install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1077
#, c-format
msgid "Boot"
msgstr ""
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1074
+#: install_steps_interactive.pm:1081
#, c-format
msgid "%s on %s"
msgstr ""
-#: install_steps_interactive.pm:1085 services.pm:177
+#: install_steps_interactive.pm:1095 services.pm:177
#, c-format
msgid "Services: %d activated for %d registered"
msgstr ""
-#: install_steps_interactive.pm:1095
+#: install_steps_interactive.pm:1105
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr ""
-#: install_steps_interactive.pm:1153
+#: install_steps_interactive.pm:1163
#, c-format
msgid "Set root password and network authentication methods"
msgstr ""
-#: install_steps_interactive.pm:1154
+#: install_steps_interactive.pm:1164
#, c-format
msgid "Set root password"
msgstr ""
-#: install_steps_interactive.pm:1165
+#: install_steps_interactive.pm:1175
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr ""
-#: install_steps_interactive.pm:1170 network/netconnect.pm:566 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:460
+#: install_steps_interactive.pm:1180 network/netconnect.pm:570 standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:460
#, c-format
msgid "Authentication"
msgstr ""
-#: install_steps_interactive.pm:1202
+#: install_steps_interactive.pm:1212
#, c-format
msgid "Preparing bootloader..."
msgstr ""
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1222
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown\n"
@@ -5395,60 +5431,39 @@ msgid ""
" need to use BootX or some other means to boot your machine"
msgstr ""
-#: install_steps_interactive.pm:1218
+#: install_steps_interactive.pm:1228
#, c-format
msgid "Do you want to use aboot?"
msgstr ""
-#: install_steps_interactive.pm:1221
+#: install_steps_interactive.pm:1231
#, c-format
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: install_steps_interactive.pm:1232
-#, c-format
-msgid "Installing bootloader"
-msgstr ""
-
-#: install_steps_interactive.pm:1239
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-
-#: install_steps_interactive.pm:1244
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader. If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-
-#: install_steps_interactive.pm:1257
+#: install_steps_interactive.pm:1252
#, c-format
msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
msgstr ""
-#: install_steps_interactive.pm:1285 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1280 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: install_steps_interactive.pm:1290
+#: install_steps_interactive.pm:1285
#, c-format
msgid "Please insert another floppy for drivers disk"
msgstr ""
-#: install_steps_interactive.pm:1292
+#: install_steps_interactive.pm:1287
#, c-format
msgid "Creating auto install floppy..."
msgstr ""
-#: install_steps_interactive.pm:1304
+#: install_steps_interactive.pm:1299
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -5456,12 +5471,12 @@ msgid ""
"Do you really want to quit now?"
msgstr ""
-#: install_steps_interactive.pm:1319
+#: install_steps_interactive.pm:1314
#, c-format
msgid "Generate auto install floppy"
msgstr ""
-#: install_steps_interactive.pm:1321
+#: install_steps_interactive.pm:1316
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -6170,1142 +6185,1142 @@ msgid ""
"key to switch between the different keyboard layouts."
msgstr ""
-#: lang.pm:154
+#: lang.pm:166
#, c-format
msgid "default:LTR"
msgstr ""
-#: lang.pm:170
+#: lang.pm:182
#, c-format
-msgid "Afghanistan"
+msgid "Andorra"
msgstr ""
-#: lang.pm:171
+#: lang.pm:183
#, c-format
-msgid "Andorra"
+msgid "United Arab Emirates"
msgstr ""
-#: lang.pm:172
+#: lang.pm:184
#, c-format
-msgid "United Arab Emirates"
+msgid "Afghanistan"
msgstr ""
-#: lang.pm:173
+#: lang.pm:185
#, c-format
msgid "Antigua and Barbuda"
msgstr ""
-#: lang.pm:174
+#: lang.pm:186
#, c-format
msgid "Anguilla"
msgstr ""
-#: lang.pm:175
+#: lang.pm:187
#, c-format
msgid "Albania"
msgstr ""
-#: lang.pm:176
+#: lang.pm:188
#, c-format
msgid "Armenia"
msgstr ""
-#: lang.pm:177
+#: lang.pm:189
#, c-format
msgid "Netherlands Antilles"
msgstr ""
-#: lang.pm:178
+#: lang.pm:190
#, c-format
msgid "Angola"
msgstr ""
-#: lang.pm:179
+#: lang.pm:191
#, c-format
msgid "Antarctica"
msgstr ""
-#: lang.pm:180 standalone/drakxtv:48
+#: lang.pm:192 standalone/drakxtv:48
#, c-format
msgid "Argentina"
msgstr ""
-#: lang.pm:181
+#: lang.pm:193
#, c-format
msgid "American Samoa"
msgstr ""
-#: lang.pm:183 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:46
#, c-format
msgid "Australia"
msgstr ""
-#: lang.pm:184
+#: lang.pm:196
#, c-format
msgid "Aruba"
msgstr ""
-#: lang.pm:185
+#: lang.pm:197
#, c-format
msgid "Azerbaijan"
msgstr ""
-#: lang.pm:186
+#: lang.pm:198
#, c-format
msgid "Bosnia and Herzegovina"
msgstr ""
-#: lang.pm:187
+#: lang.pm:199
#, c-format
msgid "Barbados"
msgstr ""
-#: lang.pm:188
+#: lang.pm:200
#, c-format
msgid "Bangladesh"
msgstr ""
-#: lang.pm:190
+#: lang.pm:202
#, c-format
msgid "Burkina Faso"
msgstr ""
-#: lang.pm:191 network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:203 network/adsl_consts.pm:110 network/adsl_consts.pm:118
#, c-format
msgid "Bulgaria"
msgstr ""
-#: lang.pm:192
+#: lang.pm:204
#, c-format
msgid "Bahrain"
msgstr ""
-#: lang.pm:193
+#: lang.pm:205
#, c-format
msgid "Burundi"
msgstr ""
-#: lang.pm:194
+#: lang.pm:206
#, c-format
msgid "Benin"
msgstr ""
-#: lang.pm:195
+#: lang.pm:207
#, c-format
msgid "Bermuda"
msgstr ""
-#: lang.pm:196
+#: lang.pm:208
#, c-format
msgid "Brunei Darussalam"
msgstr ""
-#: lang.pm:197
+#: lang.pm:209
#, c-format
msgid "Bolivia"
msgstr ""
-#: lang.pm:198 network/adsl_consts.pm:76 network/adsl_consts.pm:86 network/adsl_consts.pm:94 network/adsl_consts.pm:102
+#: lang.pm:210 network/adsl_consts.pm:76 network/adsl_consts.pm:86 network/adsl_consts.pm:94 network/adsl_consts.pm:102
#, c-format
msgid "Brazil"
msgstr ""
-#: lang.pm:199
+#: lang.pm:211
#, c-format
msgid "Bahamas"
msgstr ""
-#: lang.pm:200
+#: lang.pm:212
#, c-format
msgid "Bhutan"
msgstr ""
-#: lang.pm:201
+#: lang.pm:213
#, c-format
msgid "Bouvet Island"
msgstr ""
-#: lang.pm:202
+#: lang.pm:214
#, c-format
msgid "Botswana"
msgstr ""
-#: lang.pm:203
+#: lang.pm:215
#, c-format
msgid "Belarus"
msgstr ""
-#: lang.pm:204
+#: lang.pm:216
#, c-format
msgid "Belize"
msgstr ""
-#: lang.pm:205
+#: lang.pm:217
#, c-format
msgid "Canada"
msgstr ""
-#: lang.pm:206
+#: lang.pm:218
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr ""
-#: lang.pm:207
+#: lang.pm:219
#, c-format
msgid "Congo (Kinshasa)"
msgstr ""
-#: lang.pm:208
+#: lang.pm:220
#, c-format
msgid "Central African Republic"
msgstr ""
-#: lang.pm:209
+#: lang.pm:221
#, c-format
msgid "Congo (Brazzaville)"
msgstr ""
-#: lang.pm:210 network/adsl_consts.pm:365 network/adsl_consts.pm:372
+#: lang.pm:222 network/adsl_consts.pm:365 network/adsl_consts.pm:372
#, c-format
msgid "Switzerland"
msgstr ""
-#: lang.pm:211
+#: lang.pm:223
#, c-format
msgid "Cote d'Ivoire"
msgstr ""
-#: lang.pm:212
+#: lang.pm:224
#, c-format
msgid "Cook Islands"
msgstr ""
-#: lang.pm:213
+#: lang.pm:225
#, c-format
msgid "Chile"
msgstr ""
-#: lang.pm:214
+#: lang.pm:226
#, c-format
msgid "Cameroon"
msgstr ""
-#: lang.pm:215
+#: lang.pm:227
#, c-format
msgid "China"
msgstr ""
-#: lang.pm:216
+#: lang.pm:228
#, c-format
msgid "Colombia"
msgstr ""
-#: lang.pm:218
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr ""
+
+#: lang.pm:231
#, c-format
msgid "Cuba"
msgstr ""
-#: lang.pm:219
+#: lang.pm:232
#, c-format
msgid "Cape Verde"
msgstr ""
-#: lang.pm:220
+#: lang.pm:233
#, c-format
msgid "Christmas Island"
msgstr ""
-#: lang.pm:221
+#: lang.pm:234
#, c-format
msgid "Cyprus"
msgstr ""
-#: lang.pm:224
+#: lang.pm:237
#, c-format
msgid "Djibouti"
msgstr ""
-#: lang.pm:225 network/adsl_consts.pm:126
+#: lang.pm:238 network/adsl_consts.pm:126
#, c-format
msgid "Denmark"
msgstr ""
-#: lang.pm:226
+#: lang.pm:239
#, c-format
msgid "Dominica"
msgstr ""
-#: lang.pm:227
+#: lang.pm:240
#, c-format
msgid "Dominican Republic"
msgstr ""
-#: lang.pm:228
+#: lang.pm:241
#, c-format
msgid "Algeria"
msgstr ""
-#: lang.pm:229
+#: lang.pm:242
#, c-format
msgid "Ecuador"
msgstr ""
-#: lang.pm:230
+#: lang.pm:243
#, c-format
msgid "Estonia"
msgstr ""
-#: lang.pm:231
+#: lang.pm:244
#, c-format
msgid "Egypt"
msgstr ""
-#: lang.pm:232
+#: lang.pm:245
#, c-format
msgid "Western Sahara"
msgstr ""
-#: lang.pm:233
+#: lang.pm:246
#, c-format
msgid "Eritrea"
msgstr ""
-#: lang.pm:234 network/adsl_consts.pm:328 network/adsl_consts.pm:337 network/adsl_consts.pm:348
+#: lang.pm:247 network/adsl_consts.pm:328 network/adsl_consts.pm:337 network/adsl_consts.pm:348
#, c-format
msgid "Spain"
msgstr ""
-#: lang.pm:235
+#: lang.pm:248
#, c-format
msgid "Ethiopia"
msgstr ""
-#: lang.pm:236 network/adsl_consts.pm:226
+#: lang.pm:249 network/adsl_consts.pm:226
#, c-format
msgid "Finland"
msgstr ""
-#: lang.pm:237
+#: lang.pm:250
#, c-format
msgid "Fiji"
msgstr ""
-#: lang.pm:238
+#: lang.pm:251
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr ""
-#: lang.pm:239
+#: lang.pm:252
#, c-format
msgid "Micronesia"
msgstr ""
-#: lang.pm:240
+#: lang.pm:253
#, c-format
msgid "Faroe Islands"
msgstr ""
-#: lang.pm:242
+#: lang.pm:255
#, c-format
msgid "Gabon"
msgstr ""
-#: lang.pm:243 network/adsl_consts.pm:382 network/adsl_consts.pm:390 network/netconnect.pm:52
+#: lang.pm:256 network/adsl_consts.pm:382 network/adsl_consts.pm:390 network/netconnect.pm:52
#, c-format
msgid "United Kingdom"
msgstr ""
-#: lang.pm:244
+#: lang.pm:257
#, c-format
msgid "Grenada"
msgstr ""
-#: lang.pm:245
+#: lang.pm:258
#, c-format
msgid "Georgia"
msgstr ""
-#: lang.pm:246
+#: lang.pm:259
#, c-format
msgid "French Guiana"
msgstr ""
-#: lang.pm:247
+#: lang.pm:260
#, c-format
msgid "Ghana"
msgstr ""
-#: lang.pm:248
+#: lang.pm:261
#, c-format
msgid "Gibraltar"
msgstr ""
-#: lang.pm:249
+#: lang.pm:262
#, c-format
msgid "Greenland"
msgstr ""
-#: lang.pm:250
+#: lang.pm:263
#, c-format
msgid "Gambia"
msgstr ""
-#: lang.pm:251
+#: lang.pm:264
#, c-format
msgid "Guinea"
msgstr ""
-#: lang.pm:252
+#: lang.pm:265
#, c-format
msgid "Guadeloupe"
msgstr ""
-#: lang.pm:253
+#: lang.pm:266
#, c-format
msgid "Equatorial Guinea"
msgstr ""
-#: lang.pm:255
+#: lang.pm:268
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr ""
-#: lang.pm:256
+#: lang.pm:269
#, c-format
msgid "Guatemala"
msgstr ""
-#: lang.pm:257
+#: lang.pm:270
#, c-format
msgid "Guam"
msgstr ""
-#: lang.pm:258
+#: lang.pm:271
#, c-format
msgid "Guinea-Bissau"
msgstr ""
-#: lang.pm:259
+#: lang.pm:272
#, c-format
msgid "Guyana"
msgstr ""
-#: lang.pm:260
+#: lang.pm:273
#, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
msgstr ""
-#: lang.pm:261
+#: lang.pm:274
#, c-format
msgid "Heard and McDonald Islands"
msgstr ""
-#: lang.pm:262
+#: lang.pm:275
#, c-format
msgid "Honduras"
msgstr ""
-#: lang.pm:263
+#: lang.pm:276
#, c-format
msgid "Croatia"
msgstr ""
-#: lang.pm:264
+#: lang.pm:277
#, c-format
msgid "Haiti"
msgstr ""
-#: lang.pm:265 network/adsl_consts.pm:260
+#: lang.pm:278 network/adsl_consts.pm:260
#, c-format
msgid "Hungary"
msgstr ""
-#: lang.pm:266
+#: lang.pm:279
#, c-format
msgid "Indonesia"
msgstr ""
-#: lang.pm:267 network/adsl_consts.pm:268 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:268 standalone/drakxtv:45
#, c-format
msgid "Ireland"
msgstr ""
-#: lang.pm:268
+#: lang.pm:281
#, c-format
msgid "Israel"
msgstr ""
-#: lang.pm:269
+#: lang.pm:282
#, c-format
msgid "India"
msgstr ""
-#: lang.pm:270
+#: lang.pm:283
#, c-format
msgid "British Indian Ocean Territory"
msgstr ""
-#: lang.pm:271
+#: lang.pm:284
#, c-format
msgid "Iraq"
msgstr ""
-#: lang.pm:272
+#: lang.pm:285
#, c-format
msgid "Iran"
msgstr ""
-#: lang.pm:273
+#: lang.pm:286
#, c-format
msgid "Iceland"
msgstr ""
-#: lang.pm:275
+#: lang.pm:288
#, c-format
msgid "Jamaica"
msgstr ""
-#: lang.pm:276
+#: lang.pm:289
#, c-format
msgid "Jordan"
msgstr ""
-#: lang.pm:277
+#: lang.pm:290
#, c-format
msgid "Japan"
msgstr ""
-#: lang.pm:278
+#: lang.pm:291
#, c-format
msgid "Kenya"
msgstr ""
-#: lang.pm:279
+#: lang.pm:292
#, c-format
msgid "Kyrgyzstan"
msgstr ""
-#: lang.pm:280
+#: lang.pm:293
#, c-format
msgid "Cambodia"
msgstr ""
-#: lang.pm:281
+#: lang.pm:294
#, c-format
msgid "Kiribati"
msgstr ""
-#: lang.pm:282
+#: lang.pm:295
#, c-format
msgid "Comoros"
msgstr ""
-#: lang.pm:283
+#: lang.pm:296
#, c-format
msgid "Saint Kitts and Nevis"
msgstr ""
-#: lang.pm:284
+#: lang.pm:297
#, c-format
msgid "Korea (North)"
msgstr ""
-#: lang.pm:285
+#: lang.pm:298
#, c-format
msgid "Korea"
msgstr ""
-#: lang.pm:286
+#: lang.pm:299
#, c-format
msgid "Kuwait"
msgstr ""
-#: lang.pm:287
+#: lang.pm:300
#, c-format
msgid "Cayman Islands"
msgstr ""
-#: lang.pm:288
+#: lang.pm:301
#, c-format
msgid "Kazakhstan"
msgstr ""
-#: lang.pm:289
+#: lang.pm:302
#, c-format
msgid "Laos"
msgstr ""
-#: lang.pm:290
+#: lang.pm:303
#, c-format
msgid "Lebanon"
msgstr ""
-#: lang.pm:291
+#: lang.pm:304
#, c-format
msgid "Saint Lucia"
msgstr ""
-#: lang.pm:292
+#: lang.pm:305
#, c-format
msgid "Liechtenstein"
msgstr ""
-#: lang.pm:293
+#: lang.pm:306
#, c-format
msgid "Sri Lanka"
msgstr ""
-#: lang.pm:294
+#: lang.pm:307
#, c-format
msgid "Liberia"
msgstr ""
-#: lang.pm:295
+#: lang.pm:308
#, c-format
msgid "Lesotho"
msgstr ""
-#: lang.pm:296
+#: lang.pm:309
#, c-format
msgid "Lithuania"
msgstr ""
-#: lang.pm:297
+#: lang.pm:310
#, c-format
msgid "Luxembourg"
msgstr ""
-#: lang.pm:298
+#: lang.pm:311
#, c-format
msgid "Latvia"
msgstr ""
-#: lang.pm:299
+#: lang.pm:312
#, c-format
msgid "Libya"
msgstr ""
-#: lang.pm:300
+#: lang.pm:313
#, c-format
msgid "Morocco"
msgstr ""
-#: lang.pm:301
+#: lang.pm:314
#, c-format
msgid "Monaco"
msgstr ""
-#: lang.pm:302
+#: lang.pm:315
#, c-format
msgid "Moldova"
msgstr ""
-#: lang.pm:303
+#: lang.pm:316
#, c-format
msgid "Madagascar"
msgstr ""
-#: lang.pm:304
+#: lang.pm:317
#, c-format
msgid "Marshall Islands"
msgstr ""
-#: lang.pm:305
+#: lang.pm:318
#, c-format
msgid "Macedonia"
msgstr ""
-#: lang.pm:306
+#: lang.pm:319
#, c-format
msgid "Mali"
msgstr ""
-#: lang.pm:307
+#: lang.pm:320
#, c-format
msgid "Myanmar"
msgstr ""
-#: lang.pm:308
+#: lang.pm:321
#, c-format
msgid "Mongolia"
msgstr ""
-#: lang.pm:309
+#: lang.pm:322
#, c-format
msgid "Northern Mariana Islands"
msgstr ""
-#: lang.pm:310
+#: lang.pm:323
#, c-format
msgid "Martinique"
msgstr ""
-#: lang.pm:311
+#: lang.pm:324
#, c-format
msgid "Mauritania"
msgstr ""
-#: lang.pm:312
+#: lang.pm:325
#, c-format
msgid "Montserrat"
msgstr ""
-#: lang.pm:313
+#: lang.pm:326
#, c-format
msgid "Malta"
msgstr ""
-#: lang.pm:314
+#: lang.pm:327
#, c-format
msgid "Mauritius"
msgstr ""
-#: lang.pm:315
+#: lang.pm:328
#, c-format
msgid "Maldives"
msgstr ""
-#: lang.pm:316
+#: lang.pm:329
#, c-format
msgid "Malawi"
msgstr ""
-#: lang.pm:317
+#: lang.pm:330
#, c-format
msgid "Mexico"
msgstr ""
-#: lang.pm:318
+#: lang.pm:331
#, c-format
msgid "Malaysia"
msgstr ""
-#: lang.pm:319
+#: lang.pm:332
#, c-format
msgid "Mozambique"
msgstr ""
-#: lang.pm:320
+#: lang.pm:333
#, c-format
msgid "Namibia"
msgstr ""
-#: lang.pm:321
+#: lang.pm:334
#, c-format
msgid "New Caledonia"
msgstr ""
-#: lang.pm:322
+#: lang.pm:335
#, c-format
msgid "Niger"
msgstr ""
-#: lang.pm:323
+#: lang.pm:336
#, c-format
msgid "Norfolk Island"
msgstr ""
-#: lang.pm:324
+#: lang.pm:337
#, c-format
msgid "Nigeria"
msgstr ""
-#: lang.pm:325
+#: lang.pm:338
#, c-format
msgid "Nicaragua"
msgstr ""
-#: lang.pm:328
+#: lang.pm:341
#, c-format
msgid "Nepal"
msgstr ""
-#: lang.pm:329
+#: lang.pm:342
#, c-format
msgid "Nauru"
msgstr ""
-#: lang.pm:330
+#: lang.pm:343
#, c-format
msgid "Niue"
msgstr ""
-#: lang.pm:331
+#: lang.pm:344
#, c-format
msgid "New Zealand"
msgstr ""
-#: lang.pm:332
+#: lang.pm:345
#, c-format
msgid "Oman"
msgstr ""
-#: lang.pm:333
+#: lang.pm:346
#, c-format
msgid "Panama"
msgstr ""
-#: lang.pm:334
+#: lang.pm:347
#, c-format
msgid "Peru"
msgstr ""
-#: lang.pm:335
+#: lang.pm:348
#, c-format
msgid "French Polynesia"
msgstr ""
-#: lang.pm:336
+#: lang.pm:349
#, c-format
msgid "Papua New Guinea"
msgstr ""
-#: lang.pm:337
+#: lang.pm:350
#, c-format
msgid "Philippines"
msgstr ""
-#: lang.pm:338
+#: lang.pm:351
#, c-format
msgid "Pakistan"
msgstr ""
-#: lang.pm:339 network/adsl_consts.pm:311
+#: lang.pm:352 network/adsl_consts.pm:311
#, c-format
msgid "Poland"
msgstr ""
-#: lang.pm:340
+#: lang.pm:353
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr ""
-#: lang.pm:341
+#: lang.pm:354
#, c-format
msgid "Pitcairn"
msgstr ""
-#: lang.pm:342
+#: lang.pm:355
#, c-format
msgid "Puerto Rico"
msgstr ""
-#: lang.pm:343
+#: lang.pm:356
#, c-format
msgid "Palestine"
msgstr ""
-#: lang.pm:344 network/adsl_consts.pm:321
+#: lang.pm:357 network/adsl_consts.pm:321
#, c-format
msgid "Portugal"
msgstr ""
-#: lang.pm:345
+#: lang.pm:358
#, c-format
msgid "Paraguay"
msgstr ""
-#: lang.pm:346
+#: lang.pm:359
#, c-format
msgid "Palau"
msgstr ""
-#: lang.pm:347
+#: lang.pm:360
#, c-format
msgid "Qatar"
msgstr ""
-#: lang.pm:348
+#: lang.pm:361
#, c-format
msgid "Reunion"
msgstr ""
-#: lang.pm:349
+#: lang.pm:362
#, c-format
msgid "Romania"
msgstr ""
-#: lang.pm:350
+#: lang.pm:363
#, c-format
msgid "Russia"
msgstr ""
-#: lang.pm:351
+#: lang.pm:364
#, c-format
msgid "Rwanda"
msgstr ""
-#: lang.pm:352
+#: lang.pm:365
#, c-format
msgid "Saudi Arabia"
msgstr ""
-#: lang.pm:353
+#: lang.pm:366
#, c-format
msgid "Solomon Islands"
msgstr ""
-#: lang.pm:354
+#: lang.pm:367
#, c-format
msgid "Seychelles"
msgstr ""
-#: lang.pm:355
+#: lang.pm:368
#, c-format
msgid "Sudan"
msgstr ""
-#: lang.pm:357
+#: lang.pm:370
#, c-format
msgid "Singapore"
msgstr ""
-#: lang.pm:358
+#: lang.pm:371
#, c-format
msgid "Saint Helena"
msgstr ""
-#: lang.pm:359
+#: lang.pm:372
#, c-format
msgid "Slovenia"
msgstr ""
-#: lang.pm:360
+#: lang.pm:373
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr ""
-#: lang.pm:361
+#: lang.pm:374
#, c-format
msgid "Slovakia"
msgstr ""
-#: lang.pm:362
+#: lang.pm:375
#, c-format
msgid "Sierra Leone"
msgstr ""
-#: lang.pm:363
+#: lang.pm:376
#, c-format
msgid "San Marino"
msgstr ""
-#: lang.pm:364
+#: lang.pm:377
#, c-format
msgid "Senegal"
msgstr ""
-#: lang.pm:365
+#: lang.pm:378
#, c-format
msgid "Somalia"
msgstr ""
-#: lang.pm:366
+#: lang.pm:379
#, c-format
msgid "Suriname"
msgstr ""
-#: lang.pm:367
+#: lang.pm:380
#, c-format
msgid "Sao Tome and Principe"
msgstr ""
-#: lang.pm:368
+#: lang.pm:381
#, c-format
msgid "El Salvador"
msgstr ""
-#: lang.pm:369
+#: lang.pm:382
#, c-format
msgid "Syria"
msgstr ""
-#: lang.pm:370
+#: lang.pm:383
#, c-format
msgid "Swaziland"
msgstr ""
-#: lang.pm:371
+#: lang.pm:384
#, c-format
msgid "Turks and Caicos Islands"
msgstr ""
-#: lang.pm:372
+#: lang.pm:385
#, c-format
msgid "Chad"
msgstr ""
-#: lang.pm:373
+#: lang.pm:386
#, c-format
msgid "French Southern Territories"
msgstr ""
-#: lang.pm:374
+#: lang.pm:387
#, c-format
msgid "Togo"
msgstr ""
-#: lang.pm:375
+#: lang.pm:388
#, c-format
msgid "Thailand"
msgstr ""
-#: lang.pm:376
+#: lang.pm:389
#, c-format
msgid "Tajikistan"
msgstr ""
-#: lang.pm:377
+#: lang.pm:390
#, c-format
msgid "Tokelau"
msgstr ""
-#: lang.pm:378
+#: lang.pm:391
#, c-format
msgid "East Timor"
msgstr ""
-#: lang.pm:379
+#: lang.pm:392
#, c-format
msgid "Turkmenistan"
msgstr ""
-#: lang.pm:380
+#: lang.pm:393
#, c-format
msgid "Tunisia"
msgstr ""
-#: lang.pm:381
+#: lang.pm:394
#, c-format
msgid "Tonga"
msgstr ""
-#: lang.pm:382
+#: lang.pm:395
#, c-format
msgid "Turkey"
msgstr ""
-#: lang.pm:383
+#: lang.pm:396
#, c-format
msgid "Trinidad and Tobago"
msgstr ""
-#: lang.pm:384
+#: lang.pm:397
#, c-format
msgid "Tuvalu"
msgstr ""
-#: lang.pm:385
+#: lang.pm:398
#, c-format
msgid "Taiwan"
msgstr ""
-#: lang.pm:386
+#: lang.pm:399
#, c-format
msgid "Tanzania"
msgstr ""
-#: lang.pm:387
+#: lang.pm:400
#, c-format
msgid "Ukraine"
msgstr ""
-#: lang.pm:388
+#: lang.pm:401
#, c-format
msgid "Uganda"
msgstr ""
-#: lang.pm:389
+#: lang.pm:402
#, c-format
msgid "United States Minor Outlying Islands"
msgstr ""
-#: lang.pm:391
+#: lang.pm:404
#, c-format
msgid "Uruguay"
msgstr ""
-#: lang.pm:392
+#: lang.pm:405
#, c-format
msgid "Uzbekistan"
msgstr ""
-#: lang.pm:393
+#: lang.pm:406
#, c-format
msgid "Vatican"
msgstr ""
-#: lang.pm:394
+#: lang.pm:407
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr ""
-#: lang.pm:395
+#: lang.pm:408
#, c-format
msgid "Venezuela"
msgstr ""
-#: lang.pm:396
+#: lang.pm:409
#, c-format
msgid "Virgin Islands (British)"
msgstr ""
-#: lang.pm:397
+#: lang.pm:410
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr ""
-#: lang.pm:398
+#: lang.pm:411
#, c-format
msgid "Vietnam"
msgstr ""
-#: lang.pm:399
+#: lang.pm:412
#, c-format
msgid "Vanuatu"
msgstr ""
-#: lang.pm:400
+#: lang.pm:413
#, c-format
msgid "Wallis and Futuna"
msgstr ""
-#: lang.pm:401
+#: lang.pm:414
#, c-format
msgid "Samoa"
msgstr ""
-#: lang.pm:402
+#: lang.pm:415
#, c-format
msgid "Yemen"
msgstr ""
-#: lang.pm:403
+#: lang.pm:416
#, c-format
msgid "Mayotte"
msgstr ""
-#: lang.pm:404
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr ""
-
-#: lang.pm:405 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:47
#, c-format
msgid "South Africa"
msgstr ""
-#: lang.pm:406
+#: lang.pm:418
#, c-format
msgid "Zambia"
msgstr ""
-#: lang.pm:407
+#: lang.pm:419
#, c-format
msgid "Zimbabwe"
msgstr ""
-#: lang.pm:1056
+#: lang.pm:1042
#, c-format
msgid "Welcome to %s"
msgstr ""
@@ -7387,7 +7402,7 @@ msgstr ""
#, c-format
msgid ""
"You may now provide options to module %s.\n"
-"Options are in format ``name=value name2=value2...''.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
"For instance, ``io=0x300 irq=7''"
msgstr ""
@@ -7479,7 +7494,7 @@ msgstr ""
msgid "GlidePoint"
msgstr ""
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:577 network/netconnect.pm:582 network/netconnect.pm:594 network/netconnect.pm:599 network/netconnect.pm:615 network/netconnect.pm:617
+#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/modem.pm:58 network/modem.pm:72 network/modem.pm:77 network/modem.pm:108 network/netconnect.pm:581 network/netconnect.pm:586 network/netconnect.pm:598 network/netconnect.pm:603 network/netconnect.pm:619 network/netconnect.pm:621
#, c-format
msgid "Automatic"
msgstr ""
@@ -7684,12 +7699,12 @@ msgstr ""
msgid "Sagem (using DHCP) USB"
msgstr ""
-#: network/adsl.pm:35 network/netconnect.pm:752
+#: network/adsl.pm:35 network/netconnect.pm:756
#, c-format
msgid "Connect to the Internet"
msgstr ""
-#: network/adsl.pm:36 network/netconnect.pm:753
+#: network/adsl.pm:36 network/netconnect.pm:757
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -7697,7 +7712,7 @@ msgid ""
"If you don't know, choose 'use pppoe'"
msgstr ""
-#: network/adsl.pm:41 network/netconnect.pm:757
+#: network/adsl.pm:41 network/netconnect.pm:761
#, c-format
msgid "ADSL connection type:"
msgstr ""
@@ -7814,37 +7829,37 @@ msgstr ""
msgid "Other ports"
msgstr ""
-#: network/isdn.pm:94 network/netconnect.pm:430
+#: network/isdn.pm:94 network/netconnect.pm:434
#, c-format
msgid "Unlisted - edit manually"
msgstr ""
-#: network/isdn.pm:137 network/netconnect.pm:379
+#: network/isdn.pm:137 network/netconnect.pm:383
#, c-format
msgid "ISA / PCMCIA"
msgstr ""
-#: network/isdn.pm:137 network/netconnect.pm:379
+#: network/isdn.pm:137 network/netconnect.pm:383
#, c-format
msgid "I don't know"
msgstr ""
-#: network/isdn.pm:138 network/netconnect.pm:379
+#: network/isdn.pm:138 network/netconnect.pm:383
#, c-format
msgid "PCI"
msgstr ""
-#: network/isdn.pm:139 network/netconnect.pm:379
+#: network/isdn.pm:139 network/netconnect.pm:383
#, c-format
msgid "USB"
msgstr ""
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:582 network/netconnect.pm:599 network/netconnect.pm:615
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44 network/netconnect.pm:586 network/netconnect.pm:603 network/netconnect.pm:619
#, c-format
msgid "Manual"
msgstr ""
-#: network/netconnect.pm:89 network/netconnect.pm:459 network/netconnect.pm:469
+#: network/netconnect.pm:89 network/netconnect.pm:463 network/netconnect.pm:473
#, c-format
msgid "Manual choice"
msgstr ""
@@ -7884,7 +7899,7 @@ msgstr ""
msgid "Auto"
msgstr ""
-#: network/netconnect.pm:106 printer/printerdrake.pm:1133 standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1114 standalone/drakups:64
#, c-format
msgid "Manual configuration"
msgstr ""
@@ -7916,163 +7931,163 @@ msgid ""
"No D-Channel (leased lines)"
msgstr ""
-#: network/netconnect.pm:151
+#: network/netconnect.pm:152
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr ""
-#: network/netconnect.pm:152
+#: network/netconnect.pm:153
#, c-format
msgid "Sagem USB modem"
msgstr ""
-#: network/netconnect.pm:153
+#: network/netconnect.pm:154
#, c-format
msgid "Bewan modem"
msgstr ""
-#: network/netconnect.pm:154
+#: network/netconnect.pm:155
#, c-format
msgid "ECI Hi-Focus modem"
msgstr ""
-#: network/netconnect.pm:158
+#: network/netconnect.pm:159
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr ""
-#: network/netconnect.pm:159
+#: network/netconnect.pm:160
#, c-format
msgid "Manual TCP/IP configuration"
msgstr ""
-#: network/netconnect.pm:160
+#: network/netconnect.pm:161
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr ""
-#: network/netconnect.pm:161
+#: network/netconnect.pm:162
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr ""
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr ""
-#: network/netconnect.pm:166
+#: network/netconnect.pm:167
#, c-format
msgid "Bridged Ethernet LLC"
msgstr ""
-#: network/netconnect.pm:167
+#: network/netconnect.pm:168
#, c-format
msgid "Bridged Ethernet VC"
msgstr ""
-#: network/netconnect.pm:168
+#: network/netconnect.pm:169
#, c-format
msgid "Routed IP LLC"
msgstr ""
-#: network/netconnect.pm:169
+#: network/netconnect.pm:170
#, c-format
msgid "Routed IP VC"
msgstr ""
-#: network/netconnect.pm:170
+#: network/netconnect.pm:171
#, c-format
msgid "PPPOA LLC"
msgstr ""
-#: network/netconnect.pm:171
+#: network/netconnect.pm:172
#, c-format
msgid "PPPOA VC"
msgstr ""
-#: network/netconnect.pm:175 standalone/drakconnect:476
+#: network/netconnect.pm:176 standalone/drakconnect:476
#, c-format
msgid "Script-based"
msgstr ""
-#: network/netconnect.pm:176 standalone/drakconnect:476
+#: network/netconnect.pm:177 standalone/drakconnect:476
#, c-format
msgid "PAP"
msgstr ""
-#: network/netconnect.pm:177 standalone/drakconnect:476
+#: network/netconnect.pm:178 standalone/drakconnect:476
#, c-format
msgid "Terminal-based"
msgstr ""
-#: network/netconnect.pm:178 standalone/drakconnect:476
+#: network/netconnect.pm:179 standalone/drakconnect:476
#, c-format
msgid "CHAP"
msgstr ""
-#: network/netconnect.pm:179 standalone/drakconnect:476
+#: network/netconnect.pm:180 standalone/drakconnect:476
#, c-format
msgid "PAP/CHAP"
msgstr ""
-#: network/netconnect.pm:233 standalone/drakconnect:58
+#: network/netconnect.pm:234 standalone/drakconnect:58
#, c-format
msgid "Network & Internet Configuration"
msgstr ""
-#: network/netconnect.pm:239
+#: network/netconnect.pm:240
#, c-format
msgid "(detected on port %s)"
msgstr ""
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:241
+#: network/netconnect.pm:242
#, c-format
msgid "(detected %s)"
msgstr ""
-#: network/netconnect.pm:241
+#: network/netconnect.pm:242
#, c-format
msgid "(detected)"
msgstr ""
-#: network/netconnect.pm:243
+#: network/netconnect.pm:244
#, c-format
msgid "Modem connection"
msgstr ""
-#: network/netconnect.pm:244
+#: network/netconnect.pm:245
#, c-format
msgid "ISDN connection"
msgstr ""
-#: network/netconnect.pm:245
+#: network/netconnect.pm:246
#, c-format
msgid "ADSL connection"
msgstr ""
-#: network/netconnect.pm:246
+#: network/netconnect.pm:247
#, c-format
msgid "Cable connection"
msgstr ""
-#: network/netconnect.pm:247
+#: network/netconnect.pm:248
#, c-format
msgid "LAN connection"
msgstr ""
-#: network/netconnect.pm:248 network/netconnect.pm:262
+#: network/netconnect.pm:249 network/netconnect.pm:263
#, c-format
msgid "Wireless connection"
msgstr ""
-#: network/netconnect.pm:258
+#: network/netconnect.pm:259
#, c-format
msgid "Choose the connection you want to configure"
msgstr ""
-#: network/netconnect.pm:276
+#: network/netconnect.pm:277
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -8081,122 +8096,122 @@ msgid ""
"Press \"%s\" to continue."
msgstr ""
-#: network/netconnect.pm:284 network/netconnect.pm:781
+#: network/netconnect.pm:285 network/netconnect.pm:786
#, c-format
msgid "Connection Configuration"
msgstr ""
-#: network/netconnect.pm:285 network/netconnect.pm:782
+#: network/netconnect.pm:286 network/netconnect.pm:787
#, c-format
msgid "Please fill or check the field below"
msgstr ""
-#: network/netconnect.pm:292 standalone/drakconnect:531
+#: network/netconnect.pm:293 standalone/drakconnect:531
#, c-format
msgid "Card IRQ"
msgstr ""
-#: network/netconnect.pm:293 standalone/drakconnect:532
+#: network/netconnect.pm:294 standalone/drakconnect:532
#, c-format
msgid "Card mem (DMA)"
msgstr ""
-#: network/netconnect.pm:294 standalone/drakconnect:533
+#: network/netconnect.pm:295 standalone/drakconnect:533
#, c-format
msgid "Card IO"
msgstr ""
-#: network/netconnect.pm:295 standalone/drakconnect:534
+#: network/netconnect.pm:296 standalone/drakconnect:534
#, c-format
msgid "Card IO_0"
msgstr ""
-#: network/netconnect.pm:296
+#: network/netconnect.pm:297
#, c-format
msgid "Card IO_1"
msgstr ""
-#: network/netconnect.pm:297
+#: network/netconnect.pm:298
#, c-format
msgid "Your personal phone number"
msgstr ""
-#: network/netconnect.pm:298 network/netconnect.pm:785
+#: network/netconnect.pm:299 network/netconnect.pm:790
#, c-format
msgid "Provider name (ex provider.net)"
msgstr ""
-#: network/netconnect.pm:299 standalone/drakconnect:472