summaryrefslogtreecommitdiffstats
path: root/perl-install/network/modem.pm
blob: dbeefe3184ae3dc8b5ef6fb92947aade95dc5e6d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
package network::modem;	# $Id$

use strict;
use common;
use any;
use modules;
use detect_devices;
use mouse;
use network::tools;


#-----modem conf
sub ppp_configure {
    my ($in, $modem) = @_;
    $modem or return;
    $in->do_pkgs->install('ppp') if !$::testing;
    $in->do_pkgs->install('kdenetwork-kppp') if !$::testing &&$in->do_pkgs->is_installed('kdebase');

    any::devfssymlinkf($modem, 'modem') if $modem->{device} ne "/dev/modem";

    my %toreplace = map { $_ => $modem->{$_} } qw(Authentication AutoName connection dns1 dns2 domain IPAddr login passwd phone SubnetMask);
    $toreplace{phone} =~ s/[a-zA-Z]//g;
    if ($modem->{auto_dns} ne N("Automatic")) {
        $toreplace{dnsserver} = join ',', map { $modem->{$_} } "dns1", "dns2";
        $toreplace{dnsserver} .= $toreplace{dnsserver} && ',';
    }

    #- using peerdns or dns1,dns2 avoid writing a /etc/resolv.conf file.
    $toreplace{peerdns} = "yes";

    $toreplace{connection} ||= 'DialupConnection';
    $toreplace{domain} ||= 'localdomain';
    $toreplace{intf} ||= 'ppp0';
    $toreplace{papname} = $toreplace{login} if member($modem->{Authentication}, 1, 3, 4);

    # handle static/dynamic settings:
    if ($modem->{auto_ip} eq N("Automatic")) {
        $toreplace{$_} = '0.0.0.0' foreach qw(IPAddr SubnetMask) ;
    } else {
        $toreplace{$_} = $modem->{$_} foreach qw(IPAddr SubnetMask) ;
    }
    $toreplace{Gateway} = $modem->{auto_gateway} eq N("Automatic") ? '0.0.0.0' : $modem->{Gateway};


    #- build ifcfg-ppp0.
    my $various = <<END;
DEVICE="$toreplace{intf}"
ONBOOT="no"
USERCTL="no"
MODEMPORT="/dev/modem"
LINESPEED="115200"
PERSIST="yes"
DEFABORT="yes"
DEBUG="yes"
INITSTRING="ATZ"
DEFROUTE="yes"
HARDFLOWCTL="yes"
ESCAPECHARS="no"
PPPOPTIONS=""
PAPNAME="$toreplace{papname}"
REMIP=""
NETMASK=""
IPADDR=""
MRU=""
MTU=""
DISCONNECTTIMEOUT="5"
RETRYTIMEOUT="60"
BOOTPROTO="none"
PEERDNS="$toreplace{peerdns}"
END
    output("$::prefix/etc/sysconfig/network-scripts/ifcfg-ppp0", 
	   $various,
           if_($modem->{auto_dns} ne N("Automatic"), map { qq(DNS$_=$toreplace{"dns$_"}\n) } grep { $toreplace{"dns$_"} } 1..2));

    #- build chat-ppp0.
    my @chat = <<END;
'ABORT' 'BUSY'
'ABORT' 'ERROR'
'ABORT' 'NO CARRIER'
'ABORT' 'NO DIALTONE'
'ABORT' 'Invalid Login'
'ABORT' 'Login incorrect'
'' 'ATZ'
END
    if ($modem->{special_command}) {
	push @chat, <<END;
'OK' '$modem->{special_command}'
END
    }
    push @chat, <<END;
'OK' 'ATDT$toreplace{phone}'
'CONNECT' ''
END
    if (member($modem->{Authentication}, 0, 2)) {
	push @chat, <<END;
'ogin:--ogin:' '$toreplace{login}'
'ord:' '$toreplace{passwd}'
END
    }
    push @chat, <<END;
'TIMEOUT' '5'
'~--' ''
END
    my $chat_file = "$::prefix/etc/sysconfig/network-scripts/chat-ppp0";
    output_with_perm($chat_file, 0600, @chat);

    write_secret_backend($toreplace{login}, $toreplace{passwd});

    #- install kppprc file according to used configuration.
    mkdir_p("$::prefix/usr/share/config");

    output("$::prefix/usr/share/config/kppprc", c::to_utf8(<<END));
# KDE Config File

[Account0]
ExDNSDisabled=0
AutoName=$toreplace{AutoName}
ScriptArguments=
AccountingEnabled=0
DialString=ATDT
Phonenumber=$toreplace{phone}
IPAddr=$toreplace{IPAddr}
Domain=$toreplace{domain}
Name=$toreplace{connection}
VolumeAccountingEnabled=0
pppdArguments=
Password=$toreplace{passwd}
BeforeDisconnect=
Command=
ScriptCommands=
Authentication=$toreplace{Authentication}
DNS=$toreplace{dnsserver}
SubnetMask=$toreplace{SubnetMask}
AccountingFile=
DefaultRoute=1
Username=$toreplace{login}
Gateway=$toreplace{Gateway}
StorePassword=1
DisconnectCommand=

[Modem]
BusyWait=0
Enter=CR
FlowControl=CRTSCTS
Volume=0
Timeout=60
UseCDLine=0
UseLockFile=1
Device=/dev/modem
Speed=115200

[Graph]
InBytes=0,0,255
Text=0,0,0
Background=255,255,255
Enabled=true
OutBytes=255,0,0

[General]
QuitOnDisconnect=0
ShowLogWindow=0
DisconnectOnXServerExit=1
DefaultAccount=$toreplace{connection}
iconifyOnConnect=1
Hint_QuickHelp=0
AutomaticRedial=0
PPPDebug=0
NumberOfAccounts=1
ShowClock=1
DockIntoPanel=0
pppdTimeout=30
END
    network::network::proxy_configure($::o->{miscellaneous});
}

