summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
blob: f8ad163f034577e10a4e17c72c74415b4539a568 (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
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
package Xconfigurator; # $Id$

use diagnostics;
use strict;
use vars qw($in $install $isLaptop @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $XF86firstchunk_text2 $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $pointersection_text_v4 $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $default_monitor $layoutsection_v4);

use common qw(:common :file :functional :system);
use log;
use detect_devices;
use run_program;
use Xconfigurator_consts;
use any;
use modules;
use my_gtk qw(:wrappers);

my $tmpconfig = "/tmp/Xconfig";

my ($prefix, %monitors);

1;

sub getVGAMode($) { $_[0]->{card}{vga_mode} || $vgamodes{"640x480x16"}; }

sub readCardsDB {
    my ($file) = @_;
    my ($card, %cards);

    local *F;
    open F, $file or die "file $file not found";

    my ($lineno, $cmd, $val) = 0;
    my $fs = {
        LINE => sub { push @{$card->{lines}}, $val unless $val eq "VideoRam" },
	NAME => sub {
	    $cards{$card->{type}} = $card if $card;
	    $card = { type => $val };
	},
	SEE => sub {
	    my $c = $cards{$val} or die "Error in database, invalid reference $val at line $lineno";

	    push @{$card->{lines}}, @{$c->{lines} || []};
	    add2hash($card->{flags}, $c->{flags});
	    add2hash($card, $c);
	},
	CHIPSET => sub {
	    $card->{chipset} = $val;
	    $card->{flags}{needChipset} = 1 if $val eq 'GeForce DDR';
	    $card->{flags}{needVideoRam} = 1 if member($val, qw(mgag10 mgag200 RIVA128 SiS6326));
	},
	SERVER => sub { $card->{server} = $val; },
	DRIVER => sub { $card->{driver} = $val; },
	RAMDAC => sub { $card->{ramdac} = $val; },
	DACSPEED => sub { $card->{dacspeed} = $val; },
	CLOCKCHIP => sub { $card->{clockchip} = $val; $card->{flags}{noclockprobe} = 1; },
	NOCLOCKPROBE => sub { $card->{flags}{noclockprobe} = 1 },
	UNSUPPORTED => sub { $card->{flags}{unsupported} = 1 },
	COMMENT => sub {},
    };

    foreach (<F>) { $lineno++;
	s/\s+$//;
	/^#/ and next;
	/^$/ and next;
	/^END/ and last;

	($cmd, $val) = /(\S+)\s*(.*)/ or next; #log::l("bad line $lineno ($_)"), next;

	my $f = $fs->{$cmd};

	$f ? &$f() : log::l("unknown line $lineno ($_)");
    }
    \%cards;
}
sub readCardsNames {
    my $file = "/usr/X11R6/lib/X11/CardsNames";
    local *F; open F, $file or die "can't find $file\n";
    map { (split '=>')[0] } <F>;
}
sub cardName2RealName {
    my $file = "/usr/X11R6/lib/X11/CardsNames";
    my ($name) = @_;
    local *F; open F, $file or die "can't find $file\n";
    foreach (<F>) { chop;
	my ($name_, $real) = split '=>';
	return $real if $name eq $name_;
    }
    $name;
}
sub updateCardAccordingName {
    my ($card, $name) = @_;
    my $cards = readCardsDB("/usr/X11R6/lib/X11/Cards+");

    add2hash($card->{flags}, $cards->{$name}{flags});
    add2hash($card, $cards->{$name});
    $card;
}

sub readMonitorsDB {
    my ($file) = @_;

    %monitors and return;

    local *F;
    open F, $file or die "can't open monitors database ($file): $!";
    my $lineno = 0; foreach (<F>) {
	$lineno++;
	s/\s+$//;
	/^#/ and next;
	/^$/ and next;

	my @fields = qw(vendor type eisa hsyncrange vsyncrange);
	my @l = split /\s*;\s*/;
	@l == @fields or log::l("bad line $lineno ($_)"), next;

	my %l; @l{@fields} = @l;
	if ($monitors{$l{type}}) {
	    my $i; for ($i = 0; $monitors{"$l{type} ($i)"}; $i++) {}
	    $l{type} = "$l{type} ($i)";
	}
	$monitors{"$l{vendor}|$l{type}"} = \%l;
    }
    while (my ($k, $v) = each %standard_monitors) {
	$monitors{"Generic|" . translate($k)} =
	    { hsyncrange => $v->[1], vsyncrange => $v->[2] };
    }
}

sub rewriteInittab {
    my ($runlevel) = @_;
    my $f = "$prefix/etc/inittab";
    -r $f or log::l("missing inittab!!!"), return;
    substInFile { s/^(id:)[35](:initdefault:)\s*$/$1$runlevel$2\n/ } $f;
}

sub keepOnlyLegalModes {
    my ($card, $monitor) = @_;
    my $mem = 1024 * ($card->{memory} || ($card->{server} eq 'FBDev' ? 2048 : 99999));
    my $hsync = max(split(/[,-]/, $monitor->{hsyncrange}));

    while (my ($depth, $res) = each %{$card->{depth}}) {
	@$res = grep {
	    $mem >= product(@$_, $depth / 8) &&
	    $hsync >= ($min_hsync4wres{$_->[0]} || 0) &&
	    ($card->{server} ne 'FBDev' || $vgamodes{"$_->[0]x$_->[1]x$depth"})
	} @$res;
	delete $card->{depth}{$depth} if @$res == 0;
    }
}

sub cardConfigurationAuto() {
    my $card;
    if (my ($c) = grep { $_->{driver} =~ /(Card|Server):/ } detect_devices::probeall()) {
	local $_ = $c->{driver};
	$card->{type} = $1 if /Card:(.*)/;
	$card->{server} = $1 if /Server:(.*)/;
	$card->{flags}{needVideoRam} &&= /86c368/;
	$card->{identifier} = $c->{description};
	push @{$card->{lines}}, @{$lines{$card->{identifier}} || []};
    }
    #- take a default on sparc if nothing has been found.
    if (arch() =~ /^sparc/ && !$card->{server} && !$card->{type}) {
        log::l("Using probe with /proc/fb as nothing has been found!");
	local $_ = cat_("/proc/fb");
	if (/Mach64/) { $card->{server} = "Mach64" }
	elsif (/Permedia2/) { $card->{server} = "3DLabs" }
	else { $card->{server} = "Sun24" }
    }
    $card;
}

sub cardConfiguration(;$$$) {
    my ($card, $noauto, $allowFB) = @_;
    $card ||= {};

    updateCardAccordingName($card, $card->{type}) if $card->{type}; #- try to get info from given type
    undef $card->{type} unless $card->{server}; #- bad type as we can't find the server
    add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto;
    $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto;
    $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphic card"), _("Select a graphic card"), '|', ['Other|Unlisted', readCardsNames()])) unless $card->{type} || $card->{server};
    undef $card->{type}, $card->{server} = $in->ask_from_list(_("X server"), _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq 'Other|Unlisted';

    updateCardAccordingName($card, $card->{type}) if $card->{type};
    add2hash($card, { vendor => "Unknown", board => "Unknown" });

    $card->{memory} = 4096,  delete $card->{depth} if $card->{driver} eq 'i810';
    $card->{memory} = 16384, delete $card->{depth} if $card->{chipset} =~ /PERMEDIA/ && $card->{memory} <= 1024;

    #- 3D acceleration configuration for XFree 3.3 using Utah-GLX.
    $card->{Utah_glx} = ($card->{identifier} =~ /Matrox.* G[24]00/ || #- 8bpp does not work.
			 $card->{identifier} =~ /3D Rage Pro AGP/); #- by default only such card are supported, with AGP ?
                         #- NOT WORKING $card->{type} =~ /Intel 810/);
    #- 3D acceleration configuration for XFree 3.3 using Utah-GLX but EXPERIMENTAL that may freeze the machine (FOR INFO NOT USED).
    $card->{Utah_glx_EXPERIMENTAL} = ($card->{type} =~ /RIVA TNT/ || #- all RIVA/GeForce comes from NVIDIA and may freeze (gltron).
				      $card->{type} =~ /RIVA128/ ||
				      $card->{type} =~ /GeForce 256/ ||
				      $card->{type} =~ /S3 Savage3D/ || #- only this one is evoluting (expect a stable release ?)
				      #- $card->{type} =~ /S3 ViRGE/ || #- 15bits only
				      $card->{type} =~ /SiS /);
    #- 3D acceleration configuration for XFree 4.0 using DRI.
    $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || $card->{identifier} =~ /Voodoo Banshee/ || #- 16bit only
			$card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI)
			$card->{type} =~ /Intel 810/ || #- 16bit
			$card->{type} =~ /ATI Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA.

    #- check to use XFree 4.0 or XFree 3.3.
    $card->{use_xf4} = $card->{driver} && !$card->{flags}{unsupported};
    $card->{prefer_xf3} = ($card->{type} =~ /RIVA TNT/ ||
			   $card->{type} =~ /RIVA128/ ||
			   $card->{type} =~ /GeForce/);

    #- basic installation, use of XFree 4.0 or XFree 3.3.
    my ($xf4_ver, $xf3_ver) = ("4.0.1", "3.3.6");
    my $xf3_tc = { text => _("XFree %s", $xf3_ver),
		   code => sub { $card->{Utah_glx} = $card->{DRI_glx} = ''; $card->{use_xf4} = '';
				 log::l("Using XFree $xf3_ver") } };
    my $msg = _("Which configuration of XFree do you want to have?");
    my @choices = $card->{use_xf4} ? (($card->{prefer_xf3} ? ($xf3_tc) : ()),
				      (!$card->{prefer_xf3} || $::expert ?
				       ({ text => _("XFree %s", $xf4_ver),
					  code => sub { $card->{Utah_glx} = $card->{DRI_glx} = '';
							log::l("Using XFree $xf4_ver") } }) : (),),
				      ($::expert && !$card->{prefer_xf3} ? ($xf3_tc) : ())) : ($xf3_tc);

    #- try to figure if 3D acceleration is supported
    #- by XFree 3.3 but not XFree 4.0 then ask user to keep XFree 3.3 ?
    if ($card->{Utah_glx}) {
	$msg = ($card->{use_xf4} && !$card->{DRI_glx} ?
_("Your card can have 3D hardware acceleration support but only with XFree %s.
Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :
_("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver)) . "\n\n" . $msg;
	$::beginner and @choices = (); #- keep it by default here as it is the only choice available.
	unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf3_ver),
			    code => sub { $card->{use_xf4} = '';
					  log::l("Using XFree $xf3_ver with 3D hardware acceleration") } };
    }

    #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration, currenlty
    #- this is with Utah GLX and so, it can provide a way of testing.
    if ($::expert && $card->{Utah_glx_EXPERIMENTAL}) {
	$msg = ($card->{use_xf4} && !$card->{DRI_glx} ?
_("Your card can have 3D hardware acceleration support but only with XFree %s,
NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.
Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :
_("Your card can have 3D hardware acceleration support with XFree %s,
NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "\n\n" . $msg;
	push @choices, { text => _("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf3_ver),
			 code => sub { $card->{use_xf4} = ''; $card->{Utah_glx} = 'EXPERIMENTAL';
				       log::l("Using XFree $xf3_ver with EXPERIMENTAL 3D hardware acceleration") } };
    }

    #- ask the expert user to enable or not hardware acceleration support.
    if ($card->{use_xf4} && $card->{DRI_glx}) {
	$msg = _("Your card can have 3D hardware acceleration support with XFree %s.", $xf4_ver) . "\n\n" . $msg;
	$::expert or @choices = (); #- keep all user by default with XFree 4.0 including 3D acceleration.
	unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf4_ver),
			    code => sub { log::l("Using XFree $xf4_ver with 3D hardware acceleration") } };
    }

    #- examine choice of user, beware the list MUST NOT BE REORDERED AS THERE ARE FALL TRHOUGH!
    my $tc = $in->ask_from_listf(_("XFree configuration"), $msg, sub { translate($_[0]{text}) }, \@choices);
    $tc->{code} and $tc->{code}();

    $card->{prog} = "/usr/X11R6/bin/" . ($card->{use_xf4} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
					 "Xsun$1" : "XF86_$card->{server}");

    #- additional packages to install according available card.
    #- add XFree86-libs-DRI here if using DRI (future split of XFree86 TODO)
    my @l = ();
    if ($card->{DRI_glx}) {
	push @l, 'Glide_V5' if $card->{identifier} =~ /Voodoo 5/;
	push @l, 'Glide_V3-DRI' if $card->{identifier} =~ /Voodoo (3|Banshee)/;
	push @l, 'Device3Dfx', 'XFree86-glide-module' if $card->{identifier} =~ /Voodoo/;
    }
    if ($card->{Utah_glx}) {
	push @l, 'Mesa' if !$card->{use_xf4};
    }

    -x "$prefix$card->{prog}" or $install && do {
	$in->suspend;
	&$install('server', @l) if $card->{use_xf4};
	&$install($card->{server}, @l) if !$card->{use_xf4};
	$in->resume;
    };
    -x "$prefix$card->{prog}" or die "server $card->{server} is not available (should be in $prefix$card->{prog})";

    unless ($card->{type}) {
	$card->{flags}{noclockprobe} = member($card->{server}, qw(I128 S3 S3V Mach64));
    }
    $card->{options_xf3}{power_saver} = 1;
    $card->{options_xf4}{DPMS} = 1;

    $card->{flags}{needVideoRam} and
      $card->{memory} ||=
	$videomemory{$in->ask_from_list_('',
					 _("Select the memory size of your graphic card"),
					 [ sort { $videomemory{$a} <=> $videomemory{$b} }
					   keys %videomemory])};


    #- hack for ATI Mach64 card where two options should be used if using Utah-GLX.
    if ($card->{identifier} =~ /3D Rage Pro AGP/) {
	$card->{options_xf3}{no_font_cache} = $card->{Utah_glx};
	$card->{options_xf3}{no_pixmap_cache} = $card->{Utah_glx};
    }

    #- 3D acceleration configuration for XFree 4.0 using DRI, this is enabled by default
    #- but for some there is a need to specify VideoRam (else it won't run).
    if ($card->{DRI_glx}) {
	$card->{identifier} =~ /Matrox.* G[24]00/ and $card->{flags}{needVideoRam} = 'fakeVideoRam';
	$card->{type} =~ /Intel 810/ and ($card->{flags}{needVideoRam}, $card->{memory}) = ('fakeVideoRam', 16384);
    }

    if (!$::isStandalone && $card->{driver} eq 'i810') {
	require modules;
	eval { modules::load("agpgart"); };
    }
    $card;
}

sub optionsConfiguration($) {
    my ($o) = @_;
    my @l;
    my %l;

    foreach (@options) {
	if ($o->{card}{server} eq $_->[1] && $o->{card}{identifier} =~ /$_->[2]/) {
	    my $options = 'options_' . ($o->{card}{server} eq 'XFree86' ? 'xf4' : 'xf3');
	    $o->{card}{$options}{$_->[0]} ||= 0;
	    unless ($l{$_->[0]}) {
		push @l, $_->[0], { val => \$o->{card}{$options}{$_->[0]}, type => 'bool' };
		$l{$_->[0]} = 1;
	    }
	}
    }
    @l = @l[0..19] if @l > 19; #- reduce list size to 10 for display (it's a hash).

    $in->ask_from_entries_refH('', _("Choose options for server"), \@l);
}

sub monitorConfiguration(;$$) {
    my $monitor = shift || {};
    my $useFB = shift || 0;

    $monitor->{hsyncrange} && $monitor->{vsyncrange} and return $monitor;

    readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");

    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], _("Generic") . '|' . translate($default_monitor)) }) unless $monitor->{type};
    if ($monitor->{type} eq 'Unlisted') {
	$in->ask_from_entries_ref('',
_("The two critical parameters are the vertical refresh rate, which is the rate
at which the whole screen is refreshed, and most importantly the horizontal
sync rate, which is the rate at which scanlines are displayed.

It is VERY IMPORTANT that you do not specify a monitor type with a sync range
that is beyond the capabilities of your monitor: you may damage your monitor.
 If in doubt, choose a conservative setting."),
				  [ _("Horizontal refresh rate"), _("Vertical refresh rate") ],
				  [ { val => \$monitor->{hsyncrange}, list => \@hsyncranges },
				    { val => \$monitor->{vsyncrange}, list => \@vsyncranges }, ]);
    } else {
	add2hash($monitor, $monitors{$monitor->{type}});
    }
    add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown", manual => 1 });
}

sub testConfig($) {
    my ($o) = @_;
    my ($resolutions, $clocklines);

    write_XF86Config($o, $tmpconfig);

    unlink "/tmp/.X9-lock";
    #- restart_xfs;

    my $f = $tmpconfig . ($o->{card}{use_xf4} && "-4");
    local *F;
    open F, "$prefix$o->{card}{prog} :9 -probeonly -pn -xf86config $f 2>&1 |";
    foreach (<F>) {
	$o->{card}{memory} ||= $2 if /(videoram|Video RAM):\s*(\d*)/;

	# look for clocks
	push @$clocklines, $1 if /clocks: (.*)/ && !/(pixel |num)clocks:/;

	push @$resolutions, [ $1, $2 ] if /: Mode "(\d+)x(\d+)": mode clock/;
	print;
    }
    close F or die "X probeonly failed";

    ($resolutions, $clocklines);
}

sub testFinalConfig {
    my ($o, $auto, $skiptest, $skip_badcard) = @_;

    $o->{monitor}{hsyncrange} && $o->{monitor}{vsyncrange} or
      $in->ask_warn('', _("Monitor not configured")), return;

    $o->{card}{server} || $o->{card}{driver} or
      $in->ask_warn('', _("Graphic card not configured yet")), return;

    $o->{card}{depth} or
      $in->ask_warn('', _("Resolutions not chosen yet")), return;

    my $f = "/etc/X11/XF86Config.test";
    write_XF86Config($o, $::testing ? $tmpconfig : "$prefix/$f");

    $skiptest || $o->{card}{server} =~ 'FBDev|Sun' and return 1; #- avoid testing with these.

    #- needed for bad cards not restoring cleanly framebuffer
    my $bad_card = $o->{card}{identifier} =~ /i740|ViRGE/;
    $bad_card ||= $o->{card}{identifier} eq "ATI|3D Rage P/M Mobility AGP 2x";
    $bad_card ||= $o->{card}{use_xf4}; #- TODO obsoleted to check, when using fbdev of XFree 4.0!
    log::l("the graphic card does not like X in framebuffer") if $bad_card;

    my $verybad_card = $o->{card}{driver} eq 'i810';
    $verybad_card and return 1;

    my $mesg = _("Do you want to test the configuration?");
    my $def = 1;
    if ($bad_card && !$::isStandalone) {
	$skip_badcard and return 1;
	$mesg = $mesg . "\n" . _("Warning: testing this graphic card may freeze your computer");
	$def = 0;
    }
    $auto && $def or $in->ask_yesorno(_("Test of the configuration"), $mesg, $def) or return 1;

    unlink "$prefix/tmp/.X9-lock";

    #- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one
    #- that way, you can talk to :9 without doing a chroot
    #- but take care of non X11 install :-)
    if (-d "/tmp/.X11-unix") {
	symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix;
    } else {
	symlinkf "$prefix/tmp/.X11-unix", "/tmp/.X11-unix" if $prefix;
    }
    #- restart_xfs;

    my $f_err = "$prefix/tmp/Xoutput";
    my $pid;
    unless ($pid = fork) {
	open STDERR, ">$f_err";
	chroot $prefix if $prefix;
	exec $o->{card}{prog}, 
	  ($o->{card}{prog} !~ /Xsun/ ? ("-xf86config", ($::testing ? $tmpconfig : $f) . ($o->{card}{use_xf4} && "-4")) : ()),
	  ":9" or c::_exit(0);
    }

    do { sleep 1 } until c::Xtest(":9") || waitpid($pid, c::WNOHANG());

    my $b = before_leaving { unlink $f_err };

    unless (c::Xtest(":9")) {
	local $_;
	local *F; open F, $f_err;
      i: while (<F>) {
	    if (/\b(error|not supported)\b/i) {
		my @msg = !/error/ && $_ ;
		while (<F>) {
		    /not fatal/ and last i;
		    /^$/ and last;
		    push @msg, $_;
		}
		$in->ask_warn('', [ _("An error has occurred:"), " ", @msg, _("\ntry to change some parameters") ]);
		return 0;
	    }
	}
    }

    local *F;
    open F, "|perl" or die '';
    print F "use lib qw(", join(' ', @INC), ");\n";
    print F q{
	use interactive_gtk;
        use my_gtk qw(:wrappers);

	$ENV{DISPLAY} = ":9";

        gtkset_background(200 * 257, 210 * 257, 210 * 257);
        my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size;
        $my_gtk::force_position = [ $w / 3, $h / 2.4 ];
	$my_gtk::force_focus = 1;
        my $text = Gtk::Label->new;
        my $time = 8;
        Gtk->timeout_add(1000, sub {
	    $text->set(_("Leaving in %d seconds", $time));
	    $time-- or Gtk->main_quit;
            1;
	});

        my $background = "/usr/share/pixmaps/backgrounds/linux-mandrake/XFdrake-image-test.jpg";
        my $qiv = "/usr/bin/qiv";
        -r "} . $prefix . q{/$background" && -x "} . $prefix . q{/$qiv" and
            system(($::testing ? "} . $prefix . q{" : "chroot } . $prefix . q{/ ") . "$qiv -y $background");

	exit (interactive_gtk->new->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222);
    };
    my $rc = close F;
    my $err = $?;

    unlink "/tmp/.X11-unix/X9" if $prefix;
    kill 2, $pid;

    $rc || $err == 222 << 8 or $in->ask_warn('', _("An error has occurred, try to change some parameters"));
    $rc;
}

sub autoDefaultDepth($$) {
    my ($card, $wres_wanted) = @_;
    my ($best, $depth);

    return 24 if $card->{identifier} =~ /SiS/; #- assume 24 bit even for 3D acceleration (not enabled currently).
    return 16 if $card->{Utah_glx} || $card->{DRI_glx}; #- assume 16bit as most of them need 16.
    
    for ($card->{server}) {
	/FBDev/   and return 16; #- this should work by default, FBDev is allowed only if install currently uses it at 16bpp.
	/Sun24/   and return 24;
	/SunMono/ and return 2;
	/Sun/     and return 8;
    }

    while (my ($d, $r) = each %{$card->{depth}}) {
	$depth = max($depth || 0, $d);

	#- try to have resolution_wanted
	$best = max($best || 0, $d) if $r->[0][0] >= $wres_wanted;
    }
    $best || $depth or die "no valid modes";
}

sub autoDefaultResolution {
    return "1024x768" if $isLaptop;

    my ($size) = @_;
    $monitorSize2resolution[round($size || 14)] || #- assume a small monitor (size is in inch)
      $monitorSize2resolution[-1]; #- no corresponding resolution for this size. It means a big monitor, take biggest we have
}

sub chooseResolutionsGtk($$;$) {
    my ($card, $chosen_depth, $chosen_w) = @_;
    my $W = my_gtk->new(_("Resolution"));
    my %txt2depth = reverse %depths;
    my ($r, $depth_combo, %w2depth, %w2h, %w2widget);

    my $best_w;
    while (my ($depth, $res) = each %{$card->{depth}}) {
	foreach (@$res) {
	    $w2h{$_->[0]} = $_->[1];
	    push @{$w2depth{$_->[0]}}, $depth;

	    $best_w = max($_->[0], $best_w) if $_->[0] <= $chosen_w;
	}
    }
    $chosen_w = $best_w;

    my $set_depth = sub { $depth_combo->entry->set_text(translate($depths{$chosen_depth})) };

    #- the set function is usefull to toggle the CheckButton with the callback being ignored
    my $ignore;
    my $set = sub { $ignore = 1; $_[0]->set_active(1); $ignore = 0; };

    while (my ($w, $h) = each %w2h) {
	my $V = $w . "x" . $h;
	$w2widget{$w} = $r = new Gtk::RadioButton($r ? ($V, $r) : $V);
	&$set($r) if $chosen_w == $w;
	$r->signal_connect("clicked" => sub {
			       $ignore and return;
			       $chosen_w = $w;
			       unless (member($chosen_depth, @{$w2depth{$w}})) {
				   $chosen_depth = max(@{$w2depth{$w}});
				   &$set_depth();
			       }
			   });
    }
    gtkadd($W->{window},
	   gtkpack_($W->create_box_with_title(_("Choose the resolution and the color depth"),
					      "(" . ($card->{type} ? 
						     _("Graphic card: %s", $card->{type}) :
						     _("XFree86 server: %s", $card->{server})) . ")"
					     ),
		    1, gtkpack(new Gtk::HBox(0,20),
			       $depth_combo = new Gtk::Combo,
			       gtkpack_(new Gtk::VBox(0,0),
					map {; 0, $w2widget{$_} } ikeys(%w2widget),
					),
			       ),
		    0, gtkadd($W->create_okcancel,
			      gtksignal_connect(new Gtk::Button(_("Show all")), clicked => sub { $W->{retval} = 1; $chosen_w = 0; Gtk->main_quit })),
		    ));
    $depth_combo->disable_activate;
    $depth_combo->set_use_arrows_always(1);
    $depth_combo->entry->set_editable(0);
    $depth_combo->set_popdown_strings(map { translate($depths{$_}) } ikeys(%{$card->{depth}}));
    $depth_combo->entry->signal_connect(changed => sub {
       $chosen_depth = $txt2depth{untranslate($depth_combo->entry->get_text, keys %txt2depth)};
       my $w = $card->{depth}{$chosen_depth}[0][0];
       $chosen_w > $w and &$set($w2widget{$chosen_w = $w});
    });
    &$set_depth();
    $W->{ok}->grab_focus;

    $W->main or return;
    ($chosen_depth, $chosen_w);
}

sub chooseResolutions($$;$) {
    goto &chooseResolutionsGtk if ref($in) =~ /gtk/;

    my ($card, $chosen_depth, $chosen_w) = @_;

    my $best_w;
    local $_ = $in->ask_from_list(_("Resolutions"), "", 
				  [ map_each { map { "$_->[0]x$_->[1] ${main::a}bpp" } @$::b } %{$card->{depth}} ]) or return;
    reverse /(\d+)x\S+ (\d+)/;
}


sub resolutionsConfiguration {
    my ($o, $auto) = @_;
    my $card = $o->{card};

    #- For the mono and vga16 server, no further configuration is required.
    if (member($card->{server}, "Mono", "VGA16")) {
	$card->{depth}{8} = [[ 640, 480 ]];
	return;
    } elsif ($card->{server} =~ /Sun/) {
	$card->{depth}{2} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono)$/;
	$card->{depth}{8} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono|Sun)$/;
	$card->{depth}{24} = [[ 1152, 864 ]] if $card->{server} =~ /^(SunMono|Sun|Sun24)$/;
	$card->{default_wres} = 1152;
	$o->{default_depth} = max(keys %{$card->{depth}});
	return 1; #- aka we cannot test, assumed as good (should be).
    }
    if (is_empty_hash_ref($card->{depth})) {
	$card->{depth}{$_} = [ map { [ split "x" ] } @resolutions ]
	  foreach @depths;
    }
    #- sort resolutions in each depth
    foreach (values %{$card->{depth}}) {
	my $i = 0;
	@$_ = grep { first($i != $_->[0], $i = $_->[0]) }
	  sort { $b->[0] <=> $a->[0] } @$_;
    }

    #- remove unusable resolutions (based on the video memory size and the monitor hsync rate)
    keepOnlyLegalModes($card, $o->{monitor});

    my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size});
    my $wres = first(split 'x', $res);

    #- take the first available resolution <= the wanted resolution
    $wres ||= max map { first(grep { $_->[0] <= $wres } @$_)->[0] } values %{$card->{depth}};
    my $depth = eval { $o->{default_depth} || autoDefaultDepth($card, $wres) };

    $auto or ($depth, $wres) = chooseResolutions($card, $depth, $wres) or return;

    unless ($wres) {
	delete $card->{depth};
	return resolutionsConfiguration($o);
    }

    #- needed in auto mode when all has been provided by the user
    $card->{depth}{$depth} or die "you selected an unusable depth";

    #- remove all biggest resolution (keep the small ones for ctl-alt-+)
    #- otherwise there'll be a virtual screen :(
    $_ = [ grep { $_->[0] <= $wres } @$_ ] foreach values %{$card->{depth}};
    $card->{default_wres} = $wres;
    $card->{vga_mode} = $vgamodes{"${wres}xx$depth"} || $vgamodes{"${res}x$depth"}; #- for use with frame buffer.
    $o->{default_depth} = $depth;
    1;
}


