summaryrefslogtreecommitdiffstats
path: root/perl-install/authentication.pm
blob: 4ff647ad91883cdcc373c9a03402db33acd6e0d5 (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
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
package authentication; # $Id$

use common;

sub kinds { 
    my $no_para = @_ == 0;
    my ($do_pkgs, $_meta_class) = @_;
    my $allow_SmartCard = $no_para || $do_pkgs->is_available('castella-pam');
    my $allow_AD = 1;
    (
	'local', 
	'LDAP',
	'NIS', 
	if_($allow_SmartCard, 'SmartCard'), 
	'winbind', 
	if_($allow_AD, 'AD', 'SMBKRB'),
    );
}

sub kind2name {
    my ($kind) = @_;
    # Keep the following strings in sync with kind2description ones!!!
    ${{ local => N("Local file"), 
    LDAP => N("LDAP"), 
    NIS => N("NIS"),
    SmartCard => N("Smart Card"),
    winbind => N("Windows Domain"), 
    AD => N("Active Directory with SFU"),
    SMBKRB => N("Active Directory with Winbind") }}{$kind};
}

my %kind2pam_kind = (
    local     => [],
    SmartCard => ['castella'],
    LDAP      => ['ldap'], 
    NIS       => [],
    AD        => ['krb5'],
    winbind   => ['winbind'], 
    SMBKRB    => ['winbind'],
);

my %kind2nsswitch = (
    local     => [],
    SmartCard => [],
    LDAP      => ['ldap'], 
    NIS       => ['nis'],
    AD        => ['ldap'],
    winbind   => ['winbind'], 
    SMBKRB    => ['winbind'],
);

sub kind2description {
    my (@kinds) = @_;
    my %kind2description = (
	local     => [ N("Local file:"), N("Use local for all authentication and information user tell in local file"), ],
	LDAP      => [ N("LDAP:"), N("Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."), ],
	NIS       => [ N("NIS:"), N("Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."), ],
	winbind   => [ N("Windows Domain:"), N("iWinbind allows the system to retrieve information and authenticate users in a Windows domain."), ],
	AD        => [ N("Active Directory with SFU:"), N("With Kerberos and Ldap for authentication in Active Directory Server "), ],
	SMBKRB    => [ N("Active Directory with Winbind:"), N("Winbind allows the system to authenticate users in a Windows Active Directory Server.")  ],
    );
    join('', map { $_ ? qq($_->[0]\n$_->[1]\n\n) : '' } map { $kind2description{$_} } @kinds);
}
sub to_kind {
    my ($authentication) = @_;
    (find { exists $authentication->{$_} } kinds()) || 'local';
}

sub domain_to_ldap_domain {
    my ($domain) = @_;
    join(',', map { "dc=$_" } split /\./, $domain);
}

sub ask_parameters {
    my ($in, $net, $authentication, $kind) = @_;

    #- keep only this authentication kind
    foreach (kinds()) {
	delete $authentication->{$_} if $_ ne $kind;
    }

    if ($kind eq 'LDAP') {
	$authentication->{LDAPDOMAIN} ||= domain_to_ldap_domain($net->{resolv}{DOMAINNAME});
	$in->ask_from('',
		     N("Authentication LDAP"),
		     [ { label => N("LDAP Base dn"), val => \$authentication->{LDAPDOMAIN} },
		       { label => N("LDAP Server"), val => \$authentication->{LDAP_server} },
		     ]) or return;
    } elsif ($kind eq 'AD') {
	
	$authentication->{AD_domain} ||= $net->{resolv}{DOMAINNAME};
	$authentication->{AD_users_db} ||= 'cn=users,' . domain_to_ldap_domain($authentication->{AD_domain});

	$in->do_pkgs->ensure_are_installed([ 'perl-Net-DNS' ], 1) or return;

	my @srvs = query_srv_names($authentication->{AD_domain});
	$authentication->{AD_server} ||= $srvs[0] if @srvs;

	my %sub_kinds = my @sub_kinds = (
	    simple => N("simple"), 
	    tls => N("TLS"),
	    ssl => N("SSL"),
	    kerberos => N("security layout (SASL/Kerberos)"),
	);

	my $AD_user = $authentication->{AD_user} =~ /(.*)\@\Q$authentication->{AD_domain}\E$/ ? $1 : $authentication->{AD_user};
	my $anonymous = $AD_user;

	$in->ask_from('',
		     N("Authentication Active Directory"),
		     [ { label => N("Domain"), val => \$authentication->{AD_domain} },
		     #{ label => N("Server"), val => \$authentication->{AD_server} },
		       { label => N("Server"), type => 'combo', val => \$authentication->{AD_server}, list => \@srvs , not_edit => 0 },
		       { label => N("LDAP users database"), val => \$authentication->{AD_users_db} },
		       { label => N("Use Anonymous BIND "), val => \$anonymous, type => 'bool' },
		       { label => N("LDAP user allowed to browse the Active Directory"), val => \$AD_user, disabled => sub { $anonymous } },
		       { label => N("Password for user"), val => \$authentication->{AD_password}, disabled => sub { $anonymous } },
		       #{ label => N("Encryption"), val => \$authentication->{sub_kind}, list => [ map { $_->[0] } group_by2(@sub_kinds) ], format => sub { $sub_kinds{$_[0]} } },
		     ]) or return;
	$authentication->{AD_user} = !$AD_user || $authentication->{sub_kind} eq 'anonymous' ? '' : 
	                             $AD_user =~ /@/ ? $AD_user : "$AD_user\@$authentication->{AD_domain}";
	$authentication->{AD_password} = '' if !$authentication->{AD_user};


    } elsif ($kind eq 'NIS') { 
	$authentication->{NIS_server} ||= 'broadcast';
	$net->{network}{NISDOMAIN} ||= $net->{resolv}{DOMAINNAME};
	$in->ask_from('',
		     N("Authentication NIS"),
		     [ { label => N("NIS Domain"), val => \$net->{network}{NISDOMAIN} },
		       { label => N("NIS Server"), val => \$authentication->{NIS_server}, list => ["broadcast"], not_edit => 0 },
		     ]) or return;
    } elsif ($kind eq 'winbind' || $kind eq 'SMBKRB') {
	#- maybe we should browse the network like diskdrake --smb and get the 'doze server names in a list 
	#- but networking is not setup yet necessarily
	$in->ask_warn('', N("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 /add and reboot the server.
You will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain.
If networking is not yet enabled, Drakx will attempt to join the domain after the network setup step.
Should this setup fail for some reason and domain authentication is not working, run 'smbpasswd -j DOMAIN -U USER%%PASSWORD' using your Windows(tm) Domain, and Admin Username/Password, after system boot.
The command 'wbinfo -t' will test whether your authentication secrets are good."))
	  if $kind eq 'winbind';

	$authentication->{AD_domain} ||= $net->{resolv}{DOMAINNAME} if $kind eq 'SMBKRB';
	 $authentication->{AD_users_idmap} ||= 'ou=idmap,' . domain_to_ldap_domain($authentication->{AD_domain}) if $kind eq 'SMBKRB';
	$authentication->{WINDOMAIN} ||= $net->{resolv}{DOMAINNAME};

	$in->ask_from('',
		      $kind eq 'SMBKRB' ? N("Authentication Active Directory") : N("Authentication Windows Domain"),
		        [ if_($kind eq 'SMBKRB', 
			  { label => N("Active Directory Realm "), val => \$authentication->{AD_domain} }
			     ),
			  { label => N("Windows Domain"), val => \$authentication->{WINDOMAIN} },
			  { label => N("Domain Admin User Name"), val => \$authentication->{winuser} },
			  { label => N("Domain Admin Password"), val => \$authentication->{winpass}, hidden => 1 },
			  #{ label => N("Use Idmap for store UID/SID "), val => \$anonymous, type => 'bool' },
			  #{ label => N("Default Idmap "), val => \$authentication->{AD_users_idmap}, disabled => sub { $anonymous } },
			]) or return;
    }
    $authentication->{$kind} ||= 1;
    1;
}

sub ask_root_password_and_authentication {
    my ($in, $net, $superuser, $authentication, $meta_class, $security) = @_;

    my $kind = to_kind($authentication);
    my @kinds = kinds($in->do_pkgs, $meta_class);

    $in->ask_from_({
	 title => N("Set administrator (root) password and network authentication methods"), 
	 messages => N("Set administrator (root) password"),
	 advanced_label => N("Authentication method"),
	 advanced_messages => kind2description(@kinds),
	 interactive_help_id => "setRootPassword",
	 cancel => ($security <= 2 ? 
		    #-PO: keep this short or else the buttons will not fit in the window
		    N("No password") : ''),
	 focus_first => 1,
	 callbacks => { 
	     complete => sub {
		 $superuser->{password} eq $superuser->{password2} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1,0;
		 length $superuser->{password} < 2 * $security
		   and $in->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $security)), return 1,0;
		 return 0;
        } } }, [
{ label => N("Password"), val => \$superuser->{password},  hidden => 1 },
{ label => N("Password (again)"), val => \$superuser->{password2}, hidden => 1 },
{ label => N("Authentication"), val => \$kind, type => 'list', list => \@kinds, format => \&kind2name, advanced => 1 },
        ]) or delete $superuser->{password};

    ask_parameters($in, $net, $authentication, $kind) or goto &ask_root_password_and_authentication;
}


sub get() {
    my @pam_kinds = get_pam_authentication_kinds();
    my @kinds = grep { intersection(\@pam_kinds, $kind2pam_kind{$_}) } keys %kind2pam_kind;

    my $system_auth = cat_("/etc/pam.d/system-auth");
    { 
	md5 => $system_auth =~ /md5/, shadow => $system_auth =~ /shadow/, 
	if_(@kinds, $kinds[0] => ''),
    };
}

sub set {
    my ($in, $net, $authentication, $o_when_network_is_up) = @_;

    my $when_network_is_up = $o_when_network_is_up || sub { my ($f) = @_; $f->() };

    enable_shadow() if $authentication->{shadow};    

    my $kind = to_kind($authentication);

    log::l("authentication::set $kind");

    my $pam_modules = $kind2pam_kind{$kind} or log::l("kind2pam_kind does not know $kind");
    $pam_modules ||= [];
    sshd_config_UsePAM(@$pam_modules > 0);
    set_pam_authentication(@$pam_modules);

    my $nsswitch = $kind2nsswitch{$kind} or log::l("kind2nsswitch does not know $kind");
    $nsswitch ||= [];
    set_nsswitch_priority(@$nsswitch);

    if ($kind eq 'local') {
    } elsif ($kind eq 'SmartCard') {
	$in->do_pkgs->ensure_are_installed([ 'castella-pam' ], 1) or return;
    } elsif ($kind eq 'LDAP') {
	$in->do_pkgs->ensure_are_installed([ qw(openldap-clients nss_ldap pam_ldap autofs) ]) or return;

	my $domain = $authentication->{LDAPDOMAIN} || do {
	    my $s = run_program::rooted_get_stdout($::prefix, 'ldapsearch', '-x', '-h', $authentication->{LDAP_server}, '-b', '', '-s', 'base', '+');
	    first($s =~ /namingContexts: (.+)/);
	} or log::l("no ldap domain found on server $authentication->{LDAP_server}"), return;

	update_ldap_conf(
			 host => $authentication->{LDAP_server},
			 base => $domain,
			 nss_base_shadow => $domain . "?sub",
			 nss_base_passwd => $domain . "?sub",
			 nss_base_group => $domain . "?sub",
			);
    } elsif ($kind eq 'AD') {
	$in->do_pkgs->ensure_are_installed([ qw(nss_ldap pam_krb5 libsasl2-plug-gssapi) ]) or return;
	my $port = "389";
	
	my $ssl = { 
		   anonymous => 'off', 
		   simple => 'off', 
		   tls => 'start_tls',
		   ssl => 'on',
		   kerberos => 'off',
		  }->{$authentication->{sub_kind}};

	if ($ssl eq 'on') {
		$port = '636';
	}
	
	
	
	update_ldap_conf(
			 host => $authentication->{AD_server},
			 base => domain_to_ldap_domain($authentication->{AD_domain}),
			 nss_base_shadow => "$authentication->{AD_users_db}?sub",
			 nss_base_passwd => "$authentication->{AD_users_db}?sub",
			 nss_base_group => "$authentication->{AD_users_db}?sub",

			 ssl => $ssl,
			 sasl_mech => $authentication->{sub_kind} eq 'kerberos' ? 'GSSAPI' : '',
			 port => $port,

			 binddn => $authentication->{AD_user},
			 bindpw => $authentication->{AD_password},

			 (map_each { "nss_map_objectclass_$::a" => $::b }
			  posixAccount => 'User',
			  shadowAccount => 'User',
			  posixGroup => 'Group',
			 ),


			 scope => 'sub',
			 pam_login_attribute => 'sAMAccountName',
			 pam_filter => 'objectclass=User',
			 pam_password => 'ad',

			 
			 (map_each { "nss_map_attribute_$::a" => $::b }
			  uid => 'sAMAccountName',
			  uidNumber => 'msSFU30UidNumber',
			  gidNumber => 'msSFU30GidNumber',
			  cn => 'sAMAccountName',
			  uniqueMember => 'member',
			  userPassword => 'msSFU30Password',
			  homeDirectory => 'msSFU30HomeDirectory',
			  loginShell => 'msSFU30LoginShell',
			  gecos => 'name',
			 ),
			);

	configure_krb5_for_AD($authentication);

    } elsif ($kind eq 'NIS') {
	$in->do_pkgs->ensure_are_installed([ qw(ypbind autofs) ], 1) or return;
	my $domain = $net->{network}{NISDOMAIN};
	$domain || $authentication->{NIS_server} ne "broadcast" or die N("Can not use broadcast with no NIS domain");
	my $t = $domain ? "domain $domain" . ($authentication->{NIS_server} ne "broadcast" && " server") : "ypserver";
	substInFile {
	    $_ = "#~$_" unless /^#/;
	    $_ .= "$t $authentication->{NIS_server}\n" if eof;
	} "$::prefix/etc/yp.conf";

	#- no need to modify system-auth for nis

	$when_network_is_up->(sub {
	    run_program::rooted($::prefix, 'nisdomainname', $domain);
	    run_program::rooted($::prefix, 'service', 'ypbind', 'restart');
	}) if !$::isInstall; #- TODO: also do it during install since nis can be useful to resolve domain names. Not done because 9.2-RC
#    } elsif ($kind eq 'winbind' || $kind eq 'AD' && $authentication->{subkind} eq 'winbind') {

#	}) if !$::isInstall; 
#- TODO: also do it during install since nis can be useful to resolve domain names. Not done because 9.2-RC
    } elsif ($kind eq 'winbind') {

	my $domain = uc $authentication->{WINDOMAIN};
	
	$in->do_pkgs->ensure_are_installed([ 'samba-winbind' ], 1) or return;

	require network::smb;
	network::smb::write_smb_conf($domain);
	run_program::rooted($::prefix, "chkconfig", "--level", "35", "winbind", "on");
	mkdir_p("$::prefix/home/$domain");
	run_program::rooted($::prefix, 'service', 'smb', 'restart');
	run_program::rooted($::prefix, 'service', 'winbind', 'restart');
	
	#- defer running smbpassword until the network is up

	$when_network_is_up->(sub {
	    run_program::rooted($::prefix, 'net', 'join', $domain, '-U', $authentication->{winuser} . '%' . $authentication->{winpass});
	});
    } elsif ($kind eq 'SMBKRB') {
	 $authentication->{AD_server} ||= 'ads.' . $authentication->{AD_domain};
	my $domain = uc $authentication->{WINDOMAIN};
	my $realm = $authentication->{AD_domain};

	configure_krb5_for_AD($authentication);
	$in->do_pkgs->ensure_are_installed([ 'samba-winbind', 'pam_krb5', 'samba-server', 'samba-client' ]) or return;
		
	require network::smb;
	network::smb::write_smb_ads_conf($domain,$realm);
	run_program::rooted($::prefix, "chkconfig", "--level", "35", "winbind", "on");
	mkdir_p("$::prefix/home/$domain");
	run_program::rooted($::prefix, 'net', 'time', 'set', '-S', $authentication->{AD_server});
	run_program::rooted($::prefix, 'service', 'smb', 'restart');
	run_program::rooted($::prefix, 'service', 'winbind', 'restart');
	
	$when_network_is_up->(sub {
	    run_program::rooted($::prefix, 'net', 'ads', 'join', '-U', $authentication->{winuser} . '%' . $authentication->{winpass});
	});
    }
    1;
}


sub pam_modules() {
    'pam_ldap', 'pam_castella', 'pam_winbind', 'pam_krb5', 'pam_mkhomedir';
}
sub pam_module_from_path { 
    $_[0] && $_[0] =~ m|(/lib/security/)?(pam_.*)\.so| && $2;
}
sub pam_module_to_path { 
    "$_[0].so";
}
sub pam_format_line {
    my ($type, $control, $module, @para) = @_;
    sprintf("%-11s %-13s %s\n", $type, $control, join(' ', pam_module_to_path($module), @para));
}

sub get_raw_pam_authentication() {
    my %before_deny;
    foreach (cat_("$::prefix/etc/pam.d/system-auth")) {
	my ($type, $control, $module, @para) = split;
	if ($module = pam_module_from_path($module)) {
	    $before_deny{$type}{$module} = \@para if $control eq 'sufficient' && member($module, pam_modules());
	}
    }
    \%before_deny;
}

sub get_pam_authentication_kinds() {
    my $before_deny = get_raw_pam_authentication();
    map { s/pam_//; $_ } keys %{$before_deny->{auth}};
}

sub set_pam_authentication {
    my (@authentication_kinds) = @_;
    
    my %special = (
	auth => \@authentication_kinds,
	account => [ difference2(\@authentication_kinds, [ 'castella' ]) ],
	password => [ intersection(\@authentication_kinds, [ 'ldap', 'krb5' ]) ],
    );
    my %before_first = (
	session => 
	  intersection(\@authentication_kinds, [ 'winbind', 'krb5', 'ldap' ]) 
	    ? pam_format_line('session', 'optional', 'pam_mkhomedir', 'skel=/etc/skel/', 'umask=0022') :
	  member('castella', @authentication_kinds)
	    ? pam_format_line('session', 'optional', 'pam_castella') : '',
    );
    my %after_deny = (
	session => member('krb5', @authentication_kinds) ? pam_format_line('session', 'optional', 'pam_krb5') : '',
    );

    substInFile {
	my ($type, $control, $module, @para) = split;
	if ($module = pam_module_from_path($module)) {
	    if (member($module, pam_modules())) {
		#- first removing previous config
		$_ = '';
	    }
	    if ($module eq 'pam_unix' && $special{$type}) {
		my @para_for_last = 
		    member($type, 'auth', 'account') ? qw(use_first_pass) : @{[]};
		@para = difference2(\@para, \@para_for_last);

		my ($before_noask, $ask) = partition { $_ eq 'castella' } @{$special{$type}};
		my ($before, $after) = partition { $_ eq 'krb5' } @$ask;

		if (!@$ask) {
		    @para_for_last = grep { $_ ne 'use_first_pass' } @para_for_last;
		}

		my @l = ((map { [ "pam_$_" ] } @$before_noask, @$before),
			 [ 'pam_unix', @para ],
			 (map { [ "pam_$_" ] } @$after),
			 );
		push @{$l[-1]}, @para_for_last;
		$_ = join('', map { pam_format_line($type, 'sufficient', @$_) } @l);

		if ($control eq 'required') {
		    #- ensure a pam_deny line is there
		    ($control, $module, @para) = ('required', 'pam_deny');
		    $_ .= pam_format_line($type, $control, $module);
		}
	    }
	    if (my $s = delete $before_first{$type}) {
		$_ = $s . $_;
	    }
	    if ($control eq 'required' && member($module, 'pam_deny', 'pam_unix')) {
		if (my $s = delete $after_deny{$type}) {
		    $_ .= $s;
		}
	    }
	}
    } "$::prefix/etc/pam.d/system-auth";
}

sub set_nsswitch_priority {
    my (@kinds) = @_;
    my @known = qw(nis ldap winbind);
    substInFile {
	if (my ($database, $l) = /^(\s*(?:passwd|shadow|group|automount):\s*)(.*)/) {
	    my @l = difference2([ split(' ', $l) ], \@known);
	    $_ = $database . join(' ', uniq('files', @kinds, @l)) . "\n";
	}	
    } "$::prefix/etc/nsswitch.conf";
}

my $special_ldap_cmds = join('|', 'nss_map_attribute', 'nss_map_objectclass');
sub _after_read_ldap_line {
    my ($s) = @_;
    $s =~ s/\b($special_ldap_cmds)\s*/$1 . '_'/e;
    $s;
}
sub _pre_write_ldap_line {
    my ($s) = @_;
    $s =~ s/\b($special_ldap_cmds)_/$1 . ' '/e;
    $s;
}

sub read_ldap_conf() {
    my %conf = map { 
	s/^\s*#.*//; 
	if_(_after_read_ldap_line($_) =~ /(\S+)\s+(.*)/, $1 => $2);
    } cat_("$::prefix/etc/ldap.conf");
    \%conf;
}

sub update_ldap_conf {    
    my (%conf) = @_;

    substInFile {
	my ($cmd) = _after_read_ldap_line($_) =~ /^\s*#?\s*(\w+)\s/;
	if ($cmd && exists $conf{$cmd}) {
	    my $val = $conf{$cmd};
	    $conf{$cmd} = '';
	    $_ = $val ? _pre_write_ldap_line("$cmd $val\n") : /^\s*#/ ? $_ : "#$_";
        }
	if (eof) {
	    foreach my $cmd (keys %conf) {
		my $val = $conf{$cmd} or next;
		$_ .= _pre_write_ldap_line("$cmd $val\n");
	    }
	}
    } "$::prefix/etc/ldap.conf";
}

sub configure_krb5_for_AD {
    my ($authentication) = @_;

    my $uc_domain = uc $authentication->{AD_domain};
    my $krb5_conf_file = "$::prefix/etc/krb5.conf";

    krb5_conf_update($krb5_conf_file,
		     libdefaults => (
				     default_realm => $uc_domain,
				     dns_lookup_realm => $authentication->{AD_server} ? 'false' : 'true',
				     dns_lookup_kdc => $authentication->{AD_server} ? 'false' : 'true',
				     default_tgs_enctypes => undef, 
				     default_tkt_enctypes => undef,
				     permitted_enctypes => undef,
				    ));

    my @sections = (
		    realms => <<EOF,
 $uc_domain = {
  kdc = $authentication->{AD_server}:88
  admin_server = $authentication->{AD_server}:749
  default_domain = $authentication->{AD_domain}
 }
EOF
		    domain_realm => <<EOF,
 .$authentication->{AD_domain} = $uc_domain
EOF
		    kdc => <<'EOF',
 profile = /etc/kerberos/krb5kdc/kdc.conf
EOF
		    pam => <<'EOF',
 debug = false
 ticket_lifetime = 36000
 renew_lifetime = 36000
 forwardable = true
 krb4_convert = false
EOF
		    login => <<'EOF',
 krb4_convert = false
 krb4_get_tickets = false
EOF
		       );
    foreach (group_by2(@sections)) {
	my ($section, $txt) = @$_;
	krb5_conf_overwrite_category($krb5_conf_file, $section => $authentication->{AD_server} ? $txt : '');
    }
}

sub krb5_conf_overwrite_category {
    my ($file, $category, $new_val) = @_;

    my $done;
    substInFile {
	if (my $i = /^\s*\[\Q$category\E\]/i ... /^\[/) {
	    if ($new_val) {
		if ($i == 1) {
		    $_ .= $new_val;
		    $done = 1;
		} elsif ($i =~ /E/) {
		    $_ = "\n$_";
		} else {
		    $_ = '';
		}
	    } else {
		$_ = '' if $i !~ /E/;
	    }
	}
	#- if category has not been found above.
	if (eof && $new_val && !$done) {
	    $_ .= "\n[$category]\n$new_val";
	}
    } $file;
}

sub krb5_conf_update {
    my ($file, $category, %subst_) = @_;

    my %subst = map { lc($_) => [ $_, $subst_{$_} ] } keys %subst_;

    my $s;
    foreach (MDK::Common::File::cat_($file), "[NOCATEGORY]\n") {
	if (my $i = /^\s*\[\Q$category\E\]/i ... /^\[/) {
	    if ($i =~ /E/) { #- for last line of category
		chomp $s; $s .= "\n";
		$s .= " $_->[0] = $_->[1]\n" foreach grep { defined($_->[1]) } values %subst;
		%subst = ();
	    } elsif (/^\s*([^=]*?)\s*=/) {
		if (my $e = delete $subst{lc($1)}) {
		    $_ = defined($e->[1]) ? " $1 = $e->[1]\n" : '';
		}
	      }
	}
	$s .= $_ if !/^\Q[NOCATEGORY]/;
    }

    #- if category has not been found above.
    if (keys %subst) {
	chomp $s;
	$s .= "\n[$category]\n";
	$s .= " $_->[0] = $_->[1]\n" foreach grep { defined($_->[1]) } values %subst;
    }

    MDK::Common::File::output($file, $s);

}

sub sshd_config_UsePAM {
    my ($UsePAM) = @_;
    my $sshd = "$::prefix/etc/ssh/sshd_config";
    -e $sshd or return;

    my $val = "UsePAM " . bool2yesno($UsePAM);
    substInFile {
	$val = '' if s/^#?UsePAM.*/$val/;
	$_ .= "$val\n" if eof && $val;
    } $sshd;
}

sub query_srv_names {
    my ($domain) = @_;

    eval { require Net::DNS; 1 } or return;
    my $res = Net::DNS::Resolver->new;
    my $query = $res->query("_ldap._tcp.$domain", 'srv') or return;
    map { $_->target } $query->answer;
}

sub enable_shadow() {
    run_program::rooted($::prefix, "pwconv")  or log::l("pwconv failed");
    run_program::rooted($::prefix, "grpconv") or log::l("grpconv failed");
}

sub user_crypted_passwd {
    my ($u, $isMD5) = @_;
    if ($u->{password}) {
	crypt($u->{password}, $isMD5 ? '$1$' . salt(8) : salt(2));
    } else {
	$u->{pw} || '';
    }
}

sub set_root_passwd {
    my ($superuser, $authentication) = @_;
    $superuser->{name} = 'root';
    write_passwd_user($superuser, $authentication->{md5});    
    delete $superuser->{name};
}

sub write_passwd_user {
    my ($u, $isMD5) = @_;

    $u->{pw} = user_crypted_passwd($u, $isMD5);      
    $u->{shell} ||= '/bin/bash';

    substInFile {
	my $l = unpack_passwd($_);
	if ($l->{name} eq $u->{name}) {
	    add2hash_($u, $l);
	    $_ = pack_passwd($u);
	    $u = {};
	}
	if (eof && $u->{name}) {
	    $_ .= pack_passwd($u);
	}
    } "$::prefix/etc/passwd";
}

my @etc_pass_fields = qw(name pw uid gid realname home shell);
sub unpack_passwd {
    my ($l) = @_;
    my %l; @l{@etc_pass_fields} = split ':', chomp_($l);
    \%l;
}
sub pack_passwd {
    my ($l) = @_;
    join(':', @$l{@etc_pass_fields}) . "\n";
}

1;

iv class='ctx'> msgid "Printer host name or IP"
msgstr ""
-#: printer/printerdrake.pm:1645 printer/printerdrake.pm:1647
+#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
#, c-format
msgid "Printer Device URI"
msgstr ""
-#: printer/printerdrake.pm:1646
+#: printer/printerdrake.pm:1650
#, c-format
msgid "You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."
msgstr ""
-#: printer/printerdrake.pm:1664
+#: printer/printerdrake.pm:1668
#, c-format
msgid "A valid URI must be entered!"
msgstr ""
-#: printer/printerdrake.pm:1745
+#: printer/printerdrake.pm:1749
#, c-format
msgid "Pipe into command"
msgstr ""
-#: printer/printerdrake.pm:1746
+#: printer/printerdrake.pm:1750
#, c-format
msgid "Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."
msgstr ""
-#: printer/printerdrake.pm:1747
+#: printer/printerdrake.pm:1751
#, c-format
msgid "Command line"
msgstr ""
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1755
#, c-format
msgid "A command line must be entered!"
msgstr ""
-#: printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1788
#, c-format
msgid "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
msgstr ""
-#: printer/printerdrake.pm:1797
+#: printer/printerdrake.pm:1801
#, c-format
msgid "Installing HPOJ package..."
msgstr ""
-#: printer/printerdrake.pm:1805 printer/printerdrake.pm:1889
+#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
#, c-format
msgid "Checking device and configuring HPOJ..."
msgstr ""
-#: printer/printerdrake.pm:1827
+#: printer/printerdrake.pm:1831
#, c-format
msgid "Installing SANE packages..."
msgstr ""
-#: printer/printerdrake.pm:1854
+#: printer/printerdrake.pm:1858
#, c-format
msgid "Installing mtools packages..."
msgstr ""
-#: printer/printerdrake.pm:1869
+#: printer/printerdrake.pm:1873
#, c-format
msgid "Scanning on your HP multi-function device"
msgstr ""
-#: printer/printerdrake.pm:1877
+#: printer/printerdrake.pm:1881
#, c-format
msgid "Photo memory card access on your HP multi-function device"
msgstr ""
-#: printer/printerdrake.pm:1926
+#: printer/printerdrake.pm:1930
#, c-format
msgid "Making printer port available for CUPS..."
msgstr ""
-#: printer/printerdrake.pm:1935 printer/printerdrake.pm:2179 printer/printerdrake.pm:2323
+#: printer/printerdrake.pm:1939 printer/printerdrake.pm:2183 printer/printerdrake.pm:2327
#, c-format
msgid "Reading printer database..."
msgstr ""
-#: printer/printerdrake.pm:2145
+#: printer/printerdrake.pm:2149
#, c-format
msgid "Enter Printer Name and Comments"
msgstr ""
-#: printer/printerdrake.pm:2149 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:2153 printer/printerdrake.pm:3241
#, c-format
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr ""
-#: printer/printerdrake.pm:2155 printer/printerdrake.pm:3242
+#: printer/printerdrake.pm:2159 printer/printerdrake.pm:3246
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
"do you really want to overwrite its configuration?"
msgstr ""
-#: printer/printerdrake.pm:2164
+#: printer/printerdrake.pm:2168
#, c-format
msgid "Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users."
msgstr ""
-#: printer/printerdrake.pm:2165
+#: printer/printerdrake.pm:2169
#, c-format
msgid "Name of printer"
msgstr ""
-#: printer/printerdrake.pm:2166 standalone/drakconnect:516 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219
+#: printer/printerdrake.pm:2170 standalone/drakconnect:521 standalone/harddrake2:40 standalone/printerdrake:212 standalone/printerdrake:219
#, c-format
msgid "Description"
msgstr ""
-#: printer/printerdrake.pm:2167 standalone/printerdrake:212 standalone/printerdrake:219
+#: printer/printerdrake.pm:2171 standalone/printerdrake:212 standalone/printerdrake:219
#, c-format
msgid "Location"
msgstr ""
-#: printer/printerdrake.pm:2184
+#: printer/printerdrake.pm:2188
#, c-format
msgid "Preparing printer database..."
msgstr ""
-#: printer/printerdrake.pm:2302
+#: printer/printerdrake.pm:2306
#, c-format
msgid "Your printer model"
msgstr ""
-#: printer/printerdrake.pm:2303
+#: printer/printerdrake.pm:2307
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.\n"
@@ -10212,17 +10219,17 @@ msgid ""
"%s"
msgstr ""
-#: printer/printerdrake.pm:2308 printer/printerdrake.pm:2311
+#: printer/printerdrake.pm:2312 printer/printerdrake.pm:2315
#, c-format
msgid "The model is correct"
msgstr ""
-#: printer/printerdrake.pm:2309 printer/printerdrake.pm:2310 printer/printerdrake.pm:2313
+#: printer/printerdrake.pm:2313 printer/printerdrake.pm:2314 printer/printerdrake.pm:2317
#, c-format
msgid "Select model manually"
msgstr ""
-#: printer/printerdrake.pm:2336
+#: printer/printerdrake.pm:2340
#, c-format
msgid ""
"\n"
@@ -10230,114 +10237,114 @@ msgid ""
"Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted."
msgstr ""
-#: printer/printerdrake.pm:2355
+#: printer/printerdrake.pm:2359
#, c-format
msgid "Install a manufacturer-supplied PPD file"
msgstr ""
-#: printer/printerdrake.pm:2386
+#: printer/printerdrake.pm:2390
#, c-format
msgid "Every PostScript printer is delivered with a PPD file which describes the printer's options and features."
msgstr ""
-#: printer/printerdrake.pm:2387
+#: printer/printerdrake.pm:2391
#, c-format
msgid "This file is usually somewhere on the CD with the Windows and Mac drivers delivered with the printer."
msgstr ""
-#: printer/printerdrake.pm:2388
+#: printer/printerdrake.pm:2392
#, c-format
msgid "You can find the PPD files also on the manufacturer's web sites."
msgstr ""
-#: printer/printerdrake.pm:2389
+#: printer/printerdrake.pm:2393
#, c-format
msgid "If you have Windows installed on your machine, you can find the PPD file on your Windows partition, too."
msgstr ""
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2394
#, c-format
msgid "Installing the printer's PPD file and using it when setting up the printer makes all options of the printer available which are provided by the printer's hardware"
msgstr ""
-#: printer/printerdrake.pm:2391
+#: printer/printerdrake.pm:2395
#, c-format
msgid "Here you can choose the PPD file to be installed on your machine, it will then be used for the setup of your printer."
msgstr ""
-#: printer/printerdrake.pm:2393
+#: printer/printerdrake.pm:2397
#, c-format
msgid "Install PPD file from"
msgstr ""
-#: printer/printerdrake.pm:2395 printer/printerdrake.pm:2402 standalone/scannerdrake:174 standalone/scannerdrake:182 standalone/scannerdrake:233 standalone/scannerdrake:240
+#: printer/printerdrake.pm:2399 printer/printerdrake.pm:2406 standalone/scannerdrake:174 standalone/scannerdrake:182 standalone/scannerdrake:233 standalone/scannerdrake:240
#, c-format
msgid "CD-ROM"
msgstr ""
-#: printer/printerdrake.pm:2396 printer/printerdrake.pm:2404 standalone/scannerdrake:175 standalone/scannerdrake:184 standalone/scannerdrake:234 standalone/scannerdrake:242
+#: printer/printerdrake.pm:2400 printer/printerdrake.pm:2408 standalone/scannerdrake:175 standalone/scannerdrake:184 standalone/scannerdrake:234 standalone/scannerdrake:242
#, c-format
msgid "Floppy Disk"
msgstr ""
-#: printer/printerdrake.pm:2397 printer/printerdrake.pm:2406 standalone/scannerdrake:176 standalone/scannerdrake:186 standalone/scannerdrake:235 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2401 printer/printerdrake.pm:2410 standalone/scannerdrake:176 standalone/scannerdrake:186 standalone/scannerdrake:235 standalone/scannerdrake:244
#, c-format
msgid "Other place"
msgstr ""
-#: printer/printerdrake.pm:2412
+#: printer/printerdrake.pm:2416
#, c-format
msgid "Select PPD file"
msgstr ""
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2420
#, c-format
msgid "The PPD file %s does not exist or is unreadable!"
msgstr ""
-#: printer/printerdrake.pm:2422
+#: printer/printerdrake.pm:2426
#, c-format
msgid "The PPD file %s does not conform with the PPD specifications!"
msgstr ""
-#: printer/printerdrake.pm:2433
+#: printer/printerdrake.pm:2437
#, c-format
msgid "Installing PPD file..."
msgstr ""
-#: printer/printerdrake.pm:2535
+#: printer/printerdrake.pm:2539
#, c-format
msgid "OKI winprinter configuration"
msgstr ""
-#: printer/printerdrake.pm:2536
+#: printer/printerdrake.pm:2540
#, c-format
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
"use a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."
msgstr ""
-#: printer/printerdrake.pm:2560 printer/printerdrake.pm:2589
+#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
#, c-format
msgid "Lexmark inkjet configuration"
msgstr ""
-#: printer/printerdrake.pm:2561
+#: printer/printerdrake.pm:2565
#, c-format
msgid "The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."
msgstr ""
-#: printer/printerdrake.pm:2590
+#: printer/printerdrake.pm:2594
#, c-format
msgid "To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."
msgstr ""
-#: printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2597
#, c-format
msgid "Firmware-Upload for HP LaserJet 1000"
msgstr ""
-#: printer/printerdrake.pm:2706
+#: printer/printerdrake.pm:2710
#, c-format
msgid ""
"Printer default settings\n"
@@ -10345,86 +10352,86 @@ msgid ""
"You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower."
msgstr ""
-#: printer/printerdrake.pm:2831
+#: printer/printerdrake.pm:2835
#, c-format
msgid "Printer default settings"
msgstr ""
-#: printer/printerdrake.pm:2838
+#: printer/printerdrake.pm:2842
#, c-format
msgid "Option %s must be an integer number!"
msgstr ""
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:2846
#, c-format
msgid "Option %s must be a number!"
msgstr ""
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:2850
#, c-format
msgid "Option %s out of range!"
msgstr ""
-#: printer/printerdrake.pm:2897
+#: printer/printerdrake.pm:2901
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
"as the default printer?"
msgstr ""
-#: printer/printerdrake.pm:2912
+#: printer/printerdrake.pm:2916
#, c-format
msgid "Test pages"
msgstr ""
-#: printer/printerdrake.pm:2913
+#: printer/printerdrake.pm:2917
#, c-format
msgid ""
"Please select the test pages you want to print.\n"
"Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."
msgstr ""
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:2921
#, c-format
msgid "No test pages"
msgstr ""
-#: printer/printerdrake.pm:2918
+#: printer/printerdrake.pm:2922
#, c-format
msgid "Print"
msgstr ""
-#: printer/printerdrake.pm:2943
+#: printer/printerdrake.pm:2947
#, c-format
msgid "Standard test page"
msgstr ""
-#: printer/printerdrake.pm:2946
+#: printer/printerdrake.pm:2950
#, c-format
msgid "Alternative test page (Letter)"
msgstr ""
-#: printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2953
#, c-format
msgid "Alternative test page (A4)"
msgstr ""
-#: printer/printerdrake.pm:2951
+#: printer/printerdrake.pm:2955
#, c-format
msgid "Photo test page"
msgstr ""
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:2959
#, c-format
msgid "Do not print any test page"
msgstr ""
-#: printer/printerdrake.pm:2963 printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
#, c-format
msgid "Printing test page(s)..."
msgstr ""
-#: printer/printerdrake.pm:2988
+#: printer/printerdrake.pm:2992
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -10435,7 +10442,7 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:2996
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -10443,38 +10450,38 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:2999
+#: printer/printerdrake.pm:3003
#, c-format
msgid "Did it work properly?"
msgstr ""
-#: printer/printerdrake.pm:3020 printer/printerdrake.pm:4183
+#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
#, c-format
msgid "Raw printer"
msgstr ""
-#: printer/printerdrake.pm:3050
+#: printer/printerdrake.pm:3054
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3052
+#: printer/printerdrake.pm:3056
#, c-format
msgid ""
"These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3055 printer/printerdrake.pm:3072 printer/printerdrake.pm:3082
+#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3076 printer/printerdrake.pm:3086
#, c-format
msgid ""
"\n"
"The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". "
msgstr ""
-#: printer/printerdrake.pm:3058 printer/printerdrake.pm:3098
+#: printer/printerdrake.pm:3062 printer/printerdrake.pm:3102
#, c-format
msgid ""
"To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s\n"
@@ -10482,7 +10489,7 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:3062
+#: printer/printerdrake.pm:3066
#, c-format
msgid ""
"Here is a list of the available printing options for the current printer:\n"
@@ -10490,33 +10497,33 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:3067 printer/printerdrake.pm:3077
+#: printer/printerdrake.pm:3071 printer/printerdrake.pm:3081
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s <file>\".\n"
""
msgstr ""
-#: printer/printerdrake.pm:3069 printer/printerdrake.pm:3079 printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3073 printer/printerdrake.pm:3083 printer/printerdrake.pm:3093
#, c-format
msgid ""
"This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3074 printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3078 printer/printerdrake.pm:3088
#, c-format
msgid "To get a list of the options available for the current printer click on the \"Print option list\" button."
msgstr ""
-#: printer/printerdrake.pm:3087
+#: printer/printerdrake.pm:3091
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".\n"
""
msgstr ""
-#: printer/printerdrake.pm:3091
+#: printer/printerdrake.pm:3095
#, c-format
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.\n"
@@ -10524,7 +10531,7 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3099
#, c-format
msgid ""
"\n"
@@ -10532,37 +10539,37 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:3105
+#: printer/printerdrake.pm:3109
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr ""
-#: printer/printerdrake.pm:3106
+#: printer/printerdrake.pm:3110
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr ""
-#: printer/printerdrake.pm:3108
+#: printer/printerdrake.pm:3112
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr ""
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3113
#, c-format
msgid "Printing on the printer \"%s\""
msgstr ""
-#: printer/printerdrake.pm:3112 printer/printerdrake.pm:3115 printer/printerdrake.pm:3116 printer/printerdrake.pm:3117 printer/printerdrake.pm:4170 standalone/drakTermServ:321 standalone/drakbackup:4587 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508
+#: printer/printerdrake.pm:3116 printer/printerdrake.pm:3119 printer/printerdrake.pm:3120 printer/printerdrake.pm:3121 printer/printerdrake.pm:4179 standalone/drakTermServ:321 standalone/drakbackup:4583 standalone/drakbug:177 standalone/drakfont:497 standalone/drakfont:588 standalone/net_monitor:106 standalone/printerdrake:508
#, c-format
msgid "Close"
msgstr ""
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3119
#, c-format
msgid "Print option list"
msgstr ""
-#: printer/printerdrake.pm:3136
+#: printer/printerdrake.pm:3140
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.\n"
@@ -10570,22 +10577,22 @@ msgid ""
"Do not use \"scannerdrake\" for this device!"
msgstr ""
-#: printer/printerdrake.pm:3159
+#: printer/printerdrake.pm:3163
#, c-format
msgid "Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists."
msgstr ""
-#: printer/printerdrake.pm:3181 printer/printerdrake.pm:3570
+#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
#, c-format
msgid "Reading printer data..."
msgstr ""
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:3228 printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3205 printer/printerdrake.pm:3232 printer/printerdrake.pm:3267
#, c-format
msgid "Transfer printer configuration"
msgstr ""
-#: printer/printerdrake.pm:3202
+#: printer/printerdrake.pm:3206
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.\n"
@@ -10593,40 +10600,40 @@ msgid ""
""
msgstr ""
-#: printer/printerdrake.pm:3205
+#: printer/printerdrake.pm:3209
#, c-format
msgid ""
"CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3207
+#: printer/printerdrake.pm:3211
#, c-format
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3213
#, c-format
msgid ""
"LPD and LPRng do not support IPP printers.\n"
""
msgstr ""
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3215
#, c-format
msgid "In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred."
msgstr ""
-#: printer/printerdrake.pm:3212
+#: printer/printerdrake.pm:3216
#, c-format
msgid ""
"\n"
"Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred."
msgstr ""
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3217
#, c-format
msgid ""
"\n"
@@ -10634,17 +10641,17 @@ msgid ""
"\"Transfer\"."
msgstr ""
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3220
#, c-format
msgid "Do not transfer printers"
msgstr ""
-#: printer/printerdrake.pm:3217 printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
#, c-format
msgid "Transfer"
msgstr ""
-#: printer/printerdrake.pm:3229
+#: printer/printerdrake.pm:3233
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -10652,87 +10659,82 @@ msgid ""
"You can also type a new name or skip this printer."
msgstr ""
-#: printer/printerdrake.pm:3250
+#: printer/printerdrake.pm:3254
#, c-format
msgid "New printer name"
msgstr ""
-#: printer/printerdrake.pm:3253
+#: printer/printerdrake.pm:3257
#, c-format
msgid "Transferring %s..."
msgstr ""
-#: printer/printerdrake.pm:3264
+#: printer/printerdrake.pm:3268
#, c-format
msgid "You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?"
msgstr ""
-#: printer/printerdrake.pm:3274
+#: printer/printerdrake.pm:3278
#, c-format
msgid "Refreshing printer data..."
msgstr ""
-#: printer/printerdrake.pm:3282 printer/printerdrake.pm:3360 printer/printerdrake.pm:3372
-#, c-format
-msgid "Configuration of a remote printer"
-msgstr ""
-
-#: printer/printerdrake.pm:3283
+#: printer/printerdrake.pm:3287
#, c-format
msgid "Starting network..."
msgstr ""
-#: printer/printerdrake.pm:3324 printer/printerdrake.pm:3328 printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3328 printer/printerdrake.pm:3332 printer/printerdrake.pm:3334
#, c-format
msgid "Configure the network now"
msgstr ""
-#: printer/printerdrake.pm:3325
+#: printer/printerdrake.pm:3329
#, c-format
msgid "Network functionality not configured"
msgstr ""
-#: printer/printerdrake.pm:3326
+#: printer/printerdrake.pm:3330
#, c-format
msgid "You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"
msgstr ""
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3333
#, c-format
msgid "Go on without configuring the network"
msgstr ""
-#: printer/printerdrake.pm:3362
+#: printer/printerdrake.pm:3367
#, c-format
msgid "The network configuration done during the installation cannot be started now. Please check whether the network is accessable after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\""
msgstr ""
-#: printer/printerdrake.pm:3363
+#: printer/printerdrake.pm:3368
#, c-format
msgid "The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again."
msgstr ""
-#: printer/printerdrake.pm:3373
+#: printer/printerdrake.pm:3378
#, c-format
msgid "Restarting printing system..."
msgstr ""
-#: printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3417
#, c-format
msgid "high"
msgstr ""
-#: printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3417
#, c-format
msgid "paranoid"
msgstr ""
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3418
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr ""
-#: printer/printerdrake.pm:3414
+#: printer/printerdrake.pm:3419
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %s security level.\n"
@@ -10742,12 +10744,12 @@ msgid ""
"Do you really want to configure printing on this machine?"
msgstr ""
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3453
#, c-format
msgid "Starting the printing system at boot time"
msgstr ""
-#: printer/printerdrake.pm:3449
+#: printer/printerdrake.pm:3454
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine is booted.\n"
@@ -10757,204 +10759,204 @@ msgid ""
"Do you want to have the automatic starting of the printing system turned on again?"
msgstr ""
-#: printer/printerdrake.pm:3470 printer/printerdrake.pm:3685
+#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
#, c-format
msgid "Checking installed software..."
msgstr ""
-#: printer/printerdrake.pm:3476
+#: printer/printerdrake.pm:3481
#, c-format
msgid "Removing %s ..."
msgstr ""
-#: printer/printerdrake.pm:3483
+#: printer/printerdrake.pm:3488
#, c-format
msgid "Installing %s ..."
msgstr ""
-#: printer/printerdrake.pm:3530
+#: printer/printerdrake.pm:3535
#, c-format
msgid "Setting Default Printer..."
msgstr ""
-#: printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:3555
#, c-format
msgid "Select Printer Spooler"
msgstr ""
-#: printer/printerdrake.pm:3551
+#: printer/printerdrake.pm:3556
#, c-format
msgid "Which printing system (spooler) do you want to use?"
msgstr ""
-#: printer/printerdrake.pm:3602
+#: printer/printerdrake.pm:3607
#, c-format
msgid "Failed to configure printer \"%s\"!"
msgstr ""
-#: printer/printerdrake.pm:3615
+#: printer/printerdrake.pm:3620
#, c-format
msgid "Installing Foomatic..."
msgstr ""
-#: printer/printerdrake.pm:3800
+#: printer/printerdrake.pm:3806
#, c-format
-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."
+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 ""
-#: printer/printerdrake.pm:3827
+#: printer/printerdrake.pm:3834
#, c-format
msgid "Display all available remote CUPS printers"
msgstr ""
-#: printer/printerdrake.pm:3828
+#: printer/printerdrake.pm:3835
#, c-format
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr ""
-#: printer/printerdrake.pm:3836
+#: printer/printerdrake.pm:3845
#, c-format
msgid "CUPS configuration"
msgstr ""
-#: printer/printerdrake.pm:3848
+#: printer/printerdrake.pm:3857
#, c-format
msgid "Change the printing system"
msgstr ""
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:3866
#, c-format
msgid "Normal Mode"
msgstr ""
-#: printer/printerdrake.pm:3858
+#: printer/printerdrake.pm:3867
#, c-format
msgid "Expert Mode"
msgstr ""
-#: printer/printerdrake.pm:4129 printer/printerdrake.pm:4184 printer/printerdrake.pm:4265 printer/printerdrake.pm:4275
+#: printer/printerdrake.pm:4138 printer/printerdrake.pm:4193 printer/printerdrake.pm:4274 printer/printerdrake.pm:4284
#, c-format
msgid "Printer options"
msgstr ""
-#: printer/printerdrake.pm:4165
+#: printer/printerdrake.pm:4174
#, c-format
msgid "Modify printer configuration"
msgstr ""
-#: printer/printerdrake.pm:4167
+#: printer/printerdrake.pm:4176
#, c-format
msgid ""
"Printer %s\n"
"What do you want to modify on this printer?"
msgstr ""
-#: printer/printerdrake.pm:4171
+#: printer/printerdrake.pm:4180
#, c-format
msgid "Do it!"
msgstr ""
-#: printer/printerdrake.pm:4176 printer/printerdrake.pm:4234
+#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
#, c-format
msgid "Printer connection type"
msgstr ""
-#: printer/printerdrake.pm:4177 printer/printerdrake.pm:4238
+#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
#, c-format
msgid "Printer name, description, location"
msgstr ""
-#: printer/printerdrake.pm:4179 printer/printerdrake.pm:4257
+#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
#, c-format
msgid "Printer manufacturer, model, driver"
msgstr ""
-#: printer/printerdrake.pm:4180 printer/printerdrake.pm:4258
+#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
#, c-format
msgid "Printer manufacturer, model"
msgstr ""
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4269
+#: printer/printerdrake.pm:4195 printer/printerdrake.pm:4278
#, c-format
msgid "Set this printer as the default"
msgstr ""
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4276
+#: printer/printerdrake.pm:4197 printer/printerdrake.pm:4285
#, c-format
msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4281
+#: printer/printerdrake.pm:4198 printer/printerdrake.pm:4290
#, c-format
msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: printer/printerdrake.pm:4190 printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
#, c-format
msgid "Print test pages"
msgstr ""
-#: printer/printerdrake.pm:4191 printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4200 printer/printerdrake.pm:4297
#, c-format
msgid "Learn how to use this printer"
msgstr ""
-#: printer/printerdrake.pm:4192 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
#, c-format
msgid "Remove printer"
msgstr ""
-#: printer/printerdrake.pm:4246
+#: printer/printerdrake.pm:4255
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr ""
-#: printer/printerdrake.pm:4277
+#: printer/printerdrake.pm:4286
#, c-format
msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: printer/printerdrake.pm:4279
+#: printer/printerdrake.pm:4288
#, c-format
msgid "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: printer/printerdrake.pm:4280
+#: printer/printerdrake.pm:4289
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: printer/printerdrake.pm:4282
+#: printer/printerdrake.pm:4291
#, c-format
msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
msgstr ""
-#: printer/printerdrake.pm:4284
+#: printer/printerdrake.pm:4293
#, c-format
msgid "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: printer/printerdrake.pm:4285
+#: printer/printerdrake.pm:4294
#, c-format
msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
msgstr ""
-#: printer/printerdrake.pm:4329
+#: printer/printerdrake.pm:4338
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr ""
-#: printer/printerdrake.pm:4333
+#: printer/printerdrake.pm:4342
#, c-format
msgid "Removing printer \"%s\"..."
msgstr ""
-#: printer/printerdrake.pm:4357
+#: printer/printerdrake.pm:4366
#, c-format
msgid "Default printer"
msgstr ""
-#: printer/printerdrake.pm:4358
+#: printer/printerdrake.pm:4367
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr ""
@@ -11956,7 +11958,7 @@ msgid ""
"about this service, sorry."
msgstr ""
-#: services.pm:226 ugtk2.pm:1138
+#: services.pm:226 ugtk2.pm:1139
#, c-format
msgid "Info"
msgstr ""
@@ -11986,7 +11988,7 @@ msgstr ""
msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
msgstr ""
-#: share/advertising/dis-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15 share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
#, c-format
msgid "Welcome to the Open Source world!"
msgstr ""
@@ -11996,7 +11998,7 @@ msgstr ""
msgid "Your new Mandrake Linux operating system and its many applications is the result of collaborative efforts between MandrakeSoft developers and Mandrake Linux contributors throughout the world."
msgstr ""
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:17 share/advertising/ppp-01.pl:19
+#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19 share/advertising/ppp-01.pl:19
#, c-format
msgid "We would like to thank everyone who participated in the development of this latest release."
msgstr ""
@@ -12201,7 +12203,7 @@ msgstr ""
msgid "If you have Linux questions, subscribe to MandrakeExpert at <b>www.mandrakeexpert.com</b>"
msgstr ""
-#: share/advertising/dwd-01.pl:15
+#: share/advertising/dwd-01.pl:17
#, c-format
msgid "Mandrake Linux is committed to the Open Source Model and fully respects the General Public License. This new release is the result of collaboration between MandrakeSoft's team of developers and the worldwide community of Mandrake Linux contributors."
msgstr ""
@@ -13423,7 +13425,7 @@ msgid ""
"The parameters of the auto-install are available in the sections on the left"
msgstr ""
-#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:892 standalone/scannerdrake:367
+#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:898 standalone/scannerdrake:367
#, c-format
msgid "Congratulations!"
msgstr ""
@@ -13450,17 +13452,17 @@ msgstr ""
msgid "Remove the last item"
msgstr ""
-#: standalone/drakbackup:88
+#: standalone/drakbackup:87
#, c-format
msgid "hd"
msgstr ""
-#: standalone/drakbackup:88
+#: standalone/drakbackup:87
#, c-format
msgid "tape"
msgstr ""
-#: standalone/drakbackup:159
+#: standalone/drakbackup:158
#, c-format
msgid "No devices found"
msgstr ""
@@ -13692,37 +13694,37 @@ msgid ""
"%d MB used vs %d MB allocated."
msgstr ""
-#: standalone/drakbackup:1251 standalone/drakbackup:1307
+#: standalone/drakbackup:1251 standalone/drakbackup:1305
#, c-format
msgid "Backup system files..."
msgstr ""
-#: standalone/drakbackup:1308 standalone/drakbackup:1372
+#: standalone/drakbackup:1306 standalone/drakbackup:1368
#, c-format
msgid "Hard Disk Backup files..."
msgstr ""
-#: standalone/drakbackup:1371
+#: standalone/drakbackup:1367
#, c-format
msgid "Backup User files..."
msgstr ""
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1421
#, c-format
msgid "Backup Other files..."
msgstr ""
-#: standalone/drakbackup:1428
+#: standalone/drakbackup:1422
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr ""
-#: standalone/drakbackup:1433
+#: standalone/drakbackup:1427
#, c-format
msgid "No changes to backup!"
msgstr ""
-#: standalone/drakbackup:1451 standalone/drakbackup:1475
+#: standalone/drakbackup:1445 standalone/drakbackup:1469
#, c-format
msgid ""
"\n"
@@ -13731,7 +13733,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1460
+#: standalone/drakbackup:1454
#, c-format
msgid ""
"\n"
@@ -13739,19 +13741,19 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1461
+#: standalone/drakbackup:1455
#, c-format
msgid "Error during sending file via FTP. Please correct your FTP configuration."
msgstr ""
-#: standalone/drakbackup:1463
+#: standalone/drakbackup:1457
#, c-format
msgid ""
"file list sent by FTP: %s\n"
""
msgstr ""
-#: standalone/drakbackup:1480
+#: standalone/drakbackup:1474
#, c-format
msgid ""
"\n"
@@ -13760,7 +13762,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1485
+#: standalone/drakbackup:1479
#, c-format
msgid ""
"\n"
@@ -13769,39 +13771,39 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1494
+#: standalone/drakbackup:1488
#, c-format
msgid "Error sending mail. Your report mail was not sent."
msgstr ""
-#: standalone/drakbackup:1495
+#: standalone/drakbackup:1489
#, c-format
msgid ""
" Error while sending mail. \n"
""
msgstr ""
-#: standalone/drakbackup:1524
+#: standalone/drakbackup:1518
#, c-format
msgid "Can't create catalog!"
msgstr ""
-#: standalone/drakbackup:1646
+#: standalone/drakbackup:1639
#, c-format
msgid "Can't create log file!"
msgstr ""
-#: standalone/drakbackup:1663 standalone/drakbackup:1674 standalone/drakfont:584
+#: standalone/drakbackup:1656 standalone/drakbackup:1667 standalone/drakfont:584
#, c-format
msgid "File Selection"
msgstr ""
-#: standalone/drakbackup:1702
+#: standalone/drakbackup:1695
#, c-format
msgid "Select the files or directories and click on 'OK'"
msgstr ""
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1723
#, c-format
msgid ""
"\n"
@@ -13809,475 +13811,480 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1724
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
""
msgstr ""
-#: standalone/drakbackup:1732
+#: standalone/drakbackup:1725
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr ""
-#: standalone/drakbackup:1733 standalone/drakbackup:1797 standalone/drakbackup:1863
+#: standalone/drakbackup:1726 standalone/drakbackup:1790 standalone/drakbackup:1856
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr ""
-#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865
+#: standalone/drakbackup:1728 standalone/drakbackup:1792 standalone/drakbackup:1858
#, c-format
msgid "Use Incremental Backups"
msgstr ""
-#: standalone/drakbackup:1735 standalone/drakbackup:1799 standalone/drakbackup:1865
+#: standalone/drakbackup:1728 standalone/drakbackup:1792 standalone/drakbackup:1858
#, c-format
msgid "Use Differential Backups"
msgstr ""
-#: standalone/drakbackup:1737
+#: standalone/drakbackup:1730
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
msgstr ""
-#: standalone/drakbackup:1738
+#: standalone/drakbackup:1731
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr ""
-#: standalone/drakbackup:1769
+#: standalone/drakbackup:1762
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr ""
-#: standalone/drakbackup:1796
+#: standalone/drakbackup:1789
#, c-format
msgid "Do not include the browser cache"
msgstr ""
-#: standalone/drakbackup:1851 standalone/drakfont:650
+#: standalone/drakbackup:1844 standalone/drakfont:650
#, c-format
msgid "Remove Selected"
msgstr ""
-#: standalone/drakbackup:1898 standalone/drakbackup:1902
+#: standalone/drakbackup:1891 standalone/drakbackup:1895
#, c-format
msgid "Under Devel ... please wait."
msgstr ""
-#: standalone/drakbackup:1916
+#: standalone/drakbackup:1909
#, c-format
msgid "Windows (FAT32)"
msgstr ""
-#: standalone/drakbackup:1949
+#: standalone/drakbackup:1942
#, c-format
msgid "Users"
msgstr ""
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1961
#, c-format
msgid "Use network connection to backup"
msgstr ""
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1963
#, c-format
msgid "Net Method:"
msgstr ""
-#: standalone/drakbackup:1974
+#: standalone/drakbackup:1967
#, c-format
msgid "Use Expect for SSH"
msgstr ""
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1968
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr ""
-#: standalone/drakbackup:1977
+#: standalone/drakbackup:1970
#, c-format
msgid "Transfer Now"
msgstr ""
-#: standalone/drakbackup:1979
+#: standalone/drakbackup:1972
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr ""
-#: standalone/drakbackup:1982
+#: standalone/drakbackup:1975
#, c-format
msgid "Host name or IP."
msgstr ""
-#: standalone/drakbackup:1987
+#: standalone/drakbackup:1980
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr ""
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1985
#, c-format
msgid "Login name"
msgstr ""
-#: standalone/drakbackup:1999
+#: standalone/drakbackup:1992
#, c-format
msgid "Remember this password"
msgstr ""
-#: standalone/drakbackup:2011
+#: standalone/drakbackup:2004
#, c-format
msgid "Need hostname, username and password!"
msgstr ""
-#: standalone/drakbackup:2112
+#: standalone/drakbackup:2106
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr ""
-#: standalone/drakbackup:2115
+#: standalone/drakbackup:2109
#, c-format
msgid "Choose your CD/DVD device"
msgstr ""
-#: standalone/drakbackup:2120
+#: standalone/drakbackup:2114
#, c-format
msgid "Choose your CD/DVD media size"
msgstr ""
-#: standalone/drakbackup:2127
+#: standalone/drakbackup:2121
#, c-format
msgid "Multisession CD"
msgstr ""
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:2123
#, c-format
msgid "CDRW media"
msgstr ""
-#: standalone/drakbackup:2134
+#: standalone/drakbackup:2128
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr ""
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2129
#, c-format
msgid " Erase Now "
msgstr ""
-#: standalone/drakbackup:2142
+#: standalone/drakbackup:2136
#, c-format
msgid "DVD+RW media"
msgstr ""
-#: standalone/drakbackup:2144
+#: standalone/drakbackup:2138
#, c-format
msgid "DVD-R media"
msgstr ""
-#: standalone/drakbackup:2146
+#: standalone/drakbackup:2140
#, c-format
msgid "DVDRAM device"
msgstr ""
-#: standalone/drakbackup:2151
+#: standalone/drakbackup:2145
#, c-format
msgid ""
"Enter your CD Writer device name\n"
" ex: 0,1,0"
msgstr ""
-#: standalone/drakbackup:2183
+#: standalone/drakbackup:2177
#, c-format
msgid "No CD device defined!"
msgstr ""
-#: standalone/drakbackup:2232
+#: standalone/drakbackup:2227
#, c-format
msgid "Use tape to backup"
msgstr ""
-#: standalone/drakbackup:2235
+#: standalone/drakbackup:2230
#, c-format
msgid "Device name to use for backup"
msgstr ""
-#: standalone/drakbackup:2242
+#: standalone/drakbackup:2237
#, c-format
msgid "Don't rewind tape after backup"
msgstr ""
-#: standalone/drakbackup:2248
+#: standalone/drakbackup:2243
#, c-format
msgid "Erase tape before backup"
msgstr ""
-#: standalone/drakbackup:2254
+#: standalone/drakbackup:2249
#, c-format
msgid "Eject tape after the backup"
msgstr ""
-#: standalone/drakbackup:2321
+#: standalone/drakbackup:2317
#, c-format
msgid "Enter the directory to save to:"
msgstr ""
-#: standalone/drakbackup:2330
+#: standalone/drakbackup:2326
#, c-format
msgid ""
"Maximum size\n"
" allowed for Drakbackup (MB)"
msgstr ""
-#: standalone/drakbackup:2402
+#: standalone/drakbackup:2399
#, c-format
msgid "CD-R / DVD-R"
msgstr ""
-#: standalone/drakbackup:2407
+#: standalone/drakbackup:2404
#, c-format
msgid "HardDrive / NFS"
msgstr ""
-#: standalone/drakbackup:2423 standalone/drakbackup:2428 standalone/drakbackup:2433
+#: standalone/drakbackup:2420 standalone/drakbackup:2425 standalone/drakbackup:2430
#, c-format
msgid "hourly"
msgstr ""
-#: standalone/drakbackup:2424 standalone/drakbackup:2429 standalone/drakbackup:2433
+#: standalone/drakbackup:2421 standalone/drakbackup:2426 standalone/drakbackup:2430
#, c-format
msgid "daily"
msgstr ""
-#: standalone/drakbackup:2425 standalone/drakbackup:2430 standalone/drakbackup:2433
+#: standalone/drakbackup:2422 standalone/drakbackup:2427 standalone/drakbackup:2430
#, c-format
msgid "weekly"
msgstr ""
-#: standalone/drakbackup:2426 standalone/drakbackup:2431 standalone/drakbackup:2433
+#: standalone/drakbackup:2423 standalone/drakbackup:2428 standalone/drakbackup:2430
#, c-format
msgid "monthly"
msgstr ""
-#: standalone/drakbackup:2427 standalone/drakbackup:2432 standalone/drakbackup:2433
+#: standalone/drakbackup:2424 standalone/drakbackup:2429 standalone/drakbackup:2430
#, c-format
msgid "custom"
msgstr ""
-#: standalone/drakbackup:2438
+#: standalone/drakbackup:2435
#, c-format
msgid "January"
msgstr ""
-#: standalone/drakbackup:2438
+#: standalone/drakbackup:2435
#, c-format
msgid "February"
msgstr ""
-#: standalone/drakbackup:2438
+#: standalone/drakbackup:2435
#, c-format
msgid "March"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "April"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "May"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "June"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "July"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "August"
msgstr ""
-#: standalone/drakbackup:2439
+#: standalone/drakbackup:2436
#, c-format
msgid "September"
msgstr ""
-#: standalone/drakbackup:2440
+#: standalone/drakbackup:2437
#, c-format
msgid "October"
msgstr ""
-#: standalone/drakbackup:2440
+#: standalone/drakbackup:2437
#, c-format
msgid "November"
msgstr ""
-#: standalone/drakbackup:2440
+#: standalone/drakbackup:2437
#, c-format
msgid "December"
msgstr ""
-#: standalone/drakbackup:2445
+#: standalone/drakbackup:2442
#, c-format
msgid "Sunday"
msgstr ""
-#: standalone/drakbackup:2445
+#: standalone/drakbackup:2442
#, c-format
msgid "Monday"
msgstr ""
-#: standalone/drakbackup:2445
+#: standalone/drakbackup:2442
#, c-format
msgid "Tuesday"
msgstr ""
-#: standalone/drakbackup:2446
+#: standalone/drakbackup:2443
#, c-format
msgid "Wednesday"
msgstr ""
-#: standalone/drakbackup:2446
+#: standalone/drakbackup:2443
#, c-format
msgid "Thursday"
msgstr ""
-#: standalone/drakbackup:2446
+#: standalone/drakbackup:2443
#, c-format
msgid "Friday"
msgstr ""
-#: standalone/drakbackup:2446
+#: standalone/drakbackup:2443
#, c-format
msgid "Saturday"
msgstr ""
-#: standalone/drakbackup:2481
+#: standalone/drakbackup:2478
#, c-format
msgid "Use daemon"
msgstr ""
-#: standalone/drakbackup:2486
+#: standalone/drakbackup:2483
#, c-format
msgid "Please choose the time interval between each backup"
msgstr ""
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
#, c-format
msgid "Custom setup/crontab entry:"
msgstr ""
-#: standalone/drakbackup:2497
+#: standalone/drakbackup:2494
#, c-format
msgid "Minute"
msgstr ""
-#: standalone/drakbackup:2501
+#: standalone/drakbackup:2498
#, c-format
msgid "Hour"
msgstr ""
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2502
#, c-format
msgid "Day"
msgstr ""
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2506
#, c-format
msgid "Month"
msgstr ""
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2510
#, c-format
msgid "Weekday"
msgstr ""
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
#, c-format
msgid "Please choose the media for backup."
msgstr ""
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr ""
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr ""
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2571
#, c-format
msgid "Use tar and bzip2 (rather than tar and gzip)"
msgstr ""
-#: standalone/drakbackup:2575
+#: standalone/drakbackup:2572
#, c-format
msgid "Use .backupignore files"
msgstr ""
-#: standalone/drakbackup:2577
+#: standalone/drakbackup:2574
#, c-format
msgid "Send mail report after each backup to:"
msgstr ""
-#: standalone/drakbackup:2583
+#: standalone/drakbackup:2580
#, c-format
msgid "SMTP server for mail:"
msgstr ""
-#: standalone/drakbackup:2588
+#: standalone/drakbackup:2585
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr ""
-#: standalone/drakbackup:2627
+#: standalone/drakbackup:2624
#, c-format
msgid "What"
msgstr ""
-#: standalone/drakbackup:2632
+#: standalone/drakbackup:2629
#, c-format
msgid "Where"
msgstr ""
-#: standalone/drakbackup:2637
+#: standalone/drakbackup:2634
#, c-format
msgid "When"
msgstr ""
-#: standalone/drakbackup:2642
+#: standalone/drakbackup:2639
#, c-format
msgid "More Options"
msgstr ""
-#: standalone/drakbackup:2663 standalone/drakbackup:4735
+#: standalone/drakbackup:2651
+#, c-format
+msgid "Backup destination not configured..."
+msgstr ""
+
+#: standalone/drakbackup:2667 standalone/drakbackup:4731
#, c-format
msgid "Drakbackup Configuration"
msgstr ""
-#: standalone/drakbackup:2680
+#: standalone/drakbackup:2684
#, c-format
msgid "Please choose where you want to backup"
msgstr ""
-#: standalone/drakbackup:2682
+#: standalone/drakbackup:2686
#, c-format
msgid "Hard Drive used to prepare backups for all media"
msgstr ""
-#: standalone/drakbackup:2692
+#: standalone/drakbackup:2694
#, c-format
msgid "Across Network"
msgstr ""
@@ -14287,47 +14294,47 @@ msgstr ""
msgid "On CD-R"
msgstr ""
-#: standalone/drakbackup:2712
+#: standalone/drakbackup:2710
#, c-format
msgid "On Tape Device"
msgstr ""
-#: standalone/drakbackup:2742
+#: standalone/drakbackup:2738
#, c-format
msgid "Please select media for backup..."
msgstr ""
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2760
#, c-format
msgid "Backup Users"
msgstr ""
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2761
#, c-format
msgid " (Default is all users)"
msgstr ""
-#: standalone/drakbackup:2777
+#: standalone/drakbackup:2773
#, c-format
msgid "Please choose what you want to backup"
msgstr ""
-#: standalone/drakbackup:2778
+#: standalone/drakbackup:2774
#, c-format
msgid "Backup System"
msgstr ""
-#: standalone/drakbackup:2780
+#: standalone/drakbackup:2776
#, c-format
msgid "Select user manually"
msgstr ""
-#: standalone/drakbackup:2809
+#: standalone/drakbackup:2805
#, c-format
msgid "Please select data to backup..."
msgstr ""
-#: standalone/drakbackup:2883
+#: standalone/drakbackup:2879
#, c-format
msgid ""
"\n"
@@ -14335,7 +14342,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2880
#, c-format
msgid ""
"\n"
@@ -14343,7 +14350,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2882
#, c-format
msgid ""
"\n"
@@ -14351,7 +14358,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2888
+#: standalone/drakbackup:2884
#, c-format
msgid ""
"\n"
@@ -14359,7 +14366,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2886
#, c-format
msgid ""
"\n"
@@ -14367,14 +14374,14 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2891
+#: standalone/drakbackup:2887
#, c-format
msgid ""
"\tLimit disk usage to %s MB\n"
""
msgstr ""
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2890
#, c-format
msgid ""
"\n"
@@ -14382,51 +14389,51 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2894
#, c-format
msgid "NO"
msgstr ""
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2895
#, c-format
msgid "YES"
msgstr ""
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2896
#, c-format
msgid ""
"\n"
"- Burn to CD"
msgstr ""
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2897
#, c-format
msgid "RW"
msgstr ""
-#: standalone/drakbackup:2902
+#: standalone/drakbackup:2898
#, c-format
msgid " on device: %s"
msgstr ""
-#: standalone/drakbackup:2903
+#: standalone/drakbackup:2899
#, c-format
msgid " (multi-session)"
msgstr ""
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2900
#, c-format
msgid ""
"\n"
"- Save to Tape on device: %s"
msgstr ""
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2901
#, c-format
msgid "\t\tErase=%s"
msgstr ""
-#: standalone/drakbackup:2908
+#: standalone/drakbackup:2904
#, c-format
msgid ""
"\n"
@@ -14434,7 +14441,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2909
+#: standalone/drakbackup:2905
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -14442,7 +14449,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2906
#, c-format
msgid ""
"\n"
@@ -14450,49 +14457,49 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2911
+#: standalone/drakbackup:2907
#, c-format
msgid ""
"\tDo not include System Files\n"
""
msgstr ""
-#: standalone/drakbackup:2914
+#: standalone/drakbackup:2910
#, c-format
msgid ""
"\tBackups use tar and bzip2\n"
""
msgstr ""
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2912
#, c-format
msgid ""
"\tBackups use tar and gzip\n"
""
msgstr ""
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2915
#, c-format
msgid ""
"\tUse .backupignore files\n"
""
msgstr ""
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2916
#, c-format
msgid ""
"\tSend mail to %s\n"
""
msgstr ""
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2917
#, c-format
msgid ""
"\tUsing SMTP server %s\n"
""
msgstr ""
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2919
#, c-format
msgid ""
"\n"
@@ -14500,63 +14507,63 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2920
#, c-format
msgid ""
"\t-Hard drive.\n"
""
msgstr ""
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2921
#, c-format
msgid ""
"\t-CD-R.\n"
""
msgstr ""
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2922
#, c-format
msgid ""
"\t-Tape \n"
""
msgstr ""
-#: standalone/drakbackup:2927
+#: standalone/drakbackup:2923
#, c-format
msgid ""
"\t-Network by FTP.\n"
""
msgstr ""
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2924
#, c-format
msgid ""
"\t-Network by SSH.\n"
""
msgstr ""
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2925
#, c-format
msgid ""
"\t-Network by rsync.\n"
""
msgstr ""
-#: standalone/drakbackup:2930
+#: standalone/drakbackup:2926
#, c-format
msgid ""
"\t-Network by webdav.\n"
""
msgstr ""
-#: standalone/drakbackup:2932
+#: standalone/drakbackup:2928
#, c-format
msgid ""
"No configuration, please click Wizard or Advanced.\n"
""
msgstr ""
-#: standalone/drakbackup:2937
+#: standalone/drakbackup:2933
#, c-format
msgid ""
"List of data to restore:\n"
@@ -14564,35 +14571,35 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:2939
+#: standalone/drakbackup:2935
#, c-format
msgid ""
"- Restore System Files.\n"
""
msgstr ""
-#: standalone/drakbackup:2941 standalone/drakbackup:2951
+#: standalone/drakbackup:2937 standalone/drakbackup:2947
#, c-format
msgid ""
" - from date: %s %s\n"
""
msgstr ""
-#: standalone/drakbackup:2944
+#: standalone/drakbackup:2940
#, c-format
msgid ""
"- Restore User Files: \n"
""
msgstr ""
-#: standalone/drakbackup:2949
+#: standalone/drakbackup:2945
#, c-format
msgid ""
"- Restore Other Files: \n"
""
msgstr ""
-#: standalone/drakbackup:3125
+#: standalone/drakbackup:3121
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -14600,395 +14607,395 @@ msgid ""
""
msgstr ""
-#: standalone/drakbackup:3127
+#: standalone/drakbackup:3123
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr ""
-#: standalone/drakbackup:3137
+#: standalone/drakbackup:3133
#, c-format
msgid "Backup files are corrupted"
msgstr ""
-#: standalone/drakbackup:3158
+#: standalone/drakbackup:3154
#, c-format
msgid " All of your selected data have been "
msgstr ""
-#: standalone/drakbackup:3159
+#: standalone/drakbackup:3155
#, c-format
msgid " Successfuly Restored on %s "
msgstr ""
-#: standalone/drakbackup:3274
+#: standalone/drakbackup:3270
#, c-format
msgid " Restore Configuration "
msgstr ""
-#: standalone/drakbackup:3302
+#: standalone/drakbackup:3298
#, c-format
msgid "OK to restore the other files."
msgstr ""
-#: standalone/drakbackup:3320
+#: standalone/drakbackup:3316
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr ""
-#: standalone/drakbackup:3386
+#: standalone/drakbackup:3382
#, c-format
msgid "Please choose the date to restore:"
msgstr ""
-#: standalone/drakbackup:3424
+#: standalone/drakbackup:3420
#, c-format
msgid "Restore from Hard Disk."
msgstr ""
-#: standalone/drakbackup:3426
+#: standalone/drakbackup:3422
#, c-format
msgid "Enter the directory where backups are stored"
msgstr ""
-#: standalone/drakbackup:3482
+#: standalone/drakbackup:3478
#, c-format
msgid "Select another media to restore from"
msgstr ""
-#: standalone/drakbackup:3484
+#: standalone/drakbackup:3480
#, c-format
msgid "Other Media"
msgstr ""
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3485
#, c-format
msgid "Restore system"
msgstr ""
-#: standalone/drakbackup:3490
+#: standalone/drakbackup:3486
#, c-format
msgid "Restore Users"
msgstr ""
-#: standalone/drakbackup:3491
+#: standalone/drakbackup:3487
#, c-format
msgid "Restore Other"
msgstr ""
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3489
#, c-format
msgid "select path to restore (instead of /)"
msgstr ""
-#: standalone/drakbackup:3497
+#: standalone/drakbackup:3493
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr ""
-#: standalone/drakbackup:3499
+#: standalone/drakbackup:3495
#, c-format
msgid "Remove user directories before restore."
msgstr ""
-#: standalone/drakbackup:3579
+#: standalone/drakbackup:3575
#, c-format
msgid "Filename text substring to search for (empty string matches all):"
msgstr ""
-#: standalone/drakbackup:3582
+#: standalone/drakbackup:3578
#, c-format
msgid "Search Backups"
msgstr ""
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3597
#, c-format
msgid "No matches found..."
msgstr ""
-#: standalone/drakbackup:3605
+#: standalone/drakbackup:3601
#, c-format
msgid "Restore Selected"
msgstr ""
-#: standalone/drakbackup:3739
+#: standalone/drakbackup:3735
#, c-format
msgid ""
"Click date/time to see backup files.\n"
"Ctrl-Click files to select multiple files."
msgstr ""
-#: standalone/drakbackup:3745
+#: standalone/drakbackup:3741
#, c-format
msgid ""
"Restore Selected\n"
"Catalog Entry"
msgstr ""
-#: standalone/drakbackup:3754
+#: standalone/drakbackup:3750
#, c-format
msgid ""
"Restore Selected\n"
"Files"
msgstr ""
-#: standalone/drakbackup:3770
+#: standalone/drakbackup:3766
#, c-format
msgid ""
"Change\n"
"Restore Path"
msgstr ""
-#: standalone/drakbackup:3837
+#: standalone/drakbackup:3833
#, c-format
msgid "Backup files not found at %s."
msgstr ""
-#: standalone/drakbackup:3850
+#: standalone/drakbackup:3846
#, c-format
msgid "Restore From CD"
msgstr ""
-#: standalone/drakbackup:3850
+#: standalone/drakbackup:3846
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
" in the CD drive under mount point /mnt/cdrom"
msgstr ""
-#: standalone/drakbackup:3852
+#: standalone/drakbackup:3848
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr ""
-#: standalone/drakbackup:3862
+#: standalone/drakbackup:3858
#, c-format
msgid "Restore From Tape"
msgstr ""
-#: standalone/drakbackup:3862
+#: standalone/drakbackup:3858
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
" in the tape drive device %s"
msgstr ""
-#: standalone/drakbackup:3864
+#: standalone/drakbackup:3860
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr ""
-#: standalone/drakbackup:3875
+#: standalone/drakbackup:3871
#, c-format
msgid "Restore Via Network"
msgstr ""
-#: standalone/drakbackup:3875
+#: standalone/drakbackup:3871
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr ""
-#: standalone/drakbackup:3876
+#: standalone/drakbackup:3872
#, c-format
msgid "Host Name"
msgstr ""
-#: standalone/drakbackup:3877
+#: standalone/drakbackup:3873
#, c-format
msgid "Host Path or Module"
msgstr ""
-#: standalone/drakbackup:3884
+#: standalone/drakbackup:3880
#, c-format
msgid "Password required"
msgstr ""
-#: standalone/drakbackup:3890
+#: standalone/drakbackup:3886
#, c-format
msgid "Username required"
msgstr ""
-#: standalone/drakbackup:3893
+#: standalone/drakbackup:3889
#, c-format
msgid "Hostname required"
msgstr ""
-#: standalone/drakbackup:3898
+#: standalone/drakbackup:3894
#, c-format
msgid "Path or Module required"
msgstr ""
-#: standalone/drakbackup:3911
+#: standalone/drakbackup:3907
#, c-format
msgid "Files Restored..."
msgstr ""
-#: standalone/drakbackup:3914
+#: standalone/drakbackup:3910
#, c-format
msgid "Restore Failed..."
msgstr ""
-#: standalone/drakbackup:4019 standalone/drakbackup:4035
+#: standalone/drakbackup:4015 standalone/drakbackup:4031
#, c-format
msgid "%s not retrieved..."
msgstr ""
-#: standalone/drakbackup:4159 standalone/drakbackup:4232
+#: standalone/drakbackup:4155 standalone/drakbackup:4228
#, c-format
msgid "Search for files to restore"
msgstr ""
-#: standalone/drakbackup:4164
+#: standalone/drakbackup:4160
#, c-format
msgid "Restore all backups"
msgstr ""
-#: standalone/drakbackup:4173
+#: standalone/drakbackup:4169
#, c-format
msgid "Custom Restore"
msgstr ""
-#: standalone/drakbackup:4178 standalone/drakbackup:4228
+#: standalone/drakbackup:4174 standalone/drakbackup:4224
#, c-format
msgid "Restore From Catalog"
msgstr ""
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:4196
#, c-format
msgid ""
"Unable to find backups to restore...\n"
""
msgstr ""
-#: standalone/drakbackup:4201
+#: standalone/drakbackup:4197
#, c-format
msgid "Verify that %s is the correct path"
msgstr ""
-#: standalone/drakbackup:4202
+#: standalone/drakbackup:4198
#, c-format
msgid " and the CD is in the drive"
msgstr ""
-#: standalone/drakbackup:4204
+#: standalone/drakbackup:4200
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr ""
-#: standalone/drakbackup:4220
+#: standalone/drakbackup:4216
#, c-format
msgid "CD in place - continue."
msgstr ""
-#: standalone/drakbackup:4225
+#: standalone/drakbackup:4221
#, c-format
msgid "Browse to new restore repository."
msgstr ""
-#: standalone/drakbackup:4262
+#: standalone/drakbackup:4258
#, c-format
msgid "Restore Progress"
msgstr ""
-#: standalone/drakbackup:4296 standalone/drakbackup:4408 standalone/logdrake:175
+#: standalone/drakbackup:4292 standalone/drakbackup:4404 standalone/logdrake:175
#, c-format
msgid "Save"
msgstr ""
-#: standalone/drakbackup:4382
+#: standalone/drakbackup:4378
#, c-format
msgid "Build Backup"
msgstr ""
-#: standalone/drakbackup:4434 standalone/drakbackup:4833
+#: standalone/drakbackup:4430 standalone/drakbackup:4829
#, c-format
msgid "Restore"
msgstr ""
-#: standalone/drakbackup:4604
+#: standalone/drakbackup:4600
#, c-format
msgid ""
"The following packages need to be installed:\n"
""
msgstr ""
-#: standalone/drakbackup:4626
+#: standalone/drakbackup:4622
#, c-format
msgid "Please select data to restore..."
msgstr ""
-#: standalone/drakbackup:4666
+#: standalone/drakbackup:4662
#, c-format
msgid "Backup system files"
msgstr ""
-#: standalone/drakbackup:4669
+#: standalone/drakbackup:4665
#, c-format
msgid "Backup user files"
msgstr ""
-#: standalone/drakbackup:4672
+#: standalone/drakbackup:4668
#, c-format
msgid "Backup other files"
msgstr ""
-#: standalone/drakbackup:4675 standalone/drakbackup:4711
+#: standalone/drakbackup:4671 standalone/drakbackup:4707
#, c-format
msgid "Total Progress"
msgstr ""
-#: standalone/drakbackup:4703
+#: standalone/drakbackup:4699
#, c-format
msgid "Sending files by FTP"
msgstr ""
-#: standalone/drakbackup:4706
+#: standalone/drakbackup:4702
#, c-format
msgid "Sending files..."
msgstr ""
-#: standalone/drakbackup:4776
+#: standalone/drakbackup:4772
#, c-format
msgid "Backup Now from configuration file"
msgstr ""
-#: standalone/drakbackup:4781
+#: standalone/drakbackup:4777
#, c-format
msgid "View Backup Configuration."
msgstr ""
-#: standalone/drakbackup:4807
+#: standalone/drakbackup:4803
#, c-format
msgid "Wizard Configuration"
msgstr ""
-#: standalone/drakbackup:4812
+#: standalone/drakbackup:4808
#, c-format
msgid "Advanced Configuration"
msgstr ""
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4813
#, c-format
msgid "View Configuration"
msgstr ""
-#: standalone/drakbackup:4821
+#: standalone/drakbackup:4817
#, c-format
msgid "View Last Log"
msgstr ""
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4822
#, c-format
msgid "Backup Now"
msgstr ""
-#: standalone/drakbackup:4830
+#: standalone/drakbackup:4826
#, c-format
msgid ""
"No configuration file found \n"
"please click Wizard or Advanced."
msgstr ""
-#: standalone/drakbackup:4862 standalone/drakbackup:4869
+#: standalone/drakbackup:4858 standalone/drakbackup:4865
#, c-format
msgid "Drakbackup"
msgstr ""
@@ -15329,204 +15336,204 @@ msgid ""
"Do you want to install ntp ?"
msgstr ""
-#: standalone/drakconnect:77
+#: standalone/drakconnect:78
#, c-format
msgid "Network configuration (%d adapters)"
msgstr ""
-#: standalone/drakconnect:88 standalone/drakconnect:678
+#: standalone/drakconnect:89 standalone/drakconnect:686
#, c-format
msgid "Gateway:"
msgstr ""
-#: standalone/drakconnect:88 standalone/drakconnect:678
+#: standalone/drakconnect:89 standalone/drakconnect:686
#, c-format
msgid "Interface:"
msgstr ""
-#: standalone/drakconnect:92 standalone/net_monitor:105
+#: standalone/drakconnect:93 standalone/net_monitor:105
#, c-format
msgid "Wait please"
msgstr ""
-#: standalone/drakconnect:112
+#: standalone/drakconnect:113
#, c-format
msgid "Interface"
msgstr ""
-#: standalone/drakconnect:112 standalone/drakconnect:497 standalone/drakvpn:962
+#: standalone/drakconnect:113 standalone/drakconnect:502 standalone/drakvpn:1136
#, c-format
msgid "Protocol"
msgstr ""
-#: standalone/drakconnect:112
+#: standalone/drakconnect:113
#, c-format
msgid "Driver"
msgstr ""
-#: standalone/drakconnect:112
+#: standalone/drakconnect:113
#, c-format
msgid "State"
msgstr ""
-#: standalone/drakconnect:129
+#: standalone/drakconnect:130
#, c-format
msgid "Hostname: "
msgstr ""
-#: standalone/drakconnect:131
+#: standalone/drakconnect:132
#, c-format
msgid "Configure hostname..."
msgstr ""
-#: standalone/drakconnect:145 standalone/drakconnect:719
+#: standalone/drakconnect:146 standalone/drakconnect:727
#, c-format
msgid "LAN configuration"
msgstr ""
-#: standalone/drakconnect:150
+#: standalone/drakconnect:151
#, c-format
msgid "Configure Local Area Network..."
msgstr ""
-#: standalone/drakconnect:158 standalone/drakconnect:227 standalone/drakconnect:231
+#: standalone/drakconnect:159 standalone/drakconnect:228 standalone/drakconnect:232
#, c-format
msgid "Apply"
msgstr ""
-#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:278 standalone/drakconnect:288 standalone/drakconnect:289 standalone/drakconnect:535
+#: standalone/drakconnect:254 standalone/drakconnect:263 standalone/drakconnect:277 standalone/drakconnect:283 standalone/drakconnect:293 standalone/drakconnect:294 standalone/drakconnect:540
#, c-format
msgid "TCP/IP"
msgstr ""
-#: standalone/drakconnect:253 standalone/drakconnect:258 standalone/drakconnect:272 standalone/drakconnect:416 standalone/drakconnect:420 standalone/drakconnect:535
+#: standalone/drakconnect:254 standalone/drakconnect:263 standalone/drakconnect:277 standalone/drakconnect:421 standalone/drakconnect:425 standalone/drakconnect:540
#, c-format
msgid "Account"
msgstr ""
-#: standalone/drakconnect:278 standalone/drakconnect:342 standalone/drakconnect:343 standalone/drakconnect:535
+#: standalone/drakconnect:283 standalone/drakconnect:347 standalone/drakconnect:348 standalone/drakconnect:540
#, c-format
msgid "Wireless"
msgstr ""
-#: standalone/drakconnect:320
+#: standalone/drakconnect:325
#, c-format
msgid "DNS servers"
msgstr ""
-#: standalone/drakconnect:327
+#: standalone/drakconnect:332
#, c-format
msgid "Search Domain"
msgstr ""
-#: standalone/drakconnect:333
+#: standalone/drakconnect:338
#, c-format
msgid "static"
msgstr ""
-#: standalone/drakconnect:333
+#: standalone/drakconnect:338
#, c-format
msgid "dhcp"
msgstr ""
-#: standalone/drakconnect:452
+#: standalone/drakconnect:457
#, c-format
msgid "Flow control"
msgstr ""
-#: standalone/drakconnect:453
+#: standalone/drakconnect:458
#, c-format
msgid "Line termination"
msgstr ""
-#: standalone/drakconnect:458
+#: standalone/drakconnect:463
#, c-format
msgid "Tone dialing"
msgstr ""
-#: standalone/drakconnect:458
+#: standalone/drakconnect:463
#, c-format
msgid "Pulse dialing"
msgstr ""
-#: standalone/drakconnect:463
+#: standalone/drakconnect:468
#, c-format
msgid "Use lock file"
msgstr ""
-#: standalone/drakconnect:466
+#: standalone/drakconnect:471
#, c-format
msgid "Modem timeout"
msgstr ""
-#: standalone/drakconnect:470
+#: standalone/drakconnect:475
#, c-format
msgid "Wait for dialup tone before dialing"
msgstr ""
-#: standalone/drakconnect:473
+#: standalone/drakconnect:478
#, c-format
msgid "Busy wait"
msgstr ""
-#: standalone/drakconnect:477
+#: standalone/drakconnect:482
#, c-format
msgid "Modem sound"
msgstr ""
-#: standalone/drakconnect:478
+#: standalone/drakconnect:483
#, c-format
msgid "Enable"
msgstr ""
-#: standalone/drakconnect:478
+#: standalone/drakconnect:483
#, c-format
msgid "Disable"
msgstr ""
-#: standalone/drakconnect:517 standalone/harddrake2:58
+#: standalone/drakconnect:522 standalone/harddrake2:58
#, c-format
msgid "Media class"
msgstr ""
-#: standalone/drakconnect:518 standalone/drakfloppy:140
+#: standalone/drakconnect:523 standalone/drakfloppy:140
#, c-format
msgid "Module name"
msgstr ""
-#: standalone/drakconnect:519
+#: standalone/drakconnect:524
#, c-format
msgid "Mac Address"
msgstr ""
-#: standalone/drakconnect:520 standalone/harddrake2:21
+#: standalone/drakconnect:525 standalone/harddrake2:21
#, c-format
msgid "Bus"
msgstr ""
-#: standalone/drakconnect:521 standalone/harddrake2:29
+#: standalone/drakconnect:526 standalone/harddrake2:29
#, c-format
msgid "Location on the bus"
msgstr ""
-#: standalone/drakconnect:581
+#: standalone/drakconnect:587
#, c-format
msgid ""
"An unexpected error has happened:\n"
"%s"
msgstr ""
-#: standalone/drakconnect:591
+#: standalone/drakconnect:597
#, c-format
msgid "Remove a network interface"
msgstr ""
-#: standalone/drakconnect:595
+#: standalone/drakconnect:601
#, c-format
msgid "Select the network interface to remove:"
msgstr ""
-#: standalone/drakconnect:611
+#: standalone/drakconnect:617
#, c-format
msgid ""
"An error occured while deleting the \"%s\" network interface:\n"
@@ -15534,148 +15541,148 @@ msgid ""
"%s"
msgstr ""
-#: standalone/drakconnect:613
+#: standalone/drakconnect:619
#, c-format
msgid "Congratulations, the \"%s\" network interface has been succesfully deleted"
msgstr ""
-#: standalone/drakconnect:630
+#: standalone/drakconnect:636
#, c-format
msgid "No Ip"
msgstr ""
-#: standalone/drakconnect:631
+#: standalone/drakconnect:637
#, c-format
msgid "No Mask"
msgstr ""
-#: standalone/drakconnect:632 standalone/drakconnect:790
+#: standalone/drakconnect:638 standalone/drakconnect:798
#, c-format
msgid "up"
msgstr ""
-#: standalone/drakconnect:632 standalone/drakconnect:790
+#: standalone/drakconnect:638 standalone/drakconnect:798
#, c-format
msgid "down"
msgstr ""
-#: standalone/drakconnect:669 standalone/net_monitor:415
+#: standalone/drakconnect:677 standalone/net_monitor:415
#, c-format
msgid "Connected"
msgstr ""
-#: standalone/drakconnect:669 standalone/net_monitor:415
+#: standalone/drakconnect:677 standalone/net_monitor:415
#, c-format
msgid "Not connected"
msgstr ""
-#: standalone/drakconnect:670
+#: standalone/drakconnect:678
#, c-format
msgid "Disconnect..."
msgstr ""
-#: standalone/drakconnect:670
+#: standalone/drakconnect:678
#, c-format
msgid "Connect..."
msgstr ""
-#: standalone/drakconnect:699
+#: standalone/drakconnect:707
#, c-format
msgid "Warning, another Internet connection has been detected, maybe using your network"
msgstr ""
-#: standalone/drakconnect:715
+#: standalone/drakconnect:723
#, c-format
msgid "Deactivate now"
msgstr ""
-#: standalone/drakconnect:715
+#: standalone/drakconnect:723
#, c-format
msgid "Activate now"
msgstr ""
-#: standalone/drakconnect:723
+#: standalone/drakconnect:731
#, c-format
msgid ""
"You don't have any configured interface.\n"
"Configure them first by clicking on 'Configure'"
msgstr ""
-#: standalone/drakconnect:737
+#: standalone/drakconnect:745
#, c-format
msgid "LAN Configuration"
msgstr ""
-#: standalone/drakconnect:749
+#: standalone/drakconnect:757
#, c-format
msgid "Adapter %s: %s"
msgstr ""
-#: standalone/drakconnect:758
+#: standalone/drakconnect:766
#, c-format
msgid "Boot Protocol"
msgstr ""
-#: standalone/drakconnect:759
+#: standalone/drakconnect:767
#, c-format
msgid "Started on boot"
msgstr ""
-#: standalone/drakconnect:795
+#: standalone/drakconnect:803
#, c-format
msgid ""
"This interface has not been configured yet.\n"
"Run the \"Add an interface\" assistant from the Mandrake Control Center"
msgstr ""
-#: standalone/drakconnect:850
+#: standalone/drakconnect:858
#, c-format
msgid ""
"You don't have any configured Internet connection.\n"
"Please run \"Internet access\" in control center."
msgstr ""
-#: standalone/drakconnect:858
+#: standalone/drakconnect:866
#, c-format
msgid "Internet connection configuration"
msgstr ""
-#: standalone/drakconnect:899
+#: standalone/drakconnect:907
#, c-format
msgid "Provider dns 1 (optional)"
msgstr ""
-#: standalone/drakconnect:900
+#: standalone/drakconnect:908
#, c-format
msgid "Provider dns 2 (optional)"
msgstr ""
-#: standalone/drakconnect:913
+#: standalone/drakconnect:921
#, c-format
msgid "Ethernet Card"
msgstr ""
-#: standalone/drakconnect:914
+#: standalone/drakconnect:922
#, c-format
msgid "DHCP Client"
msgstr ""
-#: standalone/drakconnect:943
+#: standalone/drakconnect:951
#, c-format
msgid "Internet Connection Configuration"
msgstr ""
-#: standalone/drakconnect:944
+#: standalone/drakconnect:952
#, c-format
msgid "Internet access"
msgstr ""
-#: standalone/drakconnect:946 standalone/net_monitor:87
+#: standalone/drakconnect:954 standalone/net_monitor:87
#, c-format
msgid "Connection type: "
msgstr ""
-#: standalone/drakconnect:949
+#: standalone/drakconnect:957
#, c-format
msgid "Status:"
msgstr ""
@@ -15920,7 +15927,7 @@ msgid ""
"-You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server."
msgstr ""
-#: standalone/drakfont:474
+#: standalone/drakfont:474 standalone/drakfont:483
#, c-format
msgid "DrakFont"
msgstr ""
@@ -16134,17 +16141,17 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: standalone/drakgw:133 standalone/drakvpn:97
+#: standalone/drakgw:133 standalone/drakvpn:99
#, c-format
msgid "disable"
msgstr ""
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123
+#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99 standalone/drakvpn:125
#, c-format
msgid "reconfigure"
msgstr ""
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:97 standalone/drakvpn:123 standalone/drakvpn:372 standalone/drakvpn:723
+#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99 standalone/drakvpn:125 standalone/drakvpn:372 standalone/drakvpn:731
#, c-format
msgid "dismiss"
msgstr ""
@@ -16173,7 +16180,7 @@ msgid ""
"What would you like to do?"
msgstr ""
-#: standalone/drakgw:162 standalone/drakvpn:123
+#: standalone/drakgw:162 standalone/drakvpn:125
#, c-format
msgid "enable"
msgstr ""
@@ -16199,7 +16206,7 @@ msgid ""
"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN)."
msgstr ""
-#: standalone/drakgw:211 standalone/drakvpn:208
+#: standalone/drakgw:211 standalone/drakvpn:210
#, c-format
msgid ""
"Please enter the name of the interface connected to the internet.\n"
@@ -16380,7 +16387,7 @@ msgstr ""
msgid "Configuring scripts, installing software, starting servers..."
msgstr ""
-#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:272
+#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:274
#, c-format
msgid "Problems installing package %s"
msgstr ""
@@ -16527,7 +16534,7 @@ msgstr ""
msgid "Delete selected rule"
msgstr ""
-#: standalone/drakperm:125 standalone/drakvpn:327 standalone/drakvpn:682 standalone/printerdrake:229
+#: standalone/drakperm:125 standalone/drakvpn:329 standalone/drakvpn:690 standalone/printerdrake:229
#, c-format
msgid "Edit"
msgstr ""
@@ -17034,17 +17041,17 @@ msgstr ""
msgid "%s BootSplash (%s) preview"
msgstr ""
-#: standalone/drakvpn:69
+#: standalone/drakvpn:71
#, c-format
msgid "DrakVPN"
msgstr ""
-#: standalone/drakvpn:91
+#: standalone/drakvpn:93
#, c-format
msgid "The VPN connection is enabled."
msgstr ""
-#: standalone/drakvpn:92
+#: standalone/drakvpn:94
#, c-format
msgid ""
"The setup of a VPN connection has already been done.\n"
@@ -17054,22 +17061,22 @@ msgid ""
"What would you like to do ?"
msgstr ""
-#: standalone/drakvpn:101
+#: standalone/drakvpn:103
#, c-format
msgid "Disabling VPN..."
msgstr ""
-#: standalone/drakvpn:110
+#: standalone/drakvpn:112
#, c-format
msgid "The VPN connection is now disabled."
msgstr ""
-#: standalone/drakvpn:117
+#: standalone/drakvpn:119
#, c-format
msgid "VPN connection currently disabled"
msgstr ""
-#: standalone/drakvpn:118
+#: standalone/drakvpn:120
#, c-format
msgid ""
"The setup of a VPN connection has already been done.\n"
@@ -17079,22 +17086,22 @@ msgid ""
"What would you like to do ?"
msgstr ""
-#: standalone/drakvpn:131
+#: standalone/drakvpn:133
#, c-format
msgid "Enabling VPN..."
msgstr ""
-#: standalone/drakvpn:137
+#: standalone/drakvpn:139
#, c-format
msgid "The VPN connection is now enabled."
msgstr ""
-#: standalone/drakvpn:151 standalone/drakvpn:177
+#: standalone/drakvpn:153 standalone/drakvpn:179
#, c-format
msgid "Simple VPN setup."
msgstr ""
-#: standalone/drakvpn:152
+#: standalone/drakvpn:154
#, c-format
msgid ""
"You are about to configure your computer to use a VPN connection.\n"
@@ -17110,7 +17117,7 @@ msgid ""
"drakconnect before going any further."
msgstr ""
-#: standalone/drakvpn:178
+#: standalone/drakvpn:180
#, c-format
msgid ""
"VPN connection.\n"
@@ -17126,12 +17133,12 @@ msgid ""
"before going any further."
msgstr ""
-#: standalone/drakvpn:190
+#: standalone/drakvpn:192
#, c-format
msgid "Kernel module."
msgstr ""
-#: standalone/drakvpn:191
+#: standalone/drakvpn:193
#, c-format
msgid ""
"The kernel need to have ipsec support.\n"
@@ -17141,22 +17148,22 @@ msgid ""
"This kernel has '%s' support."
msgstr ""
-#: standalone/drakvpn:286
+#: standalone/drakvpn:288
#, c-format
msgid "Security Policies"
msgstr ""
-#: standalone/drakvpn:286
+#: standalone/drakvpn:288
#, c-format
msgid "IKE daemon racoon"
msgstr ""
-#: standalone/drakvpn:289 standalone/drakvpn:300
+#: standalone/drakvpn:291 standalone/drakvpn:302
#, c-format
msgid "Configuration file"
msgstr ""
-#: standalone/drakvpn:290
+#: standalone/drakvpn:292
#, c-format
msgid ""
"Configuration step !\n"
@@ -17169,7 +17176,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:301
+#: standalone/drakvpn:303
#, c-format
msgid ""
"Next, we will configure the %s file.\n"
@@ -17179,12 +17186,12 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:319 standalone/drakvpn:673
+#: standalone/drakvpn:321 standalone/drakvpn:681
#, c-format
msgid "%s entries"
msgstr ""
-#: standalone/drakvpn:320
+#: standalone/drakvpn:322
#, c-format
msgid ""
"The %s file contents\n"
@@ -17199,17 +17206,17 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:327 standalone/drakvpn:682
+#: standalone/drakvpn:329 standalone/drakvpn:690
#, c-format
msgid "Display"
msgstr ""
-#: standalone/drakvpn:327 standalone/drakvpn:682
+#: standalone/drakvpn:329 standalone/drakvpn:690
#, c-format
msgid "Commit"
msgstr ""
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:697 standalone/drakvpn:701
+#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705 standalone/drakvpn:709
#, c-format
msgid "Display configuration"
msgstr ""
@@ -17261,7 +17268,7 @@ msgstr ""
msgid "normal conn"
msgstr ""
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506 standalone/drakvpn:546
+#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
#, c-format
msgid "Exists !"
msgstr ""
@@ -17429,7 +17436,7 @@ msgstr ""
msgid "rightnexthop"
msgstr ""
-#: standalone/drakvpn:507 standalone/drakvpn:547
+#: standalone/drakvpn:507
#, c-format
msgid ""
"A section with this name already exists.\n"
@@ -17451,12 +17458,12 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:564 standalone/drakvpn:816
+#: standalone/drakvpn:572 standalone/drakvpn:822
#, c-format
msgid "Edit section"
msgstr ""
-#: standalone/drakvpn:565
+#: standalone/drakvpn:573
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -17466,17 +17473,17 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:568 standalone/drakvpn:648 standalone/drakvpn:821 standalone/drakvpn:867
+#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827 standalone/drakvpn:873
#, c-format
msgid "Section names"
msgstr ""
-#: standalone/drakvpn:578
+#: standalone/drakvpn:586
#, c-format
msgid "Can't edit !"
msgstr ""
-#: standalone/drakvpn:579
+#: standalone/drakvpn:587
#, c-format
msgid ""
"You cannot edit this section.\n"
@@ -17484,11 +17491,11 @@ msgid ""
"This section is mandatory for Freswan 2.X.\n"
"One has to specify version 2.0 on the top\n"
"of the %s file, and eventually, disable or\n"
-"enable the oportunistic ecryption.\n"
+"enable the oportunistic encryption.\n"
""
msgstr ""
-#: standalone/drakvpn:588
+#: standalone/drakvpn:596
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -17498,7 +17505,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:599
+#: standalone/drakvpn:607
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -17508,7 +17515,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:612
+#: standalone/drakvpn:620
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -17519,7 +17526,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:633
+#: standalone/drakvpn:641
#, c-format
msgid ""
"Edit a Security Policy.\n"
@@ -17530,22 +17537,22 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:644 standalone/drakvpn:863
+#: standalone/drakvpn:652 standalone/drakvpn:869
#, c-format
msgid "Remove section"
msgstr ""
-#: standalone/drakvpn:645 standalone/drakvpn:864
+#: standalone/drakvpn:653 standalone/drakvpn:870
#, c-format
msgid ""
-"Your %s file has several or sections or connections.\n"
+"Your %s file has several sections or connections.\n"
"\n"
"You can choose here below the one you want to remove\n"
"and then click on next.\n"
""
msgstr ""
-#: standalone/drakvpn:674
+#: standalone/drakvpn:682
#, c-format
msgid ""
"The racoon.conf file configuration.\n"
@@ -17559,7 +17566,7 @@ msgid ""
" - commit \t\t (writes the changes to the real file)"
msgstr ""
-#: standalone/drakvpn:702
+#: standalone/drakvpn:710
#, c-format
msgid ""
"The %s file does not exist\n"
@@ -17570,12 +17577,12 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:716
+#: standalone/drakvpn:724
#, c-format
msgid "racoonf.conf entries"
msgstr ""
-#: standalone/drakvpn:717
+#: standalone/drakvpn:725
#, c-format
msgid ""
"The 'add' sections step.\n"
@@ -17589,22 +17596,22 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:723
+#: standalone/drakvpn:731
#, c-format
msgid "path"
msgstr ""
-#: standalone/drakvpn:723 standalone/drakvpn:930
+#: standalone/drakvpn:731
#, c-format
msgid "remote"
msgstr ""
-#: standalone/drakvpn:723
+#: standalone/drakvpn:731
#, c-format
msgid "sainfo"
msgstr ""
-#: standalone/drakvpn:731
+#: standalone/drakvpn:739
#, c-format
msgid ""
"The 'add path' section step.\n"
@@ -17614,45 +17621,41 @@ msgid ""
"Put your mouse over the certificate entry to obtain online help."
msgstr ""
-#: standalone/drakvpn:734
+#: standalone/drakvpn:742
#, c-format
msgid "path type"
msgstr ""
-#: standalone/drakvpn:738
+#: standalone/drakvpn:746
#, c-format
msgid ""
-"Path Specification\n"
-" path include path;\n"
-"\tspecifies a path to include a file. See File Inclusion.\n"
-" Example: path include '/etc/racoon'\n"
+"path include path : specifies a path to include\n"
+"a file. See File Inclusion.\n"
+"\tExample: path include '/etc/racoon'\n"
"\n"
-" path pre_shared_key file;\n"
-"\tspecifies a file containing pre-shared key(s)\n"
-"\tfor various ID(s). See Pre-shared key File.\n"
-" Example: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"path pre_shared_key file : specifies a file containing\n"
+"pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
+"\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
"\n"
-" path certificate path;\n"
-" \tracoon(8) will search this directory if a certificate or\n"
-"\t certificate request is received.\n"
-" Example: path certificate '/etc/cert' ;\n"
+"path certificate path : racoon(8) will search this directory\n"
+"if a certificate or certificate request is received.\n"
+"\tExample: path certificate '/etc/cert' ;\n"
"\n"
-"File Inclusion\n"
-" include file\n"
-"\tother configuration files can be included.\n"
+"File Inclusion : include file \n"
+"other configuration files can be included.\n"
+"\tExample: include \"remote.conf\" ;\n"
"\n"
-"Pre-shared key File\n"
-" Pre-shared key file defines a pair of the identifier and the\n"
-" shared secret key which are used at Pre-shared key authentication\n"
-" method in phase 1."
+"Pre-shared key File : Pre-shared key file defines a pair\n"
+"of the identifier and the shared secret key which are used at\n"
+"Pre-shared key authentication method in phase 1."
msgstr ""
-#: standalone/drakvpn:762
+#: standalone/drakvpn:766
#, c-format
msgid "real file"
msgstr ""
-#: standalone/drakvpn:785
+#: standalone/drakvpn:789
#, c-format
msgid ""
"Make sure you already have the path sections\n"
@@ -17663,19 +17666,18 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:802
+#: standalone/drakvpn:806
#, c-format
msgid ""
"Make sure you already have the path sections\n"
"on the top of your %s file.\n"
"\n"
-"\n"
"You can now choose the sainfo settings.\n"
"Choose continue or previous when you are done.\n"
""
msgstr ""
-#: standalone/drakvpn:817
+#: standalone/drakvpn:823
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -17685,7 +17687,7 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:828
+#: standalone/drakvpn:834
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -17697,18 +17699,17 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:837
+#: standalone/drakvpn:843
#, c-format
msgid ""
"Your %s file has several sections.\n"
"\n"
"You can now edit the sainfo section entries.\n"
"\n"
-"Choose continue when you are done to write the data.\n"
-""
+"Choose continue when you are done to write the data."
msgstr ""
-#: standalone/drakvpn:845
+#: standalone/drakvpn:851
#, c-format
msgid ""
"This section has to be on top of your\n"
@@ -17723,17 +17724,17 @@ msgid ""
""
msgstr ""
-#: standalone/drakvpn:852
+#: standalone/drakvpn:858
#, c-format
msgid "path_type"
msgstr ""
-#: standalone/drakvpn:853
+#: standalone/drakvpn:859
#, c-format
msgid "real_file"
msgstr ""
-#: standalone/drakvpn:893
+#: standalone/drakvpn:899
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -17745,183 +17746,432 @@ msgid ""
"section is configured."
msgstr ""
-#: standalone/drakvpn:913
+#: standalone/drakvpn:919
#, c-format
-msgid "sainfo_source_address"
+msgid "Sainfo source address"
msgstr ""
-#: standalone/drakvpn:914
+#: standalone/drakvpn:920
#, c-format
-msgid "sainfo_source_proto"
+msgid ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.209 is the source address\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"\t172.16.1.0/24 is the source address"
msgstr ""
-#: standalone/drakvpn:915
+#: standalone/drakvpn:937
#, c-format
-msgid "sainfo_dest_address"
+msgid "Sainfo source protocol"
msgstr ""
-#: standalone/drakvpn:916
+#: standalone/drakvpn:938
#, c-format
-msgid "sainfo_dest_proto"
+msgid ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tthe first 'any' allows any protocol for the source"
+msgstr ""
+
+#: standalone/drakvpn:952
+#, c-format
+msgid "Sainfo destination address"
+msgstr ""
+
+#: standalone/drakvpn:953
+#, c-format
+msgid ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.218 is the destination address\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"\t172.16.2.0/24 is the destination address"
+msgstr ""
+
+#: standalone/drakvpn:970
+#, c-format
+msgid "Sainfo destination protocol"
+msgstr ""
+
+#: standalone/drakvpn:971
+#, c-format
+msgid ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"defines the parameters of the IKE phase 2\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"source_id and destination_id are constructed like:\n"
+"\n"
+"\taddress address [/ prefix] [[port]] ul_proto\n"
+"\n"
+"Examples : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tleave blank this entry if you want anonymous\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tthe last 'any' allows any protocol for the destination"
msgstr ""
-#: standalone/drakvpn:917
+#: standalone/drakvpn:985
#, c-format
msgid "PFS group"
msgstr ""
-#: standalone/drakvpn:919
+#: standalone/drakvpn:987
+#, c-format
+msgid ""
+"define the group of Diffie-Hellman exponentiations.\n"
+"If you do not require PFS then you can omit this directive.\n"
+"Any proposal will be accepted if you do not specify one.\n"
+"group is one of following: modp768, modp1024, modp1536.\n"
+"Or you can define 1, 2, or 5 as the DH group number."
+msgstr ""
+
+#: standalone/drakvpn:992
#, c-format
msgid "Lifetime number"
msgstr ""
-#: standalone/drakvpn:920
+#: standalone/drakvpn:993
+#, c-format
+msgid ""
+"define a lifetime of a certain time which will be pro-\n"
+"posed in the phase 1 negotiations. Any proposal will be\n"
+"accepted, and the attribute(s) will be not proposed to\n"
+"the peer if you do not specify it(them). They can be\n"
+"individually specified in each proposal.\n"
+"\n"
+"Examples : \n"
+"\n"
+" lifetime time 1 min; # sec,min,hour\n"
+" lifetime time 1 min; # sec,min,hour\n"
+" lifetime time 30 sec;\n"
+" lifetime time 30 sec;\n"
+" lifetime time 60 sec;\n"
+"\tlifetime time 12 hour;\n"
+"\n"
+"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
+""
+msgstr ""
+
+#: standalone/drakvpn:1009
#, c-format
msgid "Lifetime unit"
msgstr ""
-#: standalone/drakvpn:921 standalone/drakvpn:942
+#: standalone/drakvpn:1011
+#, c-format
+msgid ""
+"define a lifetime of a certain time which will be pro-\n"
+"posed in the phase 1 negotiations. Any proposal will be\n"
+"accepted, and the attribute(s) will be not proposed to\n"
+"the peer if you do not specify it(them). They can be\n"
+"individually specified in each proposal.\n"
+"\n"
+"Examples : \n"
+"\n"
+" lifetime time 1 min; # sec,min,hour\n"
+" lifetime time 1 min; # sec,min,hour\n"
+" lifetime time 30 sec;\n"
+" lifetime time 30 sec;\n"
+" lifetime time 60 sec;\n"
+"\tlifetime time 12 hour ;\n"
+"\n"
+"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and 'hour'.\n"
+""
+msgstr ""
+
+#: standalone/drakvpn:1027 standalone/drakvpn:1112
#, c-format
msgid "Encryption algorithm"
msgstr ""
-#: standalone/drakvpn:922
+#: standalone/drakvpn:1029
#, c-format
msgid "Authentication algorithm"
msgstr ""
-#: standalone/drakvpn:923
+#: standalone/drakvpn:1031
#, c-format
msgid "Compression algorithm"
msgstr ""
-#: standalone/drakvpn:931
+#: standalone/drakvpn:1039
+#, c-format
+msgid "Remote"
+msgstr ""
+
+#: standalone/drakvpn:1040
#, c-format
-msgid "exchange_mode"
+msgid ""
+"remote (address | anonymous) [[port]] { statements }\n"
+"specifies the parameters for IKE phase 1 for each remote node.\n"
+"The default port is 500. If anonymous is specified, the state-\n"
+"ments apply to all peers which do not match any other remote\n"
+"directive.\n"
+"\n"
+"Examples : \n"
+"\n"
+"remote anonymous\n"
+"remote ::1 [8000]"
msgstr ""
-#: standalone/drakvpn:932
+#: standalone/drakvpn:1048
#, c-format
-msgid "generate_policy"
+msgid "Exchange mode"
msgstr ""
-#: standalone/drakvpn:933
+#: standalone/drakvpn:1050
#, c-format
-msgid "passive"
+msgid ""
+"defines the exchange mode for phase 1 when racoon is the\n"
+"initiator. Also it means the acceptable exchange mode\n"
+"when racoon is responder. More than one mode can be\n"
+"specified by separating them with a comma. All of the\n"
+"modes are acceptable. The first exchange mode is what\n"
+"racoon uses when it is the initiator.\n"
+""
msgstr ""
-#: standalone/drakvpn:934
+#: standalone/drakvpn:1056
#, c-format
-msgid "certificate_type"
+msgid "Generate policy"
msgstr ""
-#: standalone/drakvpn:935
+#: standalone/drakvpn:1058
#, c-format
-msgid "my_certfile"
+msgid ""
+"This directive is for the responder. Therefore you\n"
+"should set passive on in order that racoon(8) only\n"
+"becomes a responder. If the responder does not have any\n"
+"policy in SPD during phase 2 negotiation, and the direc-\n"
+"tive is set on, then racoon(8) will choice the first pro-\n"
+"posal in the SA payload from the initiator, and generate\n"
+"policy entries from the proposal. It is useful to nego-\n"
+"tiate with the client which is allocated IP address\n"
+"dynamically. Note that inappropriate policy might be\n"
+"installed into the responder's SPD by the initiator. So\n"
+"that other communication might fail if such policies\n"
+"installed due to some policy mismatches between the ini-\n"
+"tiator and the responder. This directive is ignored in\n"
+"the initiator case. The default value is off."
msgstr ""
-#: standalone/drakvpn:936
+#: standalone/drakvpn:1072
#, c-format
-msgid "my_private_key"
+msgid "Passive"
msgstr ""
-#: standalone/drakvpn:937
+#: standalone/drakvpn:1074
#, c-format
-msgid "peers_certfile"
+msgid ""
+"If you do not want to initiate the negotiation, set this\n"
+"to on. The default value is off. It is useful for a\n"
+"server."
msgstr ""
-#: standalone/drakvpn:938
+#: standalone/drakvpn:1077
#, c-format
-msgid "verify_cert"
+msgid "Certificate type"
msgstr ""
-#: standalone/drakvpn:939
+#: standalone/drakvpn:1079
#, c-format
-msgid "my_identifier"
+msgid "My certfile"
msgstr ""
-#: standalone/drakvpn:940
+#: standalone/drakvpn:1080
#, c-format
-msgid "peers_identifier"
+msgid "Name of the certificate"
msgstr ""
-#: standalone/drakvpn:941
+#: standalone/drakvpn:1081
#, c-format
-msgid "proposal"
+msgid "My private key"
msgstr ""
-#: standalone/drakvpn:943
+#: standalone/drakvpn:1082
#, c-format
-msgid "Hash algorithm"
+msgid "Name of the private key"
msgstr ""
-#: standalone/drakvpn:944
+#: standalone/drakvpn:1083
#, c-format
-msgid "Authentication method"
+msgid "Peers certfile"
msgstr ""
-#: standalone/drakvpn:945
+#: standalone/drakvpn:1084
#, c-format
-msgid "DH group"
+msgid "Name of the peers certificate"
msgstr ""
-#: standalone/drakvpn:952
+#: standalone/drakvpn:1085
+#, c-format
+msgid "Verify cert"
+msgstr ""
+
+#: standalone/drakvpn:1087
#, c-format
msgid ""
-"Add a Security Policy.\n"
+"If you do not want to verify the peer's certificate for\n"
+"some reason, set this to off. The default is on."
+msgstr ""
+
+#: standalone/drakvpn:1089
+#, c-format
+msgid "My identifier"
+msgstr ""
+
+#: standalone/drakvpn:1090
+#, c-format
+msgid ""
+"specifies the identifier sent to the remote host and the\n"
+"type to use in the phase 1 negotiation. address, fqdn,\n"
+"user_fqdn, keyid and asn1dn can be used as an idtype.\n"
+"they are used like:\n"
+"\tmy_identifier address [address];\n"
+"\t\tthe type is the IP address. This is the default\n"
+"\t\ttype if you do not specify an identifier to use.\n"
+"\tmy_identifier user_fqdn string;\n"
+"\t\tthe type is a USER_FQDN (user fully-qualified\n"
+"\t\tdomain name).\n"
+"\tmy_identifier fqdn string;\n"
+"\t\tthe type is a FQDN (fully-qualified domain name).\n"
+"\tmy_identifier keyid file;\n"
+"\t\tthe type is a KEY_ID.\n"
+"\tmy_identifier asn1dn [string];\n"
+"\t\tthe type is an ASN.1 distinguished name. If\n"
+"\t\tstring is omitted, racoon(8) will get DN from\n"
+"\t\tSubject field in the certificate.\n"
"\n"
-"You can now add a new Security Policy.\n"
+"Examples : \n"
"\n"
-"Choose continue when you are done to write the data.\n"
-""
+"my_identifier user_fqdn \"myemail@mydomain.com\""
+msgstr ""
+
+#: standalone/drakvpn:1110
+#, c-format
+msgid "Peers identifier"
msgstr ""
-#: standalone/drakvpn:955
+#: standalone/drakvpn:1111
+#, c-format
+msgid "Proposal"
+msgstr ""
+
+#: standalone/drakvpn:1113
+#, c-format
+msgid ""
+"specify the encryption algorithm used for the\n"
+"phase 1 negotiation. This directive must be defined. \n"
+"algorithm is one of following: \n"
+"\n"
+"des, 3des, blowfish, cast128 for oakley.\n"
+"\n"
+"For other transforms, this statement should not be used."
+msgstr ""
+
+#: standalone/drakvpn:1120
+#, c-format
+msgid "Hash algorithm"
+msgstr ""
+
+#: standalone/drakvpn:1121
+#, c-format
+msgid "Authentication method"
+msgstr ""
+
+#: standalone/drakvpn:1122
+#, c-format
+msgid "DH group"
+msgstr ""
+
+#: standalone/drakvpn:1129
#, c-format
msgid "Command"
msgstr ""
-#: standalone/drakvpn:956
+#: standalone/drakvpn:1130
#, c-format
msgid "Source IP range"
msgstr ""
-#: standalone/drakvpn:957
+#: standalone/drakvpn:1131
#, c-format
msgid "Destination IP range"
msgstr ""
-#: standalone/drakvpn:958
+#: standalone/drakvpn:1132
#, c-format
msgid "Upper-layer protocol"
msgstr ""
-#: standalone/drakvpn:959
+#: standalone/drakvpn:1133
#, c-format
msgid "Flag"
msgstr ""
-#: standalone/drakvpn:960
+#: standalone/drakvpn:1134
#, c-format
msgid "Direction"
msgstr ""
-#: standalone/drakvpn:961
+#: standalone/drakvpn:1135
#, c-format
msgid "IPsec policy"
msgstr ""
-#: standalone/drakvpn:963
+#: standalone/drakvpn:1137
#, c-format
msgid "Mode"
msgstr ""
-#: standalone/drakvpn:964
+#: standalone/drakvpn:1138
#, c-format
msgid "Source/destination"
msgstr ""
-#: standalone/drakvpn:965 standalone/harddrake2:57
+#: standalone/drakvpn:1139 standalone/harddrake2:57
#, c-format
msgid "Level"
msgstr ""
@@ -18483,37 +18733,37 @@ msgstr ""
msgid "Run config tool"
msgstr ""
-#: standalone/harddrake2:209
+#: standalone/harddrake2:215
#, c-format
msgid "unknown"
msgstr ""
-#: standalone/harddrake2:210
+#: standalone/harddrake2:216
#, c-format
msgid "Unknown"
msgstr ""
-#: standalone/harddrake2:228
+#: standalone/harddrake2:234
#, c-format
msgid "Click on a device in the left tree in order to display its information here."
msgstr ""
-#: standalone/harddrake2:276
+#: standalone/harddrake2:282
#, c-format
msgid "secondary"
msgstr ""
-#: standalone/harddrake2:276
+#: standalone/harddrake2:282
#, c-format
msgid "primary"
msgstr ""
-#: standalone/harddrake2:284
+#: standalone/harddrake2:290
#, c-format
msgid "burner"
msgstr ""
-#: standalone/harddrake2:284
+#: standalone/harddrake2:290
#, c-format
msgid "DVD"
msgstr ""
@@ -19556,22 +19806,22 @@ msgstr ""
msgid "Exit install"
msgstr ""
-#: ugtk2.pm:1051
+#: ugtk2.pm:1047
#, c-format
msgid "Is this correct?"
msgstr ""
-#: ugtk2.pm:1174
+#: ugtk2.pm:1175
#, c-format
msgid "Expand Tree"
msgstr ""
-#: ugtk2.pm:1175
+#: ugtk2.pm:1176
#, c-format
msgid "Collapse Tree"
msgstr ""
-#: ugtk2.pm:1176
+#: ugtk2.pm:1177
#, c-format
msgid "Toggle between flat and group sorted"
msgstr ""
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 67afbc8a2..fe153d6e8 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po