1;
:3961
#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
#: ../../standalone/drakbackup_.c:4041 ../../standalone/drakbackup_.c:4101
@@ -288,7 +288,7 @@ msgstr ""
#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
+#: ../../standalone/drakgw_.c:560 ../../standalone/logdrake_.c:225
#: ../../ugtk.pm_.c:296
msgid "Cancel"
msgstr ""
@@ -470,7 +470,7 @@ msgstr ""
#: ../../any.pm_.c:170 ../../any.pm_.c:789
#: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
+#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:48
#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
#: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
#: ../../standalone/drakconnect_.c:649
@@ -478,7 +478,7 @@ msgid "Password"
msgstr ""
#: ../../any.pm_.c:171 ../../any.pm_.c:790
-#: ../../install_steps_interactive.pm_.c:1095
+#: ../../install_steps_interactive.pm_.c:1098
msgid "Password (again)"
msgstr ""
@@ -513,13 +513,13 @@ msgid ""
msgstr ""
#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../diskdrake/interactive.pm_.c:1191
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../install_steps_interactive.pm_.c:1092
msgid "Please try again"
msgstr ""
#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1092
msgid "The passwords do not match"
msgstr ""
@@ -571,7 +571,7 @@ msgstr ""
#: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
#: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3207 ../../standalone/drakbackup_.c:2774
msgid "Done"
msgstr ""
@@ -631,7 +631,7 @@ msgstr ""
msgid "Label"
msgstr ""
-#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:201
+#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:200
msgid "Default"
msgstr ""
@@ -879,7 +879,7 @@ msgstr ""
msgid "No sharing"
msgstr ""
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:66
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
msgstr ""
@@ -889,7 +889,7 @@ msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr ""
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:71
#, c-format
msgid "Mandatory package %s is missing"
msgstr ""
@@ -1140,35 +1140,26 @@ msgstr ""
msgid "Create new theme"
msgstr ""
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:192
#, c-format
msgid "Backup %s to %s.old"
msgstr ""
-#: ../../bootlook.pm_.c:194 ../../bootlook.pm_.c:197 ../../bootlook.pm_.c:200
-#: ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 ../../bootlook.pm_.c:242
-#: ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
-#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:355
-#: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/interactive.pm_.c:474
-#: ../../diskdrake/smbnfs_gtk.pm_.c:45 ../../fsedit.pm_.c:239
-#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:67
-#: ../../interactive/http.pm_.c:119 ../../interactive/http.pm_.c:120
-#: ../../standalone/draksplash_.c:34
-msgid "Error"
-msgstr ""
-
-#: ../../bootlook.pm_.c:194
-msgid "unable to backup lilo message"
-msgstr ""
-
-#: ../../bootlook.pm_.c:196
+#: ../../bootlook.pm_.c:195
#, c-format
msgid "Copy %s to %s"
msgstr ""
-#: ../../bootlook.pm_.c:197
-msgid "can't change lilo message"
+#: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232
+#: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
+#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
+#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344
+#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473
+#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75
+#: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119
+#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:34
+msgid "Error"
msgstr ""
#: ../../bootlook.pm_.c:200
@@ -1232,7 +1223,7 @@ msgstr ""
#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
#: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:526
+#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:554
msgid "Configure"
msgstr ""
@@ -1399,12 +1390,12 @@ msgstr ""
msgid "New"
msgstr ""
-#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392
#: ../../diskdrake/smbnfs_gtk.pm_.c:81
msgid "Unmount"
msgstr ""
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:385
+#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389
#: ../../diskdrake/smbnfs_gtk.pm_.c:82
msgid "Mount"
msgstr ""
@@ -1413,8 +1404,8 @@ msgstr ""
msgid "Server"
msgstr ""
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:379
-#: ../../diskdrake/interactive.pm_.c:568 ../../diskdrake/interactive.pm_.c:595
+#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383
+#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599
#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
#: ../../diskdrake/smbnfs_gtk.pm_.c:85
msgid "Mount point"
@@ -1432,13 +1423,13 @@ msgstr ""
msgid "Server: "
msgstr ""
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:440
-#: ../../diskdrake/interactive.pm_.c:1089
-#: ../../diskdrake/interactive.pm_.c:1164
+#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444
+#: ../../diskdrake/interactive.pm_.c:1093
+#: ../../diskdrake/interactive.pm_.c:1168
msgid "Mount point: "
msgstr ""
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1170
+#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174
#, c-format
msgid "Options: %s"
msgstr ""
@@ -1447,9 +1438,9 @@ msgstr ""
msgid "Please make a backup of your data first"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:934
-#: ../../diskdrake/interactive.pm_.c:943
-#: ../../diskdrake/interactive.pm_.c:1009
+#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:947
+#: ../../diskdrake/interactive.pm_.c:1013
msgid "Read carefully!"
msgstr ""
@@ -1513,7 +1504,7 @@ msgstr ""
msgid "Swap"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1105
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109
msgid "Empty"
msgstr ""
@@ -1527,12 +1518,12 @@ msgstr ""
msgid "Filesystem types:"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:402
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406
msgid "Create"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:380
-#: ../../diskdrake/interactive.pm_.c:531 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384
+#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26
#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
msgid "Type"
msgstr ""
@@ -1542,7 +1533,7 @@ msgstr ""
msgid "Use ``%s'' instead"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393
msgid "Delete"
msgstr ""
@@ -1550,7 +1541,7 @@ msgstr ""
msgid "Use ``Unmount'' first"
msgstr ""
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:518
+#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
@@ -1568,337 +1559,337 @@ msgstr ""
msgid "Exit"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Toggle to expert mode"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Toggle to normal mode"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Undo"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:240
+#: ../../diskdrake/interactive.pm_.c:244
msgid "Continue anyway?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:245
+#: ../../diskdrake/interactive.pm_.c:249
msgid "Quit without saving"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:245
+#: ../../diskdrake/interactive.pm_.c:249
msgid "Quit without writing the partition table?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:250
+#: ../../diskdrake/interactive.pm_.c:254
msgid "Do you want to save /etc/fstab modifications"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
msgid "Auto allocate"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
msgid "Clear all"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
#: ../../install_steps_interactive.pm_.c:214
msgid "More"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:267
+#: ../../diskdrake/interactive.pm_.c:271
msgid "Hard drive information"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:298
+#: ../../diskdrake/interactive.pm_.c:302
msgid "All primary partitions are used"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:299
+#: ../../diskdrake/interactive.pm_.c:303
msgid "I can't add any more partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:300
+#: ../../diskdrake/interactive.pm_.c:304
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:310
+#: ../../diskdrake/interactive.pm_.c:314
msgid "Save partition table"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:311
+#: ../../diskdrake/interactive.pm_.c:315
msgid "Restore partition table"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:312
+#: ../../diskdrake/interactive.pm_.c:316
msgid "Rescue partition table"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:314
+#: ../../diskdrake/interactive.pm_.c:318
msgid "Reload partition table"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:319
+#: ../../diskdrake/interactive.pm_.c:323
msgid "Removable media automounting"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:328 ../../diskdrake/interactive.pm_.c:348
+#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352
msgid "Select file"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:335
+#: ../../diskdrake/interactive.pm_.c:339
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:349 ../../harddrake/sound.pm_.c:200
+#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:200
msgid "Warning"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:350
+#: ../../diskdrake/interactive.pm_.c:354
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:361
+#: ../../diskdrake/interactive.pm_.c:365
msgid "Trying to rescue partition table"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:367
+#: ../../diskdrake/interactive.pm_.c:371
msgid "Detailed information"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:382 ../../diskdrake/interactive.pm_.c:662
+#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666
msgid "Resize"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:383 ../../diskdrake/interactive.pm_.c:715
+#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719
msgid "Move"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:384
+#: ../../diskdrake/interactive.pm_.c:388
msgid "Format"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:386
+#: ../../diskdrake/interactive.pm_.c:390
msgid "Add to RAID"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:387
+#: ../../diskdrake/interactive.pm_.c:391
msgid "Add to LVM"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:390
+#: ../../diskdrake/interactive.pm_.c:394
msgid "Remove from RAID"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:395
msgid "Remove from LVM"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:392
+#: ../../diskdrake/interactive.pm_.c:396
msgid "Modify RAID"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:393
+#: ../../diskdrake/interactive.pm_.c:397
msgid "Use for loopback"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:433
+#: ../../diskdrake/interactive.pm_.c:437
msgid "Create a new partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:436
+#: ../../diskdrake/interactive.pm_.c:440
msgid "Start sector: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:438 ../../diskdrake/interactive.pm_.c:815
+#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819
msgid "Size in MB: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:439 ../../diskdrake/interactive.pm_.c:816
+#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820
msgid "Filesystem type: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:444
+#: ../../diskdrake/interactive.pm_.c:448
msgid "Preference: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:469
+#: ../../diskdrake/interactive.pm_.c:473
msgid ""
"You can't create a new partition\n"
"(since you reached the maximal number of primary partitions).\n"
"First remove a primary partition and create an extended partition."
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:499
+#: ../../diskdrake/interactive.pm_.c:503
msgid "Remove the loopback file?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:529
+#: ../../diskdrake/interactive.pm_.c:533
msgid "Change partition type"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:530 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48
msgid "Which filesystem do you want?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:536
+#: ../../diskdrake/interactive.pm_.c:540
msgid "Switching from ext2 to ext3"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:566
+#: ../../diskdrake/interactive.pm_.c:570
#, c-format
msgid "Where do you want to mount loopback file %s?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:567
+#: ../../diskdrake/interactive.pm_.c:571
#, c-format
msgid "Where do you want to mount device %s?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:573
+#: ../../diskdrake/interactive.pm_.c:577
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:594
+#: ../../diskdrake/interactive.pm_.c:598
#, c-format
msgid "Where do you want to mount %s?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:618
+#: ../../diskdrake/interactive.pm_.c:622
msgid "Computing FAT filesystem bounds"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:618 ../../diskdrake/interactive.pm_.c:677
+#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681
#: ../../install_interactive.pm_.c:133
msgid "Resizing"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:650
+#: ../../diskdrake/interactive.pm_.c:654
msgid "This partition is not resizeable"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:655
+#: ../../diskdrake/interactive.pm_.c:659
msgid "All data on this partition should be backed-up"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:657
+#: ../../diskdrake/interactive.pm_.c:661
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:662
+#: ../../diskdrake/interactive.pm_.c:666
msgid "Choose the new size"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:663
+#: ../../diskdrake/interactive.pm_.c:667
msgid "New size in MB: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:716
+#: ../../diskdrake/interactive.pm_.c:720
msgid "Which disk do you want to move it to?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:717
+#: ../../diskdrake/interactive.pm_.c:721
msgid "Sector"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:718
+#: ../../diskdrake/interactive.pm_.c:722
msgid "Which sector do you want to move it to?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:725
msgid "Moving"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:725
msgid "Moving partition..."
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:738
+#: ../../diskdrake/interactive.pm_.c:742
msgid "Choose an existing RAID to add to"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:739 ../../diskdrake/interactive.pm_.c:756
+#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760
msgid "new"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:754
+#: ../../diskdrake/interactive.pm_.c:758
msgid "Choose an existing LVM to add to"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:759
+#: ../../diskdrake/interactive.pm_.c:763
msgid "LVM name?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:800
+#: ../../diskdrake/interactive.pm_.c:804
msgid "This partition can't be used for loopback"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:813
+#: ../../diskdrake/interactive.pm_.c:817
msgid "Loopback"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:814
+#: ../../diskdrake/interactive.pm_.c:818
msgid "Loopback file name: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:819
+#: ../../diskdrake/interactive.pm_.c:823
msgid "Give a file name"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:822
+#: ../../diskdrake/interactive.pm_.c:826
msgid "File already used by another loopback, choose another one"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:823
+#: ../../diskdrake/interactive.pm_.c:827
msgid "File already exists. Use it?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:846
+#: ../../diskdrake/interactive.pm_.c:850
msgid "Mount options"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:853
+#: ../../diskdrake/interactive.pm_.c:857
msgid "Various"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
+#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104
msgid "device"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:918
+#: ../../diskdrake/interactive.pm_.c:922
msgid "level"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:919
+#: ../../diskdrake/interactive.pm_.c:923
msgid "chunk size"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:934
+#: ../../diskdrake/interactive.pm_.c:938
msgid "Be careful: this operation is dangerous."
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:949
+#: ../../diskdrake/interactive.pm_.c:953
msgid "What type of partitioning?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:965
+#: ../../diskdrake/interactive.pm_.c:969
#, c-format
msgid "The package %s is needed. Install it?"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:979
+#: ../../diskdrake/interactive.pm_.c:983
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -1906,7 +1897,7 @@ msgid ""
"need /boot"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:983
+#: ../../diskdrake/interactive.pm_.c:987
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -1914,167 +1905,167 @@ msgid ""
"If you plan to use the LILO boot manager, be careful to add a /boot partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:989
+#: ../../diskdrake/interactive.pm_.c:993
msgid ""
"You've selected a software RAID partition as root (/).\n"
"No bootloader is able to handle this without a /boot partition.\n"
"So be careful to add a /boot partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1009
+#: ../../diskdrake/interactive.pm_.c:1013
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/interactive.pm_.c:1017
msgid "You'll need to reboot before the modification can take place"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1024
+#: ../../diskdrake/interactive.pm_.c:1028
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1026
+#: ../../diskdrake/interactive.pm_.c:1030
msgid "Formatting"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1027
+#: ../../diskdrake/interactive.pm_.c:1031
#, c-format
msgid "Formatting loopback file %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../diskdrake/interactive.pm_.c:1032
#: ../../install_steps_interactive.pm_.c:459
#, c-format
msgid "Formatting partition %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1039
+#: ../../diskdrake/interactive.pm_.c:1043
msgid "Hide files"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1039
+#: ../../diskdrake/interactive.pm_.c:1043
msgid "Move files to the new partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1040
+#: ../../diskdrake/interactive.pm_.c:1044
#, c-format
msgid ""
"Directory %s already contains data\n"
"(%s)"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1051
+#: ../../diskdrake/interactive.pm_.c:1055
msgid "Moving files to the new partition"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1055
+#: ../../diskdrake/interactive.pm_.c:1059
#, c-format
msgid "Copying %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1063
#, c-format
msgid "Removing %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1069
+#: ../../diskdrake/interactive.pm_.c:1073
#, c-format
msgid "partition %s is now known as %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1090
-#: ../../diskdrake/interactive.pm_.c:1149
+#: ../../diskdrake/interactive.pm_.c:1094
+#: ../../diskdrake/interactive.pm_.c:1153
msgid "Device: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1091
+#: ../../diskdrake/interactive.pm_.c:1095
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1095
-#: ../../diskdrake/interactive.pm_.c:1103
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../diskdrake/interactive.pm_.c:1099
+#: ../../diskdrake/interactive.pm_.c:1107
+#: ../../diskdrake/interactive.pm_.c:1172
msgid "Type: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1099
+#: ../../diskdrake/interactive.pm_.c:1103
msgid "Name: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1107
+#: ../../diskdrake/interactive.pm_.c:1111
#, c-format
msgid "Start: sector %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1112
#, c-format
msgid "Size: %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1110
+#: ../../diskdrake/interactive.pm_.c:1114
#, c-format
msgid ", %s sectors"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1116
#, c-format
msgid "Cylinder %d to %d\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1113
+#: ../../diskdrake/interactive.pm_.c:1117
msgid "Formatted\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1118
msgid "Not formatted\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1115
+#: ../../diskdrake/interactive.pm_.c:1119
msgid "Mounted\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1120
#, c-format
msgid "RAID md%s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1122
#, c-format
msgid ""
"Loopback file(s):\n"
" %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1119
+#: ../../diskdrake/interactive.pm_.c:1123
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1121
+#: ../../diskdrake/interactive.pm_.c:1125
#, c-format
msgid "Level %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1122
+#: ../../diskdrake/interactive.pm_.c:1126
#, c-format
msgid "Chunk size %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../diskdrake/interactive.pm_.c:1127
#, c-format
msgid "RAID-disks %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../diskdrake/interactive.pm_.c:1129
#, c-format
msgid "Loopback file name: %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1128
+#: ../../diskdrake/interactive.pm_.c:1132
msgid ""
"\n"
"Chances are, this partition is\n"
@@ -2082,7 +2073,7 @@ msgid ""
"probably leave it alone.\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1131
+#: ../../diskdrake/interactive.pm_.c:1135
msgid ""
"\n"
"This special Bootstrap\n"
@@ -2090,61 +2081,61 @@ msgid ""
"dual-booting your system.\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1150
+#: ../../diskdrake/interactive.pm_.c:1154
msgid "Read-only"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1151
+#: ../../diskdrake/interactive.pm_.c:1155
#, c-format
msgid "Size: %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1152
+#: ../../diskdrake/interactive.pm_.c:1156
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/interactive.pm_.c:1157
msgid "Info: "
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1154
+#: ../../diskdrake/interactive.pm_.c:1158
#, c-format
msgid "LVM-disks %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1155
+#: ../../diskdrake/interactive.pm_.c:1159
#, c-format
msgid "Partition table type: %s\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1156
+#: ../../diskdrake/interactive.pm_.c:1160
#, c-format
msgid "on channel %d id %d\n"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1186
+#: ../../diskdrake/interactive.pm_.c:1190
msgid "Filesystem encryption key"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1187
+#: ../../diskdrake/interactive.pm_.c:1191
msgid "Choose your filesystem encryption key"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1190
+#: ../../diskdrake/interactive.pm_.c:1194
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../diskdrake/interactive.pm_.c:1195
msgid "The encryption keys do not match"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1194
+#: ../../diskdrake/interactive.pm_.c:1198
msgid "Encryption key"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../diskdrake/interactive.pm_.c:1199
msgid "Encryption key (again)"
msgstr ""
@@ -2588,23 +2579,23 @@ msgstr ""
msgid "secondary"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:15 ../../harddrake/v4l.pm_.c:65
+#: ../../harddrake/v4l.pm_.c:14 ../../harddrake/v4l.pm_.c:64
msgid "Auto-detect"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:66 ../../harddrake/v4l.pm_.c:186
+#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:185
msgid "Unknown|Generic"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:98
+#: ../../harddrake/v4l.pm_.c:97
msgid "Unknown|CPH05X (bt878) [many vendors]"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:99
+#: ../../harddrake/v4l.pm_.c:98
msgid "Unknown|CPH06X (bt878) [many vendors]"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:210
+#: ../../harddrake/v4l.pm_.c:209
msgid ""
"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
"detect the rights parameters.\n"
@@ -2612,31 +2603,31 @@ msgid ""
"here. Just select your tv card parameters if needed"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:213
+#: ../../harddrake/v4l.pm_.c:212
msgid "Card model:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:213
msgid "Tuner type:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:215
+#: ../../harddrake/v4l.pm_.c:214
msgid "Number of capture buffers:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:215
+#: ../../harddrake/v4l.pm_.c:214
msgid "number of capture buffers for mmap'ed capture"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:216
msgid "PLL setting:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:218
+#: ../../harddrake/v4l.pm_.c:217
msgid "Radio support:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:218
+#: ../../harddrake/v4l.pm_.c:217
msgid "enable radio support"
msgstr ""
@@ -4602,8 +4593,8 @@ msgstr ""
msgid "Timezone"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
-#: ../../printerdrake.pm_.c:3074
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2989
+#: ../../printerdrake.pm_.c:3078
msgid "Printer"
msgstr ""
@@ -4616,78 +4607,78 @@ msgstr ""
msgid "Sound card"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1032
+#: ../../install_steps_interactive.pm_.c:1033
msgid "TV card"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1072
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1101
+#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1104
msgid "LDAP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1073
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1076
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1113
msgid "NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1074
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1118
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1121
+#: ../../install_steps_interactive.pm_.c:1127
msgid "Windows Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1097
+#: ../../install_steps_interactive.pm_.c:1078
+#: ../../install_steps_interactive.pm_.c:1100
msgid "Local files"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1084
-#: ../../install_steps_interactive.pm_.c:1085 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1087
+#: ../../install_steps_interactive.pm_.c:1088 ../../steps.pm_.c:24
msgid "Set root password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1089
msgid "No password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1091
+#: ../../install_steps_interactive.pm_.c:1094
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
+#: ../../install_steps_interactive.pm_.c:1100 ../../network/modem.pm_.c:49
#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
msgid "Authentication"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1105
+#: ../../install_steps_interactive.pm_.c:1108
msgid "Authentication LDAP"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1106
+#: ../../install_steps_interactive.pm_.c:1109
msgid "LDAP Base dn"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1107
+#: ../../install_steps_interactive.pm_.c:1110
msgid "LDAP Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1116
msgid "Authentication NIS"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1114
+#: ../../install_steps_interactive.pm_.c:1117
msgid "NIS Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1115
+#: ../../install_steps_interactive.pm_.c:1118
msgid "NIS Server"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1121
+#: ../../install_steps_interactive.pm_.c:1124
msgid ""
"For this to work for a W2K PDC, you will probably need to have the admin "
"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
@@ -4703,19 +4694,19 @@ msgid ""
"good."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1123
+#: ../../install_steps_interactive.pm_.c:1126
msgid "Authentication Windows Domain"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1125
+#: ../../install_steps_interactive.pm_.c:1128
msgid "Domain Admin User Name"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1126
+#: ../../install_steps_interactive.pm_.c:1129
msgid "Domain Admin Password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1164
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
"depending on the normal bootloader. This is useful if you don't want to "
@@ -4733,19 +4724,19 @@ msgid ""
"drive and press \"Ok\"."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1177
+#: ../../install_steps_interactive.pm_.c:1180
msgid "First floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1178
+#: ../../install_steps_interactive.pm_.c:1181
msgid "Second floppy drive"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
+#: ../../install_steps_interactive.pm_.c:1182 ../../printerdrake.pm_.c:2515
msgid "Skip"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1184
+#: ../../install_steps_interactive.pm_.c:1187
#, c-format
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -4761,7 +4752,7 @@ msgid ""
"%s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1190
+#: ../../install_steps_interactive.pm_.c:1193
msgid ""
"\n"
"\n"
@@ -4770,28 +4761,28 @@ msgid ""
"because XFS needs a very large driver)."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1198
+#: ../../install_steps_interactive.pm_.c:1201
msgid "Sorry, no floppy drive available"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1202
+#: ../../install_steps_interactive.pm_.c:1205
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1206
+#: ../../install_steps_interactive.pm_.c:1209
#, c-format
msgid "Insert a floppy in %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1209
+#: ../../install_steps_interactive.pm_.c:1212
msgid "Creating bootdisk..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1216
+#: ../../install_steps_interactive.pm_.c:1219
msgid "Preparing bootloader..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1227
+#: ../../install_steps_interactive.pm_.c:1230
msgid ""
"You appear to have an OldWorld or Unknown\n"
" machine, the yaboot bootloader will not work for you.\n"
@@ -4799,25 +4790,25 @@ msgid ""
" need to use BootX to boot your machine"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1233
+#: ../../install_steps_interactive.pm_.c:1236
msgid "Do you want to use aboot?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1236
+#: ../../install_steps_interactive.pm_.c:1239
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1243
+#: ../../install_steps_interactive.pm_.c:1246
msgid "Installing bootloader"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1252
msgid "Installation of bootloader failed. The following error occured:"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1257
+#: ../../install_steps_interactive.pm_.c:1260
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -4828,24 +4819,24 @@ msgid ""
"At your next boot you should see the bootloader prompt."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1291
+#: ../../install_steps_interactive.pm_.c:1294
#: ../../standalone/drakautoinst_.c:79
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1295
+#: ../../install_steps_interactive.pm_.c:1298
msgid "Creating auto install floppy..."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1306
+#: ../../install_steps_interactive.pm_.c:1309
msgid ""
"Some steps are not completed.\n"
"\n"
"Do you really want to quit now?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1317
+#: ../../install_steps_interactive.pm_.c:1320
#, c-format
msgid ""
"Congratulations, installation is complete.\n"
@@ -4864,15 +4855,15 @@ msgid ""
"install chapter of the Official Mandrake Linux User's Guide."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1330
+#: ../../install_steps_interactive.pm_.c:1333
msgid "http://www.mandrakelinux.com/en/90errata.php3"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1335
+#: ../../install_steps_interactive.pm_.c:1338
msgid "Generate auto install floppy"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1337
+#: ../../install_steps_interactive.pm_.c:1340
msgid ""
"The auto install can be fully automated if wanted,\n"
"in that case it will take over the hard drive!!\n"
@@ -4881,15 +4872,15 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1342
+#: ../../install_steps_interactive.pm_.c:1345
msgid "Automated"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1342
+#: ../../install_steps_interactive.pm_.c:1345
msgid "Replay"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1348
msgid "Save packages selection"
msgstr ""
@@ -4920,7 +4911,7 @@ msgstr ""
msgid "Advanced"
msgstr ""
-#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:220
+#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:103
msgid "Basic"
msgstr ""
@@ -5605,18 +5596,26 @@ msgid ""
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:147
+#: ../../network/drakfirewall.pm_.c:135
+msgid ""
+"drakfirewall configurator\n"
+"\n"
+"Make sure you have configured your Network/Internet access with\n"
+"drakconnect before going any further."
+msgstr ""
+
+#: ../../network/drakfirewall.pm_.c:152
msgid "Which services would you like to allow the Internet to connect to?"
msgstr ""
-#: ../../network/drakfirewall.pm_.c:148
+#: ../../network/drakfirewall.pm_.c:153
msgid ""
"You can enter miscellaneous ports. \n"
"Valid examples are: 139/tcp 139/udp.\n"
"Have a look at /etc/services for information."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:154
+#: ../../network/drakfirewall.pm_.c:159
#, c-format
msgid ""
"Invalid port given: %s.\n"
@@ -5624,11 +5623,11 @@ msgid ""
"where port is between 1 and 65535."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:162
+#: ../../network/drakfirewall.pm_.c:167
msgid "Everything (no firewall)"
msgstr ""
-#: ../../network/drakfirewall.pm_.c:164
+#: ../../network/drakfirewall.pm_.c:169
msgid "Other ports"
msgstr ""
@@ -5644,7 +5643,7 @@ msgid ""
"I cannot set up this connection type."
msgstr ""
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:236
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:238
msgid "Choose the network interface"
msgstr ""
@@ -5936,7 +5935,7 @@ msgstr ""
msgid "Use auto detection"
msgstr ""
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3203
#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
#: ../../standalone/drakfloppy_.c:146
msgid "Expert Mode"
@@ -6075,6 +6074,7 @@ msgid "IP address"
msgstr ""
#: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
+#: ../../standalone/drakgw_.c:295
msgid "Netmask"
msgstr ""
@@ -6147,11 +6147,11 @@ msgstr ""
msgid "Url should begin with 'ftp:' or 'http:'"
msgstr ""
-#: ../../network/shorewall.pm_.c:24
+#: ../../network/shorewall.pm_.c:25
msgid "Firewalling configuration detected!"
msgstr ""
-#: ../../network/shorewall.pm_.c:25
+#: ../../network/shorewall.pm_.c:26
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation."
@@ -6332,7 +6332,7 @@ msgstr ""
msgid "PDQ - Print, Don't Queue"
msgstr ""
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1181
msgid "CUPS"
msgstr ""
@@ -6384,102 +6384,102 @@ msgstr ""
msgid "Pipe job into a command"
msgstr ""
-#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
+#: ../../printer.pm_.c:346 ../../printer.pm_.c:388 ../../printer.pm_.c:570
msgid "Unknown Model"
msgstr ""
-#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
+#: ../../printer.pm_.c:791 ../../printer.pm_.c:982 ../../printer.pm_.c:1374
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3471
msgid "Unknown model"
msgstr ""
-#: ../../printer.pm_.c:782
+#: ../../printer.pm_.c:819
msgid "Local Printers"
msgstr ""
-#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
+#: ../../printer.pm_.c:821 ../../printer.pm_.c:1182
msgid "Remote Printers"
msgstr ""
-#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
+#: ../../printer.pm_.c:828 ../../printerdrake.pm_.c:417
#, c-format
msgid " on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
+#: ../../printer.pm_.c:831 ../../printerdrake.pm_.c:419
#, c-format
msgid ", USB printer \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:799
+#: ../../printer.pm_.c:836
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:802
+#: ../../printer.pm_.c:839
msgid ", multi-function device on USB"
msgstr ""
-#: ../../printer.pm_.c:804
+#: ../../printer.pm_.c:841
msgid ", multi-function device on HP JetDirect"
msgstr ""
-#: ../../printer.pm_.c:806
+#: ../../printer.pm_.c:843
msgid ", multi-function device"
msgstr ""
-#: ../../printer.pm_.c:809
+#: ../../printer.pm_.c:846
#, c-format
msgid ", printing to %s"
msgstr ""
-#: ../../printer.pm_.c:811
+#: ../../printer.pm_.c:848
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:813
+#: ../../printer.pm_.c:850
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ""
-#: ../../printer.pm_.c:817
+#: ../../printer.pm_.c:854
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr ""
-#: ../../printer.pm_.c:821
+#: ../../printer.pm_.c:858
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:823
+#: ../../printer.pm_.c:860
#, c-format
msgid ", using command %s"
msgstr ""
-#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
+#: ../../printer.pm_.c:979 ../../printerdrake.pm_.c:1701
msgid "Raw printer (No driver)"
msgstr ""
-#: ../../printer.pm_.c:1114
+#: ../../printer.pm_.c:1151
#, c-format
msgid "(on %s)"
msgstr ""
-#: ../../printer.pm_.c:1116
+#: ../../printer.pm_.c:1153
msgid "(on this machine)"
msgstr ""
-#: ../../printer.pm_.c:1141
+#: ../../printer.pm_.c:1178
#, c-format
msgid "On CUPS server \"%s\""
msgstr ""
-#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
-#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
-#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
-#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
+#: ../../printer.pm_.c:1184 ../../printerdrake.pm_.c:3123
+#: ../../printerdrake.pm_.c:3134 ../../printerdrake.pm_.c:3360
+#: ../../printerdrake.pm_.c:3412 ../../printerdrake.pm_.c:3438
+#: ../../printerdrake.pm_.c:3613 ../../printerdrake.pm_.c:3615
msgid " (Default)"
msgstr ""
@@ -6502,11 +6502,11 @@ msgstr ""
msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
msgstr ""
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3187
msgid "CUPS configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3188
msgid "Specify CUPS server"
msgstr ""
@@ -6556,15 +6556,15 @@ msgstr ""
#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
-#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
-#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
-#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
-#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
-#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
-#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
-#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
-#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
-#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2792
+#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2831
+#: ../../printerdrake.pm_.c:2836 ../../printerdrake.pm_.c:2873
+#: ../../printerdrake.pm_.c:2926 ../../printerdrake.pm_.c:2946
+#: ../../printerdrake.pm_.c:2960 ../../printerdrake.pm_.c:2994
+#: ../../printerdrake.pm_.c:3040 ../../printerdrake.pm_.c:3058
+#: ../../printerdrake.pm_.c:3147 ../../printerdrake.pm_.c:3226
+#: ../../printerdrake.pm_.c:3528 ../../printerdrake.pm_.c:3583
+#: ../../printerdrake.pm_.c:3636 ../../standalone/printerdrake_.c:57
msgid "Printerdrake"
msgstr ""
@@ -6661,8 +6661,8 @@ msgid ""
msgstr ""
#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
-#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
-#: ../../printerdrake.pm_.c:3290
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3169
+#: ../../printerdrake.pm_.c:3299
msgid "Add a new printer"
msgstr ""
@@ -7329,7 +7329,7 @@ msgstr ""
msgid "Did it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3473
msgid "Raw printer"
msgstr ""
@@ -7442,7 +7442,7 @@ msgstr ""
#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
-#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:3457 ../../standalone/drakTermServ_.c:248
#: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
#: ../../standalone/drakfont_.c:1014
@@ -7480,8 +7480,8 @@ msgid ""
"of the file lists."
msgstr ""
-#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
-#: ../../printerdrake.pm_.c:3218
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2927
+#: ../../printerdrake.pm_.c:3227
msgid "Reading printer data..."
msgstr ""
@@ -7680,59 +7680,59 @@ msgid ""
"again?"
msgstr ""
-#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
-#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
-#: ../../printerdrake.pm_.c:2991
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2793
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2874
+#: ../../printerdrake.pm_.c:2995
msgid "Checking installed software..."
msgstr ""
-#: ../../printerdrake.pm_.c:2794
+#: ../../printerdrake.pm_.c:2798
msgid "Removing LPRng..."
msgstr ""
-#: ../../printerdrake.pm_.c:2833
+#: ../../printerdrake.pm_.c:2837
msgid "Removing LPD..."
msgstr ""
-#: ../../printerdrake.pm_.c:2906
+#: ../../printerdrake.pm_.c:2910
msgid "Select Printer Spooler"
msgstr ""
-#: ../../printerdrake.pm_.c:2907
+#: ../../printerdrake.pm_.c:2911
msgid "Which printing system (spooler) do you want to use?"
msgstr ""
-#: ../../printerdrake.pm_.c:2943
+#: ../../printerdrake.pm_.c:2947
#, c-format
msgid "Configuring printer \"%s\"..."
msgstr ""
-#: ../../printerdrake.pm_.c:2957
+#: ../../printerdrake.pm_.c:2961
msgid "Installing Foomatic..."
msgstr ""
-#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
-#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
+#: ../../printerdrake.pm_.c:3031 ../../printerdrake.pm_.c:3072
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3547
msgid "Printer options"
msgstr ""
-#: ../../printerdrake.pm_.c:3037
+#: ../../printerdrake.pm_.c:3041
msgid "Preparing Printerdrake..."
msgstr ""
-#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
+#: ../../printerdrake.pm_.c:3059 ../../printerdrake.pm_.c:3637
msgid "Configuring applications..."
msgstr ""
-#: ../../printerdrake.pm_.c:3075
+#: ../../printerdrake.pm_.c:3079
msgid "Would you like to configure printing?"
msgstr ""
-#: ../../printerdrake.pm_.c:3087
+#: ../../printerdrake.pm_.c:3091
msgid "Printing system: "
msgstr ""
-#: ../../printerdrake.pm_.c:3147
+#: ../../printerdrake.pm_.c:3151
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; to view information about it; "
@@ -7740,137 +7740,137 @@ msgid ""
"OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3148
+#: ../../printerdrake.pm_.c:3152
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
"it."
msgstr ""
-#: ../../printerdrake.pm_.c:3175
+#: ../../printerdrake.pm_.c:3179
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr ""
-#: ../../printerdrake.pm_.c:3193
+#: ../../printerdrake.pm_.c:3197
msgid "Change the printing system"
msgstr ""
-#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3202 ../../standalone/drakconnect_.c:277
msgid "Normal Mode"
msgstr ""
-#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
-#: ../../printerdrake.pm_.c:3621
+#: ../../printerdrake.pm_.c:3367 ../../printerdrake.pm_.c:3417
+#: ../../printerdrake.pm_.c:3630
msgid "Do you want to configure another printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:3443
+#: ../../printerdrake.pm_.c:3452
msgid "Modify printer configuration"
msgstr ""
-#: ../../printerdrake.pm_.c:3445
+#: ../../printerdrake.pm_.c:3454
#, c-format
msgid ""
"Printer %s\n"
"What do you want to modify on this printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:3449
+#: ../../printerdrake.pm_.c:3458
msgid "Do it!"
msgstr ""
-#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
+#: ../../printerdrake.pm_.c:3463 ../../printerdrake.pm_.c:3518
msgid "Printer connection type"
msgstr ""
-#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
+#: ../../printerdrake.pm_.c:3464 ../../printerdrake.pm_.c:3522
msgid "Printer name, description, location"
msgstr ""
-#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
+#: ../../printerdrake.pm_.c:3466 ../../printerdrake.pm_.c:3540
msgid "Printer manufacturer, model, driver"
msgstr ""
-#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3541
msgid "Printer manufacturer, model"
msgstr ""
-#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
+#: ../../printerdrake.pm_.c:3476 ../../printerdrake.pm_.c:3551
msgid "Set this printer as the default"
msgstr ""
-#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
+#: ../../printerdrake.pm_.c:3478 ../../printerdrake.pm_.c:3556
msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
+#: ../../printerdrake.pm_.c:3479 ../../printerdrake.pm_.c:3565
msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
+#: ../../printerdrake.pm_.c:3480 ../../printerdrake.pm_.c:3574
msgid "Print test pages"
msgstr ""
-#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
+#: ../../printerdrake.pm_.c:3481 ../../printerdrake.pm_.c:3576
msgid "Know how to use this printer"
msgstr ""
-#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
+#: ../../printerdrake.pm_.c:3483 ../../printerdrake.pm_.c:3578
msgid "Remove printer"
msgstr ""
-#: ../../printerdrake.pm_.c:3520
+#: ../../printerdrake.pm_.c:3529
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr ""
-#: ../../printerdrake.pm_.c:3545
+#: ../../printerdrake.pm_.c:3554
msgid "Default printer"
msgstr ""
-#: ../../printerdrake.pm_.c:3546
+#: ../../printerdrake.pm_.c:3555
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr ""
-#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3551
+#: ../../printerdrake.pm_.c:3560
#, c-format
msgid ""
"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3554
+#: ../../printerdrake.pm_.c:3563
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
+#: ../../printerdrake.pm_.c:3568 ../../printerdrake.pm_.c:3571
msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3560
+#: ../../printerdrake.pm_.c:3569
#, c-format
msgid ""
"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
"GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3563
+#: ../../printerdrake.pm_.c:3572
#, c-format
msgid ""
"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3571
+#: ../../printerdrake.pm_.c:3580
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr ""
-#: ../../printerdrake.pm_.c:3575
+#: ../../printerdrake.pm_.c:3584
#, c-format
msgid "Removing printer \"%s\"..."
msgstr ""
@@ -7986,47 +7986,50 @@ msgid ""
"\t email)"
msgstr ""
-#: ../../security/main.pm_.c:66
+#: ../../security/main.pm_.c:65
msgid "Security Level:"
msgstr ""
-#: ../../security/main.pm_.c:74
+#: ../../security/main.pm_.c:99
msgid "Security Alerts:"
msgstr ""
-#: ../../security/main.pm_.c:83
+#: ../../security/main.pm_.c:101
msgid "Security Administrator:"
msgstr ""
-#: ../../security/main.pm_.c:114 ../../security/main.pm_.c:150
-#, c-format
-msgid " (default: %s)"
+#: ../../security/main.pm_.c:114
+msgid "Network Options"
msgstr ""
-#: ../../security/main.pm_.c:118 ../../security/main.pm_.c:154
-#: ../../security/main.pm_.c:179
+#: ../../security/main.pm_.c:114
+msgid "System Options"
+msgstr ""
+
+#: ../../security/main.pm_.c:119 ../../security/main.pm_.c:148
msgid ""
"The following options can be set to customize your\n"
"system security. If you need explanations, click on Help.\n"
msgstr ""
-#: ../../security/main.pm_.c:226
-msgid "Network Options"
+#: ../../security/main.pm_.c:137
+#, c-format
+msgid " (default: %s)"
msgstr ""
-#: ../../security/main.pm_.c:235
-msgid "System Options"
+#: ../../security/main.pm_.c:161
+msgid "Periodic Checks 2"
msgstr ""
-#: ../../security/main.pm_.c:242
+#: ../../security/main.pm_.c:162
msgid "Periodic Checks"
msgstr ""
-#: ../../security/main.pm_.c:256
+#: ../../security/main.pm_.c:176
msgid "Please wait, setting security level..."
msgstr ""
-#: ../../security/main.pm_.c:262
+#: ../../security/main.pm_.c:182
msgid "Please wait, setting security options..."
msgstr ""
@@ -8528,15 +8531,15 @@ msgid ""
"MandrakeClub!"
msgstr ""
-#: ../../standalone.pm_.c:42
+#: ../../standalone.pm_.c:49
msgid "Installing packages..."
msgstr ""
-#: ../../standalone/XFdrake_.c:147
+#: ../../standalone/XFdrake_.c:148
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../standalone/XFdrake_.c:151
+#: ../../standalone/XFdrake_.c:152
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
@@ -8734,7 +8737,7 @@ msgid ""
"The parameters of the auto-install are available in the sections on the left"
msgstr ""
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:480
+#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:508
#: ../../standalone/scannerdrake_.c:119
msgid "Congratulations!"
msgstr ""
@@ -10688,35 +10691,38 @@ msgid ""
"With that feature, other computers on your local network will be able to use "
"this computer's Internet connection.\n"
"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
"Note: you need a dedicated Network Adapter to set up a Local Area Network "
"(LAN)."
msgstr ""
-#: ../../standalone/drakgw_.c:211
+#: ../../standalone/drakgw_.c:213
#, c-format
msgid "Interface %s (using module %s)"
msgstr ""
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw_.c:214
#, c-format
msgid "Interface %s"
msgstr ""
-#: ../../standalone/drakgw_.c:220
+#: ../../standalone/drakgw_.c:222
msgid "No network adapter on your system!"
msgstr ""
-#: ../../standalone/drakgw_.c:221
+#: ../../standalone/drakgw_.c:223
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr ""
-#: ../../standalone/drakgw_.c:227
+#: ../../standalone/drakgw_.c:229
msgid "Network interface"
msgstr ""
-#: ../../standalone/drakgw_.c:228
+#: ../../standalone/drakgw_.c:230
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -10726,17 +10732,17 @@ msgid ""
"I am about to setup your Local Area Network with that adapter."
msgstr ""
-#: ../../standalone/drakgw_.c:237
+#: ../../standalone/drakgw_.c:239
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr ""
-#: ../../standalone/drakgw_.c:255
+#: ../../standalone/drakgw_.c:265
msgid "Network interface already configured"
msgstr ""
-#: ../../standalone/drakgw_.c:256
+#: ../../standalone/drakgw_.c:266
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -10746,15 +10752,15 @@ msgid ""
"You can do it manually but you need to know what you're doing."
msgstr ""
-#: ../../standalone/drakgw_.c:261
+#: ../../standalone/drakgw_.c:271
msgid "Automatic reconfiguration"
msgstr ""
-#: ../../standalone/drakgw_.c:262
+#: ../../standalone/drakgw_.c:272
msgid "Show current interface configuration"
msgstr ""
-#: ../../standalone/drakgw_.c:264
+#: ../../standalone/drakgw_.c:274
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -10765,76 +10771,112 @@ msgid ""
"Driver: %s"
msgstr ""
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:287
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
-"server; in that case please verify I correctly read the C-Class Network that "
-"you use for your local network; I will not reconfigure it and I will not "
-"touch your DHCP server configuration.\n"
+"server; in that case please verify I correctly read the Network that you use "
+"for your local network; I will not reconfigure it and I will not touch your "
+"DHCP server configuration.\n"
+"\n"
+"The default DNS entry is the Caching Nameserver configured on the firewall. "
+"You can replace that with your ISP DNS IP, for example.\n"
"\n"
"Else, I can reconfigure your interface and (re)configure a DHCP server for "
"you.\n"
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:281
-msgid "C-Class Local Network"
+#: ../../standalone/drakgw_.c:294
+msgid "Local Network adress"
msgstr ""
-#: ../../standalone/drakgw_.c:282
+#: ../../standalone/drakgw_.c:298
+msgid ""
+"DHCP Server Configuration.\n"
+"\n"
+"Here you can select different options for the DHCP server configuration.\n"
+"If you don't know the meaning of an option, simply leave it as it is.\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:304
msgid "(This) DHCP Server IP"
msgstr ""
-#: ../../standalone/drakgw_.c:283
+#: ../../standalone/drakgw_.c:305
+msgid "The DNS Server IP"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:306
+msgid "The internal domain name"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:307
+msgid "The DHCP start range"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:308
+msgid "The DHCP end range"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:309
+msgid "The default lease (in seconds)"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:310
+msgid "The maximum lease (in seconds)"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:311
msgid "Re-configure interface and DHCP server"
msgstr ""
-#: ../../standalone/drakgw_.c:290
+#: ../../standalone/drakgw_.c:318
msgid "The Local Network did not finish with `.0', bailing out."
msgstr ""
-#: ../../standalone/drakgw_.c:301
+#: ../../standalone/drakgw_.c:329
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr ""
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:339
msgid "Configuring..."
msgstr ""
-#: ../../standalone/drakgw_.c:312
+#: ../../standalone/drakgw_.c:340
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
-#: ../../standalone/drakgw_.c:348
+#: ../../standalone/drakgw_.c:376
#, c-format
msgid "Problems installing package %s"
msgstr ""
-#: ../../standalone/drakgw_.c:481
+#: ../../standalone/drakgw_.c:509
msgid ""
"Everything has been configured.\n"
"You may now share Internet connection with other computers on your Local "
"Area Network, using automatic network configuration (DHCP)."
msgstr ""
-#: ../../standalone/drakgw_.c:500
+#: ../../standalone/drakgw_.c:528
msgid "The setup has already been done, but it's currently disabled."
msgstr ""
-#: ../../standalone/drakgw_.c:501
+#: ../../standalone/drakgw_.c:529
msgid "The setup has already been done, and it's currently enabled."
msgstr ""
-#: ../../standalone/drakgw_.c:502
+#: ../../standalone/drakgw_.c:530
msgid "No Internet Connection Sharing has ever been configured."
msgstr ""
-#: ../../standalone/drakgw_.c:507
+#: ../../standalone/drakgw_.c:535
msgid "Internet connection sharing configuration"
msgstr ""
-#: ../../standalone/drakgw_.c:514
+#: ../../standalone/drakgw_.c:542
#, c-format
msgid ""
"Welcome to the Internet Connection Sharing utility!\n"
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index b27257521..24078f541 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2002-09-13 22:00+0200\n"
+"POT-Creation-Date: 2002-09-20 11:43+0200\n"
"PO-Revision-Date: 2001-08-20 21:28-0000\n"
"Last-Translator: Schalk W. Cronjé <schalkc@uk.ntaba.com>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -178,7 +178,7 @@ msgid "Test"
msgstr ""
#: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67
-#: ../../diskdrake/interactive.pm_.c:381 ../../diskdrake/removable.pm_.c:25
+#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25
#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
msgid "Options"
msgstr "Opsies"
@@ -190,14 +190,14 @@ msgstr "Opsies"
#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
#: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:159
-#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310 ../../security/main.pm_.c:246
+#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310 ../../security/main.pm_.c:166
#: ../../standalone/drakbackup_.c:3974 ../../standalone/drakbackup_.c:4069
#: ../../standalone/drakbackup_.c:4088
msgid "Ok"
msgstr "OK"
#: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3203
+#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3207
#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
msgid "Quit"
msgstr "Verlaat"
@@ -307,7 +307,7 @@ msgstr "Videokaart: %s"
#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
#: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
#: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2169
-#: ../../security/main.pm_.c:295 ../../standalone/drakautoinst_.c:203
+#: ../../security/main.pm_.c:216 ../../standalone/drakautoinst_.c:203
#: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
#: ../../standalone/drakbackup_.c:4041 ../../standalone/drakbackup_.c:4101
@@ -316,7 +316,7 @@ msgstr "Videokaart: %s"
#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:532 ../../standalone/logdrake_.c:225
+#: ../../standalone/drakgw_.c:560 ../../standalone/logdrake_.c:225
#: ../../ugtk.pm_.c:296
msgid "Cancel"
msgstr "Kanselleer"
@@ -502,7 +502,7 @@ msgstr "Wagperiode voro verstekstelsel gelaai word"
#: ../../any.pm_.c:170 ../../any.pm_.c:789
#: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1094 ../../network/modem.pm_.c:48
+#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:48
#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
#: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
#: ../../standalone/drakconnect_.c:649
@@ -510,7 +510,7 @@ msgid "Password"
msgstr "Wagwoord"
#: ../../any.pm_.c:171 ../../any.pm_.c:790
-#: ../../install_steps_interactive.pm_.c:1095
+#: ../../install_steps_interactive.pm_.c:1098
msgid "Password (again)"
msgstr "Wagwoord (weer)"
@@ -546,13 +546,13 @@ msgstr ""
"Opsie ``Beperk instruksielynopsies'' kan nie sonder wagwoord gebruikword nie"
#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../diskdrake/interactive.pm_.c:1191
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../install_steps_interactive.pm_.c:1092
msgid "Please try again"
msgstr "Probeer asb. weer"
#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1092
msgid "The passwords do not match"
msgstr "Die wagwoorde stem nie ooreen nie."
@@ -606,7 +606,7 @@ msgstr "Voeg by"
#: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
#: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printerdrake.pm_.c:3203 ../../standalone/drakbackup_.c:2774
+#: ../../printerdrake.pm_.c:3207 ../../standalone/drakbackup_.c:2774
msgid "Done"
msgstr "Klaar"
@@ -666,7 +666,7 @@ msgstr "Onveilig"
msgid "Label"
msgstr "Etiket"
-#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:201
+#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:200
msgid "Default"
msgstr "Verstek"
@@ -934,7 +934,7 @@ msgstr "Voeg 'n gebruiker by"
msgid "No sharing"
msgstr "CUPS word gelaai"
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:59
+#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:66
#, fuzzy, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
msgstr ""
@@ -946,7 +946,7 @@ msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr ""
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:64
+#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:71
#, c-format
msgid "Mandatory package %s is missing"
msgstr ""
@@ -1240,36 +1240,27 @@ msgstr ""
msgid "Create new theme"
msgstr "Kies 'n nuwe grootte"
-#: ../../bootlook.pm_.c:193
+#: ../../bootlook.pm_.c:192
#, c-format
msgid "Backup %s to %s.old"
msgstr ""
-#: ../../bootlook.pm_.c:194 ../../bootlook.pm_.c:197 ../../bootlook.pm_.c:200
-#: ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 ../../bootlook.pm_.c:242
-#: ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
-#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:355
-#: ../../diskdrake/interactive.pm_.c:469 ../../diskdrake/interactive.pm_.c:474
-#: ../../diskdrake/smbnfs_gtk.pm_.c:45 ../../fsedit.pm_.c:239
-#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:67
-#: ../../interactive/http.pm_.c:119 ../../interactive/http.pm_.c:120
-#: ../../standalone/draksplash_.c:34
-msgid "Error"
-msgstr "Fout"
-
-#: ../../bootlook.pm_.c:194
-msgid "unable to backup lilo message"
-msgstr ""
-
-#: ../../bootlook.pm_.c:196
+#: ../../bootlook.pm_.c:195
#, c-format
msgid "Copy %s to %s"
msgstr ""
-#: ../../bootlook.pm_.c:197
-msgid "can't change lilo message"
-msgstr ""
+#: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232
+#: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
+#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
+#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344
+#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473
+#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75
+#: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119
+#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:34
+msgid "Error"
+msgstr "Fout"
#: ../../bootlook.pm_.c:200
msgid "Lilo message not found"
@@ -1336,7 +1327,7 @@ msgstr ""
#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
#: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:526
+#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:554
msgid "Configure"
msgstr "Konfigureer"
@@ -1512,12 +1503,12 @@ msgstr ""
msgid "New"
msgstr "nuut"
-#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392
#: ../../diskdrake/smbnfs_gtk.pm_.c:81
msgid "Unmount"
msgstr "Ontheg"
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:385
+#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389
#: ../../diskdrake/smbnfs_gtk.pm_.c:82
msgid "Mount"
msgstr "Heg"
@@ -1526,8 +1517,8 @@ msgstr "Heg"
msgid "Server"
msgstr "Bediener"
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:379
-#: ../../diskdrake/interactive.pm_.c:568 ../../diskdrake/interactive.pm_.c:595
+#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383
+#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599
#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
#: ../../diskdrake/smbnfs_gtk.pm_.c:85
msgid "Mount point"
@@ -1548,13 +1539,13 @@ msgstr ""
msgid "Server: "
msgstr "Bediener"
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:440
-#: ../../diskdrake/interactive.pm_.c:1089
-#: ../../diskdrake/interactive.pm_.c:1164
+#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444
+#: ../../diskdrake/interactive.pm_.c:1093
+#: ../../diskdrake/interactive.pm_.c:1168
msgid "Mount point: "
msgstr "Hegpunt:"
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1170
+#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174
#, c-format
msgid "Options: %s"
msgstr "Opsies: %s"
@@ -1563,9 +1554,9 @@ msgstr "Opsies: %s"
msgid "Please make a backup of your data first"
msgstr "Rugsteun u data eers asb."
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:934
-#: ../../diskdrake/interactive.pm_.c:943
-#: ../../diskdrake/interactive.pm_.c:1009
+#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:947
+#: ../../diskdrake/interactive.pm_.c:1013
msgid "Read carefully!"
msgstr "Lees noukeurig!"
@@ -1637,7 +1628,7 @@ msgstr "SunOS"
msgid "Swap"
msgstr "Ruilarea"
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1105
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109
msgid "Empty"
msgstr "Leeg"
@@ -1651,12 +1642,12 @@ msgstr "Ander"
msgid "Filesystem types:"
msgstr "LOersteltipes:"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:402
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406
msgid "Create"
msgstr "Skep"
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:380
-#: ../../diskdrake/interactive.pm_.c:531 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384
+#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26
#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
msgid "Type"
msgstr "Tipe"
@@ -1666,7 +1657,7 @@ msgstr "Tipe"
msgid "Use ``%s'' instead"
msgstr "Gebruik ``%s'' instede."
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393
msgid "Delete"
msgstr "Uitwis"
@@ -1674,7 +1665,7 @@ msgstr "Uitwis"
msgid "Use ``Unmount'' first"
msgstr "Gebruik ``Ontheg'' eerste"
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:518
+#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
@@ -1694,60 +1685,60 @@ msgstr "Kies 'n ander partisie"
msgid "Exit"
msgstr "Verlaat"
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Toggle to expert mode"
msgstr "Skakel oor na kundige gebruiksvlak"
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Toggle to normal mode"
msgstr "Skakel oor na normale gebruiksvlak"
-#: ../../diskdrake/interactive.pm_.c:221
+#: ../../diskdrake/interactive.pm_.c:225
msgid "Undo"
msgstr "Herroep"
-#: ../../diskdrake/interactive.pm_.c:240
+#: ../../diskdrake/interactive.pm_.c:244
msgid "Continue anyway?"
msgstr "Wil u in elk geval voortgaan?"
-#: ../../diskdrake/interactive.pm_.c:245
+#: ../../diskdrake/interactive.pm_.c:249
msgid "Quit without saving"
msgstr "Verlaat, maar moenie iets stoor nie"
-#: ../../diskdrake/interactive.pm_.c:245
+#: ../../diskdrake/interactive.pm_.c:249
msgid "Quit without writing the partition table?"
msgstr "Wil u verlaat, sonder om die partisietabel op te dateer?"
-#: ../../diskdrake/interactive.pm_.c:250
+#: ../../diskdrake/interactive.pm_.c:254
msgid "Do you want to save /etc/fstab modifications"
msgstr "Wil u die /etc/fstab veranderinge stoor?"
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
msgid "Auto allocate"
msgstr "Outo-allokeer"
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
msgid "Clear all"
msgstr "Verwydeer almal"
-#: ../../diskdrake/interactive.pm_.c:263
+#: ../../diskdrake/interactive.pm_.c:267
#: ../../install_steps_interactive.pm_.c:214
msgid "More"
msgstr "Nog"
-#: ../../diskdrake/interactive.pm_.c:267
+#: ../../diskdrake/interactive.pm_.c:271
msgid "Hard drive information"
msgstr "Hardeskyfinligting"
-#: ../../diskdrake/interactive.pm_.c:298
+#: ../../diskdrake/interactive.pm_.c:302
msgid "All primary partitions are used"
msgstr "Alle primêre partisies is gebruik"
-#: ../../diskdrake/interactive.pm_.c:299
+#: ../../diskdrake/interactive.pm_.c:303
msgid "I can't add any more partition"
msgstr "Ek kan nie meer partisies byvoeg nie"
-#: ../../diskdrake/interactive.pm_.c:300
+#: ../../diskdrake/interactive.pm_.c:304
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
@@ -1755,35 +1746,35 @@ msgstr ""
"Om meer partisies te verkry, verwyder asb. een om 'n ektensiepartisiete kan "
"skep"
-#: ../../diskdrake/interactive.pm_.c:310
+#: ../../diskdrake/interactive.pm_.c:314
#, fuzzy
msgid "Save partition table"
msgstr "Skryf partisietabel"
-#: ../../diskdrake/interactive.pm_.c:311
+#: ../../diskdrake/interactive.pm_.c:315
#, fuzzy
msgid "Restore partition table"
msgstr "Reddingspartisietabel"
-#: ../../diskdrake/interactive.pm_.c:312
+#: ../../diskdrake/interactive.pm_.c:316
msgid "Rescue partition table"
msgstr "Reddingspartisietabel"
-#: ../../diskdrake/interactive.pm_.c:314
+#: ../../diskdrake/interactive.pm_.c:318
#, fuzzy
msgid "Reload partition table"
msgstr "Reddingspartisietabel"
-#: ../../diskdrake/interactive.pm_.c:319
+#: ../../diskdrake/interactive.pm_.c:323
#, fuzzy
msgid "Removable media automounting"
msgstr "Verwyderbare media"
-#: ../../diskdrake/interactive.pm_.c:328 ../../diskdrake/interactive.pm_.c:348
+#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352
msgid "Select file"
msgstr "Selekteer lOer"
-#: ../../diskdrake/interactive.pm_.c:335
+#: ../../diskdrake/interactive.pm_.c:339
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -1791,11 +1782,11 @@ msgstr ""
"Die rugsteunpartisietabel het nie dieselfde grootte nie\n"
"Wil u voortgaan?"
-#: ../../diskdrake/interactive.pm_.c:349 ../../harddrake/sound.pm_.c:200
+#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:200
msgid "Warning"
msgstr "Waarskuwing"
-#: ../../diskdrake/interactive.pm_.c:350
+#: ../../diskdrake/interactive.pm_.c:354
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -1803,106 +1794,106 @@ msgstr ""
"Sit 'n floppie in die aandrywer.\n"
"Alle data op hierdie floppie sal verloor word."
-#: ../../diskdrake/interactive.pm_.c:361
+#: ../../diskdrake/interactive.pm_.c:365
msgid "Trying to rescue partition table"
msgstr "Partisietabel Reddingspoging"
-#: ../../diskdrake/interactive.pm_.c:367
+#: ../../diskdrake/interactive.pm_.c:371
msgid "Detailed information"
msgstr "Gedetaileerde inligting"
-#: ../../diskdrake/interactive.pm_.c:382 ../../diskdrake/interactive.pm_.c:662
+#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666
msgid "Resize"
msgstr "Verstel Grootte"
-#: ../../diskdrake/interactive.pm_.c:383 ../../diskdrake/interactive.pm_.c:715
+#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719
msgid "Move"
msgstr "Skuif"
-#: ../../diskdrake/interactive.pm_.c:384
+#: ../../diskdrake/interactive.pm_.c:388
msgid "Format"
msgstr "Formatteer"
-#: ../../diskdrake/interactive.pm_.c:386
+#: ../../diskdrake/interactive.pm_.c:390
msgid "Add to RAID"
msgstr "Voeg by RAID"
-#: ../../diskdrake/interactive.pm_.c:387
+#: ../../diskdrake/interactive.pm_.c:391
msgid "Add to LVM"
msgstr "Voeg by LVM"
-#: ../../diskdrake/interactive.pm_.c:390
+#: ../../diskdrake/interactive.pm_.c:394
msgid "Remove from RAID"
msgstr "Verwyder uit RAID"
-#: ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:395
msgid "Remove from LVM"
msgstr "Verwyder uit LVM"
-#: ../../diskdrake/interactive.pm_.c:392
+#: ../../diskdrake/interactive.pm_.c:396
msgid "Modify RAID"
msgstr "Verander RAID"
-#: ../../diskdrake/interactive.pm_.c:393
+#: ../../diskdrake/interactive.pm_.c:397
msgid "Use for loopback"
msgstr "Gebruik vir teruglus"
-#: ../../diskdrake/interactive.pm_.c:433
+#: ../../diskdrake/interactive.pm_.c:437
msgid "Create a new partition"
msgstr "Kies 'n nuwe grootte"
-#: ../../diskdrake/interactive.pm_.c:436
+#: ../../diskdrake/interactive.pm_.c:440
msgid "Start sector: "
msgstr "Kies sektor: "
-#: ../../diskdrake/interactive.pm_.c:438 ../../diskdrake/interactive.pm_.c:815
+#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819
msgid "Size in MB: "
msgstr "Grootte in MB: "
-#: ../../diskdrake/interactive.pm_.c:439 ../../diskdrake/interactive.pm_.c:816
+#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820
msgid "Filesystem type: "
msgstr "LOerstelseltipe: "
-#: ../../diskdrake/interactive.pm_.c:444
+#: ../../diskdrake/interactive.pm_.c:448
msgid "Preference: "
msgstr "Voorkeure: "
-#: ../../diskdrake/interactive.pm_.c:469
+#: ../../diskdrake/interactive.pm_.c:473
msgid ""
"You can't create a new partition\n"
"(since you reached the maximal number of primary partitions).\n"
"First remove a primary partition and create an extended partition."
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:499
+#: ../../diskdrake/interactive.pm_.c:503
#, fuzzy
msgid "Remove the loopback file?"
msgstr "Terugluslêer %s word geformateer"
-#: ../../diskdrake/interactive.pm_.c:529
+#: ../../diskdrake/interactive.pm_.c:533
msgid "Change partition type"
msgstr "Verander partisietipe"
#
-#: ../../diskdrake/interactive.pm_.c:530 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48
msgid "Which filesystem do you want?"
msgstr "Watter lêerstelsel verlang u?"
-#: ../../diskdrake/interactive.pm_.c:536
+#: ../../diskdrake/interactive.pm_.c:540
msgid "Switching from ext2 to ext3"
msgstr "Oorskakeling van ext2 na ext3"
-#: ../../diskdrake/interactive.pm_.c:566
+#: ../../diskdrake/interactive.pm_.c:570
#, c-format
msgid "Where do you want to mount loopback file %s?"
msgstr "Waar wil u terugluslêer %s heg?"
-#: ../../diskdrake/interactive.pm_.c:567
+#: ../../diskdrake/interactive.pm_.c:571
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "Waar wil u toestel %s heg?"
-#: ../../diskdrake/interactive.pm_.c:573
+#: ../../diskdrake/interactive.pm_.c:577
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
@@ -1910,138 +1901,138 @@ msgstr ""
"Kan nie hegpunt ontset nie, omdat hierdie partisie vir teruglus\n"
"gebruik word. Verwyder eers die teruglus."
-#: ../../diskdrake/interactive.pm_.c:594
+#: ../../diskdrake/interactive.pm_.c:598
#, fuzzy, c-format
msgid "Where do you want to mount %s?"
msgstr "Waar wil u toestel %s heg?"
-#: ../../diskdrake/interactive.pm_.c:618
+#: ../../diskdrake/interactive.pm_.c:622
msgid "Computing FAT filesystem bounds"
msgstr "FAT lêerstelselgrense word bereken"
-#: ../../diskdrake/interactive.pm_.c:618 ../../diskdrake/interactive.pm_.c:677
+#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681
#: ../../install_interactive.pm_.c:133
msgid "Resizing"
msgstr "Grootteverandering"
-#: ../../diskdrake/interactive.pm_.c:650
+#: ../../diskdrake/interactive.pm_.c:654
msgid "This partition is not resizeable"
msgstr "Hierdie partisie se greootte kan nie verstel word nie"
-#: ../../diskdrake/interactive.pm_.c:655
+#: ../../diskdrake/interactive.pm_.c:659
msgid "All data on this partition should be backed-up"
msgstr "Alle data om hierdie partisie moet gerugsteun word."
-#: ../../diskdrake/interactive.pm_.c:657
+#: ../../diskdrake/interactive.pm_.c:661
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr "Alle data om partisie %s sal uitgewis word met die grootteverandering"
-#: ../../diskdrake/interactive.pm_.c:662
+#: ../../diskdrake/interactive.pm_.c:666
msgid "Choose the new size"
msgstr "Kies die nuwe grootte"
-#: ../../diskdrake/interactive.pm_.c:663
+#: ../../diskdrake/interactive.pm_.c:667
msgid "New size in MB: "
msgstr "Nuwe grootte in MB: "
-#: ../../diskdrake/interactive.pm_.c:716
+#: ../../diskdrake/interactive.pm_.c:720
msgid "Which disk do you want to move it to?"
msgstr "Na watter skyf wil u skuif?"
-#: ../../diskdrake/interactive.pm_.c:717
+#: ../../diskdrake/interactive.pm_.c:721
msgid "Sector"
msgstr "Sektor"
-#: ../../diskdrake/interactive.pm_.c:718
+#: ../../diskdrake/interactive.pm_.c:722
msgid "Which sector do you want to move it to?"
msgstr "Na watter sektor wil u skuif?"
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:725
msgid "Moving"
msgstr "Verskuiwing"
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:725
msgid "Moving partition..."
msgstr "Partisie word verskuif..."
-#: ../../diskdrake/interactive.pm_.c:738
+#: ../../diskdrake/interactive.pm_.c:742
msgid "Choose an existing RAID to add to"
msgstr "Kies 'n bestaande RAID om by toe te voeg"
-#: ../../diskdrake/interactive.pm_.c:739 ../../diskdrake/interactive.pm_.c:756
+#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760
msgid "new"
msgstr "nuut"
-#: ../../diskdrake/interactive.pm_.c:754
+#: ../../diskdrake/interactive.pm_.c:758
msgid "Choose an existing LVM to add to"
msgstr "Kies 'n bestaande LVM om by toe te voeg"
-#: ../../diskdrake/interactive.pm_.c:759
+#: ../../diskdrake/interactive.pm_.c:763
msgid "LVM name?"
msgstr "LVM naam?"
-#: ../../diskdrake/interactive.pm_.c:800
+#: ../../diskdrake/interactive.pm_.c:804
msgid "This partition can't be used for loopback"
msgstr "Hierdie partisie kan nie vir teruglus gebruik word nie."
-#: ../../diskdrake/interactive.pm_.c:813
+#: ../../diskdrake/interactive.pm_.c:817
msgid "Loopback"
msgstr "Teruglus"
-#: ../../diskdrake/interactive.pm_.c:814
+#: ../../diskdrake/interactive.pm_.c:818
msgid "Loopback file name: "
msgstr "Teruglus lêernaam:"
-#: ../../diskdrake/interactive.pm_.c:819
+#: ../../diskdrake/interactive.pm_.c:823
#, fuzzy
msgid "Give a file name"
msgstr "Regte naam"
-#: ../../diskdrake/interactive.pm_.c:822
+#: ../../diskdrake/interactive.pm_.c:826
msgid "File already used by another loopback, choose another one"
msgstr "Lêer word alreeds deur 'n ander teruglus gebruik,kies 'n ander een"
-#: ../../diskdrake/interactive.pm_.c:823
+#: ../../diskdrake/interactive.pm_.c:827
msgid "File already exists. Use it?"
msgstr "Lêer bestaan alreeds. Moet dit gebruik word?"
-#: ../../diskdrake/interactive.pm_.c:846
+#: ../../diskdrake/interactive.pm_.c:850
msgid "Mount options"
msgstr "Hegopsies:"
-#: ../../diskdrake/interactive.pm_.c:853
+#: ../../diskdrake/interactive.pm_.c:857
msgid "Various"
msgstr "Verskeie"
-#: ../../diskdrake/interactive.pm_.c:917 ../../standalone/drakfloppy_.c:104
+#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104
msgid "device"
msgstr "toestel"
-#: ../../diskdrake/interactive.pm_.c:918
+#: ../../diskdrake/interactive.pm_.c:922
msgid "level"
msgstr "vlak"
-#: ../../diskdrake/interactive.pm_.c:919
+#: ../../diskdrake/interactive.pm_.c:923
msgid "chunk size"
msgstr "blokgrootte"
-#: ../../diskdrake/interactive.pm_.c:934
+#: ../../diskdrake/interactive.pm_.c:938
msgid "Be careful: this operation is dangerous."
msgstr "Wees versigtig: hierdie is 'n gevaarlike operasie"
-#: ../../diskdrake/interactive.pm_.c:949
+#: ../../diskdrake/interactive.pm_.c:953
msgid "What type of partitioning?"
msgstr "Watter tipe van partisionering?"
-#: ../../diskdrake/interactive.pm_.c:965
+#: ../../diskdrake/interactive.pm_.c:969
#, fuzzy, c-format
msgid "The package %s is needed. Install it?"
msgstr ""
"Hierdie pakket moet opgradeer word\n"
"Is u seker u wil dit deselekteer?"
-#: ../../diskdrake/interactive.pm_.c:979
+#: ../../diskdrake/interactive.pm_.c:983
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -2054,7 +2045,7 @@ msgstr ""
"gebruik\n"
"nie, dan het u nie /boot nodig nie."
-#: ../../diskdrake/interactive.pm_.c:983
+#: ../../diskdrake/interactive.pm_.c:987
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -2067,7 +2058,7 @@ msgstr ""
"gebruik,moet u\n"
"asb. 'n /boot partisie skep,"
-#: ../../diskdrake/interactive.pm_.c:989
+#: ../../diskdrake/interactive.pm_.c:993
msgid ""
"You've selected a software RAID partition as root (/).\n"
"No bootloader is able to handle this without a /boot partition.\n"
@@ -2077,137 +2068,137 @@ msgstr ""
"Geen herlaaistelsel sal dit kan hanteer sonder 'n /boot partisie nie.\n"
"Onthou om 'n /boot by te voeg."
-#: ../../diskdrake/interactive.pm_.c:1009
+#: ../../diskdrake/interactive.pm_.c:1013
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "Partisietabel van skyf %s gaan opdateer word!"
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/interactive.pm_.c:1017
msgid "You'll need to reboot before the modification can take place"
msgstr "U sal moet herlaai voor die veranderinge geaktiveer kan word"
-#: ../../diskdrake/interactive.pm_.c:1024
+#: ../../diskdrake/interactive.pm_.c:1028
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr "Alle data om partisie %s sal uitgewis word met formatering."
-#: ../../diskdrake/interactive.pm_.c:1026
+#: ../../diskdrake/interactive.pm_.c:1030
msgid "Formatting"
msgstr "Formatering"
-#: ../../diskdrake/interactive.pm_.c:1027
+#: ../../diskdrake/interactive.pm_.c:1031
#, c-format
msgid "Formatting loopback file %s"
msgstr "Terugluslêer %s word geformateer"
-#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../diskdrake/interactive.pm_.c:1032
#: ../../install_steps_interactive.pm_.c:459
#, c-format
msgid "Formatting partition %s"
msgstr "Partisie %s word formateer"
-#: ../../diskdrake/interactive.pm_.c:1039
+#: ../../diskdrake/interactive.pm_.c:1043
#, fuzzy
msgid "Hide files"
msgstr "mkraid het gefaal"
-#: ../../diskdrake/interactive.pm_.c:1039
+#: ../../diskdrake/interactive.pm_.c:1043
#, fuzzy
msgid "Move files to the new partition"
msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
-#: ../../diskdrake/interactive.pm_.c:1040
+#: ../../diskdrake/interactive.pm_.c:1044
#, c-format
msgid ""
"Directory %s already contains data\n"
"(%s)"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1051
+#: ../../diskdrake/interactive.pm_.c:1055
#, fuzzy
msgid "Moving files to the new partition"
msgstr "Nie genoeg spasie beskikbaar om nuwe partisies toe te ken nie"
-#: ../../diskdrake/interactive.pm_.c:1055
+#: ../../diskdrake/interactive.pm_.c:1059
#, c-format
msgid "Copying %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1063
#, fuzzy, c-format
msgid "Removing %s"
msgstr "LPD word verwyder..."
-#: ../../diskdrake/interactive.pm_.c:1069
+#: ../../diskdrake/interactive.pm_.c:1073
#, c-format
msgid "partition %s is now known as %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1090
-#: ../../diskdrake/interactive.pm_.c:1149
+#: ../../diskdrake/interactive.pm_.c:1094
+#: ../../diskdrake/interactive.pm_.c:1153
msgid "Device: "
msgstr "Toestel:"
-#: ../../diskdrake/interactive.pm_.c:1091
+#: ../../diskdrake/interactive.pm_.c:1095
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS-skyfletter: %s ('n raaiskoot)\n"
-#: ../../diskdrake/interactive.pm_.c:1095
-#: ../../diskdrake/interactive.pm_.c:1103
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../diskdrake/interactive.pm_.c:1099
+#: ../../diskdrake/interactive.pm_.c:1107
+#: ../../diskdrake/interactive.pm_.c:1172
msgid "Type: "
msgstr "Tipe:"
-#: ../../diskdrake/interactive.pm_.c:1099
+#: ../../diskdrake/interactive.pm_.c:1103
msgid "Name: "
msgstr "Naam: "
-#: ../../diskdrake/interactive.pm_.c:1107
+#: ../../diskdrake/interactive.pm_.c:1111
#, c-format
msgid "Start: sector %s\n"
msgstr "Begin: sektor %s\n"
-#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1112
#, c-format
msgid "Size: %s"
msgstr "Grootte: %s"
-#: ../../diskdrake/interactive.pm_.c:1110
+#: ../../diskdrake/interactive.pm_.c:1114
#, c-format
msgid ", %s sectors"
msgstr ", %s sektore"
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1116
#, fuzzy, c-format
msgid "Cylinder %d to %d\n"
msgstr "Silinder %d na silinder %d\n"
-#: ../../diskdrake/interactive.pm_.c:1113
+#: ../../diskdrake/interactive.pm_.c:1117
msgid "Formatted\n"
msgstr "Geformateer\n"
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1118
msgid "Not formatted\n"
msgstr "Nie geformatter\n"
-#: ../../diskdrake/interactive.pm_.c:1115
+#: ../../diskdrake/interactive.pm_.c:1119
msgid "Mounted\n"
msgstr "Geheg\n"
-#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1120
#, c-format
msgid "RAID md%s\n"
msgstr "RAID md%s\n"
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1122
#, fuzzy, c-format
msgid ""
"Loopback file(s):\n"
" %s\n"
msgstr "Teruglus lêer(s): %s\n"
-#: ../../diskdrake/interactive.pm_.c:1119
+#: ../../diskdrake/interactive.pm_.c:1123
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -2215,27 +2206,27 @@ msgstr ""
"Verstekpartisie vir herlaai\n"
" (vir MS_DOS doeleindes, nie LILO s'n nie)\n"
-#: ../../diskdrake/interactive.pm_.c:1121
+#: ../../diskdrake/interactive.pm_.c:1125
#, c-format
msgid "Level %s\n"
msgstr "Vlak %s\n"
-#: ../../diskdrake/interactive.pm_.c:1122
+#: ../../diskdrake/interactive.pm_.c:1126
#, c-format
msgid "Chunk size %s\n"
msgstr "Blokgrootte %s\n"
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../diskdrake/interactive.pm_.c:1127
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID-skywe %s\n"
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../diskdrake/interactive.pm_.c:1129
#, c-format
msgid "Loopback file name: %s"
msgstr "Teruglus lêernaam: %s"
-#: ../../diskdrake/interactive.pm_.c:1128
+#: ../../diskdrake/interactive.pm_.c:1132
msgid ""
"\n"
"Chances are, this partition is\n"
@@ -2247,7 +2238,7 @@ msgstr ""
"drywerpartisie is en verkieslik alleen gelos\n"
"moet word.\n"
-#: ../../diskdrake/interactive.pm_.c:1131
+#: ../../diskdrake/interactive.pm_.c:1135
msgid ""
"\n"
"This special Bootstrap\n"
@@ -2258,64 +2249,64 @@ msgstr ""
"Hierdie spesiale herlaaipartisie\n"
"is om u stelsel te duolaai.\n"
-#: ../../diskdrake/interactive.pm_.c:1150
+#: ../../diskdrake/interactive.pm_.c:1154
msgid "Read-only"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1151
+#: ../../diskdrake/interactive.pm_.c:1155
#, c-format
msgid "Size: %s\n"
msgstr "Grootte: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1152
+#: ../../diskdrake/interactive.pm_.c:1156
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Geometrie: %s silinders, %s koppe, %s sektore\n"
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/interactive.pm_.c:1157
msgid "Info: "
msgstr "Info:"
-#: ../../diskdrake/interactive.pm_.c:1154
+#: ../../diskdrake/interactive.pm_.c:1158
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM-skywe %s\n"
-#: ../../diskdrake/interactive.pm_.c:1155
+#: ../../diskdrake/interactive.pm_.c:1159
#, c-format
msgid "Partition table type: %s\n"
msgstr "Partisietabeltipe: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1156
+#: ../../diskdrake/interactive.pm_.c:1160
#, fuzzy, c-format
msgid "on channel %d id %d\n"
msgstr "op bus %d id %d\n"
-#: ../../diskdrake/interactive.pm_.c:1186
+#: ../../diskdrake/interactive.pm_.c:1190
#, fuzzy
msgid "Filesystem encryption key"
msgstr "LOerstelseltipe: "
-#: ../../diskdrake/interactive.pm_.c:1187
+#: ../../diskdrake/interactive.pm_.c:1191
msgid "Choose your filesystem encryption key"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1190
+#: ../../diskdrake/interactive.pm_.c:1194
#, fuzzy, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr ""
"Hierdie wagwoord is te eenvoudig. Dit moet ten minste %d karakters bevat."
-#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../diskdrake/interactive.pm_.c:1195
#, fuzzy
msgid "The encryption keys do not match"
msgstr "Die wagwoorde stem nie ooreen nie."
-#: ../../diskdrake/interactive.pm_.c:1194
+#: ../../diskdrake/interactive.pm_.c:1198
msgid "Encryption key"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../diskdrake/interactive.pm_.c:1199
msgid "Encryption key (again)"
msgstr ""
@@ -2796,25 +2787,25 @@ msgstr ""
msgid "secondary"
msgstr "%d sekondes"
-#: ../../harddrake/v4l.pm_.c:15 ../../harddrake/v4l.pm_.c:65
+#: ../../harddrake/v4l.pm_.c:14 ../../harddrake/v4l.pm_.c:64
#, fuzzy
msgid "Auto-detect"
msgstr "Gebruik outobespeuring"
-#: ../../harddrake/v4l.pm_.c:66 ../../harddrake/v4l.pm_.c:186
+#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:185
#, fuzzy
msgid "Unknown|Generic"
msgstr "Generies"
-#: ../../harddrake/v4l.pm_.c:98
+#: ../../harddrake/v4l.pm_.c:97
msgid "Unknown|CPH05X (bt878) [many vendors]"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:99
+#: ../../harddrake/v4l.pm_.c:98
msgid "Unknown|CPH06X (bt878) [many vendors]"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:210
+#: ../../harddrake/v4l.pm_.c:209
msgid ""
"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
"detect the rights parameters.\n"
@@ -2822,34 +2813,34 @@ msgid ""
"here. Just select your tv card parameters if needed"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:213
+#: ../../harddrake/v4l.pm_.c:212
#, fuzzy
msgid "Card model:"
msgstr "Kaartgeheue (DMA)"
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:213
#, fuzzy
msgid "Tuner type:"
msgstr "Verander tipe"
-#: ../../harddrake/v4l.pm_.c:215
+#: ../../harddrake/v4l.pm_.c:214
msgid "Number of capture buffers:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:215
+#: ../../harddrake/v4l.pm_.c:214
msgid "number of capture buffers for mmap'ed capture"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:216
#, fuzzy
msgid "PLL setting:"
msgstr "Formatering"
-#: ../../harddrake/v4l.pm_.c:218
+#: ../../harddrake/v4l.pm_.c:217
msgid "Radio support:"
msgstr ""
-#: ../../harddrake/v4l.pm_.c:218
+#: ../../harddrake/v4l.pm_.c:217
msgid "enable radio support"
msgstr ""
@@ -5016,8 +5007,8 @@ msgstr "Muis"
msgid "Timezone"
msgstr "Tydsone"
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2985
-#: ../../printerdrake.pm_.c:3074
+#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2989
+#: ../../printerdrake.pm_.c:3078
msgid "Printer"
msgstr "Drukker"
@@ -5030,80 +5021,80 @@ msgstr "ISDN-kaart"
msgid "Sound card"
msgstr "Klankkaart"
-#: ../../install_steps_interactive.pm_.c:1032
+#: ../../install_steps_interactive.pm_.c:1033
msgid "TV card"
msgstr "TV-kaaer"
-#: ../../install_steps_interactive.pm_.c:1072
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1101
+#: ../../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1104
msgid "LDAP"
msgstr "KDAP"
-#: ../../install_steps_interactive.pm_.c:1073
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1076
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1113
msgid "NIS"
msgstr "NIS"
-#: ../../install_steps_interactive.pm_.c:1074
-#: ../../install_steps_interactive.pm_.c:1097
-#: ../../install_steps_interactive.pm_.c:1118
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../install_steps_interactive.pm_.c:1077
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1121
+#: ../../install_steps_interactive.pm_.c:1127
#, fuzzy
msgid "Windows Domain"
msgstr "NIS-domein"
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1097
+#: ../../install_steps_interactive.pm_.c:1078
+#: ../../install_steps_interactive.pm_.c:1100
msgid "Local files"
msgstr "Plaaslike lêers"
-#: ../../install_steps_interactive.pm_.c:1084
-#: ../../install_steps_interactive.pm_.c:1085 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1087
+#: ../../install_steps_interactive.pm_.c:1088 ../../steps.pm_.c:24
msgid "Set root password"
msgstr "Kies 'root' se wagwoord"
-#: ../../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1089
msgid "No password"
msgstr "Geen wagwoord"
-#: ../../install_steps_interactive.pm_.c:1091
+#: ../../install_steps_interactive.pm_.c:1094
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr ""
"Hierdie wagwoord is te eenvoudig. Dit moet ten minste %d karakters bevat."
-#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:49
+#: ../../install_steps_interactive.pm_.c:1100 ../../network/modem.pm_.c:49
#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
msgid "Authentication"
msgstr "Magtiging"
-#: ../../install_steps_interactive.pm_.c:1105
+#: ../../install_steps_interactive.pm_.c:1108
msgid "Authentication LDAP"
msgstr "LDAP-magtiging"
-#: ../../install_steps_interactive.pm_.c:1106
+#: ../../install_steps_interactive.pm_.c:1109
msgid "LDAP Base dn"
msgstr "LDAP Basis-dn"
-#: ../../install_steps_interactive.pm_.c:1107
+#: ../../install_steps_interactive.pm_.c:1110
msgid "LDAP Server"
msgstr "LDAP-bediener"
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1116
msgid "Authentication NIS"
msgstr "NIS-magtiging"
-#: ../../install_steps_interactive.pm_.c:1114
+#: ../../install_steps_interactive.pm_.c:1117
msgid "NIS Domain"
msgstr "NIS-domein"
-#: ../../install_steps_interactive.pm_.c:1115
+#: ../../install_steps_interactive.pm_.c:1118
msgid "NIS Server"
msgstr "NIS-bediener"
-#: ../../install_steps_interactive.pm_.c:1121
+#: ../../install_steps_interactive.pm_.c:1124
msgid ""
"For this to work for a W2K PDC, you will probably need to have the admin "
"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
@@ -5119,21 +5110,21 @@ msgid ""
"good."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1123
+#: ../../install_steps_interactive.pm_.c:1126
#, fuzzy
msgid "Authentication Windows Domain"
msgstr "LDAP-magtiging"
-#: ../../install_steps_interactive.pm_.c:1125
+#: ../../install_steps_interactive.pm_.c:1128
#, fuzzy
msgid "Domain Admin User Name"
msgstr "Domeinnaam"
-#: ../../install_steps_interactive.pm_.c:1126
+#: ../../install_steps_interactive.pm_.c:1129
msgid "Domain Admin Password"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1161
+#: ../../install_steps_interactive.pm_.c:1164
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
"depending on the normal bootloader. This is useful if you don't want to "
@@ -5160,19 +5151,19 @@ msgstr ""
"Indien u 'n herlaaiskyf wil maak,\n"
"plaas 'n skyf in die aandrywer en druk \"OK\"."
-#: ../../install_steps_interactive.pm_.c:1177
+#: ../../install_steps_interactive.pm_.c:1180
msgid "First floppy drive"
msgstr "Eerste sagteskyfaandrywer"
-#: ../../install_steps_interactive.pm_.c:1178
+#: ../../install_steps_interactive.pm_.c:1181
msgid "Second floppy drive"
msgstr "Tweede sagteskyfaandrywer"
-#: ../../install_steps_interactive.pm_.c:1179 ../../printerdrake.pm_.c:2515
+#: ../../install_steps_interactive.pm_.c:1182 ../../printerdrake.pm_.c:2515
msgid "Skip"
msgstr "Mis hierdie stap"
-#: ../../install_steps_interactive.pm_.c:1184
+#: ../../install_steps_interactive.pm_.c:1187
#, c-format
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -5196,7 +5187,7 @@ msgstr ""
"ernstige stelselfalings te herstel. Wil u 'n herlaaiskyf maak?\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:1190
+#: ../../install_steps_interactive.pm_.c:1193
msgid ""
"\n"
"\n"
@@ -5205,28 +5196,28 @@ msgid ""
"because XFS needs a very large driver)."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1198
+#: ../../install_steps_interactive.pm_.c:1201
msgid "Sorry, no floppy drive available"
msgstr "Jammer, geen sagteskyfaandrywer beskikbaar nie"
-#: ../../install_steps_interactive.pm_.c:1202
+#: ../../install_steps_interactive.pm_.c:1205
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "Kies die sagteskyfaandrywer wat u wil gebruik"
-#: ../../install_steps_interactive.pm_.c:1206
+#: ../../install_steps_interactive.pm_.c:1209
#, fuzzy, c-format
msgid "Insert a floppy in %s"
msgstr "Sit 'n skyf in aandrywer %s"
-#: ../../install_steps_interactive.pm_.c:1209
+#: ../../install_steps_interactive.pm_.c:1212
msgid "Creating bootdisk..."
msgstr "Herlaaiskyf word geskryf"
-#: ../../install_steps_interactive.pm_.c:1216
+#: ../../install_steps_interactive.pm_.c:1219
msgid "Preparing bootloader..."
msgstr "Herlaaistelsel word voorberei"
-#: ../../install_steps_interactive.pm_.c:1227
+#: ../../install_steps_interactive.pm_.c:1230
msgid ""
"You appear to have an OldWorld or Unknown\n"
" machine, the yaboot bootloader will not work for you.\n"
@@ -5234,11 +5225,11 @@ msgid ""
" need to use BootX to boot your machine"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1233
+#: ../../install_steps_interactive.pm_.c:1236
msgid "Do you want to use aboot?"
msgstr "Wil u aboot gebruik?"
-#: ../../install_steps_interactive.pm_.c:1236
+#: ../../install_steps_interactive.pm_.c:1239
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -5246,15 +5237,15 @@ msgstr ""
"Die 'aboot' installasie het gefaal. Wil u 'n installasie afwurg al\n"
"word die eerste partisie vernietig?"
-#: ../../install_steps_interactive.pm_.c:1243
+#: ../../install_steps_interactive.pm_.c:1246
msgid "Installing bootloader"
msgstr "Herlaaistelselinstallasie"
-#: ../../install_steps_interactive.pm_.c:1249
+#: ../../install_steps_interactive.pm_.c:1252
msgid "Installation of bootloader failed. The following error occured:"
msgstr "Installasie van herlaaiprogram het gefaal a.g.v. hierdie fout: "
-#: ../../install_steps_interactive.pm_.c:1257
+#: ../../install_steps_interactive.pm_.c:1260
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -5265,17 +5256,17 @@ msgid ""
"At your next boot you should see the bootloader prompt."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1291
+#: ../../install_steps_interactive.pm_.c:1294
#: ../../standalone/drakautoinst_.c:79
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Sit 'n leë floppie in aandrywer %s"
-#: ../../install_steps_interactive.pm_.c:1295
+#: ../../install_steps_interactive.pm_.c:1298
msgid "Creating auto install floppy..."
msgstr "Outoinstallasieskyf word geskep."
-#: ../../install_steps_interactive.pm_.c:1306
+#: ../../install_steps_interactive.pm_.c:1309
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -5285,7 +5276,7 @@ msgstr ""
"\n"
"Wil u werklik nou aborteer?"
-#: ../../install_steps_interactive.pm_.c:1317
+#: ../../install_steps_interactive.pm_.c:1320
#, c-format
msgid ""
"Congratulations, installation is complete.\n"
@@ -5317,15 +5308,15 @@ msgstr ""
"Inligting oor stelskonfigurasie is beskikbaar in die postinstallasie-\n"
"hoofstuk in die Offisiële Liux-Mandrake Gebruikersgids."
-#: ../../install_steps_interactive.pm_.c:1330
+#: ../../install_steps_interactive.pm_.c:1333
msgid "http://www.mandrakelinux.com/en/90errata.php3"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1335
+#: ../../install_steps_interactive.pm_.c:1338
msgid "Generate auto install floppy"
msgstr "Skep outoinstallasieskyf"
-#: ../../install_steps_interactive.pm_.c:1337
+#: ../../install_steps_interactive.pm_.c:1340
msgid ""
"The auto install can be fully automated if wanted,\n"
"in that case it will take over the hard drive!!\n"
@@ -5334,15 +5325,15 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1342
+#: ../../install_steps_interactive.pm_.c:1345
msgid "Automated"
msgstr "Outomaties"
-#: ../../install_steps_interactive.pm_.c:1342
+#: ../../install_steps_interactive.pm_.c:1345
msgid "Replay"
msgstr "Herspeel"
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1348
msgid "Save packages selection"
msgstr "Stoor pakketseleksie"
@@ -5374,7 +5365,7 @@ msgstr "Kies 'n lêer"
msgid "Advanced"
msgstr "Gevorderd"
-#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:220
+#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:103
msgid "Basic"
msgstr ""
@@ -6084,18 +6075,26 @@ msgid ""
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:147
+#: ../../network/drakfirewall.pm_.c:135
+msgid ""
+"drakfirewall configurator\n"
+"\n"
+"Make sure you have configured your Network/Internet access with\n"
+"drakconnect before going any further."
+msgstr ""
+
+#: ../../network/drakfirewall.pm_.c:152
msgid "Which services would you like to allow the Internet to connect to?"
msgstr ""
-#: ../../network/drakfirewall.pm_.c:148
+#: ../../network/drakfirewall.pm_.c:153
msgid ""
"You can enter miscellaneous ports. \n"
"Valid examples are: 139/tcp 139/udp.\n"
"Have a look at /etc/services for information."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:154
+#: ../../network/drakfirewall.pm_.c:159
#, c-format
msgid ""
"Invalid port given: %s.\n"
@@ -6103,11 +6102,11 @@ msgid ""
"where port is between 1 and 65535."
msgstr ""
-#: ../../network/drakfirewall.pm_.c:162
+#: ../../network/drakfirewall.pm_.c:167
msgid "Everything (no firewall)"
msgstr ""
-#: ../../network/drakfirewall.pm_.c:164
+#: ../../network/drakfirewall.pm_.c:169
#, fuzzy
msgid "Other ports"
msgstr "Toets poorte"
@@ -6128,7 +6127,7 @@ msgstr ""
"Geen ethernetkaart is op die stelsel gevind nie.\n"
"Ek kan nie hierdie konneksietipe opstel nie."
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:236
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:238
msgid "Choose the network interface"
msgstr "Kies die netwerkkoppelvlak"
@@ -6458,7 +6457,7 @@ msgstr "Kies die profiel om te konfigureer"
msgid "Use auto detection"
msgstr "Gebruik outobespeuring"
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3199
+#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3203
#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
#: ../../standalone/drakfloppy_.c:146
msgid "Expert Mode"
@@ -6617,6 +6616,7 @@ msgstr "IP adres"
#
#: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
+#: ../../standalone/drakgw_.c:295
msgid "Netmask"
msgstr "Netmasker"
@@ -6697,11 +6697,11 @@ msgstr "Instaanbediener moet begin met http://"
msgid "Url should begin with 'ftp:' or 'http:'"
msgstr "Instaanbediener moet begin met http://"
-#: ../../network/shorewall.pm_.c:24
+#: ../../network/shorewall.pm_.c:25
msgid "Firewalling configuration detected!"
msgstr "Vuurmuurkonfigurasie gevind!"
-#: ../../network/shorewall.pm_.c:25
+#: ../../network/shorewall.pm_.c:26
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation."
@@ -6894,7 +6894,7 @@ msgstr "LPD - Lyndrukkerdiensprogram"
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - Druk sonder drukkertou"
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1144
+#: ../../printer.pm_.c:34 ../../printer.pm_.c:1181
msgid "CUPS"
msgstr "CUPS"
@@ -6951,106 +6951,106 @@ msgstr "Tik drukkertoestel URI in"
msgid "Pipe job into a command"
msgstr "Pyk drukstuk na program"
-#: ../../printer.pm_.c:328 ../../printer.pm_.c:370 ../../printer.pm_.c:552
+#: ../../printer.pm_.c:346 ../../printer.pm_.c:388 ../../printer.pm_.c:570
#, fuzzy
msgid "Unknown Model"
msgstr "Onbekende model"
-#: ../../printer.pm_.c:754 ../../printer.pm_.c:945 ../../printer.pm_.c:1337
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3462
+#: ../../printer.pm_.c:791 ../../printer.pm_.c:982 ../../printer.pm_.c:1374
+#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3471
msgid "Unknown model"
msgstr "Onbekende model"
-#: ../../printer.pm_.c:782
+#: ../../printer.pm_.c:819
#, fuzzy
msgid "Local Printers"
msgstr "Plaaslike drukker"
#
-#: ../../printer.pm_.c:784 ../../printer.pm_.c:1145
+#: ../../printer.pm_.c:821 ../../printer.pm_.c:1182
#, fuzzy
msgid "Remote Printers"
msgstr "Eksterne drukker"
-#: ../../printer.pm_.c:791 ../../printerdrake.pm_.c:417
+#: ../../printer.pm_.c:828 ../../printerdrake.pm_.c:417
#, c-format
msgid " on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:794 ../../printerdrake.pm_.c:419
+#: ../../printer.pm_.c:831 ../../printerdrake.pm_.c:419
#, c-format
msgid ", USB printer \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:799
+#: ../../printer.pm_.c:836
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:802
+#: ../../printer.pm_.c:839
msgid ", multi-function device on USB"
msgstr ""
-#: ../../printer.pm_.c:804
+#: ../../printer.pm_.c:841
msgid ", multi-function device on HP JetDirect"
msgstr ""
-#: ../../printer.pm_.c:806
+#: ../../printer.pm_.c:843
msgid ", multi-function device"
msgstr ""
-#: ../../printer.pm_.c:809
+#: ../../printer.pm_.c:846
#, fuzzy, c-format
msgid ", printing to %s"
msgstr "Fout in die skryf van %s"
-#: ../../printer.pm_.c:811
+#: ../../printer.pm_.c:848
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:813
+#: ../../printer.pm_.c:850
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ""
-#: ../../printer.pm_.c:817
+#: ../../printer.pm_.c:854
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr ""
-#: ../../printer.pm_.c:821
+#: ../../printer.pm_.c:858
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr ""
-#: ../../printer.pm_.c:823
+#: ../../printer.pm_.c:860
#, c-format
msgid ", using command %s"
msgstr ""
-#: ../../printer.pm_.c:942 ../../printerdrake.pm_.c:1701
+#: ../../printer.pm_.c:979 ../../printerdrake.pm_.c:1701
msgid "Raw printer (No driver)"
msgstr ""
-#: ../../printer.pm_.c:1114
+#: ../../printer.pm_.c:1151
#, c-format
msgid "(on %s)"
msgstr "(op %s)"
-#: ../../printer.pm_.c:1116
+#: ../../printer.pm_.c:1153
msgid "(on this machine)"
msgstr "(op hierdie rekenaar)"
-#: ../../printer.pm_.c:1141
+#: ../../printer.pm_.c:1178
#, fuzzy, c-format
msgid "On CUPS server \"%s\""
msgstr "CUPS-bediener IP:"
-#: ../../printer.pm_.c:1147 ../../printerdrake.pm_.c:3119
-#: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3351
-#: ../../printerdrake.pm_.c:3403 ../../printerdrake.pm_.c:3429
-#: ../../printerdrake.pm_.c:3604 ../../printerdrake.pm_.c:3606
+#: ../../printer.pm_.c:1184 ../../printerdrake.pm_.c:3123
+#: ../../printerdrake.pm_.c:3134 ../../printerdrake.pm_.c:3360
+#: ../../printerdrake.pm_.c:3412 ../../printerdrake.pm_.c:3438
+#: ../../printerdrake.pm_.c:3613 ../../printerdrake.pm_.c:3615
msgid " (Default)"
msgstr " (Verstek)"
@@ -7078,13 +7078,13 @@ msgstr ""
msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
msgstr ""
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3183
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3187
#, fuzzy
msgid "CUPS configuration"
msgstr "Konfigurasie"
#
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3184
+#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3188
#, fuzzy
msgid "Specify CUPS server"
msgstr "Verwyder CUPS-bediener"
@@ -7135,15 +7135,15 @@ msgstr "Outomatiese CUPS konfigurasie"
#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
-#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2788
-#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2827
-#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2869
-#: ../../printerdrake.pm_.c:2922 ../../printerdrake.pm_.c:2942
-#: ../../printerdrake.pm_.c:2956 ../../printerdrake.pm_.c:2990
-#: ../../printerdrake.pm_.c:3036 ../../printerdrake.pm_.c:3054
-#: ../../printerdrake.pm_.c:3143 ../../printerdrake.pm_.c:3217
-#: ../../printerdrake.pm_.c:3519 ../../printerdrake.pm_.c:3574
-#: ../../printerdrake.pm_.c:3627 ../../standalone/printerdrake_.c:57
+#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2792
+#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2831
+#: ../../printerdrake.pm_.c:2836 ../../printerdrake.pm_.c:2873
+#: ../../printerdrake.pm_.c:2926 ../../printerdrake.pm_.c:2946
+#: ../../printerdrake.pm_.c:2960 ../../printerdrake.pm_.c:2994
+#: ../../printerdrake.pm_.c:3040 ../../printerdrake.pm_.c:3058
+#: ../../printerdrake.pm_.c:3147 ../../printerdrake.pm_.c:3226
+#: ../../printerdrake.pm_.c:3528 ../../printerdrake.pm_.c:3583
+#: ../../printerdrake.pm_.c:3636 ../../standalone/printerdrake_.c:57
#, fuzzy
msgid "Printerdrake"
msgstr "Drukker"
@@ -7253,8 +7253,8 @@ msgid ""
msgstr ""
#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
-#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3165
-#: ../../printerdrake.pm_.c:3290
+#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3169
+#: ../../printerdrake.pm_.c:3299
#, fuzzy
msgid "Add a new printer"
msgstr "Voeg drukker by"
@@ -7985,7 +7985,7 @@ msgstr ""
msgid "Did it work properly?"
msgstr "Het dit reg gewerk?"
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3464
+#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3473
#, fuzzy
msgid "Raw printer"
msgstr "Geen drukker"
@@ -8099,7 +8099,7 @@ msgstr "Netwerk op pad af"
#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
-#: ../../printerdrake.pm_.c:3448 ../../standalone/drakTermServ_.c:248
+#: ../../printerdrake.pm_.c:3457 ../../standalone/drakTermServ_.c:248
#: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
#: ../../standalone/drakfont_.c:1014
@@ -8138,8 +8138,8 @@ msgid ""
"of the file lists."
msgstr ""
-#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2923
-#: ../../printerdrake.pm_.c:3218
+#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2927
+#: ../../printerdrake.pm_.c:3227
msgid "Reading printer data..."
msgstr "Drukkerdata word gelees..."
@@ -8350,63 +8350,63 @@ msgid ""
"again?"
msgstr ""
-#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2789
-#: ../../printerdrake.pm_.c:2828 ../../printerdrake.pm_.c:2870
-#: ../../printerdrake.pm_.c:2991
+#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2793
+#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2874
+#: ../../printerdrake.pm_.c:2995
msgid "Checking installed software..."
msgstr "Installeerde sagteware word deursoek..."
-#: ../../printerdrake.pm_.c:2794
+#: ../../printerdrake.pm_.c:2798
msgid "Removing LPRng..."
msgstr "LPRng word verwyder..."
-#: ../../printerdrake.pm_.c:2833
+#: ../../printerdrake.pm_.c:2837
msgid "Removing LPD..."
msgstr "LPD word verwyder..."
-#: ../../printerdrake.pm_.c:2906
+#: ../../printerdrake.pm_.c:2910
msgid "Select Printer Spooler"
msgstr "Kies drukkerspoelprogram"
#
-#: ../../printerdrake.pm_.c:2907
+#: ../../printerdrake.pm_.c:2911
msgid "Which printing system (spooler) do you want to use?"
msgstr "Watter drukkerstelsel (spoelprogram) verlang u?"
-#: ../../printerdrake.pm_.c:2943
+#: ../../printerdrake.pm_.c:2947
#, fuzzy, c-format
msgid "Configuring printer \"%s\"..."
msgstr "Konfigureer drukker"
-#: ../../printerdrake.pm_.c:2957
+#: ../../printerdrake.pm_.c:2961
#, fuzzy
msgid "Installing Foomatic..."
msgstr "Installeer pakket %s"
-#: ../../printerdrake.pm_.c:3027 ../../printerdrake.pm_.c:3068
-#: ../../printerdrake.pm_.c:3465 ../../printerdrake.pm_.c:3538
+#: ../../printerdrake.pm_.c:3031 ../../printerdrake.pm_.c:3072
+#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3547
msgid "Printer options"
msgstr "Drukkeropsies"
-#: ../../printerdrake.pm_.c:3037
+#: ../../printerdrake.pm_.c:3041
#, fuzzy
msgid "Preparing Printerdrake..."
msgstr "Drukkerdata word gelees..."
-#: ../../printerdrake.pm_.c:3055 ../../printerdrake.pm_.c:3628
+#: ../../printerdrake.pm_.c:3059 ../../printerdrake.pm_.c:3637
#, fuzzy
msgid "Configuring applications..."
msgstr "Konfigureer drukker"
-#: ../../printerdrake.pm_.c:3075
+#: ../../printerdrake.pm_.c:3079
msgid "Would you like to configure printing?"
msgstr "Wil u 'n drukwerk nou konfigureer?"
-#: ../../printerdrake.pm_.c:3087
+#: ../../printerdrake.pm_.c:3091
msgid "Printing system: "
msgstr "Drukkerstelsel:"
-#: ../../printerdrake.pm_.c:3147
+#: ../../printerdrake.pm_.c:3151
#, fuzzy
msgid ""
"The following printers are configured. Double-click on a printer to change "
@@ -8417,7 +8417,7 @@ msgstr ""
"Hier is die bestaande drukkertoue.\n"
"U kan byvoeg or verwyder soos nodig."
-#: ../../printerdrake.pm_.c:3148
+#: ../../printerdrake.pm_.c:3152
#, fuzzy
msgid ""
"The following printers are configured. Double-click on a printer to change "
@@ -8427,30 +8427,30 @@ msgstr ""
"Hier is die bestaande drukkertoue.\n"
"U kan byvoeg or verwyder soos nodig."
-#: ../../printerdrake.pm_.c:3175
+#: ../../printerdrake.pm_.c:3179
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr ""
-#: ../../printerdrake.pm_.c:3193
+#: ../../printerdrake.pm_.c:3197
#, fuzzy
msgid "Change the printing system"
msgstr "Stel netwerk op"
-#: ../../printerdrake.pm_.c:3198 ../../standalone/drakconnect_.c:277
+#: ../../printerdrake.pm_.c:3202 ../../standalone/drakconnect_.c:277
msgid "Normal Mode"
msgstr "Normale modus"
-#: ../../printerdrake.pm_.c:3358 ../../printerdrake.pm_.c:3408
-#: ../../printerdrake.pm_.c:3621
+#: ../../printerdrake.pm_.c:3367 ../../printerdrake.pm_.c:3417
+#: ../../printerdrake.pm_.c:3630
#, fuzzy
msgid "Do you want to configure another printer?"
msgstr "Wil u die konfigurasie toets?"
-#: ../../printerdrake.pm_.c:3443
+#: ../../printerdrake.pm_.c:3452
msgid "Modify printer configuration"
msgstr "Verander drukkerkonfigurasie"
-#: ../../printerdrake.pm_.c:3445
+#: ../../printerdrake.pm_.c:3454
#, fuzzy, c-format
msgid ""
"Printer %s\n"
@@ -8459,104 +8459,104 @@ msgstr ""
"Drukker %s: %s %s\n"
"Wil u hierdie drukker verander?"
-#: ../../printerdrake.pm_.c:3449
+#: ../../printerdrake.pm_.c:3458
msgid "Do it!"
msgstr "Gaan voort!"
-#: ../../printerdrake.pm_.c:3454 ../../printerdrake.pm_.c:3509
+#: ../../printerdrake.pm_.c:3463 ../../printerdrake.pm_.c:3518
msgid "Printer connection type"
msgstr "Drukkerkonneksietipe"
-#: ../../printerdrake.pm_.c:3455 ../../printerdrake.pm_.c:3513
+#: ../../printerdrake.pm_.c:3464 ../../printerdrake.pm_.c:3522
msgid "Printer name, description, location"
msgstr "Drukkernaam,. beskrywing, ligging"
-#: ../../printerdrake.pm_.c:3457 ../../printerdrake.pm_.c:3531
+#: ../../printerdrake.pm_.c:3466 ../../printerdrake.pm_.c:3540
msgid "Printer manufacturer, model, driver"
msgstr "Drukkervervaardiger, model, drywer"
-#: ../../printerdrake.pm_.c:3458 ../../printerdrake.pm_.c:3532
+#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3541
msgid "Printer manufacturer, model"
msgstr "Drukkervervaardiger, model"
-#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3542
+#: ../../printerdrake.pm_.c:3476 ../../printerdrake.pm_.c:3551
msgid "Set this printer as the default"
msgstr "Maak hierdie die verstekdrukker"
-#: ../../printerdrake.pm_.c:3469 ../../printerdrake.pm_.c:3547
+#: ../../printerdrake.pm_.c:3478 ../../printerdrake.pm_.c:3556
msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3470 ../../printerdrake.pm_.c:3556
+#: ../../printerdrake.pm_.c:3479 ../../printerdrake.pm_.c:3565
msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3471 ../../printerdrake.pm_.c:3565
+#: ../../printerdrake.pm_.c:3480 ../../printerdrake.pm_.c:3574
msgid "Print test pages"
msgstr "Druk toetsbladsy(e)"
-#: ../../printerdrake.pm_.c:3472 ../../printerdrake.pm_.c:3567
+#: ../../printerdrake.pm_.c:3481 ../../printerdrake.pm_.c:3576
#, fuzzy
msgid "Know how to use this printer"
msgstr "Wil u die konfigurasie toets?"
#
-#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3569
+#: ../../printerdrake.pm_.c:3483 ../../printerdrake.pm_.c:3578
msgid "Remove printer"
msgstr "Verwyder drukker"
-#: ../../printerdrake.pm_.c:3520
+#: ../../printerdrake.pm_.c:3529
#, fuzzy, c-format
msgid "Removing old printer \"%s\"..."
msgstr "Drukkerdata word gelees..."
-#: ../../printerdrake.pm_.c:3545
+#: ../../printerdrake.pm_.c:3554
msgid "Default printer"
msgstr "Verstek drukker"
-#: ../../printerdrake.pm_.c:3546
+#: ../../printerdrake.pm_.c:3555
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "Drukker \"%s\" is nou die verstekdrukker"
-#: ../../printerdrake.pm_.c:3550 ../../printerdrake.pm_.c:3553
+#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3551
+#: ../../printerdrake.pm_.c:3560
#, c-format
msgid ""
"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3554
+#: ../../printerdrake.pm_.c:3563
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
+#: ../../printerdrake.pm_.c:3568 ../../printerdrake.pm_.c:3571
msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: ../../printerdrake.pm_.c:3560
+#: ../../printerdrake.pm_.c:3569
#, c-format
msgid ""
"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
"GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3563
+#: ../../printerdrake.pm_.c:3572
#, c-format
msgid ""
"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: ../../printerdrake.pm_.c:3571
+#: ../../printerdrake.pm_.c:3580
#, fuzzy, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "Wil u die werklik die drukker verwyder?"
-#: ../../printerdrake.pm_.c:3575
+#: ../../printerdrake.pm_.c:3584
#, fuzzy, c-format
msgid "Removing printer \"%s\"..."
msgstr "Drukkerdata word gelees..."
@@ -8678,53 +8678,56 @@ msgid ""
"\t email)"
msgstr ""
-#: ../../security/main.pm_.c:66
+#: ../../security/main.pm_.c:65
#, fuzzy
msgid "Security Level:"
msgstr "Sekuriteitsvlak word gestel."
-#: ../../security/main.pm_.c:74
+#: ../../security/main.pm_.c:99
#, fuzzy
msgid "Security Alerts:"
msgstr "Sekuriteitsvlak word gestel."
-#: ../../security/main.pm_.c:83
+#: ../../security/main.pm_.c:101
#, fuzzy
msgid "Security Administrator:"
msgstr "Eksterne lpd drukkeropsies"
-#: ../../security/main.pm_.c:114 ../../security/main.pm_.c:150
-#, fuzzy, c-format
-msgid " (default: %s)"
-msgstr " (Verstek)"
-
-#: ../../security/main.pm_.c:118 ../../security/main.pm_.c:154
-#: ../../security/main.pm_.c:179
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need explanations, click on Help.\n"
-msgstr ""
-
-#: ../../security/main.pm_.c:226
+#: ../../security/main.pm_.c:114
#, fuzzy
msgid "Network Options"
msgstr "Module opsies:"
-#: ../../security/main.pm_.c:235
+#: ../../security/main.pm_.c:114
#, fuzzy
msgid "System Options"
msgstr "Module opsies:"
-#: ../../security/main.pm_.c:242
+#: ../../security/main.pm_.c:119 ../../security/main.pm_.c:148
+msgid ""
+"The following options can be set to customize your\n"
+"system security. If you need explanations, click on Help.\n"
+msgstr ""
+
+#: ../../security/main.pm_.c:137
+#, fuzzy, c-format
+msgid " (default: %s)"
+msgstr " (Verstek)"
+
+#: ../../security/main.pm_.c:161
+msgid "Periodic Checks 2"
+msgstr ""
+
+#: ../../security/main.pm_.c:162
msgid "Periodic Checks"
msgstr ""
-#: ../../security/main.pm_.c:256
+#: ../../security/main.pm_.c:176
#, fuzzy
msgid "Please wait, setting security level..."
msgstr "Sekuriteitsvlak word gestel."
-#: ../../security/main.pm_.c:262
+#: ../../security/main.pm_.c:182
#, fuzzy
msgid "Please wait, setting security options..."
msgstr "Wag asb. installasie word voorberei"
@@ -9306,16 +9309,16 @@ msgid ""
"MandrakeClub!"
msgstr ""
-#: ../../standalone.pm_.c:42
+#: ../../standalone.pm_.c:49
#, fuzzy
msgid "Installing packages..."
msgstr "Installeer pakket %s"
-#: ../../standalone/XFdrake_.c:147
+#: ../../standalone/XFdrake_.c:148
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Teken uit en gebruik dan Ctrl-Alt-Backspace"
-#: ../../standalone/XFdrake_.c:151
+#: ../../standalone/XFdrake_.c:152
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Teken asb. weer in %s om veranderinge te aktiveer"
@@ -9531,7 +9534,7 @@ msgid ""
"The parameters of the auto-install are available in the sections on the left"
msgstr ""
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:480
+#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:508
#: ../../standalone/scannerdrake_.c:119
msgid "Congratulations!"
msgstr "Geluk!"
@@ -11642,6 +11645,9 @@ msgid ""
"With that feature, other computers on your local network will be able to use "
"this computer's Internet connection.\n"
"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
"Note: you need a dedicated Network Adapter to set up a Local Area Network "
"(LAN)."
msgstr ""
@@ -11652,21 +11658,21 @@ msgstr ""
"\n"
"Wil u internetdeling opstel?\n"
-#: ../../standalone/drakgw_.c:211
+#: ../../standalone/drakgw_.c:213
#, c-format
msgid "Interface %s (using module %s)"
msgstr "Koppelvlak %s (met module %s)"
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw_.c:214
#, c-format
msgid "Interface %s"
msgstr "Koppelvlak %s"
-#: ../../standalone/drakgw_.c:220
+#: ../../standalone/drakgw_.c:222
msgid "No network adapter on your system!"
msgstr "Daar is geen netwerkkaart op hierdie rekenaar nie!"
-#: ../../standalone/drakgw_.c:221
+#: ../../standalone/drakgw_.c:223
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
@@ -11674,12 +11680,12 @@ msgstr ""
"Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
"hardewarekonfigurasieprogram."
-#: ../../standalone/drakgw_.c:227
+#: ../../standalone/drakgw_.c:229
msgid "Network interface"
msgstr "Netwerkkoppelvlak"
#
-#: ../../standalone/drakgw_.c:228
+#: ../../standalone/drakgw_.c:230
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -11694,19 +11700,19 @@ msgstr ""
"\n"
"Ek gaan nou u LAN met daardie kaart opstel."
-#: ../../standalone/drakgw_.c:237
+#: ../../standalone/drakgw_.c:239
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr ""
"Kies asb. die netwerkkaart wat aan die loakel area netwerk gekoppel is."
-#: ../../standalone/drakgw_.c:255
+#: ../../standalone/drakgw_.c:265
#, fuzzy
msgid "Network interface already configured"
msgstr "Monitor is nie opgestel nie"
-#: ../../standalone/drakgw_.c:256
+#: ../../standalone/drakgw_.c:266
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -11716,17 +11722,17 @@ msgid ""
"You can do it manually but you need to know what you're doing."
msgstr ""
-#: ../../standalone/drakgw_.c:261
+#: ../../standalone/drakgw_.c:271
#, fuzzy
msgid "Automatic reconfiguration"
msgstr "Outomatiese CUPS konfigurasie"
-#: ../../standalone/drakgw_.c:262
+#: ../../standalone/drakgw_.c:272
#, fuzzy
msgid "Show current interface configuration"
msgstr "Verander drukkerkonfigurasie"
-#: ../../standalone/drakgw_.c:264
+#: ../../standalone/drakgw_.c:274
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -11737,78 +11743,117 @@ msgid ""
"Driver: %s"
msgstr ""
-#: ../../standalone/drakgw_.c:276
+#: ../../standalone/drakgw_.c:287
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
-"server; in that case please verify I correctly read the C-Class Network that "
-"you use for your local network; I will not reconfigure it and I will not "
-"touch your DHCP server configuration.\n"
+"server; in that case please verify I correctly read the Network that you use "
+"for your local network; I will not reconfigure it and I will not touch your "
+"DHCP server configuration.\n"
+"\n"
+"The default DNS entry is the Caching Nameserver configured on the firewall. "
+"You can replace that with your ISP DNS IP, for example.\n"
"\n"
"Else, I can reconfigure your interface and (re)configure a DHCP server for "
"you.\n"
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:281
-msgid "C-Class Local Network"
+#: ../../standalone/drakgw_.c:294
+#, fuzzy
+msgid "Local Network adress"
+msgstr "geen netwerkkaart gevind nie"
+
+#: ../../standalone/drakgw_.c:298
+msgid ""
+"DHCP Server Configuration.\n"
+"\n"
+"Here you can select different options for the DHCP server configuration.\n"
+"If you don't know the meaning of an option, simply leave it as it is.\n"
+"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:282
+#: ../../standalone/drakgw_.c:304
#, fuzzy
msgid "(This) DHCP Server IP"
msgstr "CUPS-bediener IP:"
-#: ../../standalone/drakgw_.c:283
+#: ../../standalone/drakgw_.c:305
+#, fuzzy
+msgid "The DNS Server IP"
+msgstr "CUPS-bediener IP:"
+
+#: ../../standalone/drakgw_.c:306
+#, fuzzy
+msgid "The internal domain name"
+msgstr "Nuwe drukkernaam"
+
+#: ../../standalone/drakgw_.c:307
+msgid "The DHCP start range"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:308
+msgid "The DHCP end range"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:309
+msgid "The default lease (in seconds)"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:310
+msgid "The maximum lease (in seconds)"
+msgstr ""
+
+#: ../../standalone/drakgw_.c:311
msgid "Re-configure interface and DHCP server"
msgstr ""
-#: ../../standalone/drakgw_.c:290
+#: ../../standalone/drakgw_.c:318
msgid "The Local Network did not finish with `.0', bailing out."
msgstr ""
-#: ../../standalone/drakgw_.c:301
+#: ../../standalone/drakgw_.c:329
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "Moontlike LAN-adresbotsing gevind in konfigurasie %s!\n"
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:339
msgid "Configuring..."
msgstr "Konfigurasie in aabou..."
-#: ../../standalone/drakgw_.c:312
+#: ../../standalone/drakgw_.c:340
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
"Skrips word konfigureer, sagterware installeer en bedieners afgeskop..."
-#: ../../standalone/drakgw_.c:348
+#: ../../standalone/drakgw_.c:376
#, c-format
msgid "Problems installing package %s"
msgstr "Probleme met Installasue van pakket %s"
-#: ../../standalone/drakgw_.c:481
+#: ../../standalone/drakgw_.c:509
msgid ""
"Everything has been configured.\n"
"You may now share Internet connection with other computers on your Local "
"Area Network, using automatic network configuration (DHCP)."
msgstr ""
-#: ../../standalone/drakgw_.c:500
+#: ../../standalone/drakgw_.c:528
msgid "The setup has already been done, but it's currently disabled."
msgstr "Die opstelling van is alreeds gedoen, maar is tans gedeaktiveer."
-#: ../../standalone/drakgw_.c:501
+#: ../../standalone/drakgw_.c:529
msgid "The setup has already been done, and it's currently enabled."
msgstr "Die opstelling is alreeds gedoen en is alreeds ook geaktiveer."
-#: ../../standalone/drakgw_.c:502
+#: ../../standalone/drakgw_.c:530
msgid "No Internet Connection Sharing has ever been configured."
msgstr "Geen internetkonneksiedeling is al gekonfigureer nie."
-#: ../../standalone/drakgw_.c:507
+#: ../../standalone/drakgw_.c:535
msgid "Internet connection sharing configuration"
msgstr "Internetkonneksiedelingkonfigurasie"
-#: ../../standalone/drakgw_.c:514
+#: ../../standalone/drakgw_.c:542
#, fuzzy, c-format
msgid ""
"Welcome to the Internet Connection Sharing utility!\n"
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 1dd8b61db..f9905a70f 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po