#- Create the XF86Config file.
sub write_XF86Config {
    my ($o, $file) = @_;
    my $O;

    local (*F, *G);
    open F, ">$file"   or die "can't write XF86Config in $file: $!";
    open G, ">$file-4" or die "can't write XF86Config in $file-4: $!";

    print F $XF86firstchunk_text, $XF86firstchunk_text2;
    print G $XF86firstchunk_text;
    print G qq(    Option "Pixmap"  "24"\n) if $o->{card}{type} eq "SiS 6326";
    print G $XF86firstchunk_text2;

    #- Write keyboard section.
    $O = $o->{keyboard};
    print F $keyboardsection_start;
    print G $keyboardsection_start_v4;
    print F qq(    XkbDisable\n) unless $O->{xkb_keymap};
    print G qq(    Option "XkbDisable"\n) unless $O->{xkb_keymap};
    print F $keyboardsection_part3;
    print G $keyboardsection_part3_v4;
    print F qq(    XkbLayout       "$O->{xkb_keymap}"\n);
    print G qq(    Option "XkbLayout" "$O->{xkb_keymap}"\n);
    print F join '', map { "    $_\n" } @{$xkb_options{$O->{xkb_keymap}} || []};
    print G join '', map { /(\S+)(.*)/; qq(    Option "$1" $2\n) } @{$xkb_options{$O->{xkb_keymap}} || []};
    print F $keyboardsection_end;
    print G $keyboardsection_end;

    #- Write pointer section.
    $O = $o->{mouse};
    print F $pointersection_text;
    print G $pointersection_text_v4;
    print F qq(    Protocol    "$O->{XMOUSETYPE}"\n);
    print G qq(    Option "Protocol"    "$O->{XMOUSETYPE}"\n);
    print F qq(    Device      "/dev/$O->{device}"\n);
    print G qq(    Option "Device"      "/dev/$O->{device}"\n);
    #- this will enable the "wheel" or "knob" functionality if the mouse supports it
    print F "    ZAxisMapping 4 5\n" if $O->{nbuttons} > 3;
    print F "    ZAxisMapping 6 7\n" if $O->{nbuttons} > 5;
    print G qq(    Option "ZAxisMapping" "4 5"\n) if $O->{nbuttons} > 3;
    print G qq(    Option "ZAxisMapping" "6 7"\n) if $O->{nbuttons} > 5;

    print F "#" unless $O->{nbuttons} < 3;
    print G "#" unless $O->{nbuttons} < 3;
    print F qq(    Emulate3Buttons\n);
    print G qq(    Option "Emulate3Buttons"\n);
    print F "#" unless $O->{nbuttons} < 3;
    print G "#" unless $O->{nbuttons} < 3;
    print F qq(    Emulate3Timeout    50\n\n);
    print G qq(    Option "Emulate3Timeout"    "50"\n\n);
    print F "# ChordMiddle is an option for some 3-button Logitech mice\n\n";
    print G "# ChordMiddle is an option for some 3-button Logitech mice\n\n";
    print F "#" unless $O->{chordmiddle};
    print G "#" unless $O->{chordmiddle};
    print F qq(    ChordMiddle\n\n);
    print G qq(    Option "ChordMiddle"\n\n);
    print F "    ClearDTR\n" if $O->{cleardtrrts};
    print F "    ClearRTS\n\n"  if $O->{cleardtrrts};
    print F "EndSection\n\n\n";
    print G "EndSection\n\n\n";

    #- write module section for version 3.
    if ($o->{wacom} || $o->{card}{Utah_glx}) {
	print F qq(Section "Module"
);
	print F qq(    Load "xf86Wacom.so"\n) if $o->{wacom};
	print F qq(    Load "glx-3.so"\n) if $o->{card}{Utah_glx}; #- glx.so may clash with server version 4.
	print F qq(EndSection

);
    }

    #- write wacom device support.
    print F qq(
Section "XInput"
    SubSection "WacomStylus"
        Port "/dev/$o->{wacom}"
        AlwaysCore
    EndSubSection
    SubSection "WacomCursor"
        Port "/dev/$o->{wacom}"
        AlwaysCore
    EndSubSection
    SubSection "WacomEraser"
        Port "/dev/$o->{wacom}"
        AlwaysCore
    EndSubSection
EndSection

) if $o->{wacom};

    print G qq(
Section "InputDevice"
    Identifier	"stylus"
    Driver	"wacom"
    Option	"Type" "stylus"
    Option	"Device" "/dev/$o->{wacom}"
EndSection
Section "InputDevice"
    Identifier	"eraser"
    Driver	"wacom"
    Option	"Type" "eraser"
    Option	"Device" "/dev/$o->{wacom}"
EndSection
Section "InputDevice"
    Identifier	"cursor"
    Driver	"wacom"
    Option	"Type" "cursor"
    Option	"Device" "/dev/$o->{wacom}"
EndSection
) if $o->{wacom};

    #- write modules section for version 4.
    print G qq(
Section "Module"

# This loads the DBE extension module.

    Load	"dbe"
);
    print G qq(
    Load	"glx"
    Load	"dri"
) if $o->{card}{DRI_glx};
    print G qq(

# This loads the miscellaneous extensions module, and disables
# initialisation of the XFree86-DGA extension within that module.

    SubSection	"extmod"
	#Option	"omit xfree86-dga"
    EndSubSection

# This loads the Type1 and FreeType font modules

    Load	"type1"
    Load	"freetype"
EndSection
);
    print G qq(

Section "DRI"
    Mode	0666
EndSection
) if $o->{card}{DRI_glx};

    #- Write monitor section.
    $O = $o->{monitor};
    print F $monitorsection_text1;
    print G $monitorsection_text1;
    print F qq(    Identifier "$O->{type}"\n);
    print G qq(    Identifier "$O->{type}"\n);
    print F qq(    VendorName "$O->{vendor}"\n);
    print G qq(    VendorName "$O->{vendor}"\n);
    print F qq(    ModelName  "$O->{model}"\n\n);
    print G qq(    ModelName  "$O->{model}"\n\n);
    print F $monitorsection_text2;
    print G $monitorsection_text2;
    print F qq(    HorizSync  $O->{hsyncrange}\n\n);
    print G qq(    HorizSync  $O->{hsyncrange}\n\n);
    print F $monitorsection_text3;
    print G $monitorsection_text3;
    print F qq(    VertRefresh $O->{vsyncrange}\n\n);
    print G qq(    VertRefresh $O->{vsyncrange}\n\n);
    print F $monitorsection_text4;
    print F ($O->{modelines} || '') . ($o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text);
    print F "\nEndSection\n\n\n";
    print G "\nEndSection\n\n\n";

    #- Write Device section.
    $O = $o->{card};
    print F $devicesection_text;
    print G $devicesection_text_v4;
    print F qq(Section "Device"\n);
    print G qq(Section "Device"\n);
    print F qq(    Identifier  "$O->{type}"\n);
    print G qq(    Identifier  "$O->{type}"\n);
    print F qq(    VendorName  "$O->{vendor}"\n);
    print G qq(    VendorName  "$O->{vendor}"\n);
    print F qq(    BoardName   "$O->{board}"\n);
    print G qq(    BoardName   "$O->{board}"\n);

    print F "#" if $O->{chipset} && !$O->{flags}{needChipset};
    print F qq(    Chipset     "$O->{chipset}"\n) if $O->{chipset};
    print G qq(    Driver      "$O->{driver}"\n);

    print F "#" if $O->{memory} && !$O->{flags}{needVideoRam};
    print G "#" if $O->{memory} && !$O->{flags}{needVideoRam};
    print F "    VideoRam    $O->{memory}\n" if $O->{memory};
    print G "    VideoRam    $O->{memory}\n" if $O->{memory};

    print F map { "    $_\n" } @{$O->{lines} || []};
    print G map { "    $_\n" } @{$O->{lines} || []};

    print F qq(    Ramdac      "$O->{ramdac}"\n) if $O->{ramdac};
    print G qq(    Ramdac      "$O->{ramdac}"\n) if $O->{ramdac};
    print F qq(    Dacspeed    "$O->{dacspeed}"\n) if $O->{dacspeed};
    print G qq(    Dacspeed    "$O->{dacspeed}"\n) if $O->{dacspeed};

    if ($O->{clockchip}) {
	print F qq(    Clockchip   "$O->{clockchip}"\n);
	print G qq(    Clockchip   "$O->{clockchip}"\n);
    } else {
	print F "    # Clock lines\n";
	print G "    # Clock lines\n";
	print F "    Clocks $_\n" foreach (@{$O->{clocklines}});
	print G "    Clocks $_\n" foreach (@{$O->{clocklines}});
    }
    do { print F; print G } for qq(

    # Uncomment following option if you see a big white block        
    # instead of the cursor!                                          
    #    Option      "sw_cursor"

);
    my $p = sub {
	my $l = $O->{$_[0]};
	map { (!$l->{$_} && '#') . qq(    Option      "$_"\n) } keys %{$l || {}};
    };
    print F $p->('options');
    print F $p->('options_xf3');
    print G $p->('options');
    print G $p->('options_xf4');
    print F "EndSection\n\n\n";
    print G "EndSection\n\n\n";

    #- Write Screen sections.
    print F $screensection_text1, "\n";
    print G $screensection_text1, "\n";

    my $subscreen = sub {
	my ($f, $server, $defdepth, $depths) = @_;
	print $f "    DefaultColorDepth $defdepth\n" if $defdepth;

        foreach (ikeys(%$depths)) {
	    my $m = $server ne "fbdev" ? join(" ", map { qq("$_->[0]x$_->[1]") } @{$depths->{$_}}) : qq("default"); #-"
	    print $f qq(    Subsection "Display"\n);
	    print $f qq(        Depth       $_\n) if $_;
	    print $f qq(        Modes       $m\n);
	    print $f qq(        ViewPort    0 0\n);
	    print $f qq(    EndSubsection\n);
	}
	print $f "EndSection\n";
    };

    my $screen = sub {
	my ($server, $defdepth, $device, $depths) = @_;
	print F qq(
Section "Screen"
    Driver "$server"
    Device      "$device"
    Monitor     "$o->{monitor}{type}"
); #-"
	$subscreen->(*F, $server, $defdepth, $depths);
    };

    #- SVGA screen section.
    print F qq(
# The Colour SVGA server
);

    if (member($O->{server}, @svgaservers)) {
	&$screen("svga", $o->{default_depth}, $O->{type}, $O->{depth});
    } else {
	&$screen("svga", '', "Generic VGA", { 8 => [[ 320, 200 ]] });
    }

    &$screen("vga16", '',
	     (member($O->{server}, "Mono", "VGA16") ? $O->{type} : "Generic VGA"),
	     { '' => [[ 640, 480 ], [ 800, 600 ]]});

    &$screen("vga2", '',
	     (member($O->{server}, "Mono", "VGA16") ? $O->{type} : "Generic VGA"),
	     { '' => [[ 640, 480 ], [ 800, 600 ]]});

    &$screen("accel", $o->{default_depth}, $O->{type}, $O->{depth});

    &$screen("fbdev", $o->{default_depth}, $O->{type}, $O->{depth});


    print G qq(
Section "Screen"
    Identifier "screen1"
    Device      "$O->{type}"
    Monitor     "$o->{monitor}{type}"
);
    #- bpp 32 not handled by XF4
    $subscreen->(*G, "svga", min($o->{default_depth}, 24), $O->{depth});

    print G '

Section "ServerLayout"
    Identifier "layout1"
    Screen     "screen1"
    InputDevice "Mouse1" "CorePointer"
';
    print G '
    InputDevice "stylus" "AlwaysCore"
    InputDevice "eraser" "AlwaysCore"
    InputDevice "cursor" "AlwaysCore"
' if $o->{wacom};
    print G '
    InputDevice "Keyboard1" "CoreKeyboard"
EndSection
'; #-"

    close F;
    close G;
}

sub XF86check_link {
    my ($ext) = @_;

    my $f = "$prefix/etc/X11/XF86Config$ext";
    touch($f);

    my $l = "$prefix/usr/X11R6/lib/X11/XF86Config$ext";

    if (-e $l && (stat($f))[1] != (stat($l))[1]) { #- compare the inode, must be the sames
	-e $l and unlink($l) || die "can't remove bad $l";
	symlinkf "../../../../etc/X11/XF86Config$ext", $l;
    }
}

sub info {
    my ($o) = @_;
    my $info;

    $info .= _("Keyboard layout: %s\n", $o->{keyboard}{xkb_keymap});
    $info .= _("Mouse type: %s\n", $o->{mouse}{XMOUSETYPE});
    $info .= _("Mouse device: %s\n", $o->{mouse}{device}) if $::expert;
    $info .= _("Monitor: %s\n", $o->{monitor}{type});
    $info .= _("Monitor HorizSync: %s\n", $o->{monitor}{hsyncrange}) if $::expert;
    $info .= _("Monitor VertRefresh: %s\n", $o->{monitor}{vsyncrange}) if $::expert;
    $info .= _("Graphic card: %s\n", $o->{card}{type});
    $info .= _("Graphic memory: %s kB\n", $o->{card}{memory}) if $o->{card}{memory};
    if ($o->{default_depth} and my $depth = $o->{card}{depth}{$o->{default_depth}}) {
    $info .= _("Color depth: %s\n", translate($depths{$o->{default_depth}}));
    $info .= _("Resolution: %s\n", join "x", @{$depth->[0]}) if $depth && !is_empty_array_ref($depth->[0]);
    }
    $info .= _("XFree86 server: %s\n", $o->{card}{server}) if $o->{card}{server};
    $info .= _("XFree86 driver: %s\n", $o->{card}{driver}) if $o->{card}{driver};
    $info;
}

sub show_info {
    my ($o) = @_;
    $in->ask_warn('', info($o));
}

#- Program entry point.
sub main {
    my ($o, $allowFB);
    ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_;
    $o ||= {};

    XF86check_link('');
    XF86check_link('-4');

    {
	my $w = $in->wait_message('', _("Preparing X-Window configuration"), 1);

	$o->{card} = cardConfiguration($o->{card}, $::noauto, $allowFB);

	$o->{monitor} = monitorConfiguration($o->{monitor}, $o->{card}{server} eq 'FBDev');
    }
    my $ok = resolutionsConfiguration($o, $::auto);

    $ok &&= testFinalConfig($o, $::auto, $o->{skiptest}, $::auto);

    my $quit;
    until ($ok || $quit) {

	my %c = my @c = (
	   __("Change Monitor") => sub { $o->{monitor} = monitorConfiguration() },
           __("Change Graphic card") => sub { $o->{card} = cardConfiguration('', 'noauto', $allowFB) },
           ($::expert ? (__("Change Server options") => sub { optionsConfiguration($o) }) : ()),
	   __("Change Resolution") => sub { resolutionsConfiguration($o) },
	   __("Show information") => sub { show_info($o) },
	   __("Test again") => sub { $ok = testFinalConfig($o, 1) },
	   __("Quit") => sub { $quit = 1 },
        );
	$in->set_help('configureXmain') unless $::isStandalone;
	my $f = $in->ask_from_list_(['XFdrake'],
				 _("What do you want to do?"),
				 [ grep { !ref } @c ]);
	eval { &{$c{$f}} };
	!$@ || $@ =~ /ask_from_list cancel/ or die;
	$in->kill;
    }
    if (!$ok) {
	$ok = $in->ask_yesorno('', _("Keep the changes?
Current configuration is:

%s", info($o)));
    }
    if ($ok) {
	unless ($::testing) {
	    my $f = "$prefix/etc/X11/XF86Config";
	    if (-e "$f.test") {
		rename $f, "$f.old" or die "unable to make a backup of XF86Config";
		rename "$f-4", "$f-4.old";
		rename "$f.test", $f;
		rename "$f.test-4", "$f-4";
		symlinkf "../..$o->{card}{prog}", "$prefix/etc/X11/X";
	    }
	}

	if ($::isStandalone && $0 =~ /Xdrakres/) {
	    my $found;
	    foreach (@window_managers) {
		if (`pidof "$_"` > 0) {
		    if ($in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst $_), 1)) {
			fork and $in->exit;
			system("kwmcom logout") if /kwm/;
			system("dcop kdesktop default logout") if /kwin/;
			system("save-session --kill") if /gnome-session/;

			open STDIN, "</dev/zero";
			open STDOUT, ">/dev/null";
			open STDERR, ">&STDERR";
			c::setsid();
		        exec qw(perl -e), q{
                          my $wm = shift;
  		          for (my $nb = 30; $nb && `pidof "$wm"` > 0; $nb--) { sleep 1 }
  		          system("killall X ; killall -15 xdm gdm kdm autologin") unless `pidof "$wm"` > 0;
  		        }, $_;
		    }
		    $found = 1; last;
		}
	    }
	    $in->ask_warn('', _("Please log out and then use Ctrl-Alt-BackSpace")) unless $found;
	} else {
	    $in->set_help('configureXxdm') unless $::isStandalone;
	    my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("X at startup"),
_("I can set up your computer to automatically start X upon booting.
Would you like X to start when you reboot?"), 1);
	    rewriteInittab($run ? 5 : 3) unless $::testing;
	}
	autologin($prefix, $o, $in, $install);
    }
}

sub autologin {
    my ($prefix, $o, $in, $install) = @_;
    my @etc_pass_fields = qw(name pw uid gid realname home shell);
    my @users = mapgrep {
	my %l; @l{@etc_pass_fields} = split ':';
	$l{uid} > 500, $l{name};
    } cat_("$prefix/etc/passwd");
    unless (($::auto && $o->{skiptest}) || !@users || $o->{authentication}{NIS}) {
	my $cmd = $prefix ? "chroot $prefix" : "";
	my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`));
	my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
	$o->{autologin} ||= $l{USER};
	$in->ask_from_entries_refH(_("Autologin"),
				   _("I can set up your computer to automatically log on one user.
If you don't want to use this feature, click on the cancel button."),
				   [ _("Choose the default user:") => { val => \$o->{autologin}, list => [ '', @users ] },
 				     _("Choose the window manager to run:") => { val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
    }
    $o->{autologin} and $::isStandalone ? do { $in->suspend; system("urpmi --auto --best-output autologin"); $in->resume; } : $in->pkg_install("autologin");
    any::setAutologin($prefix, $o->{autologin}, $o->{desktop});
    run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}
>
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Seurt ar gevreadenn"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Anv ar servijer"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Ouzhpennañ ur voullerez"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Ouzpennañ ur voullerez nevez war ar reizhiad"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Lakaat dre ziouer"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Lakaat ar voullerez dibabet evit ar voullerez dre ziouer"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Kemmañ ar voulerez diuzet"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Lemel ar voulerez diuzet"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Adtresañ ar roll"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Kefluniañ CUPS"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Kefluniañ ar reizhiad moullañ CUPS"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Bev"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Marv"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Obererour : "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Melestradur ar moullerezioù %s"
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 2fc114bec..55c67f8eb 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: bs\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-02-26 11:13+0100\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -1450,7 +1450,7 @@ msgstr "Pokreni userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Zatvori"
@@ -2229,7 +2229,7 @@ msgstr "Tip"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Obriši"
@@ -11801,7 +11801,7 @@ msgstr "(na %s)"
msgid "(on this machine)"
msgstr "(na ovom računaru)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Podešeno na ostalim računarima"
@@ -11928,7 +11928,7 @@ msgstr "preporučeno"
msgid "Unknown model"
msgstr "Nepoznat model"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "Podešeno na ovom računaru"
@@ -12497,7 +12497,7 @@ msgstr "Nedostaje naziv ili IP adresa CUPS servera."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
@@ -12515,13 +12515,14 @@ msgstr "Restartujem CUPS..."
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12795,7 +12796,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12805,7 +12806,7 @@ msgstr "Tražim nove štampače..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -13883,14 +13884,14 @@ msgid "Name of printer"
msgstr "Naziv štampača"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Opis"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Lokacija"
@@ -19782,8 +19783,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Datoteka"
@@ -19794,7 +19795,7 @@ msgid "/File/_Quit"
msgstr "/Datoteka/_Izlaz"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -20137,8 +20138,8 @@ msgstr "Molim sačekajte"
msgid "Interface"
msgstr "Interfejs"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Status"
@@ -21665,7 +21666,7 @@ msgstr "Obriši izabrano pravilo"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Izmijeni"
@@ -21821,7 +21822,7 @@ msgid "Connect"
msgstr "Spoji se"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Osvježi"
@@ -22087,7 +22088,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22221,10 +22222,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Šifra:"
#: standalone/draksambashare:1129
#, c-format
@@ -24680,7 +24681,7 @@ msgid "class of hardware device"
msgstr "klasa hardverskog uređaja"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Model"
@@ -25194,15 +25195,15 @@ msgstr "Osobine"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Opcije"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Pomoć"
@@ -25232,7 +25233,7 @@ msgstr ""
msgid "/_Upload the hardware list"
msgstr ""
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Izlaz"
@@ -25256,12 +25257,12 @@ msgstr ""
"Nakon što izaberete uređaj, moći ćete vidjeti informacije o uređaju u "
"poljima u desnom okviru (\"Informacije\")"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Prijavi grešku"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_O programu..."
@@ -25313,8 +25314,8 @@ msgstr "Pokreni alat za podešavanje"
msgid "unknown"
msgstr "nepoznat"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Nepoznat"
@@ -25360,11 +25361,6 @@ msgstr ""
msgid "Account:"
msgstr "Račun:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Šifra:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -25955,159 +25951,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Internet konekcije nije podešena"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Čitam podatke instaliranih štampača..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s Alat za upravljanje štampačima"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Akcije"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Dodaj štampač"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Postavi kao _Podrazumijevano"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Edituj"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Izbriši"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Ekspertni mod"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Osvježi"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Podešavanje CUPSa"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Udaljena administracija"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Pretraga:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Primijeni filter"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr "Def."
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Naziv štampača"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Vrsta konekcije"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Ime servera"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Dodaj štampač"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Dodaj štampač na sistem"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Postavi kao podrazumijevano"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Podesi izabrani štampač kao podrazumjevani"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Izmijeni izabrani štampač"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Obriši izabrani štampač"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Osvježi listu"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Podešavanje CUPSa"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Podesite CUPS sistem štampe"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Uključen"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Isključen"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Autori: "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Upravljanje štampačima %s"
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index a65a375e9..550f713c4 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ca\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-08-02 22:25+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -1418,7 +1418,7 @@ msgstr "Executa userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Tanca"
@@ -2210,7 +2210,7 @@ msgstr "Tipus"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Suprimeix"
@@ -11875,7 +11875,7 @@ msgstr "(en %s)"
msgid "(on this machine)"
msgstr "(en aquest ordinador)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Configurat a d'altres ordinadors"
@@ -12007,7 +12007,7 @@ msgstr "recomanat"
msgid "Unknown model"
msgstr "Model desconegut"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "Configurat en aquest ordinador"
@@ -12591,7 +12591,7 @@ msgstr "L'adreça IP o el nom del servidor CUPS no hi és."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
@@ -12611,13 +12611,14 @@ msgstr "S'està reiniciant el CUPS"
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#
@@ -12897,7 +12898,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12907,7 +12908,7 @@ msgstr "S'estan cercant noves impressores..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#
@@ -14029,14 +14030,14 @@ msgid "Name of printer"
msgstr "Nom de la impressora"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Descripció"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Ubicació"
@@ -20061,8 +20062,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Fitxer"
@@ -20073,7 +20074,7 @@ msgid "/File/_Quit"
msgstr "/Fitxer/_Surt"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -20420,8 +20421,8 @@ msgid "Interface"
msgstr "Interfície"
#
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Estat"
@@ -21991,7 +21992,7 @@ msgstr "Elimina la regla seleccionada"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Edita"
@@ -22149,7 +22150,7 @@ msgid "Connect"
msgstr "Connecta"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Refresca"
@@ -22419,7 +22420,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22553,10 +22554,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Contrasenya:"
#: standalone/draksambashare:1129
#, c-format
@@ -24616,7 +24617,7 @@ msgid "class of hardware device"
msgstr "tipus de dispositiu de maquinari"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Model"
@@ -25135,15 +25136,15 @@ msgstr "Característiques"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Opcions"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Ajuda"
@@ -25176,7 +25177,7 @@ msgstr ""
msgid "/_Upload the hardware list"
msgstr ""
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Surt"
@@ -25200,12 +25201,12 @@ msgstr ""
"Quan hagueu seleccionat un dispositiu podreu veure'n la informació en els "
"camps del marc dret (\"Informació\")"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Informeu d'un error"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Quant a..."
@@ -25257,8 +25258,8 @@ msgstr "Executa l'eina de configuració"
msgid "unknown"
msgstr "desconegut"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Desconegut"
@@ -25307,11 +25308,6 @@ msgstr ""
msgid "Account:"
msgstr "Compte:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Contrasenya:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -25918,164 +25914,166 @@ msgstr ""
msgid "No internet connection configured"
msgstr "No s'ha configurat cap connexió a Internet"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "S'estan llegint dades de les impressores instal·lades..."
#
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s Eina de gestió d'impressores"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Accions"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Afegeix impressora"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Estableix com a _predeterminada"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Edita"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Esborra"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/Mode _expert"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Refresca"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Configura CUPS"
#
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Administració remota"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Cerca:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Aplica el filtre"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr ""
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Nom de la impressora"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Tipus de connexió"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Nom del servidor"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Afegeix impressora"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Afegeix una nova impressora al sistema"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Estableix com a predeterminat"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Estaleix la impressora seleccionada com la predeterminada"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Edita la impressora seleccionada"
#
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Elimina la impressora seleccionada"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Actualitza la llista"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Configura CUPS"
#
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Configura el sistema d'impressió CUPS"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Habilitat"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Deshabilitat"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Autors: "
#
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Gestió d'impressores %s"
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 197f16bd6..453cecf5e 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: cs\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-08-11 20:25+0200\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -1454,7 +1454,7 @@ msgstr "Spustit UserDrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Zavřít"
@@ -2238,7 +2238,7 @@ msgstr "Změnit typ"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Smazat"
@@ -11796,7 +11796,7 @@ msgstr "(na %s)"
msgid "(on this machine)"
msgstr "(na tomto počítači)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Nastaveno na jiném počítači"
@@ -11923,7 +11923,7 @@ msgstr "doporučeno"
msgid "Unknown model"
msgstr "Neznámý model"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "Nastaveno na tomto počítači"
@@ -12491,7 +12491,7 @@ msgstr "Chybí název nebo IP adresa serveru CUPS."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "PrinterDrake"
@@ -12509,13 +12509,14 @@ msgstr "Restartuji CUPS..."
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12785,7 +12786,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12795,7 +12796,7 @@ msgstr "Vyhledávám nové tiskárny..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -13869,14 +13870,14 @@ msgid "Name of printer"
msgstr "Název tiskárny"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Popis"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Umístění"
@@ -19764,8 +19765,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Soubor"
@@ -19776,7 +19777,7 @@ msgid "/File/_Quit"
msgstr "/Soubor/U_končit"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>K"
@@ -20117,8 +20118,8 @@ msgstr "Čekejte prosím"
msgid "Interface"
msgstr "Rozhraní"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Stav"
@@ -21688,7 +21689,7 @@ msgstr "Smazat vybrané pravidlo"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Upravit"
@@ -21845,7 +21846,7 @@ msgid "Connect"
msgstr "Připojit"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Obnovit"
@@ -22111,7 +22112,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22245,10 +22246,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Heslo:"
#: standalone/draksambashare:1129
#, fuzzy, c-format
@@ -24698,7 +24699,7 @@ msgid "class of hardware device"
msgstr "třída hardwarového zařízení"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Model"
@@ -25210,15 +25211,15 @@ msgstr "Vlastnosti"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Volby"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Nápověda"
@@ -25248,7 +25249,7 @@ msgstr "/Automaticky detekovat jednotky _Zip na paralelním portu"
msgid "/_Upload the hardware list"
msgstr "/Poslat seznam _hardware"
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Konec"
@@ -25272,12 +25273,12 @@ msgstr ""
"Pokud vyberete nějaké zařízení, uvidíte o něm informace v pravém rámci "
"(\"Informace\")"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/Nah_lásit chybu"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_O aplikaci..."
@@ -25329,8 +25330,8 @@ msgstr "Spustit nástroj pro nastavení"
msgid "unknown"
msgstr "neznámý"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Neznámý"
@@ -25377,11 +25378,6 @@ msgstr "Poslat seznam hardware"
msgid "Account:"
msgstr "Účet:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Heslo:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -25972,159 +25968,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Žádné připojení k internetu není nastaveno"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Načítám data z instalovaných tiskáren..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "Nástroj pro správu tiskáren %s"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Akce"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/Přid_at tiskárnu"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Nas_tavit jako výchozí"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/Ú_pravy"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/O_dstranit"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Expertní režim"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/O_bnovit"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/Na_stavit CUPS server"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Vzdálená administrace"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Hledat:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Použít filtr"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr "Vých."
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Název tiskárny"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Typ spojení"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Název serveru"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Přidat tiskárnu"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Přidá novou tiskárnu do systému"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Nastavit jako výchozí"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Nastaví vybranou tiskárnu jako výchozí"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Upravit vybranou tiskárnu"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Smazat vybranou tiskárnu"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Obnovit seznam"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Nastavení serveru CUPS"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Nastaví tiskového systém CUPS"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Přístupná"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Nepřístupná"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Autoři:"
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Správa tiskáren %s"
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index d1e2af1f4..e1f930941 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Mandriva DrakX.cy\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-08-17 21:06+0200\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg <post@meddal.com>\n"
@@ -1447,7 +1447,7 @@ msgstr "Cychwyn userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Cau"
@@ -2221,7 +2221,7 @@ msgstr "Math"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Dileu"
@@ -11750,7 +11750,7 @@ msgstr "(ar %s)"
msgid "(on this machine)"
msgstr "(ar y peiriant hwn)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Ffurfweddu ar beiriannau eraill"
@@ -11877,7 +11877,7 @@ msgstr "argymhellir"
msgid "Unknown model"
msgstr "Model anhysbys"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "Ffurfweddwyd ar y peiriant hwn"
@@ -12457,7 +12457,7 @@ msgstr "Mae enw gweinydd CUPS neu gyfeiriad IP ar goll."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
@@ -12475,13 +12475,14 @@ msgstr "Ail gychwyn CUPS"
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12756,7 +12757,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12766,7 +12767,7 @@ msgstr "Chwilio am argraffyddion newydd..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -13848,14 +13849,14 @@ msgid "Name of printer"
msgstr "Enw'r argraffydd"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Disgrifiad"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Lleoliad"
@@ -19788,8 +19789,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Ffeil"
@@ -19800,7 +19801,7 @@ msgid "/File/_Quit"
msgstr "/Ffeil/_Gadael"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -20140,8 +20141,8 @@ msgstr "Arhoswch"
msgid "Interface"
msgstr "Rhyngwyneb"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Stad"
@@ -21673,7 +21674,7 @@ msgstr "Dileu'r rheol hon"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Golygu"
@@ -21831,7 +21832,7 @@ msgid "Connect"
msgstr "Cysylltu"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Adnewyddu"
@@ -22097,7 +22098,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22231,10 +22232,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Cyfrinair:"
#: standalone/draksambashare:1129
#, c-format
@@ -24687,7 +24688,7 @@ msgid "class of hardware device"
msgstr "dosbarth y ddyfais caledwedd"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Model"
@@ -25202,15 +25203,15 @@ msgstr "Nodweddion"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Dewisiadau"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Cymorth"
@@ -25240,7 +25241,7 @@ msgstr "/Awtoganfod gyrrwyr _zip paralel"
msgid "/_Upload the hardware list"
msgstr "/_Llwytho'r rhestr caledwedd"
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Gadael"
@@ -25264,12 +25265,12 @@ msgstr ""
"Unwaith i chi ddewis dyfais, gallwch weld esboniad mewn meysydd yn y ffrâm "
"dde [\"Gwybodaeth\"]"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Adrodd ar Wallau"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Ynghylch..."
@@ -25321,8 +25322,8 @@ msgstr "Rhedeg offeryn ffurfweddu"
msgid "unknown"
msgstr "anhysbys"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Anhysbys"
@@ -25368,11 +25369,6 @@ msgstr "Llwytho'r rhestr caledwedd"
msgid "Account:"
msgstr "Cyfrif:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Cyfrinair:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -25967,159 +25963,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Dim cysylltiad â'r rhyngrwyd wedi ei ffurfweddu"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Darllen data am argraffyddion gosodedig..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "Offeryn Rheoli Argraffydd %s"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Gweithredoedd"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Ychwanegu Argraffydd"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Gosod fel _Rhagosodiad"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Golygu"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Dileu"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Modd Uwch"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Adnewyddu"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Ffurfweddu CUPS"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Gweinyddu Pell"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Chwilio:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Gosod Hidl"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr "Def."
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Enw argraffydd"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Math o Gyswllt"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Enw Gweinydd"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Ychwanegu Argraffydd"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Ychwanegu argraffydd newydd i’r system"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Gosod fel rhagosodedig"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Gosod yr argraffydd fel y rhagosodedig"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Golygu'r argraffwyr hyn"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Dileu'r argraffydd hwn"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Adnewyddu'r rhestr"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Ffurfweddu CUPS"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Ffurfweddu'r system argraffu CUPS"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Galluogwyd"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Anablwyd"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Awduron:"
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Rheoli Argraffydd %s"
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index 3cc90f8ad..7aecbe312 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: da\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-04-29 08:32+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -1454,7 +1454,7 @@ msgstr "Start userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Luk"
@@ -2239,7 +2239,7 @@ msgstr "Type"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Slet"
@@ -11716,7 +11716,7 @@ msgstr "(på %s)"
msgid "(on this machine)"
msgstr "(på denne maskine)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Konfigureret på andre maskiner"
@@ -11843,7 +11843,7 @@ msgstr "anbefalet"
msgid "Unknown model"
msgstr "Ukendt model"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "Konfigureret på denne maskine"
@@ -12419,7 +12419,7 @@ msgstr "CUPS-servernavn eller IP-adresse mangler."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
@@ -12437,13 +12437,14 @@ msgstr "Genstarter CUPS..."
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12719,7 +12720,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12729,7 +12730,7 @@ msgstr "Søger efter nye printere..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -13800,14 +13801,14 @@ msgid "Name of printer"
msgstr "Navn på printer"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Beskrivelse"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Placering"
@@ -19698,8 +19699,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Fil"
@@ -19710,7 +19711,7 @@ msgid "/File/_Quit"
msgstr "/Fil/_Afslut"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -20051,8 +20052,8 @@ msgstr "Vent venligst"
msgid "Interface"
msgstr "Grænseflade"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Status"
@@ -21577,7 +21578,7 @@ msgstr "Slet valgte regel"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Redigér"
@@ -21732,7 +21733,7 @@ msgid "Connect"
msgstr "Forbind"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Genopfrisk"
@@ -21998,7 +21999,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22132,10 +22133,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Kodeord:"
#: standalone/draksambashare:1129
#, c-format
@@ -24593,7 +24594,7 @@ msgid "class of hardware device"
msgstr "Klasse af maskinenhed"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Model"
@@ -25105,15 +25106,15 @@ msgstr "Faciliteter"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Indstillinger"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Hjælp"
@@ -25143,7 +25144,7 @@ msgstr "/Automatisk fundne parallelle _zip-drev"
msgid "/_Upload the hardware list"
msgstr "/_Læg udstyrslisten op"
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Afslut"
@@ -25167,12 +25168,12 @@ msgstr ""
"Når du har valgt en enhed kan du se enhedsinformationen på felter som vises "
"i den højre ramme (\"Information\")"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Rapportér fejl"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Om..."
@@ -25224,8 +25225,8 @@ msgstr "Kør konfigurationsværktøj"
msgid "unknown"
msgstr "ukendt"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Ukendt"
@@ -25271,11 +25272,6 @@ msgstr "Læg udstyrslisten op"
msgid "Account:"
msgstr "Konto:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Kodeord:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -25868,159 +25864,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Ingen konfiguration af Internetforbindelse"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Læser data for nye printere..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s værktøj til administration af printere"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Handlinger"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Tilføj printer"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Set som _standard"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Redigér"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Slet"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Eksperttilstand"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Genopfrisk"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Konfigurér CUPS"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Ekstern administration"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Søg:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Udfør filter"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr "Def."
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Printer-navn"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Opkoblingstype"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Servernavn"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Tilføj printer"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Tilføj en ny printer til systemet"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Sæt som standard"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Sæt valgte printer som standard-printer"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Redigér valgte printer"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Slet valgte printer"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Genopfrisk listen"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "Konfigurér CUPS"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Konfigurér CUPS-printsystemet"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Aktiveret"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Deaktiveret"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Forfattere: "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Administration af printere %s"
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index 6b1287eb6..82893fa10 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po
@@ -17,7 +17,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX-de\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2005-08-12 23:08+0200\n"
"Last-Translator: Frank Koester <frank@dueppel13.de>\n"
"Language-Team: deutsch\n"
@@ -1470,7 +1470,7 @@ msgstr "UserDrake starten"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Schließen"
@@ -2262,7 +2262,7 @@ msgstr "Typ"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Löschen"
@@ -11944,7 +11944,7 @@ msgstr "(an %s)"
msgid "(on this machine)"
msgstr "(an diesem Rechner)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, c-format
msgid "Configured on other machines"
msgstr "Auf anderen Rechnern konfiguriert"
@@ -12071,7 +12071,7 @@ msgstr "empfohlen"
msgid "Unknown model"
msgstr "Unbekanntes Modell"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, c-format
msgid "Configured on this machine"
msgstr "An diesem Rechner eingerichtet"
@@ -12653,7 +12653,7 @@ msgstr "CUPS Servername oder IP-Adresse fehlt."
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "PrinterDrake"
@@ -12671,13 +12671,14 @@ msgstr "CUPS wird neu gestartet..."
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12953,7 +12954,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12963,7 +12964,7 @@ msgstr "Suche nach neuen Druckern..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -14050,14 +14051,14 @@ msgid "Name of printer"
msgstr "Druckername"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Beschreibung"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Standort"
@@ -20095,8 +20096,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Datei"
@@ -20107,7 +20108,7 @@ msgid "/File/_Quit"
msgstr "/Datei/B_eenden"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -20448,8 +20449,8 @@ msgstr "Bitte warten"
msgid "Interface"
msgstr "Schnittstelle"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Status"
@@ -22042,7 +22043,7 @@ msgstr "Markierte Regel entfernen"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Bearbeiten"
@@ -22199,7 +22200,7 @@ msgid "Connect"
msgstr "Verbinden"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Aktualisieren"
@@ -22465,7 +22466,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -22599,10 +22600,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Passwort:"
#: standalone/draksambashare:1129
#, fuzzy, c-format
@@ -25078,7 +25079,7 @@ msgid "class of hardware device"
msgstr "Hardwareklasse"
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Modell"
@@ -25595,15 +25596,15 @@ msgstr "Funktionen"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Optionen"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Hilfe"
@@ -25633,7 +25634,7 @@ msgstr "/Parallele _Zip-Laufwerke automatisch erkennen"
msgid "/_Upload the hardware list"
msgstr "/_Hardwareliste hochladen"
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Beenden"
@@ -25657,12 +25658,12 @@ msgstr ""
"Wenn Sie ein Gerät auswählen, werden im rechten Rahmen die Geräte-"
"Informationen angezeigt („Informationen“)."
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Fehler melden"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Über ..."
@@ -25714,8 +25715,8 @@ msgstr "Konfigurationswerkzeug starten"
msgid "unknown"
msgstr "Unbekannt"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Unbekannt"
@@ -25763,11 +25764,6 @@ msgstr "Hardwareliste hochladen"
msgid "Account:"
msgstr "Zugang:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Passwort:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -26365,159 +26361,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Keine Internetverbindung konfiguriert"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Lese Daten der installierten Drucker ..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s Drucker Verwaltung"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/Be_arbeiten"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Drucker hinzufügen"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Als Stan_dard setzen"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Ändern"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Löschen"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/-Expertenmodus"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Aktualisieren"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_CUPS konfigurieren"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Fernwartung"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Suche:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Filter anwenden"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr "Def."
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Druckername"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Verbindungstyp:"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Server Name"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add Printer"
msgstr "Drucker hinzufügen"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, c-format
msgid "Add a new printer to the system"
msgstr "Neuen Drucker hinzufügen"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Als Standard setzen"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set selected printer as the default printer"
msgstr "Als Standarddrucker verwenden"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit selected printer"
msgstr "Änderung des markierten Druckers"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, c-format
msgid "Delete selected printer"
msgstr "Ausgewählte Drucker entfernen"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Liste aktualisieren"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS"
msgstr "CUPS konfigurieren"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, c-format
msgid "Configure CUPS printing system"
msgstr "Das CUPS Drucker System konfigurieren"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Aktiviert"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Deaktiviert"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Autoren: "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, c-format
msgid "Printer Management %s"
msgstr "Druckerverwaltung %s"
diff --git a/perl-install/share/po/el.po b/perl-install/share/po/el.po
index 71ff03353..69f65e7a8 100644
--- a/perl-install/share/po/el.po
+++ b/perl-install/share/po/el.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX-el\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2004-09-15 13:28+0200\n"
"Last-Translator: Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1398,7 +1398,7 @@ msgstr "Εκκίνηση userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Κλείσιμο"
@@ -2166,7 +2166,7 @@ msgstr "Τύπος"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Διαγραφή"
@@ -11429,7 +11429,7 @@ msgstr "(στον %s)"
msgid "(on this machine)"
msgstr "(σε αυτό το μηχάνημα)"
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, fuzzy, c-format
msgid "Configured on other machines"
msgstr "Ρύθμιση της σύνδεσης"
@@ -11556,7 +11556,7 @@ msgstr "συνιστάται"
msgid "Unknown model"
msgstr "Άγνωστο μοντέλο"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, fuzzy, c-format
msgid "Configured on this machine"
msgstr "(σε αυτό το μηχάνημα)"
@@ -12100,7 +12100,7 @@ msgstr "Λείπει η διεύθυνση του Υπολογιστή/Δικτ
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
@@ -12118,13 +12118,14 @@ msgstr "Επανεκκίνηση XFS"
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -12394,7 +12395,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -12404,7 +12405,7 @@ msgstr "Αναζήτηση για νέους εκτυπωτές..."
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -13432,14 +13433,14 @@ msgid "Name of printer"
msgstr "Όνομα εκτυπωτή"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Περιγραφή"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Τοποθεσία"
@@ -19082,8 +19083,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Αρχείο"
@@ -19094,7 +19095,7 @@ msgid "/File/_Quit"
msgstr "/Αρχείο/Έ_ξοδος"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -19416,8 +19417,8 @@ msgstr "Παρακαλώ περιμένετε"
msgid "Interface"
msgstr "Διεπαφή"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Κατάσταση:"
@@ -20911,7 +20912,7 @@ msgstr "Διαγραφή επιλεγμένου κανόνα"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Επεξεργασία"
@@ -21064,7 +21065,7 @@ msgid "Connect"
msgstr "Σύνδεση"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Ανανέωση"
@@ -21330,7 +21331,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -21464,10 +21465,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Κωδικός πρόσβασης:"
#: standalone/draksambashare:1129
#, c-format
@@ -23488,7 +23489,7 @@ msgid "class of hardware device"
msgstr "κλάση της συσκευής "
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Μοντέλο"
@@ -23984,15 +23985,15 @@ msgstr "Χαρακτηριστικά"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Επιλογές"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Βοήθεια"
@@ -24022,7 +24023,7 @@ msgstr ""
msgid "/_Upload the hardware list"
msgstr ""
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Έξοδος"
@@ -24046,12 +24047,12 @@ msgstr ""
"Μόλις επιλέξετε μια συσκευή, θα μπορείτε να δείτε τις πληροφορίες σε πεδία "
"που εμφανίζονται στο δεξί τμήμα με όνομα(\"Πληροφορίες\")"
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Αναφορά Bug"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Σχετικά με..."
@@ -24103,8 +24104,8 @@ msgstr "Εκτέλεση εργαλείο ρύθμισης"
msgid "unknown"
msgstr "Άγνωστο"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Άγνωστο"
@@ -24152,11 +24153,6 @@ msgstr ""
msgid "Account:"
msgstr "Λογαριασμός:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Κωδικός πρόσβασης:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -24744,159 +24740,161 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Ρύθμιση σύνδεσης Διαδικτύου"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, c-format
msgid "Reading data of installed printers..."
msgstr "Ανάγνωση δεδομένων των εγκατεστημένων εκτυπωτών..."
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, fuzzy, c-format
msgid "%s Printer Management Tool"
msgstr "Κοινή χρήση εκτυπωτών"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Ενέργειες"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Προσθήκη εκτυπωτή"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, c-format
msgid "/Set as _Default"
msgstr "/Ορισμός ως ε_ξ ορισμού"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Επεξεργασία"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Διαγραφή"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Για Προχωρημένους"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Ανανέωση"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Ρύθμιση CUPS"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Απομακρυσμένη διαχείριση"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Αναζήτηση:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Εφαρμογή φίλτρου"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr ""
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Printer Name"
msgstr "Όνομα εκτυπωτή"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Τύπος σύνδεσης"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, fuzzy, c-format
msgid "Server Name"
msgstr "Όνομα Διακομιστή:"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, fuzzy, c-format
msgid "Add Printer"
msgstr "Εκτυπωτής"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, fuzzy, c-format
msgid "Add a new printer to the system"
msgstr "Προσθήκη μιας ομάδας"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, c-format
msgid "Set as default"
msgstr "Ορισμός ως προεπιλογής"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, fuzzy, c-format
msgid "Set selected printer as the default printer"
msgstr "Ορισμός αυτού του εκτυπωτή ως προεπιλεγμένου"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, fuzzy, c-format
msgid "Edit selected printer"
msgstr "Επεξεργασία επιλεγμένου εξυπηρετητή"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, fuzzy, c-format
msgid "Delete selected printer"
msgstr "Διαγραφή επιλεγμένου κανόνα"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Ανανέωση της λίστας"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, fuzzy, c-format
msgid "Configure CUPS"
msgstr "Ρύθμιση Χ"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, fuzzy, c-format
msgid "Configure CUPS printing system"
msgstr "Αλλαγή συστήματος εκτύπωσης"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Ενεργοποιημένο"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Ανενεργό"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Δημιουργοί: "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, fuzzy, c-format
msgid "Printer Management %s"
msgstr "Κοινή χρήση εκτυπωτών"
diff --git a/perl-install/share/po/eo.po b/perl-install/share/po/eo.po
index bdf26e7bd..5d2e19822 100644
--- a/perl-install/share/po/eo.po
+++ b/perl-install/share/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2005-09-03 01:06+0800\n"
+"POT-Creation-Date: 2005-09-04 21:26+0800\n"
"PO-Revision-Date: 2003-03-12 18:31-0400\n"
"Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
"Language-Team: esperanto <eo@li.org>\n"
@@ -1373,7 +1373,7 @@ msgstr "Lanĉu userdrake"
#: printer/printerdrake.pm:5459 standalone/drakTermServ:294
#: standalone/drakbackup:4097 standalone/drakbug:126 standalone/drakfont:498
#: standalone/draknfs:210 standalone/net_monitor:117
-#: standalone/printerdrake:565
+#: standalone/printerdrake:583
#, c-format
msgid "Close"
msgstr "Malfermu"
@@ -2129,7 +2129,7 @@ msgstr "Tipo"
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: diskdrake/hd_gtk.pm:359 diskdrake/interactive.pm:455
-#: standalone/drakperm:123 standalone/printerdrake:246
+#: standalone/drakperm:123 standalone/printerdrake:248
#, c-format
msgid "Delete"
msgstr "Forigu"
@@ -10610,7 +10610,7 @@ msgstr "(sur %s)"
msgid "(on this machine)"
msgstr ""
-#: printer/cups.pm:115 standalone/printerdrake:198
+#: printer/cups.pm:115 standalone/printerdrake:200
#, fuzzy, c-format
msgid "Configured on other machines"
msgstr "Konfiguru la konekton"
@@ -10737,7 +10737,7 @@ msgstr "recomendita"
msgid "Unknown model"
msgstr "Nekonata modelo"
-#: printer/main.pm:355 standalone/printerdrake:197
+#: printer/main.pm:355 standalone/printerdrake:199
#, fuzzy, c-format
msgid "Configured on this machine"
msgstr "Konfiguru la konekton"
@@ -11261,7 +11261,7 @@ msgstr "Printilaj Poŝtejo"
#: printer/printerdrake.pm:4853 printer/printerdrake.pm:4862
#: printer/printerdrake.pm:4877 printer/printerdrake.pm:5078
#: printer/printerdrake.pm:5540 printer/printerdrake.pm:5623
-#: standalone/printerdrake:73 standalone/printerdrake:572
+#: standalone/printerdrake:75 standalone/printerdrake:590
#, fuzzy, c-format
msgid "Printerdrake"
msgstr "Printilo"
@@ -11279,13 +11279,14 @@ msgstr "limigu"
#: printer/printerdrake.pm:614
#, c-format
-msgid "Allow pop-up windows, canceling setup and package installation possible"
+msgid ""
+"Allow pop-up windows, printer setup and package installation may be canceled"
msgstr ""
#: printer/printerdrake.pm:616
#, c-format
msgid ""
-"No pop-up windows, canceling setup and package installation not possible"
+"No pop-up windows, printer setup and package installation cannot be canceled"
msgstr ""
#: printer/printerdrake.pm:622
@@ -11529,7 +11530,7 @@ msgstr ""
#: printer/printerdrake.pm:884
#, c-format
-msgid "Do not do automatic printer setup and do not do it again"
+msgid "Do not setup printer automatically now, and never do it again"
msgstr ""
#: printer/printerdrake.pm:928
@@ -11539,7 +11540,7 @@ msgstr "Loka printilo"
#: printer/printerdrake.pm:989
#, c-format
-msgid "Do not do automatic printer setup again"
+msgid "Do not setup printer automatically again"
msgstr ""
#: printer/printerdrake.pm:996
@@ -12455,14 +12456,14 @@ msgid "Name of printer"
msgstr "Nomo de printilo"
#: printer/printerdrake.pm:3056 standalone/drakconnect:592
-#: standalone/harddrake2:39 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/harddrake2:39 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Description"
msgstr "Priskribo"
-#: printer/printerdrake.pm:3057 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: printer/printerdrake.pm:3057 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "Location"
msgstr "Loko"
@@ -17751,8 +17752,8 @@ msgstr ""
#: standalone/drakboot:84 standalone/harddrake2:190 standalone/harddrake2:191
#: standalone/harddrake2:192 standalone/logdrake:69
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/_Dosiero"
@@ -17763,7 +17764,7 @@ msgid "/File/_Quit"
msgstr "/Dosiero/_Foriru"
#: standalone/drakboot:85 standalone/harddrake2:192 standalone/logdrake:75
-#: standalone/printerdrake:150
+#: standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -18083,8 +18084,8 @@ msgstr ""
msgid "Interface"
msgstr "Interfaco"
-#: standalone/drakconnect:109 standalone/printerdrake:222
-#: standalone/printerdrake:229
+#: standalone/drakconnect:109 standalone/printerdrake:224
+#: standalone/printerdrake:231
#, c-format
msgid "State"
msgstr "Stato"
@@ -19533,7 +19534,7 @@ msgstr "Malinstalu printvicon"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:124 standalone/drakups:302 standalone/drakups:362
#: standalone/drakups:382 standalone/drakvpn:319 standalone/drakvpn:680
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, c-format
msgid "Edit"
msgstr "Redaktu"
@@ -19686,7 +19687,7 @@ msgid "Connect"
msgstr "Konektu"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:249
+#: standalone/drakroam:167 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "Rekalkulu"
@@ -19952,7 +19953,7 @@ msgstr ""
#: standalone/draksambashare:524
#, c-format
-msgid "The wizard successfully the Samba share"
+msgid "The wizard successfully added the printer Samba share"
msgstr ""
#: standalone/draksambashare:547
@@ -20086,10 +20087,10 @@ msgstr ""
msgid "User name:"
msgstr ""
-#: standalone/draksambashare:929
+#: standalone/draksambashare:929 standalone/harddrake2:551
#, c-format
-msgid "Passwd:"
-msgstr ""
+msgid "Password:"
+msgstr "Pasvorto:"
#: standalone/draksambashare:1129
#, c-format
@@ -22068,7 +22069,7 @@ msgid "class of hardware device"
msgstr ""
#: standalone/harddrake2:51 standalone/harddrake2:83
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Model"
msgstr "Modelo"
@@ -22562,15 +22563,15 @@ msgstr "Funkcioj"
#. -PO: please keep all "/" characters !!!
#: standalone/harddrake2:176 standalone/logdrake:76
-#: standalone/printerdrake:144 standalone/printerdrake:157
-#: standalone/printerdrake:169
+#: standalone/printerdrake:146 standalone/printerdrake:159
+#: standalone/printerdrake:171
#, c-format
msgid "/_Options"
msgstr "/_Opcioj"
#: standalone/harddrake2:177 standalone/harddrake2:203 standalone/logdrake:78
-#: standalone/printerdrake:170 standalone/printerdrake:172
-#: standalone/printerdrake:175 standalone/printerdrake:177
+#: standalone/printerdrake:172 standalone/printerdrake:174
+#: standalone/printerdrake:177 standalone/printerdrake:179
#, c-format
msgid "/_Help"
msgstr "/_Helpo"
@@ -22600,7 +22601,7 @@ msgstr ""
msgid "/_Upload the hardware list"
msgstr ""
-#: standalone/harddrake2:192 standalone/printerdrake:150
+#: standalone/harddrake2:192 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/_Ĉesu"
@@ -22622,12 +22623,12 @@ msgid ""
"in fields displayed on the right frame (\"Information\")"
msgstr ""
-#: standalone/harddrake2:222 standalone/printerdrake:175
+#: standalone/harddrake2:222 standalone/printerdrake:177
#, c-format
msgid "/_Report Bug"
msgstr "/_Raportu Cimo"
-#: standalone/harddrake2:224 standalone/printerdrake:177
+#: standalone/harddrake2:224 standalone/printerdrake:179
#, c-format
msgid "/_About..."
msgstr "/_Pri..."
@@ -22674,8 +22675,8 @@ msgstr ""
msgid "unknown"
msgstr "nekonata"
-#: standalone/harddrake2:307 standalone/printerdrake:309
-#: standalone/printerdrake:347
+#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "Nekonata"
@@ -22721,11 +22722,6 @@ msgstr ""
msgid "Account:"
msgstr "Konto:"
-#: standalone/harddrake2:551
-#, c-format
-msgid "Password:"
-msgstr "Pasvorto:"
-
#: standalone/harddrake2:552
#, c-format
msgid "Hostname:"
@@ -23303,161 +23299,163 @@ msgstr ""
msgid "No internet connection configured"
msgstr "Interreta konektaĵo kaj konfiguro"
-#: standalone/printerdrake:74
+#: standalone/printerdrake:76
#, fuzzy, c-format
msgid "Reading data of installed printers..."
msgstr "Loka printilo"
-#: standalone/printerdrake:126
+#: standalone/printerdrake:128
#, fuzzy, c-format
msgid "%s Printer Management Tool"
msgstr "Uzul-mastrumado \n"
-#: standalone/printerdrake:140 standalone/printerdrake:141
#: standalone/printerdrake:142 standalone/printerdrake:143
-#: standalone/printerdrake:151 standalone/printerdrake:152
-#: standalone/printerdrake:156
+#: standalone/printerdrake:144 standalone/printerdrake:145
+#: standalone/printerdrake:153 standalone/printerdrake:154
+#: standalone/printerdrake:158
#, c-format
msgid "/_Actions"
msgstr "/_Agoj"
-#: standalone/printerdrake:140 standalone/printerdrake:152
+#: standalone/printerdrake:142 standalone/printerdrake:154
#, c-format
msgid "/_Add Printer"
msgstr "/_Aldonu printilo"
-#: standalone/printerdrake:141
+#: standalone/printerdrake:143
#, fuzzy, c-format
msgid "/Set as _Default"
msgstr " (Defaŭlta)"
-#: standalone/printerdrake:142
+#: standalone/printerdrake:144
#, c-format
msgid "/_Edit"
msgstr "/_Redaktu"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:145
#, c-format
msgid "/_Delete"
msgstr "/_Forigu"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:146
#, c-format
msgid "/_Expert mode"
msgstr "/_Spertuloreĝimo"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:151
#, c-format
msgid "/_Refresh"
msgstr "/_Rekalkulu"
-#: standalone/printerdrake:156
+#: standalone/printerdrake:158
#, c-format
msgid "/_Configure CUPS"
msgstr "/_Konfiguru CUPS"
-#: standalone/printerdrake:169
+#: standalone/printerdrake:171
#, fuzzy, c-format
msgid "/Configure _Auto Administration"
msgstr "Malproksima administrado"
-#: standalone/printerdrake:192
+#: standalone/printerdrake:194
#, c-format
msgid "Search:"
msgstr "Serĉu:"
-#: standalone/printerdrake:195
+#: standalone/printerdrake:197
#, c-format
msgid "Apply filter"
msgstr "Apliku filtrilon"
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, c-format
msgid "Def."
msgstr ""
-#: standalone/printerdrake:222 standalone/printerdrake:229
+#: standalone/printerdrake:224 standalone/printerdrake:231
#, fuzzy, c-format
msgid "Printer Name"
msgstr "Printvica Nomo"
-#: standalone/printerdrake:222
+#: standalone/printerdrake:224
#, c-format
msgid "Connection Type"
msgstr "Konekto-tipo"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:231
#, c-format
msgid "Server Name"
msgstr "Servil-nomo"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, fuzzy, c-format
msgid "Add Printer"
msgstr "Printilo"
-#: standalone/printerdrake:237
+#: standalone/printerdrake:239
#, fuzzy, c-format
msgid "Add a new printer to the system"
msgstr "Aldonu uzulon al la sistemo"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, fuzzy, c-format
msgid "Set as default"
msgstr "defaŭlta"
-#: standalone/printerdrake:240
+#: standalone/printerdrake:242
#, fuzzy, c-format
msgid "Set selected printer as the default printer"
msgstr ""
"Ĉu vi deziras konfiguri tiun ĉi presilon (\"%s\")\n"
"kiel defaŭltan presilon?"
-#: standalone/printerdrake:243
+#: standalone/printerdrake:245
#, fuzzy, c-format
msgid "Edit selected printer"
msgstr "Malinstalu printvicon"
-#: standalone/printerdrake:246
+#: standalone/printerdrake:248
#, fuzzy, c-format
msgid "Delete selected printer"
msgstr "Malinstalu printvicon"
-#: standalone/printerdrake:249
+#: standalone/printerdrake:251
#, c-format
msgid "Refresh the list"
msgstr "Rekalkulu la liston"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, fuzzy, c-format
msgid "Configure CUPS"
msgstr "Konfiguru X"
-#: standalone/printerdrake:252
+#: standalone/printerdrake:254
#, fuzzy, c-format
msgid "Configure CUPS printing system"
msgstr "Konfiguru retumon"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Enabled"
msgstr "Ŝaltita"
-#: standalone/printerdrake:311 standalone/printerdrake:349
+#: standalone/printerdrake:310 standalone/printerdrake:324
+#: standalone/printerdrake:348 standalone/printerdrake:360
#, c-format
msgid "Disabled"
msgstr "Elŝaltita"
-#: standalone/printerdrake:578
+#: standalone/printerdrake:596
#, c-format
msgid "Authors: "
msgstr "Aŭtoroj: "
#. -PO: here %s is the version number
-#: standalone/printerdrake:588
+#: standalone/printerdrake:606
#, fuzzy, c-format
msgid "Printer Management %s"
msgstr "Uzul-mastrumado \n"
diff --git a/perl-install/share/po/es.po b/perl-install/share/po/es.po
index 7c021cb36..3681d4de2 100644
--- a/perl-install/share/po/es.po
+++ b/perl-install/share/po/es.po