summaryrefslogtreecommitdiffstats
path: root/perl-install/printerdrake.pm
blob: 912edc4c677989c7810e5b89a03533969cea30c9 (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
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
package printerdrake;
# $Id$

use diagnostics;
use strict;

use common;
use detect_devices;
use modules;
use network;
use log;
use printer;

1;

sub choose_printer_type {
    my ($printer, $in) = @_;
    $in->set_help('configurePrinterConnected') if $::isInstall;
    my $queue = $printer->{OLD_QUEUE};
    $printer->{str_type} = $printer::printer_type_inv{$printer->{TYPE}};
    $printer->{str_type} = 
	$in->ask_from_list_(_("Select Printer Connection"),
			    _("How is the printer connected?") .
			    ($printer->{SPOOLER} eq "cups" ?
			     _("
Printers on remote CUPS servers you do not have to configure
here; these printers will be automatically detected. Please
select \"Printer on remote CUPS server\" in this case.") : ()),
			    [ printer::printer_type($printer) ],
			    $printer->{str_type},
			    ) or return 0;
    $printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
    1;
}

sub setup_remote_cups_server {
    my ($printer, $in) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in)) {return 0};

    $in->set_help('configureRemoteCUPSServer') if $::isInstall;
    my $queue = $printer->{OLD_QUEUE};
    #- hack to handle cups remote server printing,
    #- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
    my ($server, $port, $default, $autoconf);
    # Return value: 0 when nothing was changed ("Apply" never pressed), 1
    # when "Apply" was at least pressed once.
    my $retvalue = 0;
    while (1) {
	# Read CUPS config file
	my @cupsd_conf = printer::read_cupsd_conf();
	foreach (@cupsd_conf) {
	    /^\s*BrowsePoll\s+(\S+)/ and $server = $1, last;
	}
	$server =~ /([^:]*):(.*)/ and ($server, $port) = ($1, $2);
	# Read printer list
	my @queuelist = printer::read_cups_printer_list();
	if ($#queuelist >=0) {
	    if ($printer->{DEFAULT} eq '') {
		$default = printer::get_default_printer($printer);
		if ($default) {
		    # If a CUPS system has only remote printers and no default
		    # printer defined, it defines the first printer whose
		    # broadcast signal appeared after the start of the CUPS
		    # daemon, so on every start another printer gets the
		    # default printer. To avoid this, make sure that the
		    # default printer is defined.
		    $printer->{DEFAULT} = $default;
		    printer::set_default_printer($printer);
		}
	    } else {
		$default = $printer->{DEFAULT};
	    }
	    my $queue;
	    for $queue (@queuelist) {
		if ($queue =~ /^\s*$default/) {
		    $default = $queue;
		}
	    }
	    # The default printer setting should not be "None" when there
	    # are printers
	    if ($default eq _("None")) {
		$default = _("Choose a default printer!");
	    }
	} else {
	    push(@queuelist, _("None"));
	    $default = _("None");
	}
	#- Did we have automatic or manual configuration mode for CUPS
	$autoconf = printer::get_cups_autoconf();
	#- Remember the server/port/autoconf settings to check whether the user
        #- has changed them.
	my $oldserver = $server;
	my $oldport = $port;
	my $oldautoconf = $autoconf;

        #- then ask user for this combination and rewrite /etc/cups/cupsd.conf
	#- according to new settings. There are no other point where such
	#- information is written in this file.

	if ($in->ask_from_
	    ({ title => _("Remote CUPS server"),
	       messages => _("With remote CUPS servers, you do not have to configure any 
printer here; CUPS servers inform your machine automatically
about their printers. All printers known to your machine
currently are listed in the \"Default printer\" field. Choose
the default printer for your machine there and click the
\"Apply/Re-read printers\" button. Click the same button to
refresh the list (it can take up to 30 seconds after the start
of CUPS until all remote printers are visible).
When your CUPS server is in a different network, you have to 
give the CUPS server IP address and optionally the port number
to get the printer information from the server, otherwise leave
these fields blank.") .
              ($::expert ? _("
Normally, CUPS is automatically configured according to your
network environment, so that you can access the printers on the
CUPS servers in your local network. If this does not work 
correctly, turn off \"Automatic CUPS configuration\" and edit
your file /etc/cups/cupsd.conf manually. Do not forget to restart
CUPS afterwards (command: \"service cups restart\").") : ()),
              cancel => _("Close"),
              ok => _("Apply/Re-read printers"),
	      callbacks => { complete => sub {
		 unless (!$server || network::is_ip($server)) {
		     $in->ask_warn('', 
			_("The IP address should look like 192.168.1.20"));
		     return (1,0);
		 }
		 if ($port !~ /^\d*$/) {
		     $in->ask_warn('',
			_("The port number should be an integer!"));
		     return (1,1);
		 }
		 return 0;
	     } }
	   },
	     [	
		{ label => _("Default printer"), val => \$default,
		  not_edit => 0, list => \@queuelist},
		#{ label => _("Default printer") },
		#{ val => \$default,
		#  format => \&translate, not_edit => 0, list => \@queuelist},
		{ label => _("CUPS server IP"), val => \$server },
		{ label => _("Port"), val => \$port },
		($::expert ?
		{ text => _("Automatic CUPS configuration"), type => 'bool',
		  val => \$autoconf } : ()),
		]
	     )) {
	    # We have clicked "Apply/Re-read"
	    $retvalue = 1;
	    # Set default printer
	    if ($default =~ /^\s*([^\s\(\)]+)\s*\(/) {
		$default = $1;
	    }
	    if (($default ne _("None")) &&
		($default ne _("Choose a default printer!"))) {
		$printer->{DEFAULT} = $default;
	        printer::set_default_printer($printer);
	    }
	    # Set BrowsePoll line
	    if (($server ne $oldserver) || ($port ne $oldport)) {
		$server && $port and $server = "$server:$port";
		if ($server) {
		    @cupsd_conf = 
			map { $server and 
			      s/^\s*BrowsePoll\s+(\S+)/BrowsePoll $server/ and
				  $server = '';
			      $_ } @cupsd_conf;
		    $server and push @cupsd_conf, "\nBrowsePoll $server\n";
		} else {
		    @cupsd_conf = 
			map { s/^\s*BrowsePoll\s+(\S+)/\#BrowsePoll $1/;
			      $_ } @cupsd_conf;
		}
	        printer::write_cupsd_conf(@cupsd_conf);
		sleep 3;
	    }
	    # Set auto-configuration state
	    if ($autoconf != $oldautoconf) {
	        printer::set_cups_autoconf($autoconf);
	    }
	} else {
	    last;
	}
    }
    # Save user settings for auto-install
    $printer->{BROWSEPOLLADDR} = $server;
    $printer->{BROWSEPOLLPORT} = $port;
    $printer->{MANUALCUPSCONFIG} = 1 - $autoconf;
    return $retvalue;
}

sub setup_printer_connection {
    my ($printer, $in) = @_;
    # Choose the appropriate connection config dialog
    my $done = 1;
    for ($printer->{TYPE}) {
	/LOCAL/     and setup_local    ($printer, $in) and last;
	/LPD/       and setup_lpd      ($printer, $in) and last;
	/SOCKET/    and setup_socket   ($printer, $in) and last;
	/SMB/       and setup_smb      ($printer, $in) and last;
	/NCP/       and setup_ncp      ($printer, $in) and last;
	/URI/       and setup_uri      ($printer, $in) and last;
	/POSTPIPE/  and setup_postpipe ($printer, $in) and last;
	$done = 0; last;
    }
    return $done;
}

sub auto_detect {
    my ($in) = @_;
    {
	my $w = $in->wait_message(_("Test ports"), _("Detecting devices ..."));
	modules::get_alias("usb-interface") and eval { modules::load("printer"); sleep(2); };
	foreach (qw(lp parport_pc parport_probe parport)) {
	    eval { modules::unload($_); }; #- on kernel 2.4 parport has to be unloaded to probe again
	}
	foreach (qw(parport_pc lp parport_probe)) {
	    eval { modules::load($_); }; #- take care as not available on 2.4 kernel (silent error).
	}
    }
    my $b = before_leaving { eval { modules::unload("parport_probe") } };
    detect_devices::whatPrinter();
}


sub setup_local {
    my ($printer, $in) = @_;
    my (@port, @str, $device);
    my $queue = $printer->{OLD_QUEUE};
    my @parport = auto_detect($in);
    $in->set_help('setupLocal') if $::isInstall;
    foreach (@parport) {
	$_->{val}{DESCRIPTION} and push @str, _("A printer, model \"%s\", has been detected on ",
						$_->{val}{DESCRIPTION}) . $_->{port};
    }
    if ($::expert || !@str) {
	@port = detect_devices::whatPrinterPort();
    } else {
	@port = map { $_->{port} } grep { $_->{val}{DESCRIPTION} } @parport;
    }
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^file:/)) {
	$device = $printer->{currentqueue}{'connect'};
	$device =~ s/^file://;
    } elsif ($port[0]) {
	$device = $port[0];
    }
    if ($in) {
	$::expert or $in->set_help('configurePrinterDev') if $::isInstall;
	return if !$in->ask_from(_("Local Printer Device"),
_("What device is your printer connected to 
(note that /dev/lp0 is equivalent to LPT1:)?\n") . (join "\n", @str), [
{ label => _("Printer Device"), val => \$device, list => \@port, not_edit => !$::expert } ],
complete => sub {
    unless ($device ne "") {
	$in->ask_warn('', _("Device/file name missing!"));
	return (1,0);
    }
    return 0;
}
					     );
    }

    #- make the DeviceURI from $device.
    $printer->{currentqueue}{'connect'} = "file:" . $device;

    #- Read the printer driver database if necessary
    if ((keys %printer::thedb) == 0) {
	my $w = $in->wait_message('', _("Reading printer database ..."));
        printer::read_printer_db($printer->{SPOOLER});
    }

    #- Search the database entry which matches the detected printer best
    foreach (@parport) {
	$device eq $_->{port} or next;
	my $descr = $_->{val}{DESCRIPTION};
	# Clean up the description from noise which makes the best match
	# difficult
	$descr =~ s/\s+Inc\.//;
	$descr =~ s/\s+Corp\.//;
	$descr =~ s/\s+SA\.//;
	$descr =~ s/\s+S\.\s*A\.//;
	$descr =~ s/\s+Ltd\.//;
	$descr =~ s/\s+International//;
	$descr =~ s/\s+Int\.//;
	$descr =~ s/\s+\(?[Pp]rinter\)?$//;
	
        $printer->{DBENTRY} =
            bestMatchSentence ($descr, keys %printer::thedb);
        # If the manufacturer was not guessed correctly, discard the
        # guess.
        $printer->{DBENTRY} =~ /^([^\|]+)\|/;
        my $guessedmake = lc($1);
        if (($descr !~ /$guessedmake/i) &&
            (($guessedmake ne "hp") ||
             ($descr !~ /Hewlett[\s-]+Packard/i)))
            {$printer->{DBENTRY} = ""};
    }
    1;
}

sub setup_lpd {
    my ($printer, $in) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in)) {return 0};

    $in->set_help('setupLPD') if $::isInstall;
    my ($uri, $remotehost, $remotequeue);
    my $queue = $printer->{OLD_QUEUE};
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^lpd:/)) {
	$uri = $printer->{currentqueue}{'connect'};
	$uri =~ m!^\s*lpd://([^/]+)/([^/]+)/?\s*$!;
	$remotehost = $1;
	$remotequeue = $2;
    } else {
	$remotehost = "";
	$remotequeue = "lp";
    }

    return if !$in->ask_from(_("Remote lpd Printer Options"),
_("To use a remote lpd printer, you need to supply
the hostname of the printer server and the printer name
on that server."), [
{ label => _("Remote host name"), val => \$remotehost },
{ label => _("Remote printer name"), val => \$remotequeue } ],
complete => sub {
    unless ($remotehost ne "") {
	$in->ask_warn('', _("Remote host name missing!"));
	return (1,0);
    }
    unless ($remotequeue ne "") {
	$in->ask_warn('', _("Remote printer name missing!"));
	return (1,1);
    }
    return 0;
}
			      );
    #- make the DeviceURI from user input.
    $printer->{currentqueue}{'connect'} = 
        "lpd://$remotehost/$remotequeue";

    #- LPD does not support filtered queues to a remote LPD server by itself
    #- It needs an additional program as "rlpr"
    if (($printer->{SPOOLER} eq 'lpd') && (!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/rlpr))))) {
        $in->do_pkgs->install('rlpr');
    }

    1;
}

sub setup_smb {
    my ($printer, $in) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in)) {return 0};

    $in->set_help('setupSMB') if $::isInstall;
    my ($uri, $smbuser, $smbpassword, $workgroup, $smbserver, $smbserverip, $smbshare);
    my $queue = $printer->{OLD_QUEUE};
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^smb:/)) {
	$uri = $printer->{currentqueue}{'connect'};
	$uri =~ m!^\s*smb://(.*)$!;
	my $parameters = $1;
	# Get the user's login and password from the URI
	if ($parameters =~ m!([^@]*)@([^@]+)!) {
	    my $login = $1;
	    $parameters = $2;
	    if ($login =~ m!([^:]*):([^:]*)!) {
		$smbuser = $1;
		$smbpassword = $2;
	    } else {
		$smbuser = $login;
		$smbpassword = "";
	    }
	} else {
	    $smbuser = "";
	    $smbpassword = "";
	}
	# Get the workgroup, server, and share name
	if ($parameters =~ m!([^/]*)/([^/]+)/([^/]+)$!) {
	    $workgroup = $1;
	    $smbserver = $2;
	    $smbshare = $3;
	} elsif ($parameters =~ m!([^/]+)/([^/]+)$!) {
	    $workgroup = "";
	    $smbserver = $1;
	    $smbshare = $2;
	} else {
	    die "The \"smb://\" URI must at least contain the server name and the share name!\n";
	}
	if (network::is_ip($smbserver)) {
	    $smbserverip = $smbserver;
	    $smbserver = "";
	}
    }

    return if !$in->ask_from(_("SMB (Windows 9x/NT) Printer Options"),
_("To print to a SMB printer, you need to provide the
SMB host name (Note! It may be different from its
TCP/IP hostname!) and possibly the IP address of the print server, as
well as the share name for the printer you wish to access and any
applicable user name, password, and workgroup information."), [
{ label => _("SMB server host"), val => \$smbserver },
{ label => _("SMB server IP"), val => \$smbserverip },
{ label => _("Share name"), val => \$smbshare },
{ label => _("User name"), val => \$smbuser },
{ label => _("Password"), val => \$smbpassword, hidden => 1 },
{ label => _("Workgroup"), val => \$workgroup }, ],
complete => sub {
    unless ((network::is_ip($smbserverip)) || ($smbserverip eq "")) {
	$in->ask_warn('', _("IP address should be in format 1.2.3.4"));
	return (1,1);
    }
    unless (($smbserver ne "") || ($smbserverip ne "")) {
	$in->ask_warn('', _("Either the server name or the server's IP must be given!"));
	return (1,0);
    }
    unless ($smbshare ne "") {
	$in->ask_warn('', _("Samba share name missing!"));
	return (1,2);
    }
    return 0;
}
    );
    #- make the DeviceURI from, try to probe for available variable to
    #- build a suitable URI.
    $printer->{currentqueue}{'connect'} =
    join '', ("smb://", ($smbuser && ($smbuser . 
    ($smbpassword && ":$smbpassword") . "@")), ($workgroup && ("$workgroup/")),
    ($smbserver || $smbserverip), "/$smbshare");

    if ((!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/smbclient))))) {
	$in->do_pkgs->install('samba-client');
    }
    $printer->{SPOOLER} eq 'cups' and printer::restart_queue($printer);
    1;
}

sub setup_ncp {
    my ($printer, $in) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in)) {return 0};

    $in->set_help('setupNCP') if $::isInstall;
    my ($uri, $ncpuser, $ncppassword, $ncpserver, $ncpqueue);
    my $queue = $printer->{OLD_QUEUE};
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^ncp:/)) {
	$uri = $printer->{currentqueue}{'connect'};
	my $parameters = $uri =~ m!^\s*ncp://(.*)$!;
	# Get the user's login and password from the URI
	if ($parameters =~ m!([^@]*)@([^@]+)!) {
	    my $login = $1;
	    $parameters = $2;
	    if ($login =~ m!([^:]*):([^:]*)!) {
		$ncpuser = $1;
		$ncppassword = $2;
	    } else {
		$ncpuser = $login;
		$ncppassword = "";
	    }
	} else {
	    $ncpuser = "";
	    $ncppassword = "";
	}
	# Get the workgroup, server, and share name
	if ($parameters =~ m!([^/]+)/([^/]+)$!) {
	    $ncpserver = $1;
	    $ncpqueue = $2;
	} else {
	    die "The \"ncp://\" URI must at least contain the server name and the share name!\n";
	}
    }

    return if !$in->ask_from(_("NetWare Printer Options"),
_("To print on a NetWare printer, you need to provide the
NetWare print server name (Note! it may be different from its
TCP/IP hostname!) as well as the print queue name for the printer you
wish to access and any applicable user name and password."), [
{ label => _("Printer Server"), val => \$ncpserver },
{ label => _("Print Queue Name"), val => \$ncpqueue },
{ label => _("User name"), val => \$ncpuser },
{ label => _("Password"), val => \$ncppassword, hidden => 1 } ],
complete => sub {
    unless ($ncpserver ne "") {
	$in->ask_warn('', _("NCP server name missing!"));
	return (1,0);
    }
    unless ($ncpqueue ne "") {
	$in->ask_warn('', _("NCP queue name missing!"));
	return (1,1);
    }
    return 0;
}
					);
    # Generate the Foomatic URI
    $printer->{currentqueue}{'connect'} =
    join '', ("ncp://", ($ncpuser && ($ncpuser . 
    ($ncppassword && ":$ncppassword") . "@")),
    "$ncpserver/$ncpqueue");

    if ((!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/nprint))))) {
	$in->do_pkgs->install('ncpfs');
    }

    1;
}

sub setup_socket {
    my ($printer, $in) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in)) {return 0};

    $in->set_help('setupSocket') if $::isInstall;
    my ($hostname, $port, $uri, $remotehost,$remoteport);
    my $queue = $printer->{OLD_QUEUE};
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^socket:/)) {
	$uri = $printer->{currentqueue}{'connect'};
	($remotehost, $remoteport) = $uri =~ m!^\s*socket://([^/:]+):([0-9]+)/?\s*$!;
    } else {
	$remotehost = "";
	$remoteport = "9100";
    }

    return if !$in->ask_from(_("Socket Printer Options"),
_("To print to a socket printer, you need to provide the
host name of the printer and optionally the port number.
On HP JetDirect servers the port number is usually 9100,
on other servers it can vary. See the manual of your
hardware."), [
{ label => _("Printer host name"), val => \$remotehost },
{ label => _("Port"), val => \$remoteport } ],
complete => sub {
    unless ($remotehost ne "") {
	$in->ask_warn('', _("Printer host name missing!"));
	return (1,0);
    }
    unless ($remoteport =~ /^[0-9]+$/) {
	$in->ask_warn('', _("The port number should be an integer!"));
	return (1,1);
    }
    return 0;
}
					 );

    #- make the Foomatic URI
    $printer->{currentqueue}{'connect'} = 
    join '', ("socket://$remotehost", $remoteport ? (":$remoteport") : ());

    #- LPD and LPRng need netcat ('nc') to access to socket printers
    if ((($printer->{SPOOLER} eq 'lpd') || ($printer->{SPOOLER} eq 'lprng'))&& 
        (!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/nc))))) {
        $in->do_pkgs->install('nc');
    }

    1;
}

sub setup_uri {
    my ($printer, $in) = @_;

    $in->set_help('setupURI') if $::isInstall;
    return if !$in->ask_from(_("Printer Device URI"),
_("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [
{ label => _("Printer Device URI"),
val => \$printer->{currentqueue}{'connect'},
list => [ $printer->{currentqueue}{'connect'},
	  "file:/",
	  "http://",
	  "ipp://",
	  "lpd://",
	  "smb://",
	  "ncp://",
	  "socket://",
	  "postpipe:\"\"",
	  ], not_edit => 0 }, ],
complete => sub {
    unless ($printer->{currentqueue}{'connect'} =~ /[^:]+:.+/) {
	$in->ask_warn('', _("A valid URI must be entered!"));
	return (1,0);
    }
    return 0;
}
    );

    # Non-local printer, check network and abort if no network available
    if (($printer->{currentqueue}{'connect'} !~ m!^file:/!) &&
        (!check_network($printer, $in))) {return 0};

    # If the chosen protocol needs additional software, install it.

    # LPD does not support filtered queues to a remote LPD server by itself
    # It needs an additional program as "rlpr"
    if (($printer->{currentqueue}{'connect'} =~ /^lpd:/) &&
	($printer->{SPOOLER} eq 'lpd') && (!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/rlpr))))) {
        $in->do_pkgs->install('rlpr');
    }
    if (($printer->{currentqueue}{'connect'} =~ /^smb:/) &&
        (!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/smbclient))))) {
	$in->do_pkgs->install('samba-client');
    }
    if (($printer->{currentqueue}{'connect'} =~ /^ncp:/) &&
	(!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/nprint))))) {
	$in->do_pkgs->install('ncpfs');
    }
    #- LPD and LPRng need netcat ('nc') to access to socket printers
    if (($printer->{currentqueue}{'connect'} =~ /^socket:/) &&
	(($printer->{SPOOLER} eq 'lpd') || ($printer->{SPOOLER} eq 'lprng')) &&
        (!$::testing) &&
        (!printer::files_exist((qw(/usr/bin/nc))))) {
        $in->do_pkgs->install('nc');
    }
    1;
}

sub setup_postpipe {
    my ($printer, $in) = @_;

    $in->set_help('setupPostpipe') if $::isInstall;
    my $uri;
    my $commandline;
    my $queue = $printer->{OLD_QUEUE};
    if (($printer->{configured}{$queue}) &&
	($printer->{currentqueue}{'connect'} =~ m/^postpipe:/)) {
	$uri = $printer->{currentqueue}{'connect'};
	$uri =~ m!^\s*postpipe:\"(.*)\"$!;
	$commandline = $1;
    } else {
	$commandline = "";
    }

    return if !$in->ask_from(_("Pipe into command"),
_("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [
{ label => _("Command line"),
val => \$commandline }, ],
complete => sub {
    unless ($commandline ne "") {
	$in->ask_warn('', _("A command line must be entered!"));
	return (1,0);
    }
    return 0;
}
);

    #- make the Foomatic URI
    $printer->{currentqueue}{'connect'} = "postpipe:$commandline";
    
    1;
}

sub choose_printer_name {
    my ($printer, $in) = @_;
    # Name, description, location
    $in->set_help('setupPrinterName') if $::isInstall;
    my $default = $printer->{currentqueue}{'queue'};
    $in->ask_from_
	(
	 { title => _("Enter Printer Name and Comments"),
	   #cancel => !$printer->{configured}{$queue} ? '' : _("Remove queue"),
	   callbacks => { complete => sub {
	       unless ($printer->{currentqueue}{'queue'} =~ /^\w+$/) {
		   $in->ask_warn('', _("Name of printer should contain only letters, numbers and the underscore"));
		   return (1,0);
	       }
	       if (($printer->{configured}{$printer->{currentqueue}{'queue'}})
		   && ($printer->{currentqueue}{'queue'} ne $default) && 
		   (!$in->ask_yesorno('', _("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
					    $printer->{currentqueue}{'queue'}),
				      0))) {
		   return (1,0); # Let the user correct the name
	       }
	       return 0;
	   },
		      },
	   messages =>
_("Every printer needs a name (for example lp).
The Description and Location fields do not need 
to be filled in. They are comments for the users.") }, 
	 [ { label => _("Name of printer"), val => \$printer->{currentqueue}{'queue'} },
	   { label => _("Description"), val => \$printer->{currentqueue}{'desc'} },
	   { label => _("Location"), val => \$printer->{currentqueue}{'loc'} },
	 ]) or return 0;

    $printer->{QUEUE} = $printer->{currentqueue}{'queue'};
    1;
}

sub get_db_entry {
    my ($printer, $in) = @_;
    #- Read the printer driver database if necessary
    if ((keys %printer::thedb) == 0) {
	my $w = $in->wait_message('', _("Reading printer database ..."));
        printer::read_printer_db($printer->{SPOOLER});
    }
    my $w = $in->wait_message('', _("Preparing printer database ..."));
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue}) {
	# The queue was already configured
	if ($printer->{configured}{$queue}{'queuedata'}{'foomatic'}) {
	    # The queue was configured with Foomatic
	    my $driverstr;
	    if ($printer->{configured}{$queue}{'queuedata'}{'driver'} eq "Postscript") {
		$driverstr = "PostScript";
	    } else {
		$driverstr = "GhostScript + $printer->{configured}{$queue}{'queuedata'}{'driver'}";
	    }
	    my $make = uc($printer->{configured}{$queue}{'queuedata'}{'make'});
	    my $model =	$printer->{configured}{$queue}{'queuedata'}{'model'};
	    if ($::expert) {
		$printer->{DBENTRY} = "$make|$model|$driverstr";
		# database key contains the "(recommended)" for the
		# recommended driver, so add it if necessary
		if (!($printer::thedb{$printer->{DBENTRY}}{printer})) {
		    $printer->{DBENTRY} .= " (recommended)";
		}
	    } else {
		$printer->{DBENTRY} = "$make|$model";
	    }
	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
	} elsif (($printer->{SPOOLER} eq "cups") && ($::expert) &&
		 ($printer->{configured}{$queue}{'queuedata'}{'ppd'})) {
	    # Do we have a native CUPS driver or a PostScript PPD file?
	    $printer->{DBENTRY} = printer::get_descr_from_ppd($printer) || $printer->{DBENTRY};
	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
	} else {
	    # Point the list cursor at least to manufacturer and model of the
	    # printer
	    $printer->{DBENTRY} = "";
	    my $make = uc($printer->{configured}{$queue}{'queuedata'}{'make'});
	    my $model = $printer->{configured}{$queue}{'queuedata'}{'model'};
	    my $key;
	    for $key (keys %printer::thedb) {
		if ((($::expert) && ($key =~ /^$make\|$model\|.*\(recommended\)$/)) ||
		    ((!$::expert) && ($key =~ /^$make\|$model$/))) {
		    $printer->{DBENTRY} = $key;
		}
	    }
	    if ($printer->{DBENTRY} eq "") {
		# Exact match of make and model did not work, try to clean
		# up the model name
		$model =~ s/PS//;
		$model =~ s/PostScript//;
		$model =~ s/Series//;
		for $key (keys %printer::thedb) {
		    if ((($::expert) && ($key =~ /^$make\|$model\|.*\(recommended\)$/)) ||
			((!$::expert) && ($key =~ /^$make\|$model$/))) {
			$printer->{DBENTRY} = $key;
		    }
		}
	    }
	    if (($printer->{DBENTRY} eq "") && ($make ne "")) {
		# Exact match with cleaned-up model did not work, try a best match
		my $matchstr = "$make|$model";
		$printer->{DBENTRY} = bestMatchSentence($matchstr, keys %printer::thedb);
		# If the manufacturer was not guessed correctly, discard the
		# guess.
		$printer->{DBENTRY} =~ /^([^\|]+)\|/;
		my $guessedmake = lc($1);
		if (($matchstr !~ /$guessedmake/i) &&
		    (($guessedmake ne "hp") ||
		     ($matchstr !~ /Hewlett[\s-]+Packard/i)))
		{$printer->{DBENTRY} = ""};
	    }
	    # Set the OLD_CHOICE to a non-existing value
	    $printer->{OLD_CHOICE} = "XXX";
	}
    } else {
	if (($::expert) && ($printer->{DBENTRY} !~ /(recommended)/)) {
	    my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
	    for my $key (keys %printer::thedb) {
		if ($key =~ /^$make\|$model\|.*\(recommended\)$/) {
		    $printer->{DBENTRY} = $key;
		}
	    }
	}
	$printer->{OLD_CHOICE} = $printer->{DBENTRY};
    }
}

sub choose_model {
    my ($printer, $in) = @_;
    $in->set_help('chooseModel') if $::isInstall;
    #- Read the printer driver database if necessary
    if ((keys %printer::thedb) == 0) {
	my $w = $in->wait_message('', _("Reading printer database ..."));
        printer::read_printer_db($printer->{SPOOLER});
    }
    if (!$printer::thedb{$printer->{DBENTRY}}) {
	$printer->{DBENTRY} = _("Raw printer (No driver)");
    }
    # Choose the printer/driver from the list
    return ($printer->{DBENTRY} = $in->ask_from_treelist(_("Printer model selection"),
							 _("Which printer model do you have?") .
							 _("

Please check whether Printerdrake did the 
auto-detection of your printer model
correctly. Search the correct model in the
list when the cursor is standing on a 
wrong model or on \"Raw printer\"."), '|',
							 [ keys %printer::thedb ], $printer->{DBENTRY}));

}

sub get_printer_info {
    my ($printer, $in) = @_;
    #- Read the printer driver database if necessary
    #if ((keys %printer::thedb) == 0) {
    #    my $w = $in->wait_message('', _("Reading printer database ..."));
    #    printer::read_printer_db($printer->{SPOOLER});
    #}
    my $queue = $printer->{OLD_QUEUE};
    my $oldchoice = $printer->{OLD_CHOICE};
    my $newdriver = 0;
    if ((!$printer->{configured}{$queue}) ||      # New queue  or
	(($oldchoice) && ($printer->{DBENTRY}) && # make/model/driver changed
	 (($oldchoice ne $printer->{DBENTRY}) ||
	  ($printer->{currentqueue}{'driver'} ne 
	   $printer::thedb{$printer->{DBENTRY}}{'driver'})))) {
	delete($printer->{currentqueue}{printer});
	delete($printer->{currentqueue}{ppd});
	$printer->{currentqueue}{foomatic} = 0;
	# Read info from printer database
	foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way...
	    $printer->{currentqueue}{$_} = $printer::thedb{$printer->{DBENTRY}}{$_};
	}
	$newdriver = 1;
    }
    # Use the "printer" and not the "foomatic" field to identify a Foomatic
    # queue because in a new queue "foomatic" is not set yet.
    if (($printer->{currentqueue}{'printer'}) || # We have a Foomatic queue
	($printer->{currentqueue}{'ppd'})) { # We have a CUPS+PPD queue
	if ($printer->{currentqueue}{'printer'}) { # Foomatic queue?
	    # In case of a new queue "foomatic" was not set yet
	    $printer->{currentqueue}{'foomatic'} = 1;
	    # Now get the options for this printer/driver combo
	    if (($printer->{configured}{$queue}) && ($printer->{configured}{$queue}{'queuedata'}{'foomatic'})) {
		# The queue was already configured with Foomatic ...
		if (!$newdriver) {
		    # ... and the user didn't change the printer/driver
		    $printer->{ARGS} = $printer->{configured}{$queue}{'args'};
		} else {
		    # ... and the user has chosen another printer/driver
		    $printer->{ARGS} = printer::read_foomatic_options($printer);
		}
	    } else {
		# The queue was not configured with Foomatic before
		# Set some special options
		$printer->{SPECIAL_OPTIONS} = '';
		# Default page size depending on the country/language
		# (US/Canada -> Letter, Others -> A4)
		my $pagesize;
		if ($printer->{PAPERSIZE}) {
		    $printer->{SPECIAL_OPTIONS} .= 
			" -o PageSize=$printer->{PAPERSIZE}";
		} elsif (($in->{lang}) ||
			 ($pagesize = $ENV{'LC_PAPER'}) ||
			 ($pagesize = $ENV{'LANG'}) ||
			 ($pagesize = $ENV{'LANGUAGE'}) ||
			 ($pagesize = $ENV{'LC_ALL'})) {
		    if (($pagesize eq 'en') || ($pagesize eq 'en_US')) {
			$pagesize = "Letter";
		    } else {
			$pagesize = "A4";
		    }
		    $printer->{SPECIAL_OPTIONS} .= 
			" -o PageSize=$pagesize";
		}
		# oki4w driver -> OKI winprinter which needs the
		# oki4daemon to work
		if ($printer->{currentqueue}{'driver'} eq 'oki4w') {
		    if ($printer->{currentqueue}{'connect'} ne 
			'file:/dev/lp0') {
			$in->ask_warn(_("OKI winprinter configuration"),
				      _("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they
work only when connected to the first parallel port. When
your printer is connected to another port or to a print
server box please connect the printer to the first parallel
port before you print a test page. Otherwise the printer
will not work. Your connection type setting will be ignored
by the driver."));
		    }
		    $printer->{currentqueue}{'connect'} = 'file:/dev/null';
		    # Start the oki4daemon
		    printer::start_service_on_boot('oki4daemon');
		    printer::start_service('oki4daemon');
		    # Set permissions
		    if ($printer->{SPOOLER} eq 'cups') {
			printer::set_permissions('/dev/oki4drv', '660', 'lp',
						 'sys');
		    } elsif ($printer->{SPOOLER} eq 'pdq') {
			printer::set_permissions('/dev/oki4drv', '666');
		    } else {
			printer::set_permissions('/dev/oki4drv', '660', 'lp',
						 'lp');
		    }
		} elsif ($printer->{currentqueue}{'driver'} eq 'lexmarkinkjet') {
		    # Set "Port" option
		    if ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/lp0') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=ParPort1";
		    } elsif ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/lp1') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=ParPort2";
		    } elsif ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/lp2') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=ParPort3";
		    } elsif ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/usb/lp0') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=USB1";
		    } elsif ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/usb/lp1') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=USB2";
		    } elsif ($printer->{currentqueue}{'connect'} eq 
			'file:/dev/usb/lp2') {
			$printer->{SPECIAL_OPTIONS} .= 
			    " -o Port=USB3";
		    } else {
			$in->ask_warn(_("Lexmark inkjet configuration"),
				      _("The inkjet printer drivers provided by Lexmark only support
local printers, no printers on remote machines or print server
boxes. Please connect your printer to a local port or
configure it on the machine where it is connected to."));
			return 0;
		    }
		    # Set device permissions
		    $printer->{currentqueue}{'connect'} =~ /^\s*file:(\S*)\s*$/;
		    if ($printer->{SPOOLER} eq 'cups') {
			printer::set_permissions($1, '660', 'lp', 'sys');
		    } elsif ($printer->{SPOOLER} eq 'pdq') {
			printer::set_permissions($1, '666');
		    } else {
			printer::set_permissions($1, '660', 'lp', 'lp');
		    }
		    # This is needed to have the device not blocked by the
		    # spooler backend.
		    $printer->{currentqueue}{'connect'} = 'file:/dev/null';
		    #install packages
		    my $drivertype = $printer->{currentqueue}{'model'};
		    if ($drivertype eq 'Z22') {$drivertype = 'Z32';}
		    if ($drivertype eq 'Z23') {$drivertype = 'Z33';}
		    $drivertype = lc($drivertype);
		    if (!printer::files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
			eval { $in->do_pkgs->install("lexmark-drivers-$drivertype") };
		    }
		    if (!printer::files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
			# Driver installation failed, probably we do not have
			# the commercial CDs
			$in->ask_warn(_("Lexmark inkjet configuration"),
				      _("To be able to print with your Lexmark inkjet and this
configuration, you need the inkjet printer drivers
provided by Lexmark (http://www.lexmark.com/). Go to
the US site and click on the \"Drivers\" button. Then
choose your model and afterwards \"Linux\" as
operating system. The drivers come as RPM packages
or shell scripts with interactive graphical installation.
You do not need to do this configuration by the
graphical frontends. Cancel directly after the license
agreement. Then print printhead alignment pages with
\"lexmarkmaintain\" and adjust the head alignment
settings with this program."));
		    }
		}
		$printer->{ARGS} = printer::read_foomatic_options($printer);
		delete($printer->{SPECIAL_OPTIONS});
	    }
	} elsif ($printer->{currentqueue}{'ppd'}) { # CUPS+PPD queue?
	    # If we had a Foomatic queue before, unmark the flag and initialize
	    # the "printer" and "driver" fields
	    $printer->{currentqueue}{'foomatic'} = 0;
	    $printer->{currentqueue}{'printer'} = undef;
	    $printer->{currentqueue}{'driver'} = "CUPS/PPD";
	    # Now get the options from this PPD file
	    if ($printer->{configured}{$queue}) {
		# The queue was already configured
		if ((!$printer->{DBENTRY}) || (!$oldchoice) ||
		    ($printer->{DBENTRY} eq $oldchoice)) {
		    # ... and the user didn't change the printer/driver
		    $printer->{ARGS} = printer::read_cups_options($queue);
		} else {
		    # ... and the user has chosen another printer/driver
		    $printer->{ARGS} = printer::read_cups_options("/usr/share/cups/model/$printer->{currentqueue}{ppd}");
		}
	    } else {
		# The queue was not configured before
		$printer->{ARGS} = printer::read_cups_options("/usr/share/cups/model/$printer->{currentqueue}{ppd}");
	    }
	}
    }
    1;
}

sub setup_options {
    my ($printer, $in) = @_;
    $in->set_help('setupOptions') if $::isInstall;
    if (($printer->{currentqueue}{'printer'}) || # We have a Foomatic queue
	($printer->{currentqueue}{'ppd'})) { # We have a CUPS+PPD queue
	# Set up the widgets for the option dialog
	my @widgets;
	my @userinputs;
	my @choicelists;
	my @shortchoicelists;
	my $i;
	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
	    my $optshortdefault = $printer->{ARGS}[$i]{'default'};
	    if ($printer->{ARGS}[$i]{'type'} eq 'enum') {
		# enumerated option
		push(@choicelists, []);
		push(@shortchoicelists, []);
		my $choice;
		for $choice (@{$printer->{ARGS}[$i]{'vals'}}) {
		    push(@{$choicelists[$i]}, $choice->{'comment'});
		    push(@{$shortchoicelists[$i]}, $choice->{'value'});
		    if ($choice->{'value'} eq $optshortdefault) {
			push(@userinputs, $choice->{'comment'});
		    }
		}
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{'comment'}, 
		       val => \$userinputs[$i], 
		       not_edit => 1,
		       list => \@{$choicelists[$i]} });
	    } elsif ($printer->{ARGS}[$i]{'type'} eq 'bool') {
		# boolean option
		push(@choicelists, [$printer->{ARGS}[$i]{'name'}, 
				    $printer->{ARGS}[$i]{'name_false'}]);
		push(@shortchoicelists, []);
		push(@userinputs, $choicelists[$i][1-$optshortdefault]);
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{'comment'},
		       val => \$userinputs[$i],
		       not_edit => 1,
		       list => \@{$choicelists[$i]} });
	    } else {
		# numerical option
		push(@choicelists, []);
		push(@shortchoicelists, []);
		push(@userinputs, $optshortdefault);
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{'comment'} . 
			   " ($printer->{ARGS}[$i]{'min'} ... " .
			       "$printer->{ARGS}[$i]{'max'})",
			       #type => 'range',
			       #min => $printer->{ARGS}[$i]{'min'},
			       #max => $printer->{ARGS}[$i]{'max'},
			       val => \$userinputs[$i] } );
	    }
	}
	# Show the options dialog. The call-back function does a
	# range check of the numerical options.
	my $windowtitle = "$printer->{currentqueue}{'make'} $printer->{currentqueue}{'model'}";
	if ($::expert) {
	    my $driver = undef;
	    if ($driver = $printer->{currentqueue}{driver}) {
		if ($printer->{currentqueue}{foomatic}) {
		    if ($driver eq 'Postscript') {
			$driver = "PostScript";
		    } else {
			$driver = "GhostScript + $driver";
		    }
		} elsif ($printer->{currentqueue}{ppd}) {
		    if ($printer->{DBENTRY}) {
			$printer->{DBENTRY} =~ /^[^\|]*\|[^\|]*\|(.*)$/;
			$driver = $1;
		    } else {
			$driver = printer::get_descr_from_ppd($printer);
			if ($driver =~ /^[^\|]*\|[^\|]*$/) { # No driver info
			    $driver = "CUPS/PPD";
			} else {
			    $driver =~ /^[^\|]*\|[^\|]*\|(.*)$/;
			    $driver = $1;
			}
		    }
		}
	    } 
	    if ($driver) {
		$windowtitle .= ", $driver";
	    }
	}
	return 0 if !$in->ask_from
	    ($windowtitle,
	     _("Printer default settings
You should make sure that the page size and the
ink type (if available) are set correctly. Note
that with a very high printout quality printing
can get substantially slower."),
	     \@widgets,
	     complete => sub {
		 my $i;
		 for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
		     if (($printer->{ARGS}[$i]{'type'} eq 'int') || ($printer->{ARGS}[$i]{'type'} eq 'float')) {
			 unless (($printer->{ARGS}[$i]{'type'} ne 'int') || ($userinputs[$i] =~ /^[\-\+]?[0-9]+$/)) {
			     $in->ask_warn('', _("Option %s must be an integer number!", $printer->{ARGS}[$i]{'comment'}));
			     return (1, $i);
			 }
			 unless (($printer->{ARGS}[$i]{'type'} ne 'float') || ($userinputs[$i] =~ /^[\-\+]?[0-9\.]+$/)) {
			     $in->ask_warn('', _("Option %s must be a number!", $printer->{ARGS}[$i]{'comment'}));
			     return (1, $i);
			 }
			 unless (($userinputs[$i] >= $printer->{ARGS}[$i]{'min'}) &&
				 ($userinputs[$i] <= $printer->{ARGS}[$i]{'max'})) {
			     $in->ask_warn('', _("Option %s out of range!", $printer->{ARGS}[$i]{'comment'}));
			     return (1, $i);
			 }
		     }
		 }
		 return (0);
	     } );
	# Read out the user's choices
	@{$printer->{currentqueue}{options}} = ();
	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
	    push(@{$printer->{currentqueue}{options}}, "-o");
	    if ($printer->{ARGS}[$i]{'type'} eq 'enum') {
		# enumerated option
		my $j;
		for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) {
		    if ($choicelists[$i][$j] eq $userinputs[$i]) {
			push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{'name'} . "=". $shortchoicelists[$i][$j]);
		    }
		}
	    } elsif ($printer->{ARGS}[$i]{'type'} eq 'bool') {
		# boolean option
		push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{'name'} . "=".
		     (($choicelists[$i][0] eq $userinputs[$i]) ? "1" : "0"));
	    } else {
		# numerical option
		push(@{$printer->{currentqueue}{options}}, $printer->{ARGS}[$i]{'name'} . "=" . $userinputs[$i]);
	    }
	}
    }
    1;
}

sub setasdefault {
    my ($printer, $in) = @_;
    $in->set_help('setupAsDefault') if $::isInstall;
    if (($printer->{DEFAULT} eq '') || # We have no default printer,
	                               # so set the current one as default
	($in->ask_yesorno('', _("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 1))) { # Ask the user
	$printer->{DEFAULT} = $printer->{QUEUE};
        printer::set_default_printer($printer);
    }
}
	
sub print_testpages {
    my ($printer, $in, $upNetwork) = @_;
    $in->set_help('printTestPages') if $::isInstall;
    # print test pages
    my $standard = 1;
    my $altletter = 0;
    my $alta4 = 0;
    my $photo = 0;
    my $ascii = 0;
    if ($in->ask_from_
	({ title => _("Test pages"),
	   messages => _("Please select the test pages you want to print.
Note: the photo test page can take a rather long time to get printed
and on laser printers with too low memory it can even not come out.
In most cases it is enough to print the standard test page."),
          cancel => ($printer->{configured}{$printer->{OLD_QUEUE}} ?
		     _("Cancel") : _("No test pages")),
          ok => _("Print")},
	 [
	  { text => _("Standard test page"), type => 'bool',
	    val => \$standard },
	  ($::expert ?
	   { text => _("Alternative test page (Letter)"), type => 'bool', 
	     val => \$altletter } : ()),
	  ($::expert ?
	   { text => _("Alternative test page (A4)"), type => 'bool', 
	     val => \$alta4 } : ()), 
	  { text => _("Photo test page"), type => 'bool', val => \$photo }
	  #{ text => _("Plain text test page"), type => 'bool',
	  #  val => \$ascii }
	  ])) {
	my @lpq_output;
	{
	    my $w = $in->wait_message('', _("Printing test page(s)..."));
	    
	    $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) };
	    my $stdtestpage = "/usr/share/printer-testpages/testprint.ps";
	    my $altlttestpage = "/usr/share/printer-testpages/testpage.ps";
	    my $alta4testpage = "/usr/share/printer-testpages/testpage-a4.ps";
	    my $phototestpage = "/usr/share/printer-testpages/photo-testpage.jpg";
	    my $asciitestpage = "/usr/share/printer-testpages/testpage.asc";
	    my @testpages;
	    # Install the filter to convert the photo test page to PS
	    if (($photo) && (!$::testing) &&
		(!printer::files_exist((qw(/usr/bin/convert))))) {
		$in->do_pkgs->install('ImageMagick');
	    }
	    # set up list of pages to print
	    $standard && push (@testpages, $stdtestpage);
	    $altletter && push (@testpages, $altlttestpage);
	    $alta4 && push (@testpages, $alta4testpage);
	    $photo && push (@testpages, $phototestpage);
	    $ascii && push (@testpages, $asciitestpage);
	    # print the stuff
	    @lpq_output = printer::print_pages($printer, @testpages);
	}
	my $dialogtext;
	if (@lpq_output) {
	    $dialogtext = _("Test page(s) have been sent to the printer.
It may take some time before the printer starts.
Printing status:\n%s\n\n", @lpq_output);
	} else {
	    $dialogtext = _("Test page(s) have been sent to the printer.
It may take some time before the printer starts.\n");
	}
	if ($printer->{NEW} == 0) {
	    $in->ask_warn('',$dialogtext);
	    return 1;
	} else {
	    $in->ask_yesorno('',$dialogtext . _("Did it work properly?"), 1) 
		and return 1;
	}
    } else {
	return 1;
    }
    return 0;
}

sub printer_help {
    my ($printer, $in) = @_;
    my $spooler = $printer->{SPOOLER};
    my $queue = $printer->{QUEUE};
    my $default = $printer->{DEFAULT};
    my $raw = 0;
    if (($printer->{configured}{$queue}{'queuedata'}{'model'} eq
	 _("Unknown model")) ||
	($printer->{configured}{$queue}{'queuedata'}{'model'} eq
	 _("Raw printer"))) {
	$raw = 1;
    }
    #my $foomatic = $printer->{configured}{$queue}{queuedata}{foomatic};
    #my $ppd = $printer->{configured}{$queue}{queuedata}{ppd};
    my $dialogtext;
    if ($spooler eq "cups") {
	$dialogtext =
_("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"qtcups <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
_("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
_("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
_("To get a list of the options available for the current printer read either the list shown below or click on the \"Print option list\" button.

") . printer::lphelp_output($printer) : "");
    } elsif ($spooler eq "lprng") {
	$dialogtext =
_("To print a file from the command line (terminal window) use the command \"%s <file>\".
", ($queue ne $default ? "lpr -P $queue" : "lpr")) . 
_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
_("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) .
_("To get a list of the options available for the current printer click on the \"Print option list\" button.

") : "");
    } elsif ($spooler eq "lpd") {
	$dialogtext =
_("To print a file from the command line (terminal window) use the command \"%s <file>\".
", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
_("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
_("To get a list of the options available for the current printer click on the \"Print option list\" button.

") : "");
    } elsif ($spooler eq "pdq") {
	$dialogtext =
_("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".
", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) .
_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
_("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.
If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams.
") .
(!$raw ?
_("
The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\".
", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) .
_("To get a list of the options available for the current printer read either the list shown below or click on the \"Print option list\" button.

") . printer::pdqhelp_output($printer) : "");
    }
    if (!$raw) {
        my $choice;
        while ($choice ne _("Close")) {
	    $choice = $in->ask_from_list_
	        (_("Printing on the printer \"%s\"", $queue),
		 $dialogtext,
		 [ _("Print option list"), _("Close") ],
		 _("Close"));
	    if ($choice ne _("Close")) {
		my $w = $in->wait_message('', _("Printing test page(s)..."));
	        printer::print_optionlist($printer);
	    }
	}
    } else {
	$in->ask_warn('',$dialogtext);
    }
}

sub copy_queues_from {
    my ($printer, $in, $oldspooler) = @_;

    $in->set_help('copyQueues') if $::isInstall;
    my $newspooler = $printer->{SPOOLER};
    my @oldqueues;
    my @queueentries;
    my @queuesselected;
    my $newspoolerstr;
    my $oldspoolerstr;
    my $noninteractive = 0;
    {
	my $w = $in->wait_message('', _("Reading printer data ..."));
	@oldqueues = printer::get_copiable_queues($oldspooler, $newspooler);
	@oldqueues = sort(@oldqueues);
	$newspoolerstr = $printer::shortspooler_inv{$newspooler};
	$oldspoolerstr = $printer::shortspooler_inv{$oldspooler};
	for (@oldqueues) {
	    push (@queuesselected, 1);
	    push (@queueentries, { text => $_, type => 'bool', 
				   val => \$queuesselected[$#queuesselected] });
	}
	# LPRng and LPD use the same config files, therefore one sees the 
	# queues of LPD when one uses LPRng and vice versa, but these queues
	# do not work. So automatically transfer all queues when switching
	# between LPD and LPRng.
	if (($oldspooler =~ /^lp/) && ($newspooler =~ /^lp/)) {
	    $noninteractive = 1;
	}
    }
    if ($noninteractive ||
	$in->ask_from_
	({ title => _("Transfer printer configuration"),
	   messages => _("You can copy the printer configuration which you have done 
for the spooler %s to %s, your current spooler. All the
configuration data (printer name, description, location, 
connection type, and default option settings) is overtaken,
but jobs will not be transferred.
Not all queues can be transferred due to the following 
reasons:
", $oldspoolerstr, $newspoolerstr) .
($newspooler eq "cups" ? _("CUPS does not support printers on Novell servers or printers
sending the data into a free-formed command.
") :
 ($newspooler eq "pdq" ? _("PDQ only supports local printers, remote LPD printers, and
Socket/TCP printers.
") :
  _("LPD and LPRng do not support IPP printers.
"))) .
_("In addition, queues not created with this program or
\"foomatic-configure\" cannot be transferred.") .
($oldspooler eq "cups" ? _("
Also printers configured with the PPD files provided by
their manufacturers or with native CUPS drivers can not be
transferred.") : ()) . _("
Mark the printers which you want to transfer and click 
\"Transfer\"."),
	   cancel => _("Do not transfer printers"),
           ok => _("Transfer")
	 },
         \@queueentries
      )) {
	my $queuecopied = 0;
	for (@oldqueues) {
	    if (shift(@queuesselected)) {
                my $oldqueue = $_;
                my $newqueue = $_;
                if ((!$printer->{configured}{$newqueue}) ||
		    ($noninteractive) ||
		    ($in->ask_from_
	             ({ title => _("Transfer printer configuration"),
	                messages => _("A printer named \"%s\" already exists under %s. 
Click \"Transfer\" to overwrite it.
You can also type a new name or skip this printer.", 
				      $newqueue, $newspoolerstr),
                        ok => _("Transfer"),
                        cancel => _("Skip"),
		        callbacks => { complete => sub {
	                    unless ($newqueue =~ /^\w+$/) {
				$in->ask_warn('', _("Name of printer should contain only letters, numbers and the underscore"));
				return (1,0);
			    }
			    if (($printer->{configured}{$newqueue})
				&& ($newqueue ne $oldqueue) && 
				(!$in->ask_yesorno('', _("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
							 $newqueue),
						   0))) {
				return (1,0); # Let the user correct the name
			    }
			    return 0;
			}}
		    },
		      [{label => _("New printer name"),val => \$newqueue}]))) {
		    {
			my $w = $in->wait_message('', 
			   _("Transferring %s ...", $oldqueue));
		        printer::copy_foomatic_queue($printer, $oldqueue,
						   $oldspooler, $newqueue) and
							 $queuecopied = 1;
		    }
		    if ($oldqueue eq $printer->{DEFAULT}) {
			# Make the former default printer the new default
			# printer if the user does not reject
			if (($noninteractive) ||
			    ($in->ask_yesorno
			     (_("Transfer printer configuration"),
			      _("You have transferred your former default printer (\"%s\"),
Should it be also the default printer under the
new printing system %s?", $oldqueue, $newspoolerstr), 1))) {
			    $printer->{DEFAULT} = $newqueue;
			    printer::set_default_printer($printer);
			}
		    }
		}
            }
	}
        if ($queuecopied) {
	    my $w = $in->wait_message('', _("Refreshing printer data ..."));
	    printer::read_configured_queues($printer);
        }
    }
}

sub start_network {
    my $in = $_[0];
    my $w = $in->wait_message(_("Configuration of a remote printer"), 
			      _("Starting network ..."));
    return printer::start_service("network");
}

sub check_network {

    # This routine is called whenever the user tries to configure a remote
    # printer. It checks the state of the network functionality to assure
    # that the network is up and running so that the remote printer is
    # reachable.

    my ($printer, $in) = @_;

    $in->set_help('checkNetwork') if $::isInstall;

    # First check: Does /etc/sysconfig/network-scripts/draknet_conf exist
    # (otherwise the network is not configured yet and draknet has to be
    # started)

    if (!printer::files_exist("/etc/sysconfig/network-scripts/draknet_conf")) {
	my $go_on = 0;
	while (!$go_on) {
	    my $choice = _("Configure the network now");
	    if ($in->ask_from(_("Network functionality not configured"),
			      _("You are going to configure a remote printer. This needs working
network access, but your network is not configured yet. If you
go on without network configuration, you will not be able to use
the printer which you are configuring now. How do you want 
to proceed?"),
			      [ { val => \$choice, type => 'list',
				  list => [ _("Configure the network now"),
					    _("Go on without configuring the network") ]} ] )) {
		if ($choice eq _("Configure the network now")){
		    if ($::isInstall) {
			require network::netconnect;
		        network::netconnect::main
			    ($in->{prefix}, $in->{netcnx} ||= {}, 
			     $in->{netc}, $in->{mouse}, $in, 
			     $in->{intf}, 0,
			     $in->{lang} eq "fr_FR" && 
			     $in->{keyboard} eq "fr", 0);
		    } else {
			system("/usr/sbin/draknet");
		    }
		    if (printer::files_exist("/etc/sysconfig/network-scripts/draknet_conf")) {
			$go_on = 1;
		    }
		} else {
		    return 1;
		}
	    } else {
		return 0;
	    }
	}
    }

    # Second check: Is the network running?

    if (printer::network_running()) {return 1;}

    # The network is configured now, start it.
    if (!start_network($in)) {
	$in->ask_warn(_("Configuration of a remote printer"), 
($::isInstall ?
_("The network configuration done during the installation 
cannot be started now. Please check whether the network
gets accessable after booting your system and correct the
configuration using the Mandrake Control Center, section
\"Network & Internet\"/\"Connection\", and afterwards set
up the printer, also using the Mandrake Control Center,
section \"Hardware\"/\"Printer\"") :
_("The network access was not running and could not be 
started. Please check your configuration and your 
hardware. Then try to configure your remote printer
again.")));
	return 0;
    }

    # Give a SIGHUP to the daemon and in case of CUPS do also the
    # automatic configuration of broadcasting/access permissions
    # The daemon is not really restarted but only SIGHUPped to not
    # interrupt print jobs.

    my $w = $in->wait_message(_("Configuration of a remote printer"), 
			      _("Restarting printing system ..."));
    return printer::SIGHUP_daemon($printer->{SPOOLER});

}

sub security_check {
    # Check the security mode and when in "high" or "paranoid" mode ask the
    # user whether he really wants to configure printing.
    my ($printer, $in, $spooler) = @_;
    $in->set_help('securityCheck') if $::isInstall;

    # Get security level
    my $security = undef;
    if ($::isInstall) {
	$security = $in->{'security'};
    } else {
	$security = printer::get_security_level();
    }

    # Exit silently if the spooler is PDQ
    if ($spooler eq "pdq") {return 1;}

    # Exit silently in medium or lower security levels
    if ((!$security) || ($security < 4)) {return 1;}
    
    # Exit silently if the current spooler is already activated for the current
    # security level
    if (printer::spooler_in_security_level($spooler, $security)) {return 1;}

    # Tell user in which security mode he is and ask him whether he really
    # wants to activate the spooler in the given security mode. Stop the
    # operation of installing the spooler if he disagrees.
    my $securitystr = ($security == 4 ? _("high") : _("paranoid"));
    if ($in->ask_yesorno(_("Installing a printing system in the %s security level", $securitystr),
			 _("You are about to install the printing system %s on
a system running in the %s security level.

This printing system runs a daemon (background process)
which waits for print jobs and handles them. This daemon
is also accessable by remote machines through the network
and so it is a possible point for attacks. Therefore only
a few selected daemons are started by default in this
security level.

Do you really want to configure printing on this
machine?",
			   $printer::shortspooler_inv{$spooler},
			   $securitystr))) {
        printer::add_spooler_to_security_level($spooler, $security);
	my $service;
	if (($spooler eq "lpr") || ($spooler eq "lprng")) {
	    $service = "lpd";
	} else {
	    $service = $spooler;
	}
        printer::start_service_on_boot($service);
	return 1;
    } else {
	return 0;
    }
}

sub start_spooler_on_boot {
    # Checks whether the spooler will be started at boot time and if not,
    # ask the user whether he wants to start the spooler at boot time.
    my ($printer, $in, $service) = @_;
    $in->set_help('startSpoolerOnBoot') if $::isInstall;
    if (!printer::service_starts_on_boot($service)) {
	if ($in->ask_yesorno(_("Starting the printing system at boot time"),
			     _("The printing system (%s) will not be started automatically
when the machine is booted.

It is possible that the automatic starting was turned off 
by changing to a higher security level, because the printing
system is a potential point for attacks.

Do you want to have the automatic starting of the printing
system turned on again?",
		       $printer::shortspooler_inv{$printer->{SPOOLER}}))) {
	    printer::start_service_on_boot($service);
	}
    }
    1;
}

sub install_spooler {
    # installs the default spooler and start its daemon
    my ($printer, $in) = @_;
    if (!$::testing) {
	# If the user refuses to install the spooler in high or paranoid
	# security level, exit.
	if (!security_check($printer, $in, $printer->{SPOOLER})) {
	    return 0;
	}
	if ($printer->{SPOOLER} eq "cups") {
	    {
		my $w = $in->wait_message('', _("Checking installed software..."));
		if ((!$::testing) &&
		    (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi
					       /sbin/ifconfig
					       /usr/bin/xpp
					       /usr/bin/qtcups),
					    (printer::files_exist("/usr/bin/kwin")?
					     "/usr/bin/kups" : ()),
					    ($::expert ? 
					     "/usr/share/cups/model/postscript.ppd.gz" : ())
					    )))) {
		    $in->do_pkgs->install(('cups', 'net-tools', 'xpp', 'qtcups', 
					   if_($in->do_pkgs->is_installed('kdebase'), 'kups'),
					   ($::expert ? 'cups-drivers' : ())));
		}
		# Start daemon
	        printer::start_service("cups");
		# Set the CUPS tools as defaults for "lpr", "lpq", "lprm", ...
	        printer::set_alternative("lpr","/usr/bin/lpr-cups");
	        printer::set_alternative("lpq","/usr/bin/lpq-cups");
	        printer::set_alternative("lprm","/usr/bin/lprm-cups");
	        printer::set_alternative("lp","/usr/bin/lp-cups");
	        printer::set_alternative("cancel","/usr/bin/cancel-cups");
	        printer::set_alternative("lpstat","/usr/bin/lpstat-cups");
	        printer::set_alternative("lpc","/usr/sbin/lpc-cups");
		# Remove PDQ panic buttons from the user's KDE Desktops
	        printer::pdq_panic_button("remove");
	    }
	    # Should it be started at boot time?
	    start_spooler_on_boot($printer, $in, "cups");
	} elsif ($printer->{SPOOLER} eq "lpd") {
	    {
		my $w = $in->wait_message('', _("Checking installed software..."));
		# "lpr" conflicts with "LPRng", remove "LPRng"
		if ((!$::testing) &&
		    (printer::files_exist((qw(/usr/lib/filters/lpf))))) {
		    my $w = $in->wait_message('', _("Removing LPRng..."));
		    $in->do_pkgs->remove_nodeps('LPRng');
		}
		if ((!$::testing) &&
		    (!printer::files_exist((qw(/usr/sbin/lpf
					       /usr/sbin/lpd
					       /sbin/ifconfig))))) {
		    $in->do_pkgs->install(('lpr', 'net-tools'));
		}
		# Start daemon
	        printer::restart_service("lpd");
		# Set the LPD tools as defaults for "lpr", "lpq", "lprm", ...
	        printer::set_alternative("lpr","/usr/bin/lpr-lpd");
	        printer::set_alternative("lpq","/usr/bin/lpq-lpd");
	        printer::set_alternative("lprm","/usr/bin/lprm-lpd");
	        printer::set_alternative("lpc","/usr/sbin/lpc-lpd");
		# Remove PDQ panic buttons from the user's KDE Desktops
	        printer::pdq_panic_button("remove");
	    }
	    # Should it be started at boot time?
	    start_spooler_on_boot($printer, $in, "lpd");
	} elsif ($printer->{SPOOLER} eq "lprng") {
	    {
		my $w = $in->wait_message('', _("Checking installed software..."));
		# "LPRng" conflicts with "lpr", remove "lpr"
		if ((!$::testing) &&
		    (printer::files_exist((qw(/usr/sbin/lpf))))) {
		    my $w = $in->wait_message('', _("Removing LPD..."));
		    $in->do_pkgs->remove_nodeps('lpr');
		}
		if ((!$::testing) &&
		    (!printer::files_exist((qw(/usr/lib/filters/lpf
					       /usr/sbin/lpd
					       /sbin/ifconfig))))) {
		    $in->do_pkgs->install('LPRng', 'net-tools');
		}
		# Start daemon
	        printer::restart_service("lpd");
		# Set the LPRng tools as defaults for "lpr", "lpq", "lprm", ...
	        printer::set_alternative("lpr","/usr/bin/lpr-lpd");
	        printer::set_alternative("lpq","/usr/bin/lpq-lpd");
	        printer::set_alternative("lprm","/usr/bin/lprm-lpd");
	        printer::set_alternative("lp","/usr/bin/lp-lpd");
	        printer::set_alternative("cancel","/usr/bin/cancel-lpd");
	        printer::set_alternative("lpstat","/usr/bin/lpstat-lpd");
	        printer::set_alternative("lpc","/usr/sbin/lpc-lpd");
		# Remove PDQ panic buttons from the user's KDE Desktops
	        printer::pdq_panic_button("remove");
	    }
	    # Should it be started at boot time?
	    start_spooler_on_boot($printer, $in, "lpd");
	} elsif ($printer->{SPOOLER} eq "pdq") {
	    {
		my $w = $in->wait_message('', _("Checking installed software..."));
		if ((!$::testing) &&
		    (!printer::files_exist((qw(/usr/bin/pdq
					       /usr/X11R6/bin/xpdq))))) {
		    $in->do_pkgs->install('pdq');
		}
		# PDQ has no daemon, so nothing needs to be started
		
		# Set the PDQ tools as defaults for "lpr", "lpq", "lprm", ...
	        printer::set_alternative("lpr","/usr/bin/lpr-pdq");
	        printer::set_alternative("lpq","/usr/bin/lpq-foomatic");
	        printer::set_alternative("lprm","/usr/bin/lprm-foomatic");
		# Add PDQ panic buttons to the user's KDE Desktops
	        printer::pdq_panic_button("add");
	    }
	}
    }
    1;
}

sub setup_default_spooler {
    my ($printer, $in) = @_;
    $in->set_help('setupDefaultSpooler') if $::isInstall;
    $printer->{SPOOLER} ||= 'cups';
    my $oldspooler = $printer->{SPOOLER};
    my $str_spooler = 
	$in->ask_from_list_(_("Select Printer Spooler"),
			    _("Which printing system (spooler) do you want to use?"),
			    [ printer::spooler() ],
			    $printer::spooler_inv{$printer->{SPOOLER}},
			    ) or return;
    $printer->{SPOOLER} = $printer::spooler{$str_spooler};
    # Install the spooler if not done yet
    if (!install_spooler($printer, $in)) {
	$printer->{SPOOLER} = $oldspooler;
	return;
    }
    if ($printer->{SPOOLER} ne $oldspooler) {
	# Get the queues of this spooler
	{
	    my $w = $in->wait_message('', _("Reading printer data ..."));
	    printer::read_configured_queues($printer);
	}
	# Copy queues from former spooler
	copy_queues_from($printer, $in, $oldspooler);
	# Re-read the printer database (CUPS has additional drivers, PDQ
	# has no raw queue)
	%printer::thedb = ();
	#my $w = $in->wait_message('', _("Reading printer database ..."));
	#printer::read_printer_db($printer->{SPOOLER});
    }
    # Save spooler choice
    printer::set_default_spooler($printer);
    return $printer->{SPOOLER};
}

sub configure_queue {
    my ($printer, $in) = @_;
    my $w = $in->wait_message('', _("Configuring printer \"%s\" ...",
				    $printer->{currentqueue}{queue}));
    $printer->{complete} = 1;
    printer::configure_queue($printer);
    $printer->{complete} = 0;
}

#- Program entry point for configuration of the printing system.
sub main {
    my ($printer, $in, $ask_multiple_printer, $upNetwork) = @_;

    # Default printer name, we do not use "lp" so that one can switch the
    # default printer under LPD without needing to rename another printer.
    # Under LPD the alias "lp" will be given to the default printer.
    my $defaultprname = _("Printer");

    # printerdrake does not work without foomatic, and for more convenience
    # we install some more stuff
    {
	my $w = $in->wait_message('', _("Checking installed software..."));
	if ((!$::testing) &&
	    (!printer::files_exist((qw(/usr/bin/foomatic-configure
				       /usr/lib/perl5/site_perl/5.6.1/Foomatic/DB.pm
				       /usr/bin/escputil
				       /usr/share/printer-testpages/testprint.ps
				       ),
				    (printer::files_exist("/usr/bin/gimp") ?
				     "/usr/lib/gimp/1.2/plug-ins/print" : ())
				    )))) {
	    $in->do_pkgs->install('foomatic','printer-utils','printer-testpages',
				  if_($in->do_pkgs->is_installed('gimp'), 'gimpprint'));
	}

	# only experts should be asked for the spooler
	!$::expert and $printer->{SPOOLER} ||= 'cups';

    }

    # If we have chosen a spooler, install it and mark it as default spooler
    if (($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '')) {
	if (!install_spooler($printer, $in)) {return;}
        printer::set_default_spooler($printer);
    }

    # Control variables for the main loop
    my ($queue, $continue, $newqueue, $editqueue, $expertswitch, $menushown) = ('', 1, 0, 0, 0, 0);
    # Cursor position in queue modification window
    my $modify = _("Printer options");
    while ($continue) {
	$newqueue = 0;
	# When the queue list is not shown, cancelling the printer type
	# dialog should leave the program
	$continue = 0;
	# Get the default printer
	if (defined($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '') &&
	    ((!defined($printer->{DEFAULT})) || ($printer->{DEFAULT} eq ''))) {
	    my $w = $in->wait_message('', _("Preparing PrinterDrake ..."));
	    $printer->{DEFAULT} = printer::get_default_printer($printer);
	    if ($printer->{DEFAULT}) {
		# If a CUPS system has only remote printers and no default
		# printer defined, it defines the first printer whose
		# broadcast signal appeared after the start of the CUPS
		# daemon, so on every start another printer gets the default
		# printer. To avoid this, make sure that the default printer
		# is defined.
		printer::set_default_printer($printer);
	    } else {
		$printer->{DEFAULT} = '';
	    }
	}
	if ($editqueue) {
	    # The user was either in the printer modification dialog and did
	    # not close it or he had set up a new queue and said that the test
	    # page didn't come out correctly, so let the user edit the queue.
	    $newqueue = 0;
	    $continue = 1;
	    $editqueue = 0;
	} else {
	    # Reset modification window cursor when one leaves the window
	    $modify = _("Printer options");
	    if (!$ask_multiple_printer && 
		%{$printer->{configured} || {}} == ()) {
		$in->set_help('doYouWantToPrint') if $::isInstall;
		$newqueue = 1;
		$queue = $printer->{want} || 
		    $in->ask_yesorno(_("Printer"),
				    _("Would you like to configure printing?"),
				    0) ? $defaultprname : _("Done");
		if ($queue ne _("Done")) {
		    $printer->{SPOOLER} ||= 
			setup_default_spooler ($printer, $in) ||
			    return;
		}
	    } else {
		# Ask for a spooler when none is defined
		$printer->{SPOOLER} ||=  setup_default_spooler ($printer, $in) || return;
		# This entry and the check for this entry have to use
		# the same translation to work properly
		my $spoolerentry = _("Printing system: ");
		# Show a queue list window when there is at least one queue,
		# when we are in expert mode, or when we are not in the
		# installation.
		unless ((%{$printer->{configured} || {}} == ()) && 
			(!$::expert) && ($::isInstall)) {
		    $in->set_help('mainMenu') if $::isInstall;
		    # Cancelling the printer type dialog should leed to this
		    # dialog
		    $continue = 1;
		    # This is for the "Recommended" installation. When one has
		    # no printer queue printerdrake starts directly adding
		    # a printer and in the end it asks whether one wants to
		    # install another printer. If the user says "Yes", he
		    # arrives in the main menu of printerdrake. From now
		    # on the question is not asked any more but the menu
		    # is shown directly after having done an operation.
		    $menushown = 1;
		    # $expertwitch gets one when the "Expert mode"/
		    # "Standard mode" button is clicked.
		    $expertswitch = !$in->ask_from_(
			{messages =>
			     _("The following printers are configured.
Click on one of them to modify it or
to get information about it or on 
\"Add Printer\" to add a new printer."),
			 cancel => ($::isInstall ? 
				    ('') : ($::expert ? 
				  _("Normal Mode") : _("Expert Mode"))),
			},
			# List the queues
			[ { val => \$queue, format => \&translate,
			    sort => 0, 
		        list => [ (sort(map {"$_" . ($_ eq $printer->{DEFAULT} ?
						     _(" (Default)") : ())}
				   keys(%{$printer->{configured} || {}}))),
			# CUPS makes available remote printers automatically
			($printer->{SPOOLER} eq "cups" ?
			 ($::expert ? _("Printer(s) on remote CUPS server(s)"):
			  _("Printer(s) on remote server(s)")) : ()),
			# Button to add a new queue
			_("Add printer"),
		        # In expert mode we can change the spooler
		        ($::expert ?
		         ( $spoolerentry .
		           $printer::spooler_inv{$printer->{SPOOLER}} ) : ()),
		        # Bored by configuring your printers, get out of here!
		        _("Done") ] } ]
		    );
		    # Toggle expert mode and standard mode
		    if ($expertswitch) {
			$expertswitch = 0;
			$::expert = !$::expert;
			# Read printer database for the new user mode
			%printer::thedb = ();
			#my $w = $in->wait_message('', _("Reading printer database ..."));
		        #printer::read_printer_db($printer->{SPOOLER});
			next;
		    }
		} else {
		    #- as there are no printer already configured, Add one
		    #- automatically.
		    $queue = _("Add printer"); 
		} 
	        # Determine a default name for a new printer queue
		if ($queue eq _("Add printer")) {
		    $newqueue = 1;
		    my %queues; 
		    @queues{map { split '\|', $_ } keys %{$printer->{configured}}} = ();
		    my $i = ''; while ($i < 100) { last unless exists $queues{"$defaultprname$i"}; ++$i; }
		    $queue = "$defaultprname$i";
		}
		# Function to switch to another spooler chosen
		if ($queue =~ /^$spoolerentry/) {
		    $printer->{SPOOLER} = setup_default_spooler ($printer, $in) || $printer->{SPOOLER};
		    next;
		}
		# Make available printers on remote CUPS servers (CUPS only).
		if (($queue eq _("Printer(s) on remote CUPS server(s)")) ||
		    ($queue eq _("Printer(s) on remote server(s)"))) {
		    setup_remote_cups_server($printer, $in);
		    next;
		}
		# Rip off the " (Default)" tag from the queue name
		if ($queue =~ /^\s*(\S+)\s+/) {
		    $queue = $1;
		}
	    }
	    # Save the default spooler
	    printer::set_default_spooler($printer);
	    #- Close printerdrake
	    $queue eq _("Done") and last;
	}
	if ($newqueue) {
	    $printer->{NEW} = 1;
	    #- Set default values for a new queue
	    $printer::printer_type_inv{$printer->{TYPE}} or 
		$printer->{TYPE} = printer::default_printer_type($printer);
	    $printer->{currentqueue} = { queue    => $queue,
					 foomatic => 0,
					 desc     => "",
					 loc      => "",
					 make     => "",
					 model    => "",
					 printer  => "",
					 driver   => "",
					 connect  => "",
					 spooler  => $printer->{SPOOLER},
				       };
	    #- Set OLD_QUEUE field so that the subroutines for the
	    #- configuration work correctly.
	    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
	    #- When we are back on the main menu the cursor should be
	    #- on "Add printer"
	    $queue = _("Add printer");
	    #- Do all the configuration steps for a new queue
	    choose_printer_type($printer, $in) or next;
	    if ($printer->{TYPE} eq 'CUPS') {
		setup_remote_cups_server($printer, $in);
		$continue = ($::expert || !$::isInstall || $menushown ||
			     $in->ask_yesorno('',_("Do you want to configure another printer?")));
		next;
	    }
	    #- Cancelling one of the following dialogs should restart 
	    #- printerdrake
	    $continue = 1;
	    setup_printer_connection($printer, $in) or next;
	    choose_printer_name($printer, $in) or next;
	    get_db_entry($printer, $in);
	    choose_model($printer, $in) or next;
	    get_printer_info($printer, $in) or next;
	    setup_options($printer, $in) or next;
	    configure_queue($printer, $in);
	    setasdefault($printer, $in);
	    if (print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork)) { 
		$continue = ($::expert || !$::isInstall || $menushown ||
			 $in->ask_yesorno('',_("Do you want to configure another printer?")));
	    } else {
		$editqueue = 1;
		$queue = $printer->{QUEUE};
	    }
	} else {
	    $printer->{NEW} = 0;
	    # Modify a queue, ask which part should be modified
	    $in->set_help('modifyPrinterMenu') if $::isInstall;
	    if ($in->ask_from_
		   ({ title => _("Modify printer configuration"),
		      messages => _("Printer %s: %s %s
What do you want to modify on this printer?",
				    $queue,
				    $printer->{configured}{$queue}{'queuedata'}{'make'},
				    $printer->{configured}{$queue}{'queuedata'}{'model'} .
				    ($queue eq $printer->{DEFAULT} ?
				     _(" (Default)") : ())),
		     cancel => _("Close"),
		     ok => _("Do it!")
		     },
		    [ { val => \$modify, format => \&translate,
			list => [ _("Printer connection type"),
				  _("Printer name, description, location"),
				  ($::expert ?
				   _("Printer manufacturer, model, driver") :
				   _("Printer manufacturer, model")),
				  (($printer->{configured}{$queue}{'queuedata'}{'make'} ne
				    "") &&
				   (($printer->{configured}{$queue}{'queuedata'}{'model'} ne
				    _("Unknown model")) &&
				    ($printer->{configured}{$queue}{'queuedata'}{'model'} ne
				    _("Raw printer"))) ?
				   _("Printer options") : ()),
				  (($queue ne $printer->{DEFAULT}) ?
				   _("Set this printer as the default") : ()),
				  _("Print test pages"),
				  _("Know how to print with this printer"),
				  _("Remove printer") ] } ] ) ) {
		# Stay in the queue edit window until the user clicks "Close"
		# or deletes the queue
		$editqueue = 1; 
		#- Copy the queue data and work on the copy
		$printer->{currentqueue} = {};
		if ($printer->{configured}{$queue}) {
		    printer::copy_printer_params($printer->{configured}{$queue}{'queuedata'}, $printer->{currentqueue});
		}
		#- Keep in mind the printer driver which was used, so it can
		#- be determined whether the driver is only available in expert
		#- and so for setting the options for the driver in
		#- recommended mode a special treatment has to be applied.
		my $driver = $printer->{currentqueue}{driver};
		#- keep in mind old name of queue (in case of changing)
		$printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
		#- Reset some variables
		$printer->{OLD_CHOICE} = undef;
		$printer->{DBENTRY} = undef;
		#- Which printer type did we have before (check beginning of 
		#- URI)
		my $type;
		for $type (qw(file lpd socket smb ncp postpipe)) {
		    if ($printer->{currentqueue}{'connect'}
			=~ /^$type:/) {
			$printer->{TYPE} = 
			    ($type eq 'file' ? 'LOCAL' : uc($type));
			last;
		    }
		}
		# Do the chosen task
		if ($modify eq _("Printer connection type")) {
		    choose_printer_type($printer, $in) &&
			setup_printer_connection($printer, $in) &&
		            configure_queue($printer, $in);
		} elsif ($modify eq _("Printer name, description, location")) {
		    choose_printer_name($printer, $in) &&
			configure_queue($printer, $in);
		    # Delete old queue when it was renamed
		    if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) {
			my $w = $in->wait_message('', _("Removing old printer \"%s\" ...", $printer->{OLD_QUEUE}));
		        printer::remove_queue($printer, $printer->{OLD_QUEUE});
			# If the default printer was renamed, correct the
			# the default printer setting of the spooler
			if ($queue eq $printer->{DEFAULT}) {
			    $printer->{DEFAULT} = $printer->{QUEUE};
			    printer::set_default_printer($printer);
			}
			$queue = $printer->{QUEUE};
		    }
		} elsif (($modify eq _("Printer manufacturer, model, driver")) ||
			 ($modify eq _("Printer manufacturer, model"))) {
		    get_db_entry($printer, $in);
		    choose_model($printer, $in) &&
			get_printer_info($printer, $in) &&
			    setup_options($printer, $in) &&
				configure_queue($printer, $in);
		} elsif ($modify eq _("Printer options")) {
		    get_printer_info($printer, $in) &&
			setup_options($printer, $in) &&
			    configure_queue($printer, $in);
		} elsif ($modify eq _("Set this printer as the default")) {
		    $printer->{DEFAULT} = $queue;
		    printer::set_default_printer($printer);
		    $in->ask_warn(_("Default printer"),
				  _("The printer \"%s\" is set as the default printer now.", $queue));
		} elsif ($modify eq _("Print test pages")) {
		    print_testpages($printer, $in, $upNetwork);
		} elsif ($modify eq _("Know how to print with this printer")) {
		    printer_help($printer, $in);
		} elsif ($modify eq _("Remove printer")) {
		    if ($in->ask_yesorno('',
           _("Do you really want to remove the printer \"%s\"?", $queue), 1)) {
			{
			    my $w = $in->wait_message('', _("Removing printer \"%s\" ...", $queue));
			    if (printer::remove_queue($printer, $queue)) { 
				$editqueue = 0;
				# Define a new default printer if we have
				# removed the default one
				if ($queue eq $printer->{DEFAULT}) {
				    my @k = sort(keys(%{$printer->{configured}}));
				    if (@k) {
					$printer->{DEFAULT} = $k[0];
				        printer::set_default_printer($printer);
				    } else {
					$printer->{DEFAULT} = "";
				    }
				}
			    }
			}
		    }		
		}
	    } else {
		$editqueue = 0;
	    }
	    $continue = ($editqueue || $::expert || !$::isInstall || 
			 $menushown ||
			 $in->ask_yesorno('',_("Do you want to configure another printer?")));
	}
	# Delete some variables
	$printer->{OLD_QUEUE} = "";
	$printer->{QUEUE} = "";
	$printer->{TYPE} = "";
	$printer->{str_type} = "";
	$printer->{currentqueue} = {};
	$printer->{DBENTRY} = "";
	$printer->{ARGS} = "";
	$printer->{complete} = 0;
	$printer->{OLD_CHOICE} = "";
    }
    # Clean up the $printer data structure for auto-install log
    for my $queue (keys %{$printer->{configured}}) {
	for my $item (keys %{$printer->{configured}{$queue}}) {
	    if ($item ne "queuedata") {
		delete($printer->{configured}{$queue}{$item});
	    }
	}
    }
    delete($printer->{OLD_QUEUE});
    delete($printer->{QUEUE});
    delete($printer->{TYPE});
    delete($printer->{str_type});
    delete($printer->{currentqueue});
    delete($printer->{DBENTRY});
    delete($printer->{ARGS});
    delete($printer->{complete});
    delete($printer->{OLD_CHOICE});
    delete($printer->{NEW});
    #use Data::Dumper;
    #print "###############################################################################\n", Dumper($printer); 

}

l be displayed. If you have a TV card and it isn't\n"
+"detected, click on \"%s\" to try to configure it manually.\n"
+"\n"
+" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
+"the card if you feel the configuration is wrong.\n"
"\n"
" * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
"\"%s\" to reconfigure your graphical interface.\n"
"\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
-"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
"\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
"\n"
" * \"%s\": this entry allows you to redefine the security level as set in a\n"
"previous step ().\n"
@@ -5418,126 +5350,128 @@ msgid ""
"the corresponding section of the ``Starter Guide'' for details about\n"
"firewall settings.\n"
"\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
"\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
"on your machine. If you plan to use this machine as a server it's a good\n"
"idea to review this setup."
msgstr ""
-"DrakXはお使いのシステムの情報を提供します。ご使用のハードウェアの構成にも\n"
-"よりますが、下記の一部もしくは全てについて情報を得ることができます。\n"
-"それぞれの項目には簡単な説明が表示され、アイテム別に設定を行うことが\n"
-"できます。設定を変更するには %s ボタンをクリックしてください。\n"
+"DrakXはあなたのシステムから収集した情報を表示します。ご使用のハードウェアの\n"
+"構成にもよりますが、下記の一部もしくは全てについて確認することができます。\n"
+"それぞれの項目には検出したハードウェアと現在の設定内容が表示されます。\n"
+"設定を変更するには %s をクリックしてください。\n"
"\n"
-" * \"%s\": check the current keyboard map configuration and change that if\n"
-"necessary.\n"
+" * %s: 使用中のキーボードの設定を確認/変更できます。\n"
"\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list.\n"
+" * %s: 現在選択されている国を確認できます。変更するには\n"
+"%s をクリックして他の国を選んでください。あなたの国がリストにない時は\n"
+"%s を押してください。そうすると、すべての国名が表示されます。\n"
"\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
-"you have chosen. You can click on the \"%s\" button here if this is not\n"
-"correct.\n"
+" * %s: DrakXは選択された国に基づいてタイムゾーンを推定\n"
+"します。誤っている場合は %s をクリックしてください。\n"
"\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * %s: 現在のマウスの設定を確認できます。変更する必要が\n"
+"ある時はボタンを押してください。\n"
"\n"
-" * \"%s\": clicking on the \"%s\" button will open the printer\n"
-"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+" * %s: %s を押すとプリンタ設定ウィザードが\n"
+"開きます。新しいプリンタの追加方法については Starter Guide の該当する章を\n"
+"参照してください。マニュアルに表示されているインターフェースは、\n"
+"インストール中に使用したものとほぼ同じです。\n"
"\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\n"
+" * %s: サウンドカードが検出されると、ここに表示\n"
+"されます。表示されたものがお使いのものと異なる場合は、ボタンをクリックして\n"
+"別のドライバを選んでください。\n"
"\n"
-" * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
-"\"%s\" to reconfigure your graphical interface.\n"
+" * %s: テレビカードをお使いであれば、ここに\n"
+"設定情報が表示されます。お持ちのカードが自動検出されなかった場合は\n"
+" %s をクリックして手動で設定を試みてください。\n"
"\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
+" * %s: 正しく設定されていない時は %s を押して正しい\n"
+"パラメーターに変更してください。\n"
"\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
+" * %s: DrakXはグラフィカルインターフェースの解像度を\n"
+"\"800x600\"か\"1024x768\"に設定します。デフォルトの設定が適当でない場合は\n"
+"%s をクリックして設定し直してください。\n"
"\n"
-" * \"%s\": If you want to configure your Internet or local network access\n"
-"now.\n"
+" * %s: インターネットとローカルネットワークの設定。\n"
+"マニュアルを参照するか、もしくはインストール完了後にMandrakelinux\n"
+"コントロールセンターのヘルプにしたがって行なってください。\n"
"\n"
-" * \"%s\": this entry allows you to redefine the security level as set in a\n"
-"previous step ().\n"
+" * %s: あなたのマシンがプロキシサーバの背後にあれば\n"
+"ここでHTTP/FTPプロキシアドレスを設定できます。\n"
"\n"
-" * \"%s\": if you plan to connect your machine to the Internet, it's a good\n"
-"idea to protect yourself from intrusions by setting up a firewall. Consult\n"
-"the corresponding section of the ``Starter Guide'' for details about\n"
-"firewall settings.\n"
+" * %s: 前のステップで設定したセキュリティレベルを\n"
+"設定し直すことができます。\n"
"\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * %s: インターネットに接続されるのであれば、侵入などの\n"
+"危険からあなたのマシンを守るためにファイアウォールをセットアップしてくださ"
+"い。\n"
+"詳しい設定方法については、Starter Guide の該当する章を参照してください。\n"
"\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
-"on your machine. If you plan to use this machine as a server it's a good\n"
-"idea to review this setup."
-
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "キーボード"
+" * %s: ブートローダの設定を変更する時はこのボタンを\n"
+"押してください。(注意:これは上級者向きです) 印刷されたドキュメント、あるい"
+"は\n"
+"Mandrakelinuxコントロールセンターのブートローダに関するヘルプを参照してくだ\n"
+"さい。\n"
+"\n"
+" * %s: ここではどのサービスを有効にするかを細かく設定できます。\n"
+"サーバになるマシンであれば設定を見直すのがよいでしょう。"
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
#, c-format
msgid "Timezone"
msgstr "タイムゾーン"
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "グラフィカルインタフェース"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
#, c-format
msgid "TV card"
msgstr "テレビカード"
-#: help.pm:991
+#: help.pm:855
#, c-format
msgid "ISDN card"
msgstr "ISDNカード"
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "グラフィカルインタフェース"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
#, c-format
msgid "Network"
msgstr "ネットワーク"
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "プロクシ"
+
+#: help.pm:855 install_steps_interactive.pm:1096
#, c-format
msgid "Security Level"
msgstr "セキュリティレベル"
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
#, c-format
msgid "Firewall"
msgstr "ファイアウォール"
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
#, c-format
msgid "Bootloader"
msgstr "ブートローダ"
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
#, c-format
msgid "Services"
msgstr "サービス"
-#: help.pm:994
-#, fuzzy, c-format
+#: help.pm:858
+#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
@@ -5547,8 +5481,8 @@ msgstr ""
"選んでください。注意: このパーティションのデータは全て消えて\n"
"回復できなくなります。"
-#: help.pm:999
-#, fuzzy, c-format
+#: help.pm:863
+#, c-format
msgid ""
"Click on \"%s\" if you want to delete all data and partitions present on\n"
"this hard drive. Be careful, after clicking on \"%s\", you will not be able\n"
@@ -5565,7 +5499,17 @@ msgstr ""
"この操作を中止する場合は %s をクリックしてください。そうすれば\n"
"データとパーティションは消去されません。"
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "次へ ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- 戻る"
+
+#: install2.pm:117
#, c-format
msgid ""
"Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5576,12 +5520,84 @@ msgstr ""
"ん)。おそらく起動用フロッピーがインストールメディアに対応していません(新しい"
"起動フロッピーを作成してください)。"
-#: install2.pm:169
+#: install2.pm:167
#, c-format
msgid "You must also format %s"
msgstr "%s もフォーマットしてください"
-#: install_any.pm:402
+#: install_any.pm:390
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"次のインストールメディアを検出しました\n"
+"使用しないものがあればここで除外してください"
+
+#: install_any.pm:411
+#, c-format
+msgid "Do you have further supplementary media?"
+msgstr "他に補助的なメディアがありますか?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, c-format
+msgid ""
+"The following media have been found and will be used during install: %s.\n"
+"\n"
+"\n"
+"Do you have a supplementary installation media to configure?"
+msgstr ""
+"次のメディアが検出されました: %s \n"
+"\n"
+"\n"
+"他に設定する補助的なメディアはありますか?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "ネットワーク (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "ネットワーク (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "デバイスがありません"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "CDを挿入"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "再度 CD 1 を入れてください"
+
+#: install_any.pm:502 install_any.pm:506
+#, c-format
+msgid "URL of the mirror?"
+msgstr "ミラーのURL"
+
+#: install_any.pm:532
+#, c-format
+msgid "Can't find hdlist file on this mirror"
+msgstr "このミラーにはhdlistファイルがありません"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -5604,7 +5620,8 @@ msgstr ""
"\n"
"本当にこれらのサーバをインストールしますか?\n"
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -5617,17 +5634,17 @@ msgstr ""
"\n"
"本当にこれらを削除しますか?\n"
-#: install_any.pm:818
+#: install_any.pm:1116
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "FAT形式のフロッピーをドライブ %s に挿入"
-#: install_any.pm:822
+#: install_any.pm:1120
#, c-format
msgid "This floppy is not FAT formatted"
msgstr "このフロッピーはFAT形式ではありません"
-#: install_any.pm:834
+#: install_any.pm:1132
#, c-format
msgid ""
"To use this saved packages selection, boot installation with ``linux "
@@ -5636,12 +5653,17 @@ msgstr ""
"保存したパッケージ選択を使うには、インストールの起動時に'linux "
"defcfg=floppy'と指定します。"
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
#, c-format
msgid "Error reading file %s"
msgstr "ファイル %s を読み込み中にエラー"
-#: install_any.pm:987
+#: install_any.pm:1361
+#, c-format
+msgid "%s (was %s)"
+msgstr "%s (was %s)"
+
+#: install_any.pm:1396
#, c-format
msgid ""
"An error occurred - no valid devices were found on which to create new "
@@ -5650,12 +5672,12 @@ msgstr ""
"エラー発生 - 新しいファイルシステムを構築できるようなデバイスが\n"
"ありません。ハードウェアを確認してください"
-#: install_gtk.pm:161
+#: install_gtk.pm:160
#, c-format
msgid "System installation"
msgstr "システムのインストール"
-#: install_gtk.pm:164
+#: install_gtk.pm:163
#, c-format
msgid "System configuration"
msgstr "システムを設定"
@@ -5691,7 +5713,7 @@ msgstr ""
"\n"
"それでも続けますか?"
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
#, c-format
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "/boot/efi でマウントしたFATパーティションが必要です"
@@ -5751,7 +5773,7 @@ msgstr "どのパーティションをリサイズしますか?"
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
msgstr ""
"FATのサイズ変更ツールがパーティションを操作できません。\n"
"以下のエラーが発生: %s"
@@ -5772,7 +5794,8 @@ msgstr ""
"デフラグを実行してください。その後再起動してMandrakelinuxをインストール\n"
"してください。"
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
#, c-format
msgid ""
"WARNING!\n"
@@ -5796,52 +5819,52 @@ msgstr ""
"バックアップも忘れずに。\n"
"よろしければOKを押してください。"
-#: install_interactive.pm:176
+#: install_interactive.pm:178
#, c-format
msgid "Which size do you want to keep for Windows on"
msgstr "Windows用に残しておくサイズを指定してください"
-#: install_interactive.pm:177
+#: install_interactive.pm:179
#, c-format
msgid "partition %s"
msgstr "パーティション %s"
-#: install_interactive.pm:186
+#: install_interactive.pm:188
#, c-format
msgid "Resizing Windows partition"
msgstr "Windowsパーティションのリサイズ"
-#: install_interactive.pm:191
+#: install_interactive.pm:193
#, c-format
msgid "FAT resizing failed: %s"
msgstr "FATのリサイズに失敗: %s"
-#: install_interactive.pm:206
+#: install_interactive.pm:208
#, c-format
msgid "There is no FAT partition to resize (or not enough space left)"
msgstr "リサイズするFATパーティションがありません(または十分なスペースがない)"
-#: install_interactive.pm:211
+#: install_interactive.pm:213
#, c-format
msgid "Remove Windows(TM)"
msgstr "Windows(TM)を削除"
-#: install_interactive.pm:213
+#: install_interactive.pm:215
#, c-format
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "複数のハードドライブがあります。どれにlinuxをインストールしますか?"
-#: install_interactive.pm:217
+#: install_interactive.pm:219
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "ドライブ %s の全てのパーティションとデータが失われます"
-#: install_interactive.pm:230
+#: install_interactive.pm:232
#, c-format
msgid "Use fdisk"
msgstr "fdiskを使う"
-#: install_interactive.pm:233
+#: install_interactive.pm:235
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -5850,33 +5873,34 @@ msgstr ""
"%s のパーティション設定ができます。\n"
"完了後は'w'を使って保存してください。"
-#: install_interactive.pm:269
+#: install_interactive.pm:271
#, c-format
msgid "I can't find any room for installing"
msgstr "インストール用の空きがありません"
-#: install_interactive.pm:273
+#: install_interactive.pm:275
#, c-format
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "以下の解決法があります:"
-#: install_interactive.pm:279
+#: install_interactive.pm:281
#, c-format
msgid "Partitioning failed: %s"
msgstr "パーティション設定に失敗: %s"
-#: install_interactive.pm:286
+#: install_interactive.pm:288
#, c-format
msgid "Bringing up the network"
msgstr "ネットワークを立ちあげる"
-#: install_interactive.pm:291
+#: install_interactive.pm:293
#, c-format
msgid "Bringing down the network"
msgstr "ネットワークを切断する"
-#: install_messages.pm:9
-#, fuzzy, c-format
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
+#, c-format
msgid ""
"Introduction\n"
"\n"
@@ -5893,7 +5917,7 @@ msgid ""
"\n"
"Please read this document carefully. This document is a license agreement "
"between you and \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
"By installing, duplicating or using the Software Products in any manner, you "
"explicitly \n"
"accept and fully agree to conform to the terms and conditions of this "
@@ -5915,7 +5939,7 @@ msgid ""
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
"law, be liable for any special,\n"
"incidental, direct or indirect damages whatsoever (including without "
"limitation damages for loss of \n"
@@ -5923,14 +5947,14 @@ msgid ""
"resulting from a court \n"
"judgment, or any other consequential loss) arising out of the use or "
"inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
"damages.\n"
"\n"
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
"in no circumstances, be \n"
"liable for any special, incidental, direct or indirect damages whatsoever "
"(including without \n"
@@ -5960,10 +5984,10 @@ msgid ""
"and conditions of the license agreement for each component before using any "
"component. Any question \n"
"on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
"Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
"documentation for \n"
"further details.\n"
"\n"
@@ -5974,11 +5998,11 @@ msgid ""
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
"Products, as a whole or in \n"
"parts, by all means and for all purposes.\n"
"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A. \n"
+"Mandrakesoft S.A. \n"
"\n"
"\n"
"5. Governing Laws \n"
@@ -5994,127 +6018,10 @@ msgid ""
"court. As a last \n"
"resort, the dispute will be referred to the appropriate Courts of Law of "
"Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A. \n"
+"For any question on this document, please contact Mandrakesoft S.A. \n"
msgstr ""
-"Introduction\n"
-"\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
-"shall be called the \"Software Products\" hereafter. The Software Products "
-"include, but are not \n"
-"restricted to, the set of programs, methods, rules and documentation related "
-"to the operating \n"
-"system and the different components of the Mandrakelinux distribution.\n"
-"\n"
-"\n"
-"1. License Agreement\n"
-"\n"
-"Please read this document carefully. This document is a license agreement "
-"between you and \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
-"accept and fully agree to conform to the terms and conditions of this "
-"License. \n"
-"If you disagree with any portion of the License, you are not allowed to "
-"install, duplicate or use \n"
-"the Software Products. \n"
-"Any attempt to install, duplicate or use the Software Products in a manner "
-"which does not comply \n"
-"with the terms and conditions of this License is void and will terminate "
-"your rights under this \n"
-"License. Upon termination of the License, you must immediately destroy all "
-"copies of the \n"
-"Software Products.\n"
-"\n"
-"\n"
-"2. Limited Warranty\n"
-"\n"
-"The Software Products and attached documentation are provided \"as is\", "
-"with no warranty, to the \n"
-"extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of the use or "
-"inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
-"damages.\n"
-"\n"
-"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
-"COUNTRIES\n"
-"\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
-"in no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of "
-"downloading software components \n"
-"from one of Mandrakelinux sites which are prohibited or restricted in some "
-"countries by local laws.\n"
-"This limited liability applies to, but is not restricted to, the strong "
-"cryptography components \n"
-"included in the Software Products.\n"
-"\n"
-"\n"
-"3. The GPL License and Related Licenses\n"
-"\n"
-"The Software Products consist of components created by different persons or "
-"entities. Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
-"Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
-"documentation for \n"
-"further details.\n"
-"\n"
-"\n"
-"4. Intellectual Property Rights\n"
-"\n"
-"All rights to the components of the Software Products belong to their "
-"respective authors and are \n"
-"protected by intellectual property and copyright laws applicable to software "
-"programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
-"parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A. \n"
-"\n"
-"\n"
-"5. Governing Laws \n"
-"\n"
-"If any portion of this agreement is held void, illegal or inapplicable by a "
-"court judgment, this \n"
-"portion is excluded from this contract. You remain bound by the other "
-"applicable sections of the \n"
-"agreement.\n"
-"The terms and conditions of this License are governed by the Laws of "
-"France.\n"
-"All disputes on the terms of this license will preferably be settled out of "
-"court. As a last \n"
-"resort, the dispute will be referred to the appropriate Courts of Law of "
-"Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A. \n"
-#: install_messages.pm:89
+#: install_messages.pm:90
#, c-format
msgid ""
"Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -6126,7 +6033,8 @@ msgid ""
"may be applicable to you, check your local laws."
msgstr ""
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
#, c-format
msgid ""
"\n"
@@ -6187,8 +6095,8 @@ msgstr ""
"respective authors and are protected by intellectual property and \n"
"copyright laws applicable to software programs.\n"
-#: install_messages.pm:128
-#, fuzzy, c-format
+#: install_messages.pm:131
+#, c-format
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -6205,42 +6113,45 @@ msgid ""
"Information on configuring your system is available in the post\n"
"install chapter of the Official Mandrakelinux User's Guide."
msgstr ""
-"おめでとうございます。インストールが終わりました。\n"
+"おめでとうございます。インストールが完了しました。\n"
"起動用メディアを抜き、Enterを押して再起動してください。\n"
"\n"
"\n"
-"Mandrakelinuxの修正情報(Errata)は以下にあります。\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
+"consult the Errata available from:\n"
"\n"
"\n"
"%s\n"
"\n"
"\n"
-"システムの設定については公式Mandrakelinuxユーザガイドの\n"
-"'インストール後'の章をご覧ください。"
+"Information on configuring your system is available in the post\n"
+"install chapter of the Official Mandrakelinux User's Guide."
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
#, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
-#: install_steps.pm:242
+#: install_steps.pm:246
#, c-format
msgid "Duplicate mount point %s"
msgstr "マウントポイント %s は重複しています"
-#: install_steps.pm:407
+#: install_steps.pm:477
#, c-format
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
"\"\n"
msgstr ""
"重要なパッケージがインストールされませんでした。\n"
"CD-ROMドライブかCD-ROMに問題があります。\n"
-"rpm -qpl Mandrake/RPMS/*.rpm でCD-ROMをチェックしてください。\n"
+"rpm -qpl media/main/*.rpm でCD-ROMをチェックしてください。\n"
-#: install_steps.pm:533
+#: install_steps.pm:603
#, c-format
msgid "No floppy drive available"
msgstr "利用可能なフロッピードライブがありません"
@@ -6250,7 +6161,7 @@ msgstr "利用可能なフロッピードライブがありません"
msgid "Entering step `%s'\n"
msgstr "%s を開始\n"
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -6264,95 +6175,95 @@ msgstr ""
"この場合はCD-ROMを起動したときにF1を押し、続いて'text'と入力して\n"
"ください。"
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
#, c-format
msgid "Package Group Selection"
msgstr "パッケージグループを選択"
# Changed "total size" to "total", due to problem of available
# space on screen.
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
#, c-format
msgid "Total size: %d / %d MB"
msgstr "合計: %d/%d MB"
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
#, c-format
msgid "Bad package"
msgstr "不正なパッケージ"
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
#, c-format
msgid "Version: "
msgstr "バージョン: "
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
#, c-format
msgid "Size: "
msgstr "サイズ: "
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
#, c-format
msgid "Importance: "
msgstr "重要性: "
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
#, c-format
msgid "You can't select/unselect this package"
msgstr "このパッケージを選択/選択を解除することはできません"
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
#, c-format
msgid "due to missing %s"
msgstr "%s がありません"
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s がありません"
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
#, c-format
msgid "in order to keep %s"
-msgstr ""
+msgstr "%s を維持するために"
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
#, c-format
msgid ""
"You can't select this package as there is not enough space left to install it"
msgstr "このパッケージは選択できません。インストール用の空き容量がありません"
-#: install_steps_gtk.pm:392
+#: install_steps_gtk.pm:361
#, c-format
msgid "The following packages are going to be installed"
msgstr "以下のパッケージがインストールされます"
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
#, c-format
msgid "The following packages are going to be removed"
msgstr "以下のパッケージが削除されます"
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
#, c-format
msgid "This is a mandatory package, it can't be unselected"
msgstr "これは必須パッケージです。選択を解除できません"
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
#, c-format
msgid "You can't unselect this package. It is already installed"
msgstr "このパッケージは選択解除できません。既にインストールしています"
-#: install_steps_gtk.pm:422
+#: install_steps_gtk.pm:391
#, c-format
msgid ""
"This package must be upgraded.\n"
@@ -6361,218 +6272,222 @@ msgstr ""
"このパッケージはアップグレードが必要です。\n"
"本当に選択を解除しますか?"
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
#, c-format
msgid "You can't unselect this package. It must be upgraded"
msgstr "このパッケージは選択を解除できません。アップグレードが必要です"
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
#, c-format
msgid "Show automatically selected packages"
msgstr "自動的に選択したパッケージを表示"
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
#, c-format
msgid "Load/Save on floppy"
msgstr "フロッピーに保存/ロードする"
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
#, c-format
msgid "Updating package selection"
msgstr "パッケージの選択を更新"
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
#, c-format
msgid "Minimal install"
msgstr "最小インストール"
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
#, c-format
msgid "Choose the packages you want to install"
msgstr "インストールするパッケージを選んでください"
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
#, c-format
msgid "Installing"
msgstr "インストール中"
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "詳細なし"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
#, c-format
msgid "Estimating"
msgstr "試算しています"
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
#, c-format
msgid "Time remaining "
msgstr "残り時間 "
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
#, c-format
msgid "Please wait, preparing installation..."
msgstr "お待ちください。インストールの準備中です。"
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "詳細なし"
+
+#: install_steps_gtk.pm:527
#, c-format
msgid "%d packages"
msgstr "%d 個のパッケージ"
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
#, c-format
msgid "Installing package %s"
msgstr "パッケージ %s をインストール"
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
#, c-format
msgid "Refuse"
msgstr "拒否する"
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
#, c-format
msgid ""
"Change your Cd-Rom!\n"
-"\n"
"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
"done.\n"
"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
"CD-ROMを交換してください。\n"
-"%s というCD-ROMをドライブにいれて'OK'を押してください。\n"
+"\"%s\" というCD-ROMをドライブにいれて'OK'を押してください。\n"
"持っていない場合は'キャンセル'を押してください。"
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
#, c-format
msgid "There was an error ordering packages:"
msgstr "パッケージを並べかえ中にエラーが発生:"
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
#, c-format
msgid "Go on anyway?"
msgstr "続けますか?"
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
#, c-format
msgid "There was an error installing packages:"
msgstr "パッケージをインストール中にエラーが発生:"
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
#, c-format
msgid "not configured"
msgstr "設定していません"
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
#, c-format
msgid "Do you want to recover your system?"
msgstr "システムを復旧しますか?"
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
#, c-format
msgid "License agreement"
msgstr "ライセンスへの同意"
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, c-format
+msgid "Release Notes"
+msgstr "リリースノート"
+
+#: install_steps_interactive.pm:121
#, c-format
msgid "Please choose your keyboard layout."
msgstr "キーボードの配列を選んでください"
-#: install_steps_interactive.pm:113
-#, fuzzy, c-format
+#: install_steps_interactive.pm:123
+#, c-format
msgid "Here is the full list of available keyboards"
-msgstr "利用可能な国名の全リスト"
+msgstr "利用可能なキーボードの全リスト"
-#: install_steps_interactive.pm:143
+#: install_steps_interactive.pm:153
#, c-format
msgid "Install/Upgrade"
msgstr "インストール/更新"
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "インストールか更新を選んでください"
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
#, c-format
msgid "Upgrade %s"
msgstr "%s を更新"
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
#, c-format
msgid "Encryption key for %s"
msgstr "%s の暗号キー"
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
#, c-format
msgid "Please choose your type of mouse."
msgstr "マウスの種類を選んでください。"
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
#, c-format
msgid "Mouse Port"
msgstr "マウスのポート"
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 standalone/mousedrake:47
#, c-format
msgid "Please choose which serial port your mouse is connected to."
msgstr "マウスを接続しているシリアルポートを選んでください。"
-#: install_steps_interactive.pm:197
+#: install_steps_interactive.pm:207
#, c-format
msgid "Buttons emulation"
msgstr "ボタンのエミュレーション"
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
#, c-format
msgid "Button 2 Emulation"
msgstr "第2ボタンのエミュレーション"
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
#, c-format
msgid "Button 3 Emulation"
msgstr "第3ボタンのエミュレーション"
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
#, c-format
msgid "PCMCIA"
msgstr "PCMCIA"
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
#, c-format
msgid "Configuring PCMCIA cards..."
msgstr "PCMCIAカードを設定中.."
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
#, c-format
msgid "IDE"
msgstr "IDE"
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
#, c-format
msgid "Configuring IDE"
msgstr "IDEを設定"
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
#, c-format
msgid "No partition available"
msgstr "利用可能なパーティションがありません"
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
#, c-format
msgid "Scanning partitions to find mount points"
msgstr "パーティションをスキャンしてマウントポイントを探しています"
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
#, c-format
msgid "Choose the mount points"
msgstr "マウントポイントを選択"
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6582,17 +6497,17 @@ msgstr ""
"システムを起動するにはDiskDrakeでブートストラップパーティションを\n"
"作成してください"
-#: install_steps_interactive.pm:325
+#: install_steps_interactive.pm:337
#, c-format
msgid "Choose the partitions you want to format"
msgstr "フォーマットするパーティションを選んでください"
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
#, c-format
msgid "Check bad blocks?"
msgstr "不正なブロックをチェックしますか?"
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
#, c-format
msgid ""
"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6601,39 +6516,50 @@ msgstr ""
"ファイルシステム %s のチェックに失敗しました。エラーを修復しますか?\n"
"(注意:データを失うかもしれません)"
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
#, c-format
msgid "Not enough swap space to fulfill installation, please add some"
msgstr "インストールするにはSwap領域が足りません。追加してください。"
-#: install_steps_interactive.pm:369
+#: install_steps_interactive.pm:381
#, c-format
msgid "Looking for available packages and rebuilding rpm database..."
msgstr "利用可能なパッケージを探してRPMデータベースを再構築しています.."
-#: install_steps_interactive.pm:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
#, c-format
msgid "Looking for available packages..."
msgstr "利用可能なパッケージを探しています"
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
#, c-format
msgid "Looking at packages already installed..."
msgstr "インストール済みパッケージを探しています"
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
#, c-format
msgid "Finding packages to upgrade..."
msgstr "更新するパッケージを探しています"
-#: install_steps_interactive.pm:398
+#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "Mandrakelinuxのサイトに接続してミラーのリストを取得しています"
+
+#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "パッケージを取得するミラーを選択"
+
+#: install_steps_interactive.pm:451
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%d "
"> %d)"
msgstr "インストール/アップグレードする空き容量が足りません。(%d > %d)"
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
#, c-format
msgid ""
"Please choose load or save package selection on floppy.\n"
@@ -6642,42 +6568,42 @@ msgstr ""
"フロッピーにパッケージの選択を保存するかロードするかを選んでください。\n"
"インストール自動化フロッピーと同じ形式です。"
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
#, c-format
msgid "Load from floppy"
msgstr "フロッピーからロード"
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
#, c-format
msgid "Save on floppy"
msgstr "フロッピーに保存"
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
#, c-format
msgid "Package selection"
msgstr "パッケージを選択"
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
#, c-format
msgid "Loading from floppy"
msgstr "フロッピーからロード"
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
#, c-format
msgid "Insert a floppy containing package selection"
msgstr "パッケージの選択を保存したフロッピーを入れてください"
-#: install_steps_interactive.pm:533
+#: install_steps_interactive.pm:581
#, c-format
msgid "Selected size is larger than available space"
msgstr "選んだサイズが空き容量を超えています"
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
#, c-format
msgid "Type of install"
msgstr "インストールの種類"
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
#, c-format
msgid ""
"You haven't selected any group of packages.\n"
@@ -6686,22 +6612,22 @@ msgstr ""
"パッケージグループを選んでいません。\n"
"インストールする最低限のものを選んでください:"
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "基本的なドキュメントを入れる(おすすめ)"
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "最小限のインストール(urpmiすらありません)"
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
#, c-format
msgid "All"
msgstr "全て"
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
#, c-format
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
@@ -6712,17 +6638,17 @@ msgstr ""
"どれも持っていない場合はキャンセルをクリック。\n"
"持っていないものがある場合はそれらを解除してOKをクリックしてください。"
-#: install_steps_interactive.pm:646
+#: install_steps_interactive.pm:699
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "%s というCD-ROM"
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
#, c-format
msgid "Preparing installation"
msgstr "インストールの準備"
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
#, c-format
msgid ""
"Installing package %s\n"
@@ -6731,17 +6657,17 @@ msgstr ""
"パッケージ %s をインストール\n"
"%d%%"
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
#, c-format
msgid "Post-install configuration"
msgstr "インストール後の設定"
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "更新モジュールフロッピーをドライブ %s に入れてください"
-#: install_steps_interactive.pm:748
+#: install_steps_interactive.pm:813
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -6751,7 +6677,7 @@ msgid ""
"To download these packages, you will need to have a working Internet \n"
"connection.\n"
"\n"
-"Do you want to install the updates ?"
+"Do you want to install the updates?"
msgstr ""
"更新されたパッケージをダウンロードすることができます。これらのパッケージは\n"
"ディストリビューション公開後に更新されたものです。セキュリティやバグの\n"
@@ -6761,180 +6687,166 @@ msgstr ""
"\n"
"更新されたパッケージをインストールしますか?"
-#: install_steps_interactive.pm:769
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Mandrakelinuxのサイトに接続してミラーのリストを取得しています"
-
-#: install_steps_interactive.pm:774
-#, c-format
-msgid "Choose a mirror from which to get the packages"
-msgstr "パッケージを取得するミラーを選択"
-
-#: install_steps_interactive.pm:788
+#: install_steps_interactive.pm:853
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "ミラーに接続して利用可能なパッケージのリストを取得しています"
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
#, c-format
msgid "Unable to contact mirror %s"
msgstr "ミラー %s に接続できません"
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
#, c-format
msgid "Would you like to try again?"
msgstr "もう一度試しますか?"
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
#, c-format
msgid "Which is your timezone?"
msgstr "タイムゾーンを選んでください。"
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "自動的に時間を合わせる(NTPを使用)"
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
#, c-format
msgid "NTP Server"
msgstr "NTPサーバ"
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
#, c-format
msgid "Summary"
msgstr "要約"
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
+#: install_steps_interactive.pm:1136 services.pm:135
+#: standalone/drakbackup:1593
#, c-format
msgid "System"
msgstr "システム"
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
+#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
+#: install_steps_interactive.pm:1062
#, c-format
msgid "Hardware"
msgstr "ハードウェア"
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
#, c-format
msgid "Remote CUPS server"
msgstr "リモートCUPSサーバ"
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
#, c-format
msgid "No printer"
msgstr "プリンタなし"
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "ISAサウンドカードをお持ちですか?"
-#: install_steps_interactive.pm:976
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1041
+#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
-msgstr "インストール後にsndconfigを実行してサウンドカードを設定してください。"
+msgstr ""
+"インストール後に alsaconf か sndconfigを実行してサウンドカードを設定してくだ"
+"さい。"
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "サウンドカードがありません。インストール後にharddrakeを試してください"
-#: install_steps_interactive.pm:998
+#: install_steps_interactive.pm:1063
#, c-format
msgid "Graphical interface"
msgstr "グラフィカルインタフェース"
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
#, c-format
msgid "Network & Internet"
msgstr ""
"ネットワークと\n"
"インターネット"
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "プロクシ"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
#, c-format
msgid "configured"
msgstr "設定済み"
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
#: steps.pm:20
#, c-format
msgid "Security"
msgstr "セキュリティ"
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
#, c-format
msgid "activated"
msgstr "有効化"
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
#, c-format
msgid "disabled"
msgstr "無効化"
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
#, c-format
msgid "Boot"
msgstr "起動"
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
#, c-format
msgid "%s on %s"
msgstr "%s on %s"
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
#, c-format
msgid "Services: %d activated for %d registered"
msgstr "サービス: %d 個を起動(登録数は %d 個)"
-#: install_steps_interactive.pm:1083
+#: install_steps_interactive.pm:1151
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Xを設定していません。本当によろしいですか?"
-#: install_steps_interactive.pm:1141
+#: install_steps_interactive.pm:1205
#, c-format
msgid "Set root password and network authentication methods"
msgstr "rootパスワードとネットワーク認証を設定"
-#: install_steps_interactive.pm:1142
+#: install_steps_interactive.pm:1206
#, c-format
msgid "Set root password"
msgstr "rootパスワードを設定"
-#: install_steps_interactive.pm:1152
+#: install_steps_interactive.pm:1217
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "このパスワードは短すぎます(最低でも %d 文字以上)"
-#: install_steps_interactive.pm:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: install_steps_interactive.pm:1222 network/netconnect.pm:596
+#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
#, c-format
msgid "Authentication"
msgstr "認証"
-#: install_steps_interactive.pm:1188
+#: install_steps_interactive.pm:1254
#, c-format
msgid "Preparing bootloader..."
msgstr "ブートローダを準備中.."
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown\n"
@@ -6947,12 +6859,12 @@ msgstr ""
"インストールを続けますが、マシンの起動には\n"
"BootXもしくは他の手段が必要です。"
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
#, c-format
msgid "Do you want to use aboot?"
msgstr "abootを使いますか?"
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -6961,35 +6873,7 @@ msgstr ""
"abootをインストール中にエラーが発生。\n"
"最初のパーティションを破壊してでもインストールを強制しますか?"
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "ブートローダをインストール中"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "ブートローダのインストールに失敗しました。以下のエラーが発生:"
-
-#: install_steps_interactive.pm:1230
-#, c-format
-msgid ""
-"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader. If you don't see the bootloader prompt at\n"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-"ブートローダを有効にするにはオープンファームウェアの起動デバイスを\n"
-"変更する必要があるかもしれません。再起動時にブートローダのプロンプトが\n"
-"表示されない場合は、Command-Option-O-F を再起動時に押して\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" shut-down\n"
-"と入力してください。\n"
-"次回の起動時にはブートローダのプロンプトが表示されるはずです。"
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -6998,22 +6882,22 @@ msgstr ""
"このセキュリティベルでは、Windowsパーティションのファイルへのアクセスが管理者"
"のみに限定されます"
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "空のフロッピーをドライブ %s に入れてください"
-#: install_steps_interactive.pm:1280
-#, fuzzy, c-format
+#: install_steps_interactive.pm:1327
+#, c-format
msgid "Please insert another floppy for drivers disk"
-msgstr "使用した起動用フロッピーをドライブ %s に入れてください"
+msgstr "ドライバディスクの別のフロッピーを入れてください"
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
#, c-format
msgid "Creating auto install floppy..."
msgstr "インストール自動化フロッピーを作成中.."
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -7024,12 +6908,12 @@ msgstr ""
"\n"
"本当に終了しますか?"
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
#, c-format
msgid "Generate auto install floppy"
msgstr "インストール自動化フロッピーを作成"
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -7049,7 +6933,8 @@ msgstr ""
msgid "Mandrakelinux Installation %s"
msgstr "Mandrakelinuxのインストール %s"
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
#, c-format
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
@@ -7060,17 +6945,37 @@ msgstr " <Tab>/<Alt-Tab> 項目間の移動 | <Space> 選択 | <F12> 次の画
msgid "Choose a file"
msgstr "ファイルを選択"
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
+#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Add"
+msgstr "追加"
+
+#: interactive.pm:295 interactive/gtk.pm:482
+#, c-format
+msgid "Modify"
+msgstr "変更"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "削除"
+
#: interactive.pm:372
#, c-format
msgid "Basic"
msgstr "基本"
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
#, c-format
msgid "Finish"
msgstr "完了"
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
#, c-format
msgid "Do"
msgstr "実行"
@@ -7149,572 +7054,765 @@ msgstr ""
msgid "Re-submit"
msgstr "再登録"
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
#, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
msgstr "チェコ(QWERTZ)"
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
#, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
msgstr "ドイツ"
-#: keyboard.pm:163
+#: keyboard.pm:165
#, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
msgstr "Dvorak"
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
#, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
msgstr "スペイン"
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
#, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
msgstr "フィンランド"
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
#, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
msgstr "フランス"
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
#, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
msgstr "ノルウェー"
-#: keyboard.pm:168
+#: keyboard.pm:170
#, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
msgstr "ポーランド"
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
#, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
msgstr "ロシア"
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
#, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
msgstr "スウェーデン"
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
#, c-format
msgid "UK keyboard"
msgstr "イギリス式キーボード"
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
#, c-format
msgid "US keyboard"
msgstr "アメリカ式キーボード"
-#: keyboard.pm:175
+#: keyboard.pm:177
#, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
msgstr "アルバニア"
-#: keyboard.pm:176
+#: keyboard.pm:178
#, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
msgstr "アルメニア(古い)"
-#: keyboard.pm:177
+#: keyboard.pm:179
#, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
msgstr "アルメニア(タイプライター)"
-#: keyboard.pm:178
+#: keyboard.pm:180
#, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
msgstr "アルメニア(発音記号)"
-#: keyboard.pm:179
+#: keyboard.pm:181
#, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
msgstr "アラビア"
-#: keyboard.pm:180
+#: keyboard.pm:182
#, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
msgstr "アゼルバイジャン(ラテン)"
-#: keyboard.pm:182
+#: keyboard.pm:183
#, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
msgstr "ベルギー"
-#: keyboard.pm:183
+#: keyboard.pm:184
#, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
msgstr "ベンガル"
-#: keyboard.pm:184
+#: keyboard.pm:185
#, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
msgstr "アルメニア(発音記号)"
-#: keyboard.pm:185
+#: keyboard.pm:186
#, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
msgstr "ブルガリア(BDS)"
-#: keyboard.pm:186
+#: keyboard.pm:187
#, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
msgstr "ブラジル"
-#: keyboard.pm:189
+#: keyboard.pm:188
#, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
msgstr "ボスニア"
-#: keyboard.pm:190
+#: keyboard.pm:189
#, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
msgstr "ベラルーシ"
#: keyboard.pm:191
#, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
msgstr "スイス(ドイツ)"
-#: keyboard.pm:192
+#: keyboard.pm:193
#, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
msgstr "スイス(フランス)"
-#: keyboard.pm:194
+#: keyboard.pm:195
#, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
msgstr "チェコ(QWERTY)"
-#: keyboard.pm:196
+#: keyboard.pm:197
#, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
msgstr "ドイツ(デッドキーなし)"
-#: keyboard.pm:197
+#: keyboard.pm:198
#, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
msgstr "デヴァナガーリー"
-#: keyboard.pm:198
+#: keyboard.pm:199
#, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
msgstr "デンマーク"
-#: keyboard.pm:199
+#: keyboard.pm:200
#, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
msgstr "Dvorak(US)"
-#: keyboard.pm:200
-#, fuzzy, c-format
-msgid "Dvorak (Esperanto)"
-msgstr "Dvorak(ノルウェー)"
-
#: keyboard.pm:201
#, c-format
-msgid "Dvorak (Norwegian)"
-msgstr "Dvorak(ノルウェー)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
+msgstr "Dvorak (エスペラント)"
#: keyboard.pm:202
#, c-format
-msgid "Dvorak (Swedish)"
-msgstr "Dvorak(スウェーデン)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
+msgstr "Dvorak(ノルウェー)"
#: keyboard.pm:203
#, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
+msgstr "Dvorak(スウェーデン)"
+
+#: keyboard.pm:205
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Estonian"
msgstr "エストニア"
-#: keyboard.pm:207
+#: keyboard.pm:209
#, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
msgstr "グルジア(ロシア配列)"
-#: keyboard.pm:208
+#: keyboard.pm:210
#, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
msgstr "グルジア(ラテン配列)"
-#: keyboard.pm:209
+#: keyboard.pm:211
#, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
msgstr "ギリシャ"
-#: keyboard.pm:210
+#: keyboard.pm:212
#, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
msgstr "ギリシャ(polytonic)"
-#: keyboard.pm:211
+#: keyboard.pm:213
#, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
msgstr "グジャラート"
-#: keyboard.pm:212
+#: keyboard.pm:214
#, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
msgstr "グルムキ"
-#: keyboard.pm:213
+#: keyboard.pm:216
#, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
msgstr "ハンガリー"
-#: keyboard.pm:214
+#: keyboard.pm:217
#, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
msgstr "クロアチア"
-#: keyboard.pm:215
+#: keyboard.pm:218
#, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
msgstr "Irish"
-#: keyboard.pm:216
+#: keyboard.pm:219
#, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
msgstr "イスラエル"
-#: keyboard.pm:217
+#: keyboard.pm:220
#, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
msgstr "イスラエル(発音記号)"
-#: keyboard.pm:218
+#: keyboard.pm:221
#, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
msgstr "イラン"
-#: keyboard.pm:219
+#: keyboard.pm:222
#, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
msgstr "アイスランド"
-#: keyboard.pm:220
+#: keyboard.pm:223
#, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
msgstr "イタリア"
-#: keyboard.pm:221
+#: keyboard.pm:224
#, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
msgstr "イヌクティトト"
-#: keyboard.pm:225
+#: keyboard.pm:229
#, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
msgstr "日本語106キーボード"
-#: keyboard.pm:226
+#: keyboard.pm:230
#, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
msgstr "カンナダ"
-#: keyboard.pm:229
+#: keyboard.pm:233
#, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
msgstr "韓国式キーボード"
-#: keyboard.pm:230
-#, fuzzy, c-format
-msgid "Kyrgyz keyboard"
-msgstr "イギリス式キーボード"
+#: keyboard.pm:234
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
+msgstr "Kyrgyzキーボード"
-#: keyboard.pm:231
+#: keyboard.pm:235
#, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
msgstr "ラテンアメリカ"
-#: keyboard.pm:232
+#: keyboard.pm:236
#, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
msgstr "ラオス"
-#: keyboard.pm:233
+#: keyboard.pm:238
#, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
msgstr "リトアニア AZERTY(旧)"
-#: keyboard.pm:235
+#: keyboard.pm:241
#, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
msgstr "リトアニア AZERTY(新)"
-#: keyboard.pm:236
+#: keyboard.pm:243
#, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
msgstr "リトアニア(数字列QWERTY)"
-#: keyboard.pm:237
+#: keyboard.pm:245
#, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
msgstr "リトアニア(発音QWERTY)"
-#: keyboard.pm:238
+#: keyboard.pm:246
#, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
msgstr "ラトヴィア"
-#: keyboard.pm:239
+#: keyboard.pm:247
#, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
msgstr "マレー半島"
-#: keyboard.pm:240
+#: keyboard.pm:248
#, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
msgstr "マケドニア"
-#: keyboard.pm:241
+#: keyboard.pm:249
#, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
msgstr "ミャンマー(ビルマ)"
-#: keyboard.pm:242
+#: keyboard.pm:250
#, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
msgstr "モンゴル(cyrillic)"
-#: keyboard.pm:243
+#: keyboard.pm:251
#, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
msgstr "マルタ(UK)"
-#: keyboard.pm:244
+#: keyboard.pm:252
#, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
msgstr "マルタ(US)"
-#: keyboard.pm:245
+#: keyboard.pm:253
#, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
msgstr "オランダ"
-#: keyboard.pm:247
+#: keyboard.pm:255
#, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
msgstr "オリヤー"
-#: keyboard.pm:248
+#: keyboard.pm:256
#, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
msgstr "ポーランド(qwerty)"
-#: keyboard.pm:249
+#: keyboard.pm:257
#, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
msgstr "ポーランド(qwertz)"
-#: keyboard.pm:250
+#: keyboard.pm:258
#, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
msgstr "ポルトガル"
-#: keyboard.pm:251
+#: keyboard.pm:260
#, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
msgstr "カナダ(ケベック)"
-#: keyboard.pm:253
+#: keyboard.pm:262
#, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
msgstr "ルーマニア(qwertz)"
-#: keyboard.pm:254
+#: keyboard.pm:263
#, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
msgstr "ルーマニア(qwerty)"
-#: keyboard.pm:256
+#: keyboard.pm:265
#, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
msgstr "ロシア(発音記号)"
-#: keyboard.pm:257
+#: keyboard.pm:266
#, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
msgstr "Saami (norwegian)"
-#: keyboard.pm:258
+#: keyboard.pm:267
#, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
msgstr "サーミ(swedish/finnish)"
-#: keyboard.pm:260
+#: keyboard.pm:269
#, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
msgstr "スロベニア"
-#: keyboard.pm:261
+#: keyboard.pm:270
#, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
msgstr "スロバキア(QWERTZ)"
-#: keyboard.pm:262
+#: keyboard.pm:271
#, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
msgstr "スロバキア(QWERTY)"
-#: keyboard.pm:264
+#: keyboard.pm:273
#, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
msgstr "セルビア(cyrillic)"
-#: keyboard.pm:265
+#: keyboard.pm:274
#, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
msgstr "シリア"
-#: keyboard.pm:266
+#: keyboard.pm:275
#, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
msgstr "シリア(発音記号)"
-#: keyboard.pm:267
+#: keyboard.pm:276
#, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
msgstr "テルグ"
-#: keyboard.pm:269
+#: keyboard.pm:278
#, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
msgstr "タミール(ISCII)"
-#: keyboard.pm:270
+#: keyboard.pm:279
#, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
msgstr "タミール(タイプライタ)"
-#: keyboard.pm:271
+#: keyboard.pm:280
#, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
msgstr "タイ式キーボード"
-#: keyboard.pm:273
+#: keyboard.pm:282
#, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
msgstr "タジク式キーボード"
-#: keyboard.pm:274
+#: keyboard.pm:283
#, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
msgstr "トルコ(伝統的Fモデル)"
-#: keyboard.pm:275
+#: keyboard.pm:284
#, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
msgstr "トルコ(モダンQモデル)"
-#: keyboard.pm:277
+#: keyboard.pm:286
#, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
msgstr "ウクライナ"
-#: keyboard.pm:280
+#: keyboard.pm:289
#, c-format
msgid "US keyboard (international)"
msgstr "アメリカ式キーボード(国際式)"
-#: keyboard.pm:281
+#: keyboard.pm:290
#, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
msgstr "ウズベキスタン(cyrillic)"
-#: keyboard.pm:282
+#: keyboard.pm:292
#, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
msgstr "ベトナム(数字列)"
-#: keyboard.pm:283
+#: keyboard.pm:293
#, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
msgstr "ユーゴスラビア(ラテン)"
-#: keyboard.pm:290
+#: keyboard.pm:300
#, c-format
msgid "Right Alt key"
msgstr "右側のAltキー"
-#: keyboard.pm:291
+#: keyboard.pm:301
#, c-format
msgid "Both Shift keys simultaneously"
msgstr "左右のShiftを同時に押す"
-#: keyboard.pm:292
+#: keyboard.pm:302
#, c-format
msgid "Control and Shift keys simultaneously"
msgstr "CtrlとShiftを同時に押す"
-#: keyboard.pm:293
+#: keyboard.pm:303
#, c-format
msgid "CapsLock key"
msgstr "CapsLockキー"
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "ShiftとCapsLockを同時に押す"
+
+#: keyboard.pm:305
#, c-format
msgid "Ctrl and Alt keys simultaneously"
msgstr "CtrlとAltを同時に押す"
-#: keyboard.pm:295
+#: keyboard.pm:306
#, c-format
msgid "Alt and Shift keys simultaneously"
msgstr "AltとShiftを同時に押す"
-#: keyboard.pm:296
+#: keyboard.pm:307
#, c-format
msgid "\"Menu\" key"
msgstr "メニューキー"
-#: keyboard.pm:297
+#: keyboard.pm:308
#, c-format
msgid "Left \"Windows\" key"
msgstr "左側のWindowsキー"
-#: keyboard.pm:298
+#: keyboard.pm:309
#, c-format
msgid "Right \"Windows\" key"
msgstr "右側のWindowsキー"
-#: keyboard.pm:299
+#: keyboard.pm:310
#, c-format
msgid "Both Control keys simultaneously"
msgstr "左右のCtrlを同時に押す"
-#: keyboard.pm:300
+#: keyboard.pm:311
#, c-format
msgid "Both Alt keys simultaneously"
msgstr "左右のAltを同時に押す"
-#: keyboard.pm:301
+#: keyboard.pm:312
#, c-format
msgid "Left Shift key"
msgstr "左側のShiftキー"
-#: keyboard.pm:302
+#: keyboard.pm:313
#, c-format
msgid "Right Shift key"
msgstr "右側のShiftキー"
-#: keyboard.pm:303
+#: keyboard.pm:314
#, c-format
msgid "Left Alt key"
msgstr "左側のAltキー"
-#: keyboard.pm:304
+#: keyboard.pm:315
#, c-format
msgid "Left Control key"
msgstr "左のCtrlキー"
-#: keyboard.pm:305
+#: keyboard.pm:316
#, c-format
msgid "Right Control key"
msgstr "右側のCtrlキー"
-#: keyboard.pm:336
+#: keyboard.pm:347
#, c-format
msgid ""
"Here you can choose the key or key combination that will \n"
@@ -7724,7 +7822,7 @@ msgstr ""
"キーボードの配列を切り替える(例:ラテンと非ラテン)キーの\n"
"組み合わせを選んでください"
-#: keyboard.pm:341
+#: keyboard.pm:352
#, c-format
msgid ""
"This setting will be activated after the installation.\n"
@@ -7735,1164 +7833,1188 @@ msgstr ""
"インストール時は右Ctrlキーでキーボードのレイアウトを\n"
"切り替えてください。"
-#: lang.pm:153
+#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
+#. -PO: or as "default:RTL", depending if your language is written from
+#. -PO: left to right, or from right to left; any other string is wrong.
+#: lang.pm:165
#, c-format
msgid "default:LTR"
msgstr "default:LTR"
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "アフガニスタン"
-
-#: lang.pm:170
+#: lang.pm:182
#, c-format
msgid "Andorra"
msgstr "アンドラ"
-#: lang.pm:171
+#: lang.pm:183
#, c-format
msgid "United Arab Emirates"
msgstr "アラブ首長国連邦"
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "アフガニスタン"
+
+#: lang.pm:185
#, c-format
msgid "Antigua and Barbuda"
msgstr "アンチグアバーブーダ"
-#: lang.pm:173
+#: lang.pm:186
#, c-format
msgid "Anguilla"
msgstr "アングィラ島"
-#: lang.pm:174
+#: lang.pm:187
#, c-format
msgid "Albania"
msgstr "アルバニア"
-#: lang.pm:175
+#: lang.pm:188
#, c-format
msgid "Armenia"
msgstr "アルメニア"
-#: lang.pm:176
+#: lang.pm:189
#, c-format
msgid "Netherlands Antilles"
msgstr "オランダ領アンティル諸島"
-#: lang.pm:177
+#: lang.pm:190
#, c-format
msgid "Angola"
msgstr "アンゴラ"
-#: lang.pm:178
+#: lang.pm:191
#, c-format
msgid "Antarctica"
msgstr "アンタルチカ"
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
#, c-format
msgid "Argentina"
msgstr "アルゼンチン"
-#: lang.pm:180
+#: lang.pm:193
#, c-format
msgid "American Samoa"
msgstr "サモア(アメリカ)"
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
#, c-format
msgid "Australia"
msgstr "オーストラリア"
-#: lang.pm:183
+#: lang.pm:196
#, c-format
msgid "Aruba"
msgstr "アルーバ"
-#: lang.pm:184
+#: lang.pm:197
#, c-format
msgid "Azerbaijan"
msgstr "アゼルバイジャン"
-#: lang.pm:185
+#: lang.pm:198
#, c-format
msgid "Bosnia and Herzegovina"
msgstr "ボスニア・ヘルツェゴビナ"
-#: lang.pm:186
+#: lang.pm:199
#, c-format
msgid "Barbados"
msgstr "バルバドス"
-#: lang.pm:187
+#: lang.pm:200
#, c-format
msgid "Bangladesh"
msgstr "バングラデシュ"
-#: lang.pm:189
+#: lang.pm:202
#, c-format
msgid "Burkina Faso"
msgstr "ブルキナファソ"
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
#, c-format
msgid "Bulgaria"
msgstr "ブルガリア"
-#: lang.pm:191
+#: lang.pm:204
#, c-format
msgid "Bahrain"
msgstr "バーレーン"
-#: lang.pm:192
+#: lang.pm:205
#, c-format
msgid "Burundi"
msgstr "ブルンジ"
-#: lang.pm:193
+#: lang.pm:206
#, c-format
msgid "Benin"
msgstr "ベニン"
-#: lang.pm:194
+#: lang.pm:207
#, c-format
msgid "Bermuda"
msgstr "バーミューダ"
-#: lang.pm:195
+#: lang.pm:208
#, c-format
msgid "Brunei Darussalam"
msgstr "ブルネイ・ダルサラーム国"
-#: lang.pm:196
+#: lang.pm:209
#, c-format
msgid "Bolivia"
msgstr "ボリビア"
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
#, c-format
msgid "Brazil"
msgstr "ブラジル"
-#: lang.pm:198
+#: lang.pm:211
#, c-format
msgid "Bahamas"
msgstr "バハマ"
-#: lang.pm:199
+#: lang.pm:212
#, c-format
msgid "Bhutan"
msgstr "ブータン"
-#: lang.pm:200
+#: lang.pm:213
#, c-format
msgid "Bouvet Island"
msgstr "ブーヴェ島"
-#: lang.pm:201
+#: lang.pm:214
#, c-format
msgid "Botswana"
msgstr "ボツワナ"
-#: lang.pm:202
+#: lang.pm:215
#, c-format
msgid "Belarus"
msgstr "ベラルーシ"
-#: lang.pm:203
+#: lang.pm:216
#, c-format
msgid "Belize"
msgstr "ベリーズ"
-#: lang.pm:204
+#: lang.pm:217
#, c-format
msgid "Canada"
msgstr "カナダ"
-#: lang.pm:205
+#: lang.pm:218
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr "ココス諸島"
-#: lang.pm:206
+#: lang.pm:219
#, c-format
msgid "Congo (Kinshasa)"
msgstr "コンゴ(Kinshasa)"
-#: lang.pm:207
+#: lang.pm:220
#, c-format
msgid "Central African Republic"
msgstr "中央アフリカ共和国"
-#: lang.pm:208
+#: lang.pm:221
#, c-format
msgid "Congo (Brazzaville)"
msgstr "コンゴ(Brazzaville)"
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
#, c-format
msgid "Switzerland"
msgstr "スイス"
-#: lang.pm:210
+#: lang.pm:223
#, c-format
msgid "Cote d'Ivoire"
msgstr "コートジボアール"
-#: lang.pm:211
+#: lang.pm:224
#, c-format
msgid "Cook Islands"
msgstr "クック諸島"
-#: lang.pm:212
+#: lang.pm:225
#, c-format
msgid "Chile"
msgstr "チリ"
-#: lang.pm:213
+#: lang.pm:226
#, c-format
msgid "Cameroon"
msgstr "カメルーン"
-#: lang.pm:214
+#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
+#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
+#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
+#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
+#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
+#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
+#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
+#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
+#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
+#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
#, c-format
msgid "China"
msgstr "中国"
-#: lang.pm:215
+#: lang.pm:228
#, c-format
msgid "Colombia"
msgstr "コロンビア"
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia & Montenegro"
+
+#: lang.pm:231
#, c-format
msgid "Cuba"
msgstr "キューバ"
-#: lang.pm:218
+#: lang.pm:232
#, c-format
msgid "Cape Verde"
msgstr "カーボベルデ共和国"
-#: lang.pm:219
+#: lang.pm:233
#, c-format
msgid "Christmas Island"
msgstr "クリスマス島"
-#: lang.pm:220
+#: lang.pm:234
#, c-format
msgid "Cyprus"
msgstr "キプロス"
-#: lang.pm:223
+#: lang.pm:237
#, c-format
msgid "Djibouti"
msgstr "ジブチ"
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
#, c-format
msgid "Denmark"
msgstr "デンマーク"
-#: lang.pm:225
+#: lang.pm:239
#, c-format
msgid "Dominica"
msgstr "ドミニカ"
-#: lang.pm:226
+#: lang.pm:240
#, c-format
msgid "Dominican Republic"
msgstr "ドミニカ共和国"
-#: lang.pm:227
+#: lang.pm:241
#, c-format
msgid "Algeria"
msgstr "アルジェリア"
-#: lang.pm:228
+#: lang.pm:242
#, c-format
msgid "Ecuador"
msgstr "エクアドル"
-#: lang.pm:229
+#: lang.pm:243
#, c-format
msgid "Estonia"
msgstr "エストニア"
-#: lang.pm:230
+#: lang.pm:244
#, c-format
msgid "Egypt"
msgstr "エジプト"
-#: lang.pm:231
+#: lang.pm:245
#, c-format
msgid "Western Sahara"
msgstr "西サハラ"
-#: lang.pm:232
+#: lang.pm:246
#, c-format
msgid "Eritrea"
msgstr "エリトリア"
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
#, c-format
msgid "Spain"
msgstr "スペイン"
-#: lang.pm:234
+#: lang.pm:248
#, c-format
msgid "Ethiopia"
msgstr "エチオピア"
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
#, c-format
msgid "Finland"
msgstr "フィンランド"
-#: lang.pm:236
+#: lang.pm:250
#, c-format
msgid "Fiji"
msgstr "フィジー"
-#: lang.pm:237
+#: lang.pm:251
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr "フォークランド諸島(Malvinas)"
-#: lang.pm:238
+#: lang.pm:252
#, c-format
msgid "Micronesia"
msgstr "ミクロネシア"
-#: lang.pm:239
+#: lang.pm:253
#, c-format
msgid "Faroe Islands"
msgstr "フェロー諸島"
-#: lang.pm:241
+#: lang.pm:255
#, c-format
msgid "Gabon"
msgstr "ガボン"
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
#, c-format
msgid "United Kingdom"
msgstr "イギリス"
-#: lang.pm:243
+#: lang.pm:257
#, c-format
msgid "Grenada"
msgstr "グレナダ"
-#: lang.pm:244
+#: lang.pm:258
#, c-format
msgid "Georgia"
msgstr "ジョージア"
-#: lang.pm:245
+#: lang.pm:259
#, c-format
msgid "French Guiana"
msgstr "仏領ギアナ"
-#: lang.pm:246
+#: lang.pm:260
#, c-format
msgid "Ghana"
msgstr "ガーナ"
-#: lang.pm:247
+#: lang.pm:261
#, c-format
msgid "Gibraltar"
msgstr "ジブラルタル"
-#: lang.pm:248
+#: lang.pm:262
#, c-format
msgid "Greenland"
msgstr "グリーンランド"
-#: lang.pm:249
+#: lang.pm:263
#, c-format
msgid "Gambia"
msgstr "ガンビア"
-#: lang.pm:250
+#: lang.pm:264
#, c-format
msgid "Guinea"
msgstr "ギニア"
-#: lang.pm:251
+#: lang.pm:265
#, c-format
msgid "Guadeloupe"
msgstr "グアドループ島"
-#: lang.pm:252
+#: lang.pm:266
#, c-format
msgid "Equatorial Guinea"
msgstr "赤道ギニア共和国"
-#: lang.pm:254
+#: lang.pm:268
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr "サウスジョージア島とサウスサンドイッチ島"
-#: lang.pm:255
+#: lang.pm:269
#, c-format
msgid "Guatemala"
msgstr "グアテマラ"
-#: lang.pm:256
+#: lang.pm:270
#, c-format
msgid "Guam"
msgstr "グアム"
-#: lang.pm:257
+#: lang.pm:271
#, c-format
msgid "Guinea-Bissau"
msgstr "ギニアビサウ共和国"
-#: lang.pm:258
+#: lang.pm:272
#, c-format
msgid "Guyana"
msgstr "ガイアナ"
-#: lang.pm:259
+#: lang.pm:273
#, c-format
-msgid "China (Hong Kong)"
-msgstr "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
+msgstr "Hong Kong SAR (China)"
-#: lang.pm:260
+#: lang.pm:274
#, c-format
msgid "Heard and McDonald Islands"
msgstr "ハード島とマクドナルド島"
-#: lang.pm:261
+#: lang.pm:275
#, c-format
msgid "Honduras"
msgstr "ホンジュラス"
-#: lang.pm:262
+#: lang.pm:276
#, c-format
msgid "Croatia"
msgstr "クロアチア"
-#: lang.pm:263
+#: lang.pm:277
#, c-format
msgid "Haiti"
msgstr "ハイチ"
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
#, c-format
msgid "Hungary"
msgstr "ハンガリー"
-#: lang.pm:265
+#: lang.pm:279
#, c-format
msgid "Indonesia"
msgstr "インドネシア"
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
#, c-format
msgid "Ireland"
msgstr "アイルランド"
-#: lang.pm:267
+#: lang.pm:281
#, c-format
msgid "Israel"
msgstr "イスラエル"
-#: lang.pm:268
+#: lang.pm:282
#, c-format
msgid "India"
msgstr "インド"
-#: lang.pm:269
+#: lang.pm:283
#, c-format
msgid "British Indian Ocean Territory"
msgstr "インド洋イギリス領"
-#: lang.pm:270
+#: lang.pm:284
#, c-format
msgid "Iraq"
msgstr "イラク"
-#: lang.pm:271
+#: lang.pm:285
#, c-format
msgid "Iran"
msgstr "イラン"
-#: lang.pm:272
+#: lang.pm:286
#, c-format
msgid "Iceland"
msgstr "アイスランド"
-#: lang.pm:274
+#: lang.pm:288
#, c-format
msgid "Jamaica"
msgstr "ジャマイカ"
-#: lang.pm:275
+#: lang.pm:289
#, c-format
msgid "Jordan"
msgstr "ヨルダン"
-#: lang.pm:276
+#: lang.pm:290
#, c-format
msgid "Japan"
msgstr "日本"
-#: lang.pm:277
+#: lang.pm:291
#, c-format
msgid "Kenya"
msgstr "ケニア"
-#: lang.pm:278
+#: lang.pm:292
#, c-format
msgid "Kyrgyzstan"
msgstr "キルギスタン"
-#: lang.pm:279
+#: lang.pm:293
#, c-format
msgid "Cambodia"
msgstr "カンボジア"
-#: lang.pm:280
+#: lang.pm:294
#, c-format
msgid "Kiribati"
msgstr "キリバス共和国"
-#: lang.pm:281
+#: lang.pm:295
#, c-format
msgid "Comoros"
msgstr "コモロ"
-#: lang.pm:282
+#: lang.pm:296
#, c-format
msgid "Saint Kitts and Nevis"
msgstr "セントキッツ島とネビス島"
-#: lang.pm:283
+#: lang.pm:297
#, c-format
msgid "Korea (North)"
msgstr "北朝鮮"
-#: lang.pm:284
+#: lang.pm:298
#, c-format
msgid "Korea"
msgstr "韓国"
-#: lang.pm:285
+#: lang.pm:299
#, c-format
msgid "Kuwait"
msgstr "クウェート"
-#: lang.pm:286
+#: lang.pm:300
#, c-format
msgid "Cayman Islands"
msgstr "イギリス領ケイマン諸島 "
-#: lang.pm:287
+#: lang.pm:301
#, c-format
msgid "Kazakhstan"
msgstr "カザフスタン"
-#: lang.pm:288
+#: lang.pm:302
#, c-format
msgid "Laos"
msgstr "ラオス"
-#: lang.pm:289
+#: lang.pm:303
#, c-format
msgid "Lebanon"
msgstr "レバノン"
-#: lang.pm:290
+#: lang.pm:304
#, c-format
msgid "Saint Lucia"
msgstr "セントルシア"
-#: lang.pm:291
+#: lang.pm:305
#, c-format
msgid "Liechtenstein"
msgstr "リヒテンシュタイン"
-#: lang.pm:292
+#: lang.pm:306
#, c-format
msgid "Sri Lanka"
msgstr "スリランカ"
-#: lang.pm:293
+#: lang.pm:307
#, c-format
msgid "Liberia"
msgstr "リベリア"
-#: lang.pm:294
+#: lang.pm:308
#, c-format
msgid "Lesotho"
msgstr "レソト"
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
#, c-format
msgid "Lithuania"
msgstr "リトアニア"
-#: lang.pm:296
+#: lang.pm:310
#, c-format
msgid "Luxembourg"
msgstr "ルクセンブルグ"
-#: lang.pm:297
+#: lang.pm:311
#, c-format
msgid "Latvia"
msgstr "ラトヴィア"
-#: lang.pm:298
+#: lang.pm:312
#, c-format
msgid "Libya"
msgstr "リビア"
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
#, c-format
msgid "Morocco"
msgstr "モロッコ"
-#: lang.pm:300
+#: lang.pm:314
#, c-format
msgid "Monaco"
msgstr "モナコ"
-#: lang.pm:301
+#: lang.pm:315
#, c-format
msgid "Moldova"
msgstr "モルドバ"
-#: lang.pm:302
+#: lang.pm:316
#, c-format
msgid "Madagascar"
msgstr "マダガスカル"
-#: lang.pm:303
+#: lang.pm:317
#, c-format
msgid "Marshall Islands"
msgstr "マーシャル諸島"
-#: lang.pm:304
+#: lang.pm:318
#, c-format
msgid "Macedonia"
msgstr "マケドニア"
-#: lang.pm:305
+#: lang.pm:319
#, c-format
msgid "Mali"
msgstr "マリ"
-#: lang.pm:306
+#: lang.pm:320
#, c-format
msgid "Myanmar"
msgstr "ミャンマー"
-#: lang.pm:307
+#: lang.pm:321
#, c-format
msgid "Mongolia"
msgstr "モンゴル"
-#: lang.pm:308
+#: lang.pm:322
#, c-format
msgid "Northern Mariana Islands"
msgstr "北マリアナ諸島"
-#: lang.pm:309
+#: lang.pm:323
#, c-format
msgid "Martinique"
msgstr "マルティニク島"
-#: lang.pm:310
+#: lang.pm:324
#, c-format
msgid "Mauritania"
msgstr "モーリタニア"
-#: lang.pm:311
+#: lang.pm:325
#, c-format
msgid "Montserrat"
msgstr "モンセラート"
-#: lang.pm:312
+#: lang.pm:326
#, c-format
msgid "Malta"
msgstr "マルタ"
-#: lang.pm:313
+#: lang.pm:327
#, c-format
msgid "Mauritius"
msgstr "モーリシャス"
-#: lang.pm:314
+#: lang.pm:328
#, c-format
msgid "Maldives"
msgstr "モルディブ"
-#: lang.pm:315
+#: lang.pm:329
#, c-format
msgid "Malawi"
msgstr "マラウイ"
-#: lang.pm:316
+#: lang.pm:330
#, c-format
msgid "Mexico"
msgstr "メキシコ"
-#: lang.pm:317
+#: lang.pm:331
#, c-format
msgid "Malaysia"
msgstr "マレーシア"
-#: lang.pm:318
+#: lang.pm:332
#, c-format
msgid "Mozambique"
msgstr "モザンビーク"
-#: lang.pm:319
+#: lang.pm:333
#, c-format
msgid "Namibia"
msgstr "ナミビア"
-#: lang.pm:320
+#: lang.pm:334
#, c-format
msgid "New Caledonia"
msgstr "ニューカレドニア"
-#: lang.pm:321
+#: lang.pm:335
#, c-format
msgid "Niger"
msgstr "ナイジェリア"
-#: lang.pm:322
+#: lang.pm:336
#, c-format
msgid "Norfolk Island"
msgstr "ノーフォーク島"
-#: lang.pm:323
+#: lang.pm:337
#, c-format
msgid "Nigeria"
msgstr "ナイジェリア"
-#: lang.pm:324
+#: lang.pm:338
#, c-format
msgid "Nicaragua"
msgstr "ニカラグア"
-#: lang.pm:327
+#: lang.pm:341
#, c-format
msgid "Nepal"
msgstr "ネパール"
-#: lang.pm:328
+#: lang.pm:342
#, c-format
msgid "Nauru"
msgstr "ナウル"
-#: lang.pm:329
+#: lang.pm:343
#, c-format
msgid "Niue"
msgstr "ニウエ"
-#: lang.pm:330
+#: lang.pm:344
#, c-format
msgid "New Zealand"
msgstr "ニュージーランド"
-#: lang.pm:331
+#: lang.pm:345
#, c-format
msgid "Oman"
msgstr "オーメン"
-#: lang.pm:332
+#: lang.pm:346
#, c-format
msgid "Panama"
msgstr "パナマ"
-#: lang.pm:333
+#: lang.pm:347
#, c-format
msgid "Peru"
msgstr "ペルー"
-#: lang.pm:334
+#: lang.pm:348
#, c-format
msgid "French Polynesia"
msgstr "フランス領ポリネシア"
-#: lang.pm:335
+#: lang.pm:349
#, c-format
msgid "Papua New Guinea"
msgstr "パプアニューギニア"
-#: lang.pm:336
+#: lang.pm:350
#, c-format
msgid "Philippines"
msgstr "フィリピン"
-#: lang.pm:337
+#: lang.pm:351
#, c-format
msgid "Pakistan"
msgstr "パキスタン"
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
#, c-format
msgid "Poland"
msgstr "ポーランド"
-#: lang.pm:339
+#: lang.pm:353
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr "セントピエールとミケロン"
-#: lang.pm:340
+#: lang.pm:354
#, c-format
msgid "Pitcairn"
msgstr "ピトケアン島"
-#: lang.pm:341
+#: lang.pm:355
#, c-format
msgid "Puerto Rico"
msgstr "プエルトリコ"
-#: lang.pm:342
+#: lang.pm:356
#, c-format
msgid "Palestine"
msgstr "パレスティナ"
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
#, c-format
msgid "Portugal"
msgstr "ポルトガル"
-#: lang.pm:344
+#: lang.pm:358
#, c-format
msgid "Paraguay"
msgstr "パラグアイ"
-#: lang.pm:345
+#: lang.pm:359
#, c-format
msgid "Palau"
msgstr "パラオ"
-#: lang.pm:346
+#: lang.pm:360
#, c-format
msgid "Qatar"
msgstr "カタール"
-#: lang.pm:347
+#: lang.pm:361
#, c-format
msgid "Reunion"
msgstr "Reunion"
-#: lang.pm:348
+#: lang.pm:362
#, c-format
msgid "Romania"
msgstr "ルーマニア"
-#: lang.pm:349
+#: lang.pm:363
#, c-format
msgid "Russia"
msgstr "ロシア"
-#: lang.pm:350
+#: lang.pm:364
#, c-format
msgid "Rwanda"
msgstr "ルワンダ"
-#: lang.pm:351
+#: lang.pm:365
#, c-format
msgid "Saudi Arabia"
msgstr "サウジアラビア"
-#: lang.pm:352
+#: lang.pm:366
#, c-format
msgid "Solomon Islands"
msgstr "ソロモン諸島"
-#: lang.pm:353
+#: lang.pm:367
#, c-format
msgid "Seychelles"
msgstr "セーシェル"
-#: lang.pm:354
+#: lang.pm:368
#, c-format
msgid "Sudan"
msgstr "スーダン"
-#: lang.pm:356
+#: lang.pm:370
#, c-format
msgid "Singapore"
msgstr "シンガポール"
-#: lang.pm:357
+#: lang.pm:371
#, c-format
msgid "Saint Helena"
msgstr "セントヘレナ"
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
#, c-format
msgid "Slovenia"
msgstr "スロベニア"
-#: lang.pm:359
+#: lang.pm:373
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr "スバルバールとジャンマイエン諸島"
-#: lang.pm:360
+#: lang.pm:374
#, c-format
msgid "Slovakia"
msgstr "スロバキア"
-#: lang.pm:361
+#: lang.pm:375
#, c-format
msgid "Sierra Leone"
msgstr "シエラレオネ"
-#: lang.pm:362
+#: lang.pm:376
#, c-format
msgid "San Marino"
msgstr "サンマリノ"
-#: lang.pm:363
+#: lang.pm:377
#, c-format
msgid "Senegal"
msgstr "セネガル"
-#: lang.pm:364
+#: lang.pm:378
#, c-format
msgid "Somalia"
msgstr "ソマリア"
-#: lang.pm:365
+#: lang.pm:379
#, c-format
msgid "Suriname"
msgstr "スリナム"
-#: lang.pm:366
+#: lang.pm:380
#, c-format
msgid "Sao Tome and Principe"
msgstr "サントメプリンシペ"
-#: lang.pm:367
+#: lang.pm:381
#, c-format
msgid "El Salvador"
msgstr "エルサルバドル"
-#: lang.pm:368
+#: lang.pm:382
#, c-format
msgid "Syria"
msgstr "シリア"
-#: lang.pm:369
+#: lang.pm:383
#, c-format
msgid "Swaziland"
msgstr "スワジランド"
-#: lang.pm:370
+#: lang.pm:384
#, c-format
msgid "Turks and Caicos Islands"
msgstr "タークス・ケーコス諸島"
-#: lang.pm:371
+#: lang.pm:385
#, c-format
msgid "Chad"
msgstr "チャド"
-#: lang.pm:372
+#: lang.pm:386
#, c-format
msgid "French Southern Territories"
msgstr "南フランス領"
-#: lang.pm:373
+#: lang.pm:387
#, c-format
msgid "Togo"
msgstr "トーゴ"
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
#, c-format
msgid "Thailand"
msgstr "タイ"
-#: lang.pm:375
+#: lang.pm:389
#, c-format
msgid "Tajikistan"
msgstr "タジキスタン"
-#: lang.pm:376
+#: lang.pm:390
#, c-format
msgid "Tokelau"
msgstr "トケラウ諸島"
-#: lang.pm:377
+#: lang.pm:391
#, c-format
msgid "East Timor"
msgstr "東ティモール"
-#: lang.pm:378
+#: lang.pm:392
#, c-format
msgid "Turkmenistan"
msgstr "トルクメニスタン"
-#: lang.pm:379
+#: lang.pm:393
#, c-format
msgid "Tunisia"
msgstr "チュニジア"
-#: lang.pm:380
+#: lang.pm:394
#, c-format
msgid "Tonga"
msgstr "トンガ"
-#: lang.pm:381
+#: lang.pm:395
#, c-format
msgid "Turkey"
msgstr "トルコ"
-#: lang.pm:382
+#: lang.pm:396
#, c-format
msgid "Trinidad and Tobago"
msgstr "トリニダードトバゴ"
-#: lang.pm:383
+#: lang.pm:397
#, c-format
msgid "Tuvalu"
msgstr "ツバル"
-#: lang.pm:384
+#: lang.pm:398
#, c-format
msgid "Taiwan"
msgstr "台湾"
-#: lang.pm:385
+#: lang.pm:399
#, c-format
msgid "Tanzania"
msgstr "タンザニア"
-#: lang.pm:386
+#: lang.pm:400
#, c-format
msgid "Ukraine"
msgstr "ウクライナ"
-#: lang.pm:387
+#: lang.pm:401
#, c-format
msgid "Uganda"
msgstr "ウガンダ"
-#: lang.pm:388
+#: lang.pm:402
#, c-format
msgid "United States Minor Outlying Islands"
msgstr "アメリカ辺境諸島"
-#: lang.pm:390
+#: lang.pm:404
#, c-format
msgid "Uruguay"
msgstr "ウルグアイ"
-#: lang.pm:391
+#: lang.pm:405
#, c-format
msgid "Uzbekistan"
msgstr "ウズベキスタン"
-#: lang.pm:392
+#: lang.pm:406
#, c-format
msgid "Vatican"
msgstr "バチカン"
-#: lang.pm:393
+#: lang.pm:407
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr "セントビンセントグレナディーン"
-#: lang.pm:394
+#: lang.pm:408
#, c-format
msgid "Venezuela"
msgstr "ベネズエラ"
-#: lang.pm:395
+#: lang.pm:409
#, c-format
msgid "Virgin Islands (British)"
msgstr "バージン諸島(イギリス)"
-#: lang.pm:396
+#: lang.pm:410
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr "バージン諸島(アメリカ)"
-#: lang.pm:397
+#: lang.pm:411
#, c-format
msgid "Vietnam"
msgstr "ベトナム"
-#: lang.pm:398
+#: lang.pm:412
#, c-format
msgid "Vanuatu"
msgstr "バヌアツ"
-#: lang.pm:399
+#: lang.pm:413
#, c-format
msgid "Wallis and Futuna"
msgstr "ワリー・エ・フトゥーナ諸島"
-#: lang.pm:400
+#: lang.pm:414
#, c-format
msgid "Samoa"
msgstr "サモア"
-#: lang.pm:401
+#: lang.pm:415
#, c-format
msgid "Yemen"
msgstr "イエメン"
-#: lang.pm:402
+#: lang.pm:416
#, c-format
msgid "Mayotte"
msgstr "メイヨット"
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia & Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
#, c-format
msgid "South Africa"
msgstr "南アフリカ"
-#: lang.pm:405
+#: lang.pm:418
#, c-format
msgid "Zambia"
msgstr "ザンビア"
-#: lang.pm:406
+#: lang.pm:419
#, c-format
msgid "Zimbabwe"
msgstr "ジンバブエ"
-#: lang.pm:1004
+#: lang.pm:1047
+#, c-format
+msgid "You should install the following packages: %s"
+msgstr "次のパッケージをインストールしなくてはなりません: %s"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: lang.pm:1101
#, c-format
msgid "Welcome to %s"
msgstr "%s へようこそ"
-#: loopback.pm:32
+#: loopback.pm:31
#, c-format
msgid "Circular mounts %s\n"
msgstr "巡回マウント %s\n"
-#: lvm.pm:115
+#: lvm.pm:116
#, c-format
msgid "Remove the logical volumes first\n"
msgstr "まず論理ボリュームを削除してください。\n"
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
#, c-format
msgid "Parameters"
msgstr "パラメータ"
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
#, c-format
msgid "NONE"
msgstr "NONE"
@@ -8909,8 +9031,8 @@ msgstr "モジュールの各パラメータをここで設定できます。"
#: modules/interactive.pm:63
#, c-format
-msgid "Found %s %s interfaces"
-msgstr "%s %s インタフェースがあります"
+msgid "Found %s interfaces"
+msgstr "%s インタフェースがあります"
#: modules/interactive.pm:64
#, c-format
@@ -8965,12 +9087,12 @@ msgid "Module options:"
msgstr "モジュールのオプション:"
#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
#, c-format
msgid "Which %s driver should I try?"
msgstr "どの %s ドライバを試しますか?"
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -8991,17 +9113,17 @@ msgstr ""
"\n"
"受けることはありません。"
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
#, c-format
msgid "Autoprobe"
msgstr "自動検出"
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
#, c-format
msgid "Specify options"
msgstr "オプションを指定"
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -9060,11 +9182,11 @@ msgstr "一般的なPS/2ホイールマウス"
msgid "GlidePoint"
msgstr "GlidePoint"
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
+#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
+#: network/netconnect.pm:624 network/netconnect.pm:629
+#: network/netconnect.pm:645 network/netconnect.pm:647
#, c-format
msgid "Automatic"
msgstr "自動"
@@ -9209,50 +9331,55 @@ msgstr "ユニバーサル"
msgid "Any PS/2 & USB mice"
msgstr "PS/2 & USB マウス"
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr "Synapticsタッチパッド"
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
#, c-format
msgid "none"
msgstr "なし"
-#: mouse.pm:94
+#: mouse.pm:95
#, c-format
msgid "No mouse"
msgstr "マウスなし"
-#: mouse.pm:514
+#: mouse.pm:546
#, c-format
msgid "Please test the mouse"
msgstr "マウスをテストしてください。"
-#: mouse.pm:516
+#: mouse.pm:548
#, c-format
msgid "To activate the mouse,"
msgstr "マウスを有効にするには、"
-#: mouse.pm:517
+#: mouse.pm:549
#, c-format
msgid "MOVE YOUR WHEEL!"
msgstr "ホイールを動かしてください"
#: network/adsl.pm:19
#, c-format
-msgid "use pppoe"
-msgstr "pppoeを使う"
+msgid "use PPPoE"
+msgstr "PPPoEを使う"
#: network/adsl.pm:20
#, c-format
-msgid "use pptp"
-msgstr "pptpを使う"
+msgid "use PPTP"
+msgstr "PPTPを使う"
#: network/adsl.pm:21
#, c-format
-msgid "use dhcp"
+msgid "use DHCP"
msgstr "dhcpを使う"
#: network/adsl.pm:22
#, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
+msgid "Alcatel Speedtouch USB"
+msgstr "Alcatel Speedtouch USB"
#: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
#, c-format
@@ -9261,36 +9388,36 @@ msgstr " - 検出しました"
#: network/adsl.pm:23
#, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "Sagem(pppoaを使用)usb"
+msgid "Sagem (using PPPoA) USB"
+msgstr "Sagem (using PPPoA) USB"
#: network/adsl.pm:24
#, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "Sagem(dhcpを使用)usb"
+msgid "Sagem (using DHCP) USB"
+msgstr "Sagem (using DHCP) USB"
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
#, c-format
msgid "Connect to the Internet"
msgstr "インターネットに接続"
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't know, choose 'use PPPoE'"
msgstr ""
-"adslに接続する一般的な方法はpppoeです。\n"
-"場合によってはpptpやdhcpを使うこともあります。\n"
+"adslに接続する一般的な方法はPPPoEです。\n"
+"場合によってはPPTPやDHCPを使うこともあります。\n"
"わからなければ'pppoeを使う'を選んでください。"
-#: network/adsl.pm:41 network/netconnect.pm:766
+#: network/adsl.pm:41 network/netconnect.pm:804
#, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
msgstr "ADSL接続の種類 :"
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
#, c-format
msgid "Web Server"
msgstr "Webサーバ"
@@ -9338,12 +9465,12 @@ msgstr "CUPSサーバ"
#: network/drakfirewall.pm:60
#, c-format
msgid "Echo request (ping)"
-msgstr ""
+msgstr "エコーリクエスト (ping)"
#: network/drakfirewall.pm:65
#, c-format
msgid "BitTorrent"
-msgstr ""
+msgstr "BitTorrent"
#: network/drakfirewall.pm:131
#, c-format
@@ -9419,106 +9546,107 @@ msgstr "全て(ファイアウォールなし)"
msgid "Other ports"
msgstr "その他のポート"
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
#, c-format
msgid "Unlisted - edit manually"
-msgstr ""
+msgstr "リストなし - 手動で編集"
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA/PCMCIA"
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
#, c-format
msgid "I don't know"
msgstr "不明"
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
#, c-format
msgid "PCI"
msgstr "PCI"
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
#, c-format
msgid "USB"
msgstr "USB"
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
#, c-format
msgid "Manual"
msgstr "手動"
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
-#, fuzzy, c-format
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
+#, c-format
msgid "Manual choice"
-msgstr "手動"
+msgstr "手動選択"
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
#, c-format
msgid "Internal ISDN card"
msgstr "内蔵ISDNカード"
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
#, c-format
msgid "Ad-hoc"
-msgstr ""
+msgstr "Ad-hoc"
-#: network/netconnect.pm:98
-#, fuzzy, c-format
+#: network/netconnect.pm:99
+#, c-format
msgid "Managed"
-msgstr "言語を選択"
+msgstr ""
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
#, c-format
msgid "Master"
msgstr "マスター"
-#: network/netconnect.pm:100
-#, fuzzy, c-format
+#: network/netconnect.pm:101
+#, c-format
msgid "Repeater"
-msgstr "復元"
+msgstr ""
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
#, c-format
msgid "Secondary"
msgstr "2次"
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
#, c-format
msgid "Auto"
msgstr "自動"
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
#, c-format
msgid "Manual configuration"
msgstr "手動設定"
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
#, c-format
msgid "Automatic IP (BOOTP/DHCP)"
msgstr "IPを自動設定 (BOOTP/DHCP)"
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
#, c-format
msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
msgstr "IPを自動設定 (BOOTP/DHCP/Zeroconf)"
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
#, c-format
msgid "Protocol for the rest of the world"
msgstr "その他のプロトコル"
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
#, c-format
msgid "European protocol (EDSS1)"
msgstr "ヨーロッパのプロトコル(EDSS1)"
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
#, c-format
msgid ""
"Protocol for the rest of the world\n"
@@ -9527,163 +9655,168 @@ msgstr ""
"その他のプロトコル\n"
"No D-Channel (leased lines)"
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr "Alcatel speedtouch USB modem"
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
#, c-format
msgid "Sagem USB modem"
msgstr "Sagem USB modem"
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
#, c-format
msgid "Bewan modem"
msgstr "Bewan modem"
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
#, c-format
msgid "ECI Hi-Focus modem"
msgstr "ECI Hi-Focus modem"
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr "Dynamic Host Configuration Protocol (DHCP)"
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
#, c-format
msgid "Manual TCP/IP configuration"
msgstr "手動によるTCP/IP設定"
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr "Point to Point Tunneling Protocol (PPTP)"
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr "PPP over Ethernet (PPPoE)"
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr "PPP over ATM (PPPoA)"
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
#, c-format
msgid "Bridged Ethernet LLC"
msgstr "Bridged Ethernet LLC"
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
#, c-format
msgid "Bridged Ethernet VC"
msgstr "Bridged Ethernet VC"
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
#, c-format
msgid "Routed IP LLC"
msgstr "Routed IP LLC"
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
#, c-format
msgid "Routed IP VC"
msgstr "Routed IP VC"
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
#, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
#, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
#, c-format
msgid "Script-based"
msgstr "スクリプトを使う認証"
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
#, c-format
msgid "PAP"
msgstr "PAP"
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
#, c-format
msgid "Terminal-based"
msgstr "ターミナルからの認証"
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
#, c-format
msgid "CHAP"
msgstr "CHAP"
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
#, c-format
msgid "PAP/CHAP"
msgstr "PAP/CHAP"
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
#, c-format
msgid "Network & Internet Configuration"
msgstr "ネットワークとインターネット"
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
#, c-format
msgid "(detected on port %s)"
msgstr "(ポート %s で検出)"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
#, c-format
msgid "(detected %s)"
msgstr "(%s を検出)"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
#, c-format
msgid "(detected)"
msgstr "(検出)"
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
#, c-format
msgid "Modem connection"
msgstr "モデム接続"
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
#, c-format
msgid "ISDN connection"
msgstr "ISDN接続"
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
#, c-format
msgid "ADSL connection"
msgstr "ADSL接続"
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
#, c-format
msgid "Cable connection"
msgstr "ケーブル接続"
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
#, c-format
msgid "LAN connection"
msgstr "LAN接続"
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
#, c-format
msgid "Wireless connection"
msgstr "ワイヤレス接続"
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
#, c-format
msgid "Choose the connection you want to configure"
msgstr "設定する接続を選んでください"
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -9696,131 +9829,130 @@ msgstr ""
"\n"
"\"%s\" を押すと続けます。"
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
#, c-format
msgid "Connection Configuration"
msgstr "接続の設定"
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
#, c-format
msgid "Please fill or check the field below"
msgstr "下記の項目を埋めるかチェックしてください"
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
#, c-format
msgid "Card IRQ"
msgstr "カード IRQ"
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
#, c-format
msgid "Card mem (DMA)"
msgstr "カード mem(DMA)"
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
#, c-format
msgid "Card IO"
msgstr "カード IO"
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
#, c-format
msgid "Card IO_0"
msgstr "カード IO_0"
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
#, c-format
msgid "Card IO_1"
msgstr "カード IO_1"
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
#, c-format
msgid "Your personal phone number"
msgstr "あなたの電話番号"
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "プロバイダの名前(例: provider.net)"
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
#, c-format
msgid "Provider phone number"
msgstr "プロバイダの電話番号"
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
#, c-format
msgid "Provider DNS 1 (optional)"
msgstr "プロバイダのDNS 1(オプション)"
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
#, c-format
msgid "Provider DNS 2 (optional)"
msgstr "プロバイダのDNS 2(オプション)"
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
#, c-format
msgid "Dialing mode"
msgstr "ダイアルモード"
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
#, c-format
msgid "Connection speed"
msgstr "接続の速度"
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
#, c-format
msgid "Connection timeout (in sec)"
msgstr "接続のタイムアウト(秒)"
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
#, c-format
msgid "Account Login (user name)"
msgstr "アカウントのログイン(ユーザ名)"
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
#, c-format
msgid "Account Password"
msgstr "アカウントのパスワード"
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
#, c-format
msgid "Select the network interface to configure:"
msgstr "設定するネットワークインタフェースを選択:"
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:330 network/netconnect.pm:378
+#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
+#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
#, c-format
msgid "Net Device"
msgstr "ネットデバイス"
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
#, c-format
msgid "External ISDN modem"
msgstr "外付ISDNモデム"
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
#, c-format
-msgid "Select a device !"
+msgid "Select a device!"
msgstr "デバイスを選んでください"
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
#, c-format
msgid "ISDN Configuration"
msgstr "ISDNの設定"
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
#, c-format
msgid "What kind of card do you have?"
msgstr "お使いのカードは何ですか?"
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
#, c-format
msgid ""
"\n"
@@ -9834,34 +9966,50 @@ msgstr ""
"\n"
"PCMCIAカードをお持ちの場合はカードのirqとioを調べる必要があります。\n"
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
#, c-format
msgid "Continue"
msgstr "続ける"
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
#, c-format
msgid "Abort"
msgstr "中止"
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
#, c-format
msgid "Which of the following is your ISDN card?"
msgstr "お使いのISDNカードはどれですか?"
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, c-format
+msgid ""
+"A CAPI driver is available for this modem. This CAPI driver can offer more "
+"capabilities than the free driver (like sending faxes). Which driver do you "
+"want to use?"
+msgstr ""
+"お使いのモデムにはCAPIドライバが利用可能です。このドライバはフリーのドライバ"
+"より多くの機能(例:FAX送信)を備えています。どちらのドライバを使いますか?"
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "ドライバ"
+
+#: network/netconnect.pm:439
#, c-format
msgid "Which protocol do you want to use?"
msgstr "どのプロトコルを使いますか?"
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
#: standalone/drakvpn:1142
#, c-format
msgid "Protocol"
msgstr "プロトコル"
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
#, c-format
msgid ""
"Select your provider.\n"
@@ -9870,13 +10018,13 @@ msgstr ""
"プロバイダを選んでください。\n"
"リストにない場合はUnlistedを選んでください。"
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
#, c-format
msgid "Provider:"
msgstr "プロバイダ:"
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
#, c-format
msgid ""
"Your modem isn't supported by the system.\n"
@@ -9885,122 +10033,117 @@ msgstr ""
"このモデムはサポートしていません。\n"
"http://www.linmodems.org をご覧ください"
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
#, c-format
msgid "Select the modem to configure:"
msgstr "設定するモデムを選択:"
-#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "2.4以上のカーネルのみをサポートしています。"
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "モデムを接続しているシリアルポートを選んでください。"
-#: network/netconnect.pm:539
+#: network/netconnect.pm:561
#, c-format
msgid "Select your provider:"
msgstr "プロバイダを選択:"
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
#, c-format
msgid "Dialup: account options"
msgstr "ダイアルアップ: アカウントのオプション"
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
#, c-format
msgid "Connection name"
msgstr "接続名"
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
#, c-format
msgid "Phone number"
msgstr "電話番号"
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
#, c-format
msgid "Login ID"
msgstr "ログインID"
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
#, c-format
msgid "Dialup: IP parameters"
msgstr "ダイアルアップ: IPパラメータ"
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
#, c-format
msgid "IP parameters"
msgstr "IPパラメータ"
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
#, c-format
msgid "IP address"
msgstr "IPアドレス"
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
#, c-format
msgid "Subnet mask"
msgstr "サブネットマスク"
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
#, c-format
msgid "Dialup: DNS parameters"
msgstr "ダイアルアップ: DNSパラメータ"
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
#, c-format
msgid "DNS"
msgstr "DNS"
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
#, c-format
msgid "Domain name"
msgstr "ドメイン名"
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
#, c-format
msgid "First DNS Server (optional)"
msgstr "DNSサーバ(オプション)"
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
#, c-format
msgid "Second DNS Server (optional)"
msgstr "セカンドDNSサーバ(オプション)"
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
#, c-format
msgid "Set hostname from IP"
msgstr "IPからホスト名を設定"
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
#, c-format
msgid "Gateway"
msgstr "ゲートウェイ"
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
#, c-format
msgid "Gateway IP address"
msgstr "Gateway IPアドレス"
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
#, c-format
msgid "ADSL configuration"
msgstr "ADSLの設定"
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
#, c-format
msgid "Please choose your ADSL provider"
msgstr "ADSLプロバイダを選んでください"
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -10011,32 +10154,32 @@ msgstr ""
"フロッピー/Windows経由で導入するか、スキップして\n"
"後で行ってください。"
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
#, c-format
msgid "Use a floppy"
msgstr "フロッピーを使う"
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
#, c-format
msgid "Use my Windows partition"
msgstr "Windowsのパーティションを使う"
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
#, c-format
msgid "Do it later"
msgstr "後で行う"
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr "ファームウェアのコピーに失敗。ファイル %s がありません"
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
#, c-format
msgid "Firmware copy succeeded"
msgstr "ファームウェアのコピーが完了"
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -10049,22 +10192,22 @@ msgstr ""
"からダウンロードして、\n"
"mgmt.o を /usr/share/speedtouch にコピーしてください。"
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr "Virtual Path ID (VPI):"
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr "Virtual Circuit ID (VCI):"
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
#, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
msgstr "カプセル化 :"
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10072,25 +10215,28 @@ msgid ""
"\n"
"You can find a driver on http://eciadsl.flashtux.org/"
msgstr ""
+"ECI Hi-Focus モデムはバイナリドライバ配布問題のためサポートできません。\n"
+"\n"
+"http://eciadsl.flashtux.org/ からダウンロードできます。"
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
#, c-format
msgid "Manually load a driver"
-msgstr ""
+msgstr "手動でドライバをロード"
-#: network/netconnect.pm:844
+#: network/netconnect.pm:898
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the "
"Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Modifying the fields below will override this configuration.\n"
+"Do you really want to reconfigure this device?"
msgstr ""
"警告: このデバイスは既にインターネット接続の設定を終えています。\n"
-"OKを押すとこのデバイスの設定を維持します。\n"
-"以下の項目を変更すると設定を上書きします。"
+"下の項目を変更すると、現在の設定が無効になります。\n"
+"本当にこのデバイスを再設定しますか?"
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
@@ -10100,17 +10246,17 @@ msgstr ""
"インターネットを設定しました。\n"
"\n"
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
#, c-format
msgid "Zeroconf hostname resolution"
msgstr "Zeroconfホスト名の決定"
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "ネットワークデバイス %s を設定 (ドライバ %s)"
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
#, c-format
msgid ""
"The following protocols can be used to configure an ethernet connection. "
@@ -10118,7 +10264,7 @@ msgid ""
msgstr ""
"以下のプロトコルをethernet接続で使います。使用するものを1つ選んでください"
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -10129,89 +10275,95 @@ msgstr ""
"それぞれの項目にはドットで区切られた数字(例: 1.2.3.4)が\n"
"IPアドレスとして入ります。"
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
#, c-format
msgid "Assign host name from DHCP address"
msgstr "DHCPアドレスからホスト名を割り当てる"
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
#, c-format
msgid "DHCP host name"
msgstr "DHCPホスト名"
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
#, c-format
msgid "Netmask"
msgstr "ネットマスク"
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr "ネットワークカードのIDを追跡(ラップトップで役に立つ)"
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
#, c-format
msgid "Network Hotplugging"
msgstr "Network Hotplugging"
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
#, c-format
msgid "Start at boot"
msgstr "起動時に開始"
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
#, c-format
msgid "DHCP client"
msgstr "DHCPクライアント"
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
#, c-format
msgid "IP address should be in format 1.2.3.4"
msgstr "IPアドレスは 1.2.3.4 のように入力してください"
-#: network/netconnect.pm:939
+#: network/netconnect.pm:999
#, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
msgstr "警告: IPアドレス %s はたいてい保留されています"
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s は使用中です\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "このカードのワイヤレスパラメータを入力してください:"
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
#, c-format
msgid "Operating Mode"
msgstr "操作モード"
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
#, c-format
msgid "Network name (ESSID)"
msgstr "ネットワーク名 (ESSID)"
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
#, c-format
msgid "Network ID"
msgstr "ネットワーク ID"
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
#, c-format
msgid "Operating frequency"
msgstr ""
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
#, c-format
msgid "Sensitivity threshold"
msgstr ""
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
#, c-format
msgid "Bitrate (in b/s)"
msgstr "ビットレート(b/s)"
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10220,7 +10372,7 @@ msgstr ""
"単位は k, M, G で入力してください(2.46 GHzの場合は 2.46G)。\n"
"もしくは0(ゼロ)で桁を増やしてください。"
-#: network/netconnect.pm:988
+#: network/netconnect.pm:1049
#, c-format
msgid ""
"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10229,12 +10381,12 @@ msgstr ""
"単位は k, M, G で入力してください(例: 11M)。\n"
"もしくは0(ゼロ)で桁を増やしてください。"
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10248,33 +10400,33 @@ msgid ""
"or off."
msgstr ""
-#: network/netconnect.pm:1009 standalone/drakconnect:406
-#, fuzzy, c-format
+#: network/netconnect.pm:1070 standalone/drakconnect:397
+#, c-format
msgid "Fragmentation"
-msgstr "ゲームステーション"
+msgstr ""
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
#, c-format
msgid "Iwconfig command extra arguments"
msgstr ""
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
"ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
"as the hostname).\n"
"\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
msgstr ""
#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
#, c-format
msgid "Iwspy command extra arguments"
msgstr ""
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10286,12 +10438,12 @@ msgid ""
"See iwpspy(8) man page for further information."
msgstr ""
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
#, c-format
msgid "Iwpriv command extra arguments"
msgstr ""
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10309,27 +10461,7 @@ msgid ""
"See iwpriv(8) man page for further information."
msgstr ""
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"システムにイーサネットアダプタがありません。この種類の\n"
-"接続を設定することができません。"
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "ネットワークインタフェースを選択"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr "インターネット接続に使うネットワークアダプタを選んでください"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -10339,86 +10471,92 @@ msgid ""
msgstr ""
"ホスト名を入力してください。\n"
"ホスト名は“mybox.mylab.myco.com”のようにしてください。\n"
-"ゲートウェイのIPアドレスがあれば、それも入力してください。"
+"ゲートウェイのIPアドレスも入力できます。"
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "またDNSサーバのIPアドレスも入力できます。"
-#: network/netconnect.pm:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
#, c-format
msgid "Host name (optional)"
msgstr "ホスト名 (オプション)"
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
#, c-format
msgid "Host name"
msgstr "ホスト名:"
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
#, c-format
msgid "DNS server 1"
msgstr "DNSサーバ 1"
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
#, c-format
msgid "DNS server 2"
msgstr "DNSサーバ 2"
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
#, c-format
msgid "DNS server 3"
msgstr "DNSサーバ 3"
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
#, c-format
msgid "Search domain"
msgstr "検索ドメイン"
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr ""
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1176
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "ゲートウェイ(例 %s)"
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
#, c-format
msgid "Gateway device"
msgstr "ゲートウェイデバイス"
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNSサーバのアドレスは 1.2.3.4 のように入力してください"
-#: network/netconnect.pm:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "Gatewayアドレスは 1.2.3.4 のように入力"
-#: network/netconnect.pm:1121
+#: network/netconnect.pm:1203
#, c-format
msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
msgstr ""
+"必要ならZeroconfホスト名を入力してください。\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconfホスト名"
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconfホスト名は以下を含んではいけません:"
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -10429,35 +10567,55 @@ msgstr ""
"どれを使うか選んでください。\n"
"\n"
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
#, c-format
msgid "Internet connection"
msgstr "インターネット接続"
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
#, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
msgstr "設定が完了しました。適用しますか?"
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr "起動時に接続を開始しますか?"
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1258
+#, c-format
+msgid "Automatically at boot"
+msgstr "起動時に自動的に開始"
+
+#: network/netconnect.pm:1260
+#, c-format
+msgid "By using Net Applet in the system tray"
+msgstr "システムトレイのNetアプレットを使う"
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr "手動 (the interface would still be activated at boot)"
+
+#: network/netconnect.pm:1271
+#, c-format
+msgid "How do you want to dial this connection?"
+msgstr "この接続にどのようにダイアルしますか?"
+
+#: network/netconnect.pm:1284
#, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "The network needs to be restarted. Do you want to restart it?"
msgstr "ネットワークの再起動が必要です。再起動しますか?"
-#: network/netconnect.pm:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
#, c-format
msgid "Network Configuration"
msgstr "ネットワークを設定"
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
#, c-format
msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
"\n"
"%s"
msgstr ""
@@ -10465,27 +10623,27 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "今インターネットに接続しますか?"
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
#, c-format
msgid "Testing your connection..."
msgstr "接続をテストしています.."
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
#, c-format
msgid "The system is now connected to the Internet."
msgstr "システムはインターネットに接続しました。"
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "セキュリティ上の理由で、接続を切ります。"
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
#, c-format
msgid ""
"The system doesn't seem to be connected to the Internet.\n"
@@ -10494,19 +10652,19 @@ msgstr ""
"このシステムはインターネットにつながっていないようです。\n"
"接続を再設定してください。"
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
#, c-format
msgid ""
"After this is done, we recommend that you restart your X environment to "
"avoid any hostname-related problems."
msgstr ""
"設定が完了したらXウィンドウを再起動して、\n"
-"ホスト名に関する問題を回避してください。"
+"ホスト名に問題が起こらないようにしてください。"
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
#, c-format
msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
"Test your connection via net_monitor or mcc. If your connection doesn't "
"work, you might want to relaunch the configuration."
msgstr ""
@@ -10514,7 +10672,7 @@ msgstr ""
"net_monitor か mccで接続を調べてください。接続できていない場合は\n"
"再設定してください。"
-#: network/netconnect.pm:1245
+#: network/netconnect.pm:1357
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -10526,7 +10684,7 @@ msgstr ""
"いまの設定をそのまま使うには OK をクリックしてください。ネットワーク/\n"
"インターネットを再設定するにはキャンセルを押します。\n"
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
#, c-format
msgid ""
"An unexpected error has happened:\n"
@@ -10535,27 +10693,27 @@ msgstr ""
"予期せぬエラーが発生しました:\n"
"%s"
-#: network/network.pm:315
+#: network/network.pm:316
#, c-format
msgid "Proxies configuration"
msgstr "プロクシを設定"
-#: network/network.pm:316
+#: network/network.pm:317
#, c-format
msgid "HTTP proxy"
msgstr "HTTPプロクシ"
-#: network/network.pm:317
+#: network/network.pm:318
#, c-format
msgid "FTP proxy"
msgstr "FTPプロクシ"
-#: network/network.pm:320
+#: network/network.pm:321
#, c-format
msgid "Proxy should be http://..."
msgstr "プロクシは http://.. で始まります"
-#: network/network.pm:321
+#: network/network.pm:322
#, c-format
msgid "URL should begin with 'ftp:' or 'http:'"
msgstr "URLは ftp: か http: で始まります"
@@ -10574,7 +10732,7 @@ msgstr ""
"警告: 既存のファイアウォールの設定を検出しました。\n"
"インストール後に手動で修正する必要があるかもしれません。"
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
#, c-format
msgid ""
"Please enter the name of the interface connected to the internet.\n"
@@ -10591,12 +10749,12 @@ msgstr ""
"\t\teth0, eth1(ケーブル接続の場合)\n"
"\t\tippp+(ISDN接続の場合)\n"
-#: network/tools.pm:165
+#: network/tools.pm:197
#, c-format
msgid "Insert floppy"
msgstr "フロッピーを挿入"
-#: network/tools.pm:166
+#: network/tools.pm:198
#, c-format
msgid ""
"Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10605,22 +10763,22 @@ msgstr ""
"FAT形式のフロッピーをドライブ %s に挿入(with %s in root directory)\n"
"して、%s を押す"
-#: network/tools.pm:167
+#: network/tools.pm:199
#, c-format
msgid "Floppy access error, unable to mount device %s"
msgstr "フロッピーアクセスエラー。デバイス %s をマウントできません"
-#: partition_table.pm:645
+#: partition_table.pm:393
#, c-format
msgid "mount failed: "
msgstr "マウントに失敗: "
-#: partition_table.pm:750
+#: partition_table.pm:498
#, c-format
msgid "Extended partition not supported on this platform"
msgstr "このプラットフォームでは拡張パーティションをサポートしていません"
-#: partition_table.pm:768
+#: partition_table.pm:516
#, c-format
msgid ""
"You have a hole in your partition table but I can't use it.\n"
@@ -10631,22 +10789,22 @@ msgstr ""
"The only solution is to move your primary partitions to have the hole next "
"to the extended partitions."
-#: partition_table.pm:855
+#: partition_table.pm:602
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "ファイル %s からの復元は失敗しました: %s"
-#: partition_table.pm:857
+#: partition_table.pm:604
#, c-format
msgid "Bad backup file"
msgstr "不正なバックアップファイル"
-#: partition_table.pm:877
+#: partition_table.pm:624
#, c-format
msgid "Error writing to file %s"
msgstr "ファイル %s に書き込み中にエラー"
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
#, c-format
msgid ""
"Something bad is happening on your drive. \n"
@@ -10658,27 +10816,27 @@ msgstr ""
"データの整合性チェックが失敗しました。\n"
"ディスクに何を書き込んでも異常終了するでしょう。"
-#: pkgs.pm:24
+#: pkgs.pm:23
#, c-format
msgid "must have"
msgstr "必須"
-#: pkgs.pm:25
+#: pkgs.pm:24
#, c-format
msgid "important"
msgstr "重要"
-#: pkgs.pm:26
+#: pkgs.pm:25
#, c-format
msgid "very nice"
msgstr "優秀"
-#: pkgs.pm:27
+#: pkgs.pm:26
#, c-format
msgid "nice"
msgstr "秀"
-#: pkgs.pm:28
+#: pkgs.pm:27
#, c-format
msgid "maybe"
msgstr "可"
@@ -10693,7 +10851,7 @@ msgstr "(%s で)"
msgid "(on this machine)"
msgstr "(このマシンで)"
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
#, c-format
msgid "Configured on other machines"
msgstr "設定済み(他のマシン)"
@@ -10703,298 +10861,308 @@ msgstr "設定済み(他のマシン)"
msgid "On CUPS server \"%s\""
msgstr "CUPSサーバ %s で"
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
#, c-format
msgid " (Default)"
msgstr " (デフォルト)"
-#: printer/data.pm:22
+#: printer/data.pm:40
#, c-format
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - Print, Don't Queue(キューなしで印刷)"
-#: printer/data.pm:23
+#: printer/data.pm:41
#, c-format
msgid "PDQ"
msgstr "PDQ"
-#: printer/data.pm:34
+#: printer/data.pm:53
#, c-format
msgid "LPD - Line Printer Daemon"
msgstr "LPD - ラインプリンタデーモン"
-#: printer/data.pm:35
+#: printer/data.pm:54
#, c-format
msgid "LPD"
msgstr "LPD"
-#: printer/data.pm:56
+#: printer/data.pm:76
#, c-format
msgid "LPRng - LPR New Generation"
msgstr "LPRng - LPR New Generation"
-#: printer/data.pm:57
+#: printer/data.pm:77
#, c-format
msgid "LPRng"
msgstr "LPRng"
-#: printer/data.pm:82
+#: printer/data.pm:103
#, c-format
msgid "CUPS - Common Unix Printing System"
msgstr "CUPS - Common Unix Printing System(共通Unix印刷システム)"
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - 共通Unix印刷システム"
+
+#: printer/data.pm:133
+#, c-format
+msgid "Remote CUPS"
+msgstr "リモートCUPSサーバ"
+
#: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466 printer/printerdrake.pm:686
+#: printer/detect.pm:466
#, c-format
msgid "Unknown Model"
msgstr "Unknown Model"
-#: printer/main.pm:29
+#: printer/main.pm:27
#, c-format
msgid "Local printer"
msgstr "Local printer"
-#: printer/main.pm:30
+#: printer/main.pm:28
#, c-format
msgid "Remote printer"
msgstr "リモートプリンタ"
-#: printer/main.pm:31
+#: printer/main.pm:29
#, c-format
msgid "Printer on remote CUPS server"
msgstr "リモートCUPSサーバのプリンタ"
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
#, c-format
msgid "Printer on remote lpd server"
msgstr "Printer on remote lpd server"
-#: printer/main.pm:33
+#: printer/main.pm:31
#, c-format
msgid "Network printer (TCP/Socket)"
msgstr "Network printer (TCP/Socket)"
-#: printer/main.pm:34
+#: printer/main.pm:32
#, c-format
msgid "Printer on SMB/Windows 95/98/NT server"
msgstr "Printer on SMB/Windows 95/98/NT server"
-#: printer/main.pm:35
+#: printer/main.pm:33
#, c-format
msgid "Printer on NetWare server"
msgstr "NetWareサーバのプリンタ"
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
#, c-format
msgid "Enter a printer device URI"
msgstr "Enter a printer device URI"
-#: printer/main.pm:37
+#: printer/main.pm:35
#, c-format
msgid "Pipe job into a command"
msgstr "Pipe job into a command"
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
+#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
+#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
#, c-format
msgid "Unknown model"
msgstr "Unknown model"
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
#, c-format
msgid "Configured on this machine"
msgstr "設定済み(このマシン)"
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
#, c-format
msgid " on parallel port #%s"
msgstr " on parallel port #%s"
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
#, c-format
msgid ", USB printer #%s"
msgstr ", USB printer #%s"
-#: printer/main.pm:343
+#: printer/main.pm:357
#, c-format
msgid ", USB printer"
msgstr ", USB printer"
-#: printer/main.pm:348
+#: printer/main.pm:362
#, c-format
msgid ", multi-function device on parallel port #%s"
msgstr ", multi-function device on parallel port #%s"
-#: printer/main.pm:351
+#: printer/main.pm:365
#, c-format
msgid ", multi-function device on a parallel port"
msgstr ", 多機能デバイス on a parallel port"
-#: printer/main.pm:353
+#: printer/main.pm:367
#, c-format
msgid ", multi-function device on USB"
msgstr ", multi-function device on USB"
-#: printer/main.pm:355
+#: printer/main.pm:369
#, c-format
msgid ", multi-function device on HP JetDirect"
msgstr ", multi-function device on HP JetDirect"
-#: printer/main.pm:357
+#: printer/main.pm:371
#, c-format
msgid ", multi-function device"
msgstr ", multi-function device"
-#: printer/main.pm:360
+#: printer/main.pm:375
#, c-format
msgid ", printing to %s"
msgstr ", printing to %s"
-#: printer/main.pm:362
+#: printer/main.pm:378
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr " on LPD server \"%s\", printer \"%s\""
-#: printer/main.pm:364
+#: printer/main.pm:381
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ", TCP/IP host \"%s\", port %s"
# y, c-format
-#: printer/main.pm:368
+#: printer/main.pm:386
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr " on SMB/Windows server \"%s\", share \"%s\""
-#: printer/main.pm:372
+#: printer/main.pm:391
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr " on Novell server \"%s\", printer \"%s\""
-#: printer/main.pm:374
+#: printer/main.pm:394
#, c-format
msgid ", using command %s"
msgstr ", using command %s"
-#: printer/main.pm:389
+#: printer/main.pm:409
#, c-format
msgid "Parallel port #%s"
msgstr "パラレルポート #%s"
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
#, c-format
msgid "USB printer #%s"
msgstr "USBプリンタ #%s"
-#: printer/main.pm:394
+#: printer/main.pm:414
#, c-format
msgid "USB printer"
msgstr "USBプリンタ"
-#: printer/main.pm:399
+#: printer/main.pm:419
#, c-format
msgid "Multi-function device on parallel port #%s"
msgstr "多機能デバイス on parallel port #%s"
-#: printer/main.pm:402
+#: printer/main.pm:422
#, c-format
msgid "Multi-function device on a parallel port"
msgstr "多機能デバイス on a parallel port"
-#: printer/main.pm:404
+#: printer/main.pm:424
#, c-format
msgid "Multi-function device on USB"
msgstr "USBの多機能デバイス"
-#: printer/main.pm:406
+#: printer/main.pm:426
#, c-format
msgid "Multi-function device on HP JetDirect"
msgstr "多機能デバイス on HP JetDirect"
-#: printer/main.pm:408
+#: printer/main.pm:428
#, c-format
msgid "Multi-function device"
msgstr "多機能デバイス"
-#: printer/main.pm:411
+#: printer/main.pm:432
#, c-format
msgid "Prints into %s"
msgstr "%s への印刷"
-#: printer/main.pm:413
+#: printer/main.pm:435
#, c-format
msgid "LPD server \"%s\", printer \"%s\""
msgstr "LPDサーバ \"%s\", プリンタ \"%s\""
-#: printer/main.pm:415
+#: printer/main.pm:438
#, c-format
msgid "TCP/IP host \"%s\", port %s"
msgstr "TCP/IP host \"%s\", port %s"
# y, c-format
-#: printer/main.pm:419
+#: printer/main.pm:443
#, c-format
msgid "SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows サーバ \"%s\", share \"%s\""
-#: printer/main.pm:423
+#: printer/main.pm:448
#, c-format
msgid "Novell server \"%s\", printer \"%s\""
msgstr "Novellサーバ \"%s\", プリンタ \"%s\""
-#: printer/main.pm:425
+#: printer/main.pm:451
#, c-format
msgid "Uses command %s"
msgstr "コマンド %s を使う"
-#: printer/main.pm:427
+#: printer/main.pm:453
#, c-format
msgid "URI: %s"
msgstr "URI: %s"
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
#, c-format
msgid "Raw printer (No driver)"
msgstr "Rawプリンタ(ドライバなし)"
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
#, c-format
msgid "Local network(s)"
msgstr "ローカルネットワーク"
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
#, c-format
msgid "Interface \"%s\""
msgstr "インタフェース %s"
-#: printer/main.pm:1090
+#: printer/main.pm:1151
#, c-format
msgid "Network %s"
msgstr "ネットワーク %s"
-#: printer/main.pm:1092
+#: printer/main.pm:1153
#, c-format
msgid "Host %s"
msgstr "ホスト %s"
-#: printer/main.pm:1121
+#: printer/main.pm:1182
#, c-format
msgid "%s (Port %s)"
msgstr "%s (ポート %s)"
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
#, c-format
msgid ""
"The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
"on. Download the Windows driver package from the HP web site (the firmware "
"on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
"searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
"printer' directory. There it will be found by the automatic uploader script "
"and uploaded whenever the printer is connected and turned on.\n"
@@ -11006,19 +11174,19 @@ msgstr ""
"ください。There it will be found by the automatic uploader script and "
"uploaded whenever the printer is connected and turned on.\n"
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
#, c-format
msgid "CUPS printer configuration"
msgstr "CUPSプリンタの設定"
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
#, c-format
msgid ""
"Here you can choose whether the printers connected to this machine should be "
"accessible by remote machines and by which remote machines."
msgstr "リモートマシンからのプリンタアクセスを設定します。"
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
#, c-format
msgid ""
"You can also decide here whether printers on remote machines should be "
@@ -11027,43 +11195,38 @@ msgstr ""
" \n"
"このマシンからのプリンタアクセスを設定することもできます。"
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
#, c-format
msgid "The printers on this machine are available to other computers"
msgstr "このマシンのプリンタを他のコンピュータでも利用する"
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
#, c-format
msgid "Automatically find available printers on remote machines"
msgstr "リモートマシンに接続しているプリンタを自動的に検出する"
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
#, c-format
msgid "Printer sharing on hosts/networks: "
msgstr "ホスト/ネットワークでのプリンタ共有: "
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
#, c-format
msgid "Custom configuration"
msgstr "カスタム設定"
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
#, c-format
msgid "No remote machines"
msgstr "リモートマシンがありません"
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
#, c-format
msgid "Additional CUPS servers: "
msgstr "追加のCUPSサーバ: "
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "なし"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
#, c-format
msgid ""
"To get access to printers on remote CUPS servers in your local network you "
@@ -11084,20 +11247,20 @@ msgstr ""
"に表示されます。CUPSサーバがローカルネットワークに無い場合は、IPアドレス(と\n"
"オプションでポート番号)を入力してください。"
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
#, c-format
msgid "Japanese text printing mode"
msgstr "日本語テキスト印刷モード"
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
#, c-format
msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
"activated you cannot print accentuated characters in latin fonts any more "
"and you will not be able to adjust the margins, the character size, etc. "
"This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
"activate this function on that remote machine."
msgstr ""
"これをオンにすると日本語のプレーンテキストを印刷できるようになります。\n"
@@ -11108,12 +11271,12 @@ msgstr ""
"定義したプリンタのみで有効です。リモートマシンでセットアップしたプリンタで\n"
"日本語テキストを印刷するには、リモートマシンでこの機能を有効にしてください。"
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
#, c-format
msgid "Automatic correction of CUPS configuration"
msgstr "自動的にCUPSを設定する"
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
#, c-format
msgid ""
"When this option is turned on, on every startup of CUPS it is automatically "
@@ -11140,74 +11303,103 @@ msgstr ""
"この機能に問題がある場合はこのオプションを切ってください。\n"
"ただしユーザ自身が上記の点に注意する必要があります。"
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr "リモートCUPSサーバ(ローカルCUPSデーモンなし)"
+
+#: printer/printerdrake.pm:135
+#, c-format
+msgid "On"
+msgstr "On"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, c-format
+msgid "Off"
+msgstr "Off"
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"このモードではローカルCUPSデーモンは停止し、すべての印刷要求は直接下に指定し"
+"たサーバへ送られます。注意: ローカル印刷キューは使えません。また、 指定した"
+"サーバがダウンするとこのマシンからは全く印刷できなくなります。"
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
#, c-format
msgid "Sharing of local printers"
msgstr "ローカルプリンタを共有"
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
#, c-format
msgid ""
"These are the machines and networks on which the locally connected printer"
"(s) should be available:"
msgstr "ローカル接続したプリンタを利用するマシンとネットワーク:"
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
#, c-format
msgid "Add host/network"
msgstr "ホスト/ネットワークを追加"
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
#, c-format
msgid "Edit selected host/network"
msgstr "選択したホスト/ネットワークを編集"
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
#, c-format
msgid "Remove selected host/network"
msgstr "選択したホスト/ネットワークを削除"
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
#, c-format
msgid "IP address of host/network:"
msgstr "ホスト/ネットワークのIPアドレス:"
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
#, c-format
msgid ""
"Choose the network or host on which the local printers should be made "
"available:"
msgstr "ローカルプリンタを利用するネットワークもしくはホストを選んでください:"
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
#, c-format
msgid "Host/network IP address missing."
msgstr "ホスト/ネットワークIPがありません"
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
#, c-format
msgid "The entered host/network IP is not correct.\n"
msgstr "入力したホスト/ネットワークIPは正しくありません\n"
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
#, c-format
msgid "Examples for correct IPs:\n"
msgstr "正しいIPの例:\n"
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
#, c-format
msgid "This host/network is already in the list, it cannot be added again.\n"
msgstr ""
"このホスト/ネットワークはリストにあります。重複することはできません。\n"
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
#, c-format
msgid "Accessing printers on remote CUPS servers"
msgstr "リモートCUPSサーバのプリンタにアクセス"
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
#, c-format
msgid ""
"Add here the CUPS servers whose printers you want to use. You only need to "
@@ -11217,102 +11409,118 @@ msgstr ""
"プリンタが使用するCUPSサーバをここで追加してください。これはサーバが\n"
"ローカルネットワークにプリンタ情報を送っていない場合のみ必要です。"
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
#, c-format
msgid "Add server"
msgstr "サーバを追加"
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
#, c-format
msgid "Edit selected server"
msgstr "選んだサーバを編集"
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
#, c-format
msgid "Remove selected server"
msgstr "選んだサーバを削除"
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
#, c-format
msgid "Enter IP address and port of the host whose printers you want to use."
msgstr "使用するプリンタのホストのIPアドレスとポートを入力"
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
#, c-format
msgid "If no port is given, 631 will be taken as default."
msgstr "ポート番号を指定しない場合は631がデフォルトになります。"
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
#, c-format
msgid "Server IP missing!"
msgstr "IPサーバがありません"
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
#, c-format
msgid "The entered IP is not correct.\n"
msgstr "入力したIPは正しくありません\n"
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
#, c-format
msgid "The port number should be an integer!"
msgstr "ポート番号は整数です"
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
#, c-format
msgid "This server is already in the list, it cannot be added again.\n"
msgstr "このサーバは既にリストにあります。重複することはできません。\n"
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
#, c-format
msgid "Port"
msgstr "ポート"
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "on, リモートサーバの名前かIP:"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "CUPSサーバの名前かIPがありません"
+
+#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
+#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
+#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
+#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
+#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
+#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
+#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
+#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
+#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
+#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
+#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
+#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
+#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
+#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
+#: printer/printerdrake.pm:4826 standalone/printerdrake:64
+#: standalone/printerdrake:84 standalone/printerdrake:566
#, c-format
msgid "Printerdrake"
msgstr "Printerdrake"
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "プリンタの情報を読み込み中.."
+
+#: printer/printerdrake.pm:581
#, c-format
msgid "Restarting CUPS..."
msgstr "CUPSを再起動中.."
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
#, c-format
msgid "Select Printer Connection"
msgstr "プリンタの接続を選んでください"
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
#, c-format
msgid "How is the printer connected?"
msgstr "プリンタをどのように接続していますか?"
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
#, c-format
msgid ""
"\n"
@@ -11323,7 +11531,7 @@ msgstr ""
"リモートCUPSサーバのプリンタをここで設定する必要はありません。\n"
"それらのプリンタは自動的に検出します。"
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
#, c-format
msgid ""
"\n"
@@ -11334,28 +11542,28 @@ msgstr ""
"警告: ローカルネットワーク接続が無効です。リモートプリンタを検出していません"
"しテストもしていません"
-#: printer/printerdrake.pm:515
-#, fuzzy, c-format
+#: printer/printerdrake.pm:619
+#, c-format
msgid ""
"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "プリンタを自動的に検出(ローカル,TCP/Socket,SMBプリンタ)"
+msgstr "プリンタの自動検出 (Local, TCP/Socket, SMB printers, and device URI)"
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
#, c-format
msgid "Checking your system..."
msgstr "システムを調査中.."
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
#, c-format
msgid "and one unknown printer"
msgstr "と 1 台の不明なプリンタが"
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
#, c-format
msgid "and %d unknown printers"
msgstr "と %d 台の不明なプリンタが"
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
#, c-format
msgid ""
"The following printers\n"
@@ -11368,7 +11576,7 @@ msgstr ""
"%s%s\n"
"はシステムに直接接続しています"
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
#, c-format
msgid ""
"The following printer\n"
@@ -11381,7 +11589,7 @@ msgstr ""
"%s%s\n"
"はシステムに直接接続しています"
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
#, c-format
msgid ""
"The following printer\n"
@@ -11394,7 +11602,7 @@ msgstr ""
"%s%s\n"
"はシステムに直接接続しています"
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
#, c-format
msgid ""
"\n"
@@ -11403,7 +11611,7 @@ msgstr ""
"\n"
"1台の不明なプリンタをマシンに接続しています"
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
#, c-format
msgid ""
"\n"
@@ -11412,42 +11620,42 @@ msgstr ""
"\n"
"%d 台の不明なプリンタをマシンに接続しています"
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
#, c-format
msgid ""
"There are no printers found which are directly connected to your machine"
msgstr "マシンに接続したプリンタが見つかりません"
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
#, c-format
msgid " (Make sure that all your printers are connected and turned on).\n"
msgstr ""
" \n"
"(全てのプリンタを接続して電源を入れてください)。\n"
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
#, c-format
msgid ""
"Do you want to enable printing on the printers mentioned above or on "
"printers in the local network?\n"
msgstr "上記のプリンタやローカルネットワークのプリンタで印刷を行いますか?\n"
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
#, c-format
msgid "Do you want to enable printing on printers in the local network?\n"
msgstr "ローカルネットワークのプリンタで印刷を行いますか?\n"
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:701
#, c-format
msgid "Do you want to enable printing on the printers mentioned above?\n"
msgstr "上記のプリンタで印刷を行いますか?\n"
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:702
#, c-format
msgid "Are you sure that you want to set up printing on this machine?\n"
msgstr "本当に印刷を設定しますか?\n"
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
#, c-format
msgid ""
"NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11456,48 +11664,42 @@ msgstr ""
"注意: プリンタの機種と印刷方式によっては、最大で %d MBの\n"
"追加ソフトをインストールします。"
-#: printer/printerdrake.pm:629
+#: printer/printerdrake.pm:742
#, c-format
msgid "Searching for new printers..."
msgstr "新しいプリンタを検索中.."
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
#, c-format
-msgid "Configuring printer ..."
-msgstr "プリンタを設定中.."
+msgid "Found printer on %s..."
+msgstr "%s にプリンタを検出.."
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "プリンタ %s を設定中.."
-
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
#, c-format
msgid "("
msgstr "("
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
#, c-format
msgid " on "
msgstr " on "
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
#, c-format
msgid ")"
msgstr ")"
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
#, c-format
msgid "Printer model selection"
msgstr "プリンタの機種を選ぶ"
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
#, c-format
msgid "Which printer model do you have?"
msgstr "どのプリンタをお使いですか?"
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
#, c-format
msgid ""
"\n"
@@ -11510,7 +11712,7 @@ msgstr ""
"Printerdrakeはお使いのプリンタ %s の機種を検出できませんでした。\n"
"リストの中から正しい機種を選択してください。"
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
#, c-format
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11520,21 +11722,24 @@ msgstr ""
"お使いのプリンタがなければ、互換性のあるプリンタ\n"
"(プリンタのマニュアルを参照)か類似プリンタを選んでください。"
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
#, c-format
-msgid "Configuring applications..."
-msgstr "アプリケーションを設定中.."
+msgid "Configuring printer on %s..."
+msgstr "%s のプリンタを設定.."
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "プリンタ %s を設定中.."
+
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
#, c-format
msgid "Add a new printer"
msgstr "プリンタを追加"
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
#, c-format
msgid ""
"\n"
@@ -11556,7 +11761,7 @@ msgstr ""
"プリンタドライバ/オプション/プリンタの接続方式\n"
"を選択してプリンタを設定してください。"
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
#, c-format
msgid ""
"\n"
@@ -11594,7 +11799,7 @@ msgstr ""
"準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
"'キャンセル'をクリックしてください。"
-#: printer/printerdrake.pm:854
+#: printer/printerdrake.pm:955
#, c-format
msgid ""
"\n"
@@ -11620,7 +11825,7 @@ msgstr ""
"準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
"'キャンセル'をクリックしてください。"
-#: printer/printerdrake.pm:862
+#: printer/printerdrake.pm:963
#, c-format
msgid ""
"\n"
@@ -11657,7 +11862,7 @@ msgstr ""
"準備ができましたら'次へ'をクリックしてください。プリンタを設定しない場合は\n"
"'キャンセル'をクリックしてください。"
-#: printer/printerdrake.pm:871
+#: printer/printerdrake.pm:972
#, c-format
msgid ""
"\n"
@@ -11683,23 +11888,23 @@ msgstr ""
"準備ができましたら'次'をクリックしてください。プリンタを設定しない場合は\n"
"'キャンセル'をクリックしてください。"
-#: printer/printerdrake.pm:880
+#: printer/printerdrake.pm:981
#, c-format
msgid "Auto-detect printers connected to this machine"
msgstr "このマシンに接続しているプリンタを自動的に検出する"
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
#, c-format
msgid "Auto-detect printers connected directly to the local network"
msgstr "ローカルネットワークに接続しているプリンタを自動的に検出する"
-#: printer/printerdrake.pm:886
+#: printer/printerdrake.pm:987
#, c-format
msgid "Auto-detect printers connected to machines running Microsoft Windows"
msgstr "Windowsマシンに接続しているプリンタを自動的に検出する"
-#: printer/printerdrake.pm:902
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1003
+#, c-format
msgid ""
"\n"
"Congratulations, your printer is now installed and configured!\n"
@@ -11714,77 +11919,77 @@ msgstr ""
"\n"
"おめでとうございます。プリンタのインストールと設定が完了しました。\n"
"\n"
-"アプリケーションの'印刷'(ファイルメニューにあることが多い)から\n"
-"印刷できます。\n"
-"\n"
-"プリンタの追加/削除/名前変更/デフォルト設定(用紙トレイ、印字品質など)を\n"
-"行う場合は、Mandrakeコントロールセンタの ハードウェア -> プリンタ を\n"
-"選んでください。"
-
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
-#, fuzzy, c-format
+"アプリケーションの\"Print\"(たいていは\"File\"メニューの中にあります) を選ん"
+"で印刷できます。\n"
+"\n"
+"プリンタの追加/削除/名前の変更/オプション設定の変更(用紙トレイ/印刷品質など)"
+"を行うには、%s コントロールセンターの「ハードウェア」で「プリンタ」を選んでく"
+"ださい。"
+
+#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
+#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
+#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
+#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
+#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
+#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
+#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
+#, c-format
msgid "Could not install the %s packages!"
-msgstr "XFreeパッケージをインストールできません: %s"
+msgstr "%s パッケージをインストールできません"
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
#, c-format
msgid "Skipping Windows/SMB server auto-detection"
-msgstr ""
+msgstr "Windows/SMBサーバの自動検出をスキップ"
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
#, c-format
msgid "Printer auto-detection"
msgstr "プリンタを自動的に検出する"
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
#, c-format
msgid "Detecting devices..."
msgstr "デバイスを検出中.."
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
#, c-format
msgid ", network printer \"%s\", port %s"
msgstr ", ネットワークプリンタ %s, ポート %s"
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
#, c-format
msgid ", printer \"%s\" on SMB/Windows server \"%s\""
msgstr ", printer \"%s\" on SMB/Windows server \"%s\""
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
#, c-format
msgid "Detected %s"
msgstr "%s を検出"
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
#, c-format
msgid "Printer on parallel port #%s"
msgstr "パラレルポート #%s のプリンタ"
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
#, c-format
msgid "Network printer \"%s\", port %s"
msgstr "ネットワークプリンタ %s, ポート %s"
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
#, c-format
msgid "Printer \"%s\" on SMB/Windows server \"%s\""
msgstr "プリンタ %s、SMB/Windowsサーバ %s"
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
#, c-format
msgid "Local Printer"
-msgstr "Local Printer"
+msgstr "ローカルプリンタ"
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
#, c-format
msgid ""
"No local printer found! To manually install a printer enter a device name/"
@@ -11796,32 +12001,32 @@ msgstr ""
"ファイル名を入力します(パラレルポートなら /dev/lp0, /dev/lp1 、\n"
"USBプリンタなら /dev/usb/lp0, /dev/usb/lp1 のようになります)。"
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
#, c-format
msgid "You must enter a device or file name!"
msgstr "デバイス名かファイル名を入力してください"
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
#, c-format
msgid "No printer found!"
msgstr "プリンタが見つかりません"
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
#, c-format
msgid "Local Printers"
msgstr "Local Printers"
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
#, c-format
msgid "Available printers"
msgstr "利用可能なプリンタ"
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
#, c-format
msgid "The following printer was auto-detected. "
msgstr "以下のプリンタを自動的に検出しました。"
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
#, c-format
msgid ""
"If it is not the one you want to configure, enter a device name/file name in "
@@ -11831,18 +12036,18 @@ msgstr ""
"手持ちの機器と異なる場合は、入力欄にデバイス名/ファイル名を\n"
"入力してください"
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
#, c-format
msgid ""
"Alternatively, you can specify a device name/file name in the input line"
msgstr "代わりにデバイス名/ファイル名を指定することもできます"
-#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
#, c-format
msgid "Here is a list of all auto-detected printers. "
msgstr "自動的に検出したプリンタのリスト "
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
#, c-format
msgid ""
"Please choose the printer you want to set up or enter a device name/file "
@@ -11850,7 +12055,7 @@ msgid ""
msgstr ""
"セットアップするプリンタを選択するかデバイス名/ファイル名を入力してください"
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
#, c-format
msgid ""
"Please choose the printer to which the print jobs should go or enter a "
@@ -11858,7 +12063,7 @@ msgid ""
msgstr ""
"印刷ジョブを行うプリンタを選択するか、デバイス名/ファイル名を入力してください"
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
#, c-format
msgid ""
"The configuration of the printer will work fully automatically. If your "
@@ -11868,12 +12073,12 @@ msgstr ""
"プリンタの設定は全自動で行われます。お使いのプリンタが正確に検出されない/\n"
"プリンタの設定をカスタマイズしたい場合は、'手動設定'を有効にしてください。"
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
#, c-format
msgid "Currently, no alternative possibility is available"
msgstr "現在のところ別の選択肢はありません"
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
#, c-format
msgid ""
"Please choose the printer you want to set up. The configuration of the "
@@ -11886,12 +12091,12 @@ msgstr ""
"プリンタが正確に検出されない/プリンタの設定をカスタマイズしたい場合は、\n"
"'手動設定'を有効にしてください。"
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
#, c-format
msgid "Please choose the printer to which the print jobs should go."
msgstr "印刷ジョブを行うプリンタを選んでください。"
-#: printer/printerdrake.pm:1107
+#: printer/printerdrake.pm:1222
#, c-format
msgid ""
"Please choose the port that your printer is connected to or enter a device "
@@ -11899,12 +12104,12 @@ msgid ""
msgstr ""
"プリンタを接続しているポートを選ぶか、デバイス名/ファイル名を入力してください"
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
#, c-format
msgid "Please choose the port that your printer is connected to."
msgstr "お使いのプリンタを接続しているポートを選んでください。"
-#: printer/printerdrake.pm:1110
+#: printer/printerdrake.pm:1225
#, c-format
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -11914,26 +12119,26 @@ msgstr ""
"(パラレルポート: /dev/lp0, /dev/lp1, .., が LPT1:, LPT2:, .., \n"
"1台目のUSBプリンタ: /dev/usb/lp0, 2台目のUSBプリンタ: /dev/usb/lp1, ..)"
-#: printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1229
#, c-format
msgid "You must choose/enter a printer/device!"
msgstr "プリンタかデバイスを入力/選択してください"
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
+#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
+#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
+#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
+#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
+#, c-format
msgid "Aborting"
msgstr "中止"
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
#, c-format
msgid "Remote lpd Printer Options"
msgstr "リモートlpdプリンタのオプション"
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
#, c-format
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -11942,63 +12147,63 @@ msgstr ""
"リモートlpdプリンタを使うには、プリンタサーバのホスト名と\n"
"サーバのプリンタの名前が必要です。"
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1306
#, c-format
msgid "Remote host name"
msgstr "リモートホスト名"
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
#, c-format
msgid "Remote printer name"
msgstr "リモートプリンタ名"
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
#, c-format
msgid "Remote host name missing!"
msgstr "リモートホストの名前がありません"
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
#, c-format
msgid "Remote printer name missing!"
msgstr "リモートプリンタの名前がありません"
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742 standalone/drakTermServ:1405
+#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
+#: standalone/drakbackup:513 standalone/drakbackup:619
+#: standalone/drakbackup:654 standalone/drakbackup:774
+#: standalone/harddrake2:237
#, c-format
msgid "Information"
msgstr "情報"
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
#, c-format
msgid "Detected model: %s %s"
msgstr "検出した機種: %s %s"
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
#, c-format
msgid "Scanning network..."
msgstr "ネットワークをスキャンしています.."
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
#, c-format
msgid ", printer \"%s\" on server \"%s\""
msgstr ", printer \"%s\" on server \"%s\""
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
#, c-format
msgid "Printer \"%s\" on server \"%s\""
msgstr "Printer \"%s\" on server \"%s\""
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
#, c-format
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB(Windows9x/NT)プリンタのオプション"
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
#, c-format
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12010,7 +12215,7 @@ msgstr ""
"プリントサーバのIPアドレス、アクセスしたいプリンタの共有名、\n"
"適切なユーザ名、パスワード、ワークグループの情報 が必要になります。"
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
#, c-format
msgid ""
" If the desired printer was auto-detected, simply choose it from the list "
@@ -12019,47 +12224,47 @@ msgstr ""
"適切なプリンタを検出したら、それをそのまま選択し、必要に応じてユーザ名/\n"
"パスワード/ワークグループなどを入力してください。"
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
#, c-format
msgid "SMB server host"
msgstr "SMBサーバのホスト名"
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
#, c-format
msgid "SMB server IP"
msgstr "SMBサーバのIP"
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
#, c-format
msgid "Share name"
msgstr "共有名"
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
#, c-format
msgid "Workgroup"
msgstr "ワークグループ"
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
#, c-format
msgid "Auto-detected"
msgstr "自動的に検出"
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
#, c-format
msgid "Either the server name or the server's IP must be given!"
msgstr "サーバ名かサーバのIPを入力してください"
-#: printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1506
#, c-format
msgid "Samba share name missing!"
msgstr "Sambaの共有名がありません"
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
#, c-format
msgid "SECURITY WARNING!"
msgstr "セキュリティ警告"
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -12100,7 +12305,7 @@ msgstr ""
"type in Printerdrake.\n"
"\n"
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -12112,7 +12317,7 @@ msgstr ""
"そしてこのマシンからの印刷をPrinterdrakeの接続タイプ %s で設定する。\n"
"\n"
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
#, c-format
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12125,12 +12330,12 @@ msgstr ""
"\n"
"現在の状態でプリンタの設定を続けますか?"
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
#, c-format
msgid "NetWare Printer Options"
msgstr "Netwareプリンタのオプション"
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
#, c-format
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12142,42 +12347,42 @@ msgstr ""
"TCP/IPホスト名ではない)と、アクセスするプリンタの印刷キュー名、\n"
"適切なユーザ名、パスワードが必要になります。"
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
#, c-format
msgid "Printer Server"
msgstr "プリンタサーバ"
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
#, c-format
msgid "Print Queue Name"
msgstr "印刷キューの名前"
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
#, c-format
msgid "NCP server name missing!"
msgstr "NCPサーバの名前がありません"
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
#, c-format
msgid "NCP queue name missing!"
msgstr "NCPキューの名前がありません"
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
#, c-format
msgid ", host \"%s\", port %s"
msgstr ", ホスト %s, ポート %s"
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
#, c-format
msgid "Host \"%s\", port %s"
msgstr "ホスト %s, ポート %s"
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
#, c-format
msgid "TCP/Socket Printer Options"
msgstr "TCP/ソケットプリンタのオプション"
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
#, c-format
msgid ""
"Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12186,7 +12391,7 @@ msgstr ""
"自動的に検出したプリンタをリストから選ぶか、入力項目にホスト名かIPと、\n"
"オプションでポート番号(デフォルトは9100)を入力する。"
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
#, c-format
msgid ""
"To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12199,27 +12404,27 @@ msgstr ""
"HP JetDirectサーバのポート番号は通常9100ですが、他のサーバでは異なることが\n"
"あります。ハードウェアのマニュアルをご覧ください。"
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
#, c-format
msgid "Printer host name or IP missing!"
msgstr "プリンタホスト名かIPがありません"
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
#, c-format
msgid "Printer host name or IP"
msgstr "プリンタホスト名かIP"
-#: printer/printerdrake.pm:1704
-#, fuzzy, c-format
+#: printer/printerdrake.pm:1819
+#, c-format
msgid "Refreshing Device URI list..."
-msgstr "プリンタデータを更新中.."
+msgstr "デバイスURIリストを更新.."
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
#, c-format
msgid "Printer Device URI"
msgstr "プリンタデバイスのURI"
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
#, c-format
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12230,17 +12435,17 @@ msgstr ""
"このURIはCUPSかFoomaticの仕様で指定してください。\n"
"全てのスプーラが全てのURIタイプをサポートしているわけではありません。"
-#: printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1846
#, c-format
msgid "A valid URI must be entered!"
msgstr "有効なURIを入力してください"
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
#, c-format
msgid "Pipe into command"
msgstr "コマンドにパイプする"
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
#, c-format
msgid ""
"Here you can specify any arbitrary command line into which the job should be "
@@ -12249,17 +12454,17 @@ msgstr ""
"プリンタにジョブを直接送る代わりに、パイプさせるコマンドラインを入力できま"
"す。"
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
#, c-format
msgid "Command line"
msgstr "コマンドライン"
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
#, c-format
msgid "A command line must be entered!"
msgstr "コマンドラインを入力してください"
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
#, c-format
msgid ""
"Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12271,73 +12476,73 @@ msgstr ""
"LaserJet 1100/1200/1220/3200/3300, DeskJet 450,\n"
"Sony IJP-V100), HP PhotoSmart もしくは HP LaserJet 2200"
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
#, c-format
msgid "Installing HPOJ package..."
msgstr "HPOJパッケージをインストール中.."
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
#, c-format
msgid "Only printing will be possible on the %s."
-msgstr ""
+msgstr "%s では印刷のみが可能です"
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
#, c-format
msgid "Checking device and configuring HPOJ..."
msgstr "デバイス確認とHPOJを設定中.."
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
#, c-format
msgid "Installing SANE packages..."
msgstr "SANEパッケージをインストール中.."
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
#, c-format
msgid "Scanning on the %s will not be possible."
-msgstr ""
+msgstr "%s でのスキャンはできません"
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
#, c-format
msgid "Installing mtools packages..."
msgstr "mtoolsパッケージをインストール中.."
-#: printer/printerdrake.pm:1990
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2113
+#, c-format
msgid "Photo memory card access on the %s will not be possible."
-msgstr "HP多機能デバイスのフォトメモリーカードアクセス"
+msgstr "%s でのフォトメモリーカードアクセスはできません"
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2128
#, c-format
msgid "Scanning on your HP multi-function device"
msgstr "HP多機能デバイスのスキャン"
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
#, c-format
msgid "Photo memory card access on your HP multi-function device"
msgstr "HP多機能デバイスのフォトメモリーカードアクセス"
-#: printer/printerdrake.pm:2062
+#: printer/printerdrake.pm:2185
#, c-format
msgid "Making printer port available for CUPS..."
msgstr "CUPS用のプリンタポートを作成中.."
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
#, c-format
msgid "Reading printer database..."
msgstr "プリンタデータベースを読み込み中.."
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
#, c-format
msgid "Enter Printer Name and Comments"
msgstr "プリンタ名とコメントを入力"
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
#, c-format
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "プリンタ名には文字と数字とアンダースコア(_)しか使えません"
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
@@ -12346,7 +12551,7 @@ msgstr ""
"プリンタ %s は既に存在しています。\n"
"設定を上書きしますか?"
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
#, c-format
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
@@ -12355,35 +12560,35 @@ msgstr ""
"プリンタにはそれぞれ名前が必要です(たとえば'printer')。\n"
"説明/場所の欄は空のままでも構いません。ユーザ用のメモ欄です。"
-#: printer/printerdrake.pm:2301
+#: printer/printerdrake.pm:2424
#, c-format
msgid "Name of printer"
msgstr "プリンタの名前"
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
#, c-format
msgid "Description"
msgstr "説明"
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
#, c-format
msgid "Location"
msgstr "プリンタの場所"
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
#, c-format
msgid "Preparing printer database..."
msgstr "プリンタデータベースを準備中.."
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
#, c-format
msgid "Your printer model"
msgstr "プリンタの機種"
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -12408,18 +12613,18 @@ msgstr ""
"\n"
"%s"
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
#, c-format
msgid "The model is correct"
msgstr "この機種を使う"
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
#, c-format
msgid "Select model manually"
msgstr "手動で選ぶ"
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
#, c-format
msgid ""
"\n"
@@ -12434,104 +12639,106 @@ msgstr ""
"間違った機種もしくはRawプリンタを表示している場合は、\n"
"リストから正しい機種を探してください。"
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
#, c-format
msgid "Install a manufacturer-supplied PPD file"
msgstr "メーカー提供のPPDファイルをインストール"
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
#, c-format
msgid ""
"Every PostScript printer is delivered with a PPD file which describes the "
"printer's options and features."
msgstr ""
+"PostScriptプリンタは、そのプリンタのオプションと機能を記したPPDファイルで提供"
+"されます"
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
#, c-format
msgid ""
"This file is usually somewhere on the CD with the Windows and Mac drivers "
"delivered with the printer."
msgstr ""
+"このファイルはたいていプリンタ付属のWindows/MacドライバCDのどこかにあります。"
-#: printer/printerdrake.pm:2524
+#: printer/printerdrake.pm:2645
#, c-format
msgid "You can find the PPD files also on the manufacturer's web sites."
-msgstr ""
+msgstr "PPDファイルはメーカーのWEBサイトにもあります。"
-#: printer/printerdrake.pm:2525
+#: printer/printerdrake.pm:2646
#, c-format
msgid ""
"If you have Windows installed on your machine, you can find the PPD file on "
"your Windows partition, too."
msgstr ""
+"Windowsをマシンにインストールしている場合は、WindowsパーティションにもPPDファ"
+"イルがあります。"
-#: printer/printerdrake.pm:2526
+#: printer/printerdrake.pm:2647
#, c-format
msgid ""
"Installing the printer's PPD file and using it when setting up the printer "
"makes all options of the printer available which are provided by the "
"printer's hardware"
msgstr ""
+"PPDファイルをインストールしプリンタのセットアップ時に使うと、プリンタのハード"
+"ウェアがサポートする全てのオプションを利用できるようになります。"
-#: printer/printerdrake.pm:2527
+#: printer/printerdrake.pm:2648
#, c-format
msgid ""
"Here you can choose the PPD file to be installed on your machine, it will "
"then be used for the setup of your printer."
msgstr ""
+"マシンにインストールするPPDファイルを選びます。これはプリンタのセットアップに"
+"使います。"
-#: printer/printerdrake.pm:2529
+#: printer/printerdrake.pm:2650
#, c-format
msgid "Install PPD file from"
msgstr "PPDファイルを次からインストール"
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
#, c-format
msgid "Floppy Disk"
msgstr "フロッピーディスク"
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
#, c-format
msgid "Other place"
msgstr "その他の場所"
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
#, c-format
msgid "Select PPD file"
msgstr "PPDファイルを選択"
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
#, c-format
msgid "The PPD file %s does not exist or is unreadable!"
msgstr "PPDファイル %s が無いか読み取り不能です"
-#: printer/printerdrake.pm:2558
+#: printer/printerdrake.pm:2679
#, c-format
msgid "The PPD file %s does not conform with the PPD specifications!"
-msgstr ""
+msgstr "このPPDファイル %s はPPDの仕様に合っていません。"
-#: printer/printerdrake.pm:2569
+#: printer/printerdrake.pm:2690
#, c-format
msgid "Installing PPD file..."
msgstr "PPDファイルをインストール.."
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
#, c-format
msgid "OKI winprinter configuration"
msgstr "OKI winプリンタの設定"
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
#, c-format
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
@@ -12547,12 +12754,12 @@ msgstr ""
"テストページを印刷する前に最初のパラレルポートにつなぎなおしてください。\n"
"そうしないと使えません。接続種類の設定は無視されます。"
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
#, c-format
msgid "Lexmark inkjet configuration"
msgstr "Lexmarkインクジェットを設定"
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
#, c-format
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12564,7 +12771,7 @@ msgstr ""
"サポートしません。リモートマシンやプリンタサーバのプリンタには使えません。\n"
"プリンタをローカルポートに接続するか、接続しているマシンで設定してください。"
-#: printer/printerdrake.pm:2737
+#: printer/printerdrake.pm:2864
#, c-format
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12588,29 +12795,52 @@ msgstr ""
"ページを lexmarkmaintain で印刷し、このプログラムでヘッドのアラインメントを\n"
"調整してください。"
-#: printer/printerdrake.pm:2746
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2874
+#, c-format
msgid "Lexmark X125 configuration"
-msgstr "Lexmarkインクジェットを設定"
+msgstr "Lexmark X125 の設定"
-#: printer/printerdrake.pm:2747
-#, fuzzy, c-format
+#: printer/printerdrake.pm:2875
+#, c-format
msgid ""
"The driver for this printer only supports printers locally connected via "
"USB, no printers on remote machines or print server boxes. Please connect "
"your printer to a local USB port or configure it on the machine where it is "
"connected to."
msgstr ""
-"Lexmarkのインクジェットプリンタドライバは、ローカルプリンタしか\n"
-"サポートしません。リモートマシンやプリンタサーバのプリンタには使えません。\n"
-"プリンタをローカルポートに接続するか、接続しているマシンで設定してください。"
+"このプリンタのライバはUSB経由でローカルに接続したプリンタしかサポートしませ"
+"ん。リモートマシンやプリンタサーバのプリンタには使えません。プリンタをローカ"
+"ルUSBポートに接続するか、接続しているマシンで設定してください。"
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Samsung ML/QL-85Gの設定"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected on the "
+"first parallel port, no printers on remote machines or print server boxes or "
+"on other parallel ports. Please connect your printer to the first parallel "
+"port or configure it on the machine where it is connected to."
+msgstr ""
+"このドライバは最初のパラレルポートに接続されたローカルプリンタにしか使えませ"
+"ん。リモートマシンや他のパラレルポートのプリンタはサポートされません。プリン"
+"タを最初のパラレルポートに接続するか、プリンタが接続されているマシンで設定し"
+"てください。"
+
+#: printer/printerdrake.pm:2924
+#, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Caon LBP-460/660の設定"
+
+#: printer/printerdrake.pm:2943
#, c-format
msgid "Firmware-Upload for HP LaserJet 1000"
msgstr "HP LaserJet 1000のファームウェアをアップロード"
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
#, c-format
msgid ""
"Printer default settings\n"
@@ -12626,27 +12856,27 @@ msgstr ""
"しているか確認してください。\n"
"注意: 超高品質/高解像度の印刷には非常に時間がかかることがあります。"
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
#, c-format
msgid "Printer default settings"
msgstr "プリンタのデフォルト設定"
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
#, c-format
msgid "Option %s must be an integer number!"
msgstr "オプション %s は整数にしてください"
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
#, c-format
msgid "Option %s must be a number!"
msgstr "オプション %s は数字にしてください"
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
#, c-format
msgid "Option %s out of range!"
msgstr "オプション %s は範囲外です"
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
@@ -12655,12 +12885,12 @@ msgstr ""
"このプリンタ(%s)を\n"
"デフォルトのプリンタにしますか?"
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
#, c-format
msgid "Test pages"
msgstr "テストページ"
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
#, c-format
msgid ""
"Please select the test pages you want to print.\n"
@@ -12673,57 +12903,57 @@ msgstr ""
"メモリの少ないレーザプリンタでは出力できないかもしれません。\n"
"'標準'を印刷できれば大抵のばあい問題ないでしょう。"
-#: printer/printerdrake.pm:3089
+#: printer/printerdrake.pm:3267
#, c-format
msgid "No test pages"
msgstr "テストしない"
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
#, c-format
msgid "Print"
msgstr "印刷"
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
#, c-format
msgid "Standard test page"
msgstr "標準"
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
#, c-format
msgid "Alternative test page (Letter)"
msgstr "レター"
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
#, c-format
msgid "Alternative test page (A4)"
msgstr "A4"
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
#, c-format
msgid "Photo test page"
msgstr "写真"
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
#, c-format
msgid "Do not print any test page"
msgstr "テストページを印刷しない"
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
#, c-format
msgid "Printing test page(s)..."
msgstr "テストページを印刷中.."
-#: printer/printerdrake.pm:3150
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3331
+#, c-format
msgid "Could not install the %s package!"
-msgstr "XFreeパッケージをインストールできません: %s"
+msgstr "%s パッケージをインストールできません"
-#: printer/printerdrake.pm:3152
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3333
+#, c-format
msgid "Skipping photo test page."
-msgstr "写真"
+msgstr "写真テストページをスキップ"
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12738,7 +12968,7 @@ msgstr ""
"%s\n"
"\n"
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12747,17 +12977,17 @@ msgstr ""
"テストページをプリンタデーモンに送りました。\n"
"プリンタが動くまで少し時間がかかります。\n"
-#: printer/printerdrake.pm:3180
+#: printer/printerdrake.pm:3364
#, c-format
msgid "Did it work properly?"
msgstr "うまく動きましたか?"
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
#, c-format
msgid "Raw printer"
msgstr "Rawプリンタ"
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -12769,7 +12999,7 @@ msgstr ""
"%s <file>、GUIの場合は xpp <file> もしくは kprinter <file> を使います。\n"
"グラフィカルなツールを使うとプリンタの選択とオプションの設定が楽になります\n"
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3418
#, c-format
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
@@ -12780,8 +13010,8 @@ msgstr ""
"'印刷'でも使えます。この場合はファイル名の指定は必要ありません。\n"
"アプリケーションのほうが印刷するファイルを指定します。\n"
-#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
#, c-format
msgid ""
"\n"
@@ -12794,7 +13024,7 @@ msgstr ""
"できます。必要な設定をコマンドラインに追加してください。\n"
"例: %s <file>"
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
#, c-format
msgid ""
"To know about the options available for the current printer read either the "
@@ -12805,7 +13035,7 @@ msgstr ""
"'印刷オプションの一覧'をクリックしてください。%s%s%s\n"
"\n"
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
#, c-format
msgid ""
"Here is a list of the available printing options for the current printer:\n"
@@ -12814,7 +13044,7 @@ msgstr ""
"現在のプリンタで使える印刷オプションの一覧は以下の通りです:\n"
"\n"
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
@@ -12823,8 +13053,8 @@ msgstr ""
"コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
"%s <file> を使います。\n"
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
#, c-format
msgid ""
"This command you can also use in the \"Printing command\" field of the "
@@ -12835,7 +13065,7 @@ msgstr ""
"この場合はファイル名の指定は必要ありません。アプリケーションのほうから\n"
"指定されます。\n"
-#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
#, c-format
msgid ""
"To get a list of the options available for the current printer click on the "
@@ -12844,7 +13074,7 @@ msgstr ""
"現在のプリンタで使えるオプションのリストを見るには、'印刷オプションの一覧'\n"
"をクリックしてください。"
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3453
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
@@ -12853,7 +13083,7 @@ msgstr ""
"コマンドライン(ターミナルウィンドウ)からファイルを印刷するには、\n"
"%s <file> または %s <file> を使います。\n"
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
#, c-format
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12868,7 +13098,7 @@ msgstr ""
"あります。これをクリックすると印刷ジョブがすぐに止まります。\n"
"これは紙づまりのときなどに便利です。\n"
-#: printer/printerdrake.pm:3276
+#: printer/printerdrake.pm:3461
#, c-format
msgid ""
"\n"
@@ -12881,42 +13111,32 @@ msgstr ""
"できます。必要な設定をコマンドラインに追加してください。\n"
"例: %s <file>\n"
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr "%s で印刷/スキャン/フォトカード"
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "%s で印刷/スキャン"
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr "%s で印刷/フォトカードアクセス"
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "プリンタ %s で印刷"
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, c-format
-msgid "Close"
-msgstr "閉じる"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
#, c-format
msgid "Print option list"
msgstr "印刷オプションの一覧"
-#: printer/printerdrake.pm:3317
+#: printer/printerdrake.pm:3502
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. "
@@ -12927,7 +13147,9 @@ msgid ""
"\" menu. Call also \"man scanimage\" on the command line to get more "
"information.\n"
"\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"device, you only need to use \"scannerdrake\" if you want to share the "
+"scanner on the network."
msgstr ""
"HP多機能デバイスを自動的に設定して、スキャナを使えるようにしました。\n"
"これでコマンドラインから scanimage を入力するか(複数のスキャナがある場合は\n"
@@ -12935,9 +13157,10 @@ msgstr ""
"スキャンできます。GIMPを使って ファイル -> 取り込み でスキャンすることも\n"
"可能です。詳しくはコマンドラインで man scanimage を参照してください。\n"
"\n"
-"このデバイスでは scannerdrake を使わないでください。"
+"このデバイスでスキャナをセットアップする場合は、scannerdrakeを使う必要はあり"
+"ません。ネットワークでスキャナを共有する時にのみ実行してください。"
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
#, c-format
msgid ""
"Your printer was configured automatically to give you access to the photo "
@@ -12958,18 +13181,13 @@ msgstr ""
"カードのファイルシステムは、ドライブp: 以降となります。\n"
"MtoolsFMではファイルリストの右上の項目でドライブ文字を変えられます。"
-#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "プリンタの情報を読み込み中.."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
#, c-format
msgid "Transfer printer configuration"
msgstr "プリンタの設定を変換"
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -12983,7 +13201,7 @@ msgstr ""
"オプション設定)コピーされますが、ジョブは変換されません。\n"
"以下の理由で変換できないキューもあります:\n"
-#: printer/printerdrake.pm:3389
+#: printer/printerdrake.pm:3574
#, c-format
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
@@ -12992,7 +13210,7 @@ msgstr ""
"CUPSはNovellサーバのプリンタや、自由形式のコマンドにデータを送るプリンタを\n"
"サポートしません。\n"
-#: printer/printerdrake.pm:3391
+#: printer/printerdrake.pm:3576
#, c-format
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13001,12 +13219,12 @@ msgstr ""
"PDQはローカルプリンタ、リモートのLPDプリンタ、ソケット/TCPプリンタのみを\n"
"サポートします。\n"
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
#, c-format
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPDとLPRngはIPPプリンタをサポートしません。\n"
-#: printer/printerdrake.pm:3395
+#: printer/printerdrake.pm:3580
#, c-format
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13015,7 +13233,7 @@ msgstr ""
"さらにこのプログラムやfoomatic-configureで作っていないキューは変換できませ"
"ん。"
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
#, c-format
msgid ""
"\n"
@@ -13026,7 +13244,7 @@ msgstr ""
"またメーカー提供のPPDファイルやネイティブのCUPSドライバで設定したプリンタは\n"
"変換できません。"
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
#, c-format
msgid ""
"\n"
@@ -13036,17 +13254,17 @@ msgstr ""
"\n"
"変換するプリンタを選んで'変換'をクリックしてください。"
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
#, c-format
msgid "Do not transfer printers"
msgstr "プリンタを変換しない"
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
#, c-format
msgid "Transfer"
msgstr "変換"
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -13057,17 +13275,17 @@ msgstr ""
"上書きするには'変換'を押してください。\n"
"新しい名前を入力するか、このプリンタをスキップすることもできます。"
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
#, c-format
msgid "New printer name"
msgstr "新しいプリンタの名前"
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
#, c-format
msgid "Transferring %s..."
msgstr "%s を変換中.."
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13076,28 +13294,28 @@ msgstr ""
"以前のデフォルトプリンタ(%s)を変換しました。新しい印刷システム %s でも\n"
"これをデフォルトのプリンタにしますか?"
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
#, c-format
msgid "Refreshing printer data..."
msgstr "プリンタデータを更新中.."
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
#, c-format
msgid "Starting network..."
msgstr "ネットワークを起動中.."
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
#, c-format
msgid "Configure the network now"
msgstr "ネットワークを設定する"
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
#, c-format
msgid "Network functionality not configured"
msgstr "ネットワーク機能を設定していません"
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
#, c-format
msgid ""
"You are going to configure a remote printer. This needs working network "
@@ -13109,13 +13327,13 @@ msgstr ""
"ネットワークは未設定です。ネットワークを設定しないとこのプリンタを使用する\n"
"ことはできません。どうしますか?"
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
#, c-format
msgid "Go on without configuring the network"
msgstr "ネットワークを設定せずに先へ進む"
-#: printer/printerdrake.pm:3547
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3735
+#, c-format
msgid ""
"The network configuration done during the installation cannot be started "
"now. Please check whether the network is accessible after booting your "
@@ -13123,13 +13341,12 @@ msgid ""
"\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
"also using the %s Control Center, section \"Hardware\"/\"Printer\""
msgstr ""
-"インストール中に行ったネットワーク設定を起動できません。起動時の\n"
-"ネットワークアクセスが有効かどうかを確認して、Mandrakeコントロールセンタの\n"
-"ネットワークとインターネット -> 接続 で設定を修正してください。\n"
-"その後Mandrakeコントロールセンタの ハードウェア -> プリンタ で\n"
-"プリンタを設定してください。"
+"インストール中に行ったネットワーク設定を起動できません。起動時のネットワーク"
+"アクセスが有効かどうかを確認して、%s コントロールセンタの ネットワークとイン"
+"ターネット / 接続 で設定を修正してください。その後 %s コントロールセンタの "
+"ハードウェア / プリンタ でプリンタを設定してください。"
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
#, c-format
msgid ""
"The network access was not running and could not be started. Please check "
@@ -13139,27 +13356,27 @@ msgstr ""
"ネットワークアクセスを起動できませんでした。設定とハードウェアを確認して\n"
"ください。そのあとでリモートプリンタの設定をやりなおしてください。"
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
#, c-format
msgid "Restarting printing system..."
msgstr "プリンタシステムを再起動中.."
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
#, c-format
msgid "high"
msgstr "高い"
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
#, c-format
msgid "paranoid"
msgstr "極度に高い"
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "印刷システムをセキュリティレベル %s でインストール中"
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -13183,12 +13400,12 @@ msgstr ""
"\n"
"本当に印刷システムを設定しますか?"
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
#, c-format
msgid "Starting the printing system at boot time"
msgstr "起動時に印刷システムを開始"
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -13208,259 +13425,328 @@ msgstr ""
"\n"
"印刷システムの自動起動を有効にしますか?"
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
#, c-format
msgid "Checking installed software..."
msgstr "インストール済みソフトをチェック中.."
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
#, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
msgstr "%s を削除中.."
-#: printer/printerdrake.pm:3665
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3847
+#, c-format
msgid "Could not remove the %s printing system!"
-msgstr "印刷システムを変更"
+msgstr "%s 印刷システムを削除できません"
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
#, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
msgstr "%s をインストール中.."
-#: printer/printerdrake.pm:3678
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3867
+#, c-format
msgid "Could not install the %s printing system!"
-msgstr "印刷システムを変更"
+msgstr "%s 印刷システムをインストールできません"
+
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+"このモードではローカル印刷システムはありません。すべての印刷要求は直接下に指"
+"定されたサーバに送られます。注意: ローカル印刷キューは使えません。また、指定"
+"したサーバがダウンするとこのマシンからは全く印刷できなくなります。"
+
+#: printer/printerdrake.pm:3936
+#, c-format
+msgid ""
+"Enter the host name or IP of your CUPS server and click OK if you want to "
+"use this mode, click \"Quit\" otherwise."
+msgstr ""
+"このモードを使うには、CUPSサーバの名前かIPを入力してOKをクリックしてくださ"
+"い。使わない場合は\"Quit\"を選んでください。 "
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "リモートサーバの名前かIP:"
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3970
#, c-format
msgid "Setting Default Printer..."
msgstr "デフォルトのプリンタを設定中.."
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "リモートCUPSサーバかローカルCUPS印刷システム?"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr "CUPS印刷システムは二通りに使えます:"
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr "1. CUPS印刷システムをローカルに使う"
+
+#: printer/printerdrake.pm:3993
+#, c-format
+msgid ""
+"Then locally connected printers can be used and remote printers on other "
+"CUPS servers in the same network are automatically discovered. "
+msgstr ""
+"ローカルに接続されたプリンタが使えます。ネットワーク内の他のCUPSサーバのリ"
+"モートプリンタは自動検出されます。"
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+"この方法の欠点は、ローカルマシンに負担がかかることです。例: 追加パッケージの"
+"インストール/CUPSデーモンを常に稼動させておく必要がある/IPPポート(port 631)が"
+"オープンになる。"
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr "2. すべての印刷要求は直ちにリモートCUPSサーバに送られます。"
+
+#: printer/printerdrake.pm:3997
+#, c-format
+msgid ""
+"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
+"started or port opened, no software infrastructure for setting up local "
+"print queues is installed, so less memory and disk space is used. "
+msgstr ""
+"この方法では、ローカルマシンの負担は最小限になります。CUPSデーモンを稼動させ"
+"る必要もなく、またポートも閉じられます。ローカル印刷キューをセットアップする"
+"ためのソフトウェアもインストールしないので、メモリー/ディスクスペースも少なく"
+"てすみます。"
+
+#: printer/printerdrake.pm:3998
+#, c-format
+msgid ""
+"Disadvantage is that it is not possible to define local printers then and if "
+"the specified server is down it cannot be printed at all from this machine. "
+msgstr ""
+"欠点は、ローカルプリンタを指定できないので指定したサーバがダウンするとこのマ"
+"シンからは全く印刷できなくなることです。"
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr "CUPSをどのようにセットアップしますか?"
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr "リモートサーバ - 名前かIPを指定:"
+
+#: printer/printerdrake.pm:4018
+#, c-format
+msgid "Local CUPS printing system"
+msgstr "ローカルCUPS印刷システム"
+
+#: printer/printerdrake.pm:4056
#, c-format
msgid "Select Printer Spooler"
msgstr "プリンタのスプーラを選んでください"
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
#, c-format
msgid "Which printing system (spooler) do you want to use?"
msgstr "どの印刷システム(スプーラ)を使いますか?"
-#: printer/printerdrake.pm:3799
+#: printer/printerdrake.pm:4105
#, c-format
msgid "Failed to configure printer \"%s\"!"
msgstr "プリンタ %s の設定に失敗"
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
#, c-format
msgid "Installing Foomatic..."
msgstr "Foomaticをインストール中.."
-#: printer/printerdrake.pm:3818
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4124
+#, c-format
msgid "Could not install %s packages, %s cannot be started!"
-msgstr "スキャナを共有するのに必要なパッケージをインストールできません"
+msgstr "%s パッケージをインストールできません、%s を起動できません"
-#: printer/printerdrake.pm:3910
-#, fuzzy, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr ""
-"Scannerdrakeでスキャナを設定するのに必要なファイルをインストールできません"
-
-#: printer/printerdrake.pm:4011
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4314
+#, c-format
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
"it. "
msgstr ""
-"以下のプリンタは設定済みです。ダブルクリックで設定を変更/\n"
-"デフォルトのプリンタに指定/情報を参照 することができます。"
+"以下のプリンタは設定済みです。ダブルクリックで設定を変更/デフォルトのプリンタ"
+"に指定/情報を参照 することができます。"
-#: printer/printerdrake.pm:4039
+#: printer/printerdrake.pm:4344
#, c-format
msgid "Display all available remote CUPS printers"
msgstr "利用可能なリモートCUPSプリンタを全て表示"
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
#, c-format
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "プリンタリストを更新(リモートCUPSプリンタを全て表示)"
-#: printer/printerdrake.pm:4050
+#: printer/printerdrake.pm:4356
#, c-format
msgid "CUPS configuration"
msgstr "CUPSを設定"
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
#, c-format
msgid "Change the printing system"
msgstr "印刷システムを変更"
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
#, c-format
msgid "Normal Mode"
msgstr "ノーマルモード"
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
#, c-format
msgid "Expert Mode"
msgstr "エキスパートモード"
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
#, c-format
msgid "Printer options"
msgstr "プリンタのオプション"
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
#, c-format
msgid "Modify printer configuration"
msgstr "プリンタ設定の変更"
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
#, c-format
msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
"What do you want to modify on this printer?"
msgstr ""
-"プリンタ %s\n"
+"プリンタ %s%s\n"
"このプリンタの何を変更しますか?"
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, c-format
+msgid "This printer is disabled"
+msgstr "このプリンタは無効になっています"
+
+#: printer/printerdrake.pm:4677
#, c-format
msgid "Do it!"
msgstr "実行"
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
#, c-format
msgid "Printer connection type"
msgstr "プリンタ接続の種類"
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
#, c-format
msgid "Printer name, description, location"
msgstr "プリンタの名前/説明/場所"
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
#, c-format
msgid "Printer manufacturer, model, driver"
msgstr "プリンタのメーカー/機種/ドライバ"
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
#, c-format
msgid "Printer manufacturer, model"
msgstr "プリンタのメーカー/機種"
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
#, c-format
msgid "Set this printer as the default"
msgstr "このプリンタをデフォルトにする"
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
#, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "このプリンタを Star Office/OpenOffice.org/GIMP に追加"
+msgid "Enable Printer"
+msgstr "プリンタを有効にする"
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
#, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "このプリンタを Star Office/OpenOffice.org/GIMP から削除"
+msgid "Disable Printer"
+msgstr "プリンタを無効にする"
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
#, c-format
msgid "Print test pages"
msgstr "テストページの印刷"
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
#, c-format
msgid "Learn how to use this printer"
msgstr "このプリンタの使いかたを調べる"
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
#, c-format
msgid "Remove printer"
msgstr "プリンタを削除"
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr "古いプリンタ %s を削除中.."
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "プリンタを Star Office/OpenOffice.org/GIMP に追加"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP に追加しました。"
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"プリンタ %s を Star Office/OpenOffice.org/GIMP に追加できませんでした。"
-
-#: printer/printerdrake.pm:4496
+#: printer/printerdrake.pm:4781
#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "プリンタを Star Office/OpenOffice.org/GIMP から削除中"
+msgid "Printer \"%s\" is now enabled."
+msgstr "プリンタ %s を有効にしました"
-#: printer/printerdrake.pm:4498
+#: printer/printerdrake.pm:4786
#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "プリンタ %s を Star Office/OpenOffice.org/GIMP から削除しました。"
+msgid "Printer \"%s\" is now disabled."
+msgstr "プリンタ %s を無効にしました"
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"プリンタ %s を Star Office/OpenOffice.org/GIMP から削除できませんでした。"
-
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "プリンタ %s を本当に削除しますか?"
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
#, c-format
msgid "Removing printer \"%s\"..."
msgstr "プリンタ %s を削除中.."
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
#, c-format
msgid "Default printer"
msgstr "デフォルトのプリンタ"
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "プリンタ %s がデフォルトのプリンタになりました。"
-#: raid.pm:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "フォーマット済みのRAID md%dにはパーティションを追加できません"
-
-#: raid.pm:139
+#: raid.pm:36
#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraidに失敗(おそらくraidtoolsが入っていません)"
+msgid "Can't add a partition to _formatted_ RAID %s"
+msgstr "フォーマット済の RAID %s にはパーティションを追加できません"
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "mkraidに失敗しました"
-
-#: raid.pm:155
+#: raid.pm:132
#, c-format
msgid "Not enough partitions for RAID level %d\n"
msgstr "RAIDレベル %d にはパーティションが足りません\n"
@@ -13471,9 +13757,9 @@ msgid "Could not create directory /usr/share/sane/firmware!"
msgstr "ディレクトリ /usr/share/sane/firmware を作れません"
#: scanner.pm:107
-#, fuzzy, c-format
+#, c-format
msgid "Could not create link /usr/share/sane/%s!"
-msgstr "ディレクトリ /usr/share/sane/firmware を作れません"
+msgstr "リンク /usr/share/sane/%s を作れません"
#: scanner.pm:114
#, c-format
@@ -13486,16 +13772,16 @@ msgstr ""
msgid "Could not set permissions of firmware file %s!"
msgstr "ファームウェアファイル %s の権限を設定できません"
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
+#: standalone/scannerdrake:78 standalone/scannerdrake:340
+#: standalone/scannerdrake:415 standalone/scannerdrake:459
+#: standalone/scannerdrake:463 standalone/scannerdrake:485
+#: standalone/scannerdrake:550
#, c-format
msgid "Scannerdrake"
msgstr "Scannerdrake"
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
#, c-format
msgid "Could not install the packages needed to share your scanner(s)."
msgstr "スキャナを共有するのに必要なパッケージをインストールできません"
@@ -13525,7 +13811,8 @@ msgstr " icmp echoを許可/禁止する"
msgid "Allow/Forbid autologin."
msgstr "自動ログインを許可/禁止する。"
-#: security/help.pm:19
+#. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
+#: security/help.pm:21
#, c-format
msgid ""
"If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
@@ -13535,29 +13822,38 @@ msgid ""
"Else only /etc/issue is allowed."
msgstr ""
-#: security/help.pm:25
+#: security/help.pm:27
#, c-format
msgid "Allow/Forbid reboot by the console user."
msgstr "コンソールユーザによる再起動を許可/禁止する。"
-#: security/help.pm:27
+#: security/help.pm:29
#, c-format
msgid "Allow/Forbid remote root login."
msgstr "リモートrootログインを許可/禁止する"
-#: security/help.pm:29
+#: security/help.pm:31
#, c-format
msgid "Allow/Forbid direct root login."
msgstr "直接のrootログインを許可/禁止する。"
-#: security/help.pm:31
+#: security/help.pm:33
#, c-format
msgid ""
"Allow/Forbid the list of users on the system on display managers (kdm and "
"gdm)."
msgstr "ディスプレイマネージャ(kdmとgdm)のユーザリストを許可/禁止する。"
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
#, c-format
msgid ""
"Allow/Forbid X connections:\n"
@@ -13576,7 +13872,7 @@ msgstr ""
"\n"
"- NONE(接続しない)"
-#: security/help.pm:41
+#: security/help.pm:48
#, c-format
msgid ""
"The argument specifies if clients are authorized to connect\n"
@@ -13585,7 +13881,8 @@ msgstr ""
"この引数はtcp port 6000のXサーバへのクライアントの接続を\n"
"認証するかどうかを指定する。"
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
#, c-format
msgid ""
"Authorize:\n"
@@ -13601,7 +13898,7 @@ msgid ""
"(5))."
msgstr ""
-#: security/help.pm:54
+#: security/help.pm:63
#, c-format
msgid ""
"If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13614,7 +13911,7 @@ msgid ""
"packages."
msgstr ""
-#: security/help.pm:63
+#: security/help.pm:72
#, c-format
msgid ""
"Enable/Disable crontab and at for users.\n"
@@ -13627,103 +13924,108 @@ msgstr ""
"/etc/cron.allow と /etc/at.allow (man at(1)とcrontab(1)を参照)に\n"
"許可するユーザを書き込む"
-#: security/help.pm:68
+#: security/help.pm:77
#, c-format
msgid "Enable/Disable syslog reports to console 12"
msgstr "Syslogによるconsole 12への報告を有効/無効にする"
-#: security/help.pm:70
+#: security/help.pm:79
#, c-format
msgid ""
"Enable/Disable name resolution spoofing protection. If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
msgstr ""
-"'alert'がtrueかつsyslogに報告しているときは、\n"
+"'%s'がtrueかつsyslogに報告しているときは、\n"
"name resolution spoofing protectionを有効/無効にする。"
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "セキュリティ警告:"
+
+#: security/help.pm:82
#, c-format
msgid "Enable/Disable IP spoofing protection."
msgstr "IP spoofing protectionを有効/無効にする"
-#: security/help.pm:75
+#: security/help.pm:84
#, c-format
msgid "Enable/Disable libsafe if libsafe is found on the system."
msgstr "libsafeがシステムにあるときはlibsafeを有効/無効にする"
-#: security/help.pm:77
+#: security/help.pm:86
#, c-format
msgid "Enable/Disable the logging of IPv4 strange packets."
msgstr "IPv4 strange packetsのログを有効/無効にする"
-#: security/help.pm:79
+#: security/help.pm:88
#, c-format
msgid "Enable/Disable msec hourly security check."
msgstr "定期的なmsecセキュリティチェックを有効/無効にする"
-#: security/help.pm:81
+#: security/help.pm:90
#, c-format
msgid ""
" Enabling su only from members of the wheel group or allow su from any user."
msgstr ""
" wheelグループのメンバーのみのsuを許可するか、他のユーザからのsuを許可するか"
-#: security/help.pm:83
+#: security/help.pm:92
#, c-format
msgid "Use password to authenticate users."
msgstr "ユーザの認証にパスワードを使う"
-#: security/help.pm:85
+#: security/help.pm:94
#, c-format
msgid "Activate/Disable ethernet cards promiscuity check."
msgstr "ethernetカードのpromiscuityチェックを有効/無効にする。"
-#: security/help.pm:87
+#: security/help.pm:96
#, c-format
msgid " Activate/Disable daily security check."
msgstr " デイリーセキュリティチェックを有効/無効にする。"
-#: security/help.pm:89
+#: security/help.pm:98
#, c-format
msgid " Enable/Disable sulogin(8) in single user level."
msgstr " シングルユーザレベルでのsulogin(8)を有効/無効にする。"
-#: security/help.pm:91
+#: security/help.pm:100
#, c-format
msgid "Add the name as an exception to the handling of password aging by msec."
msgstr "msecによるパスワード期限の設定から除外する名前を追加"
-#: security/help.pm:93
+#: security/help.pm:102
#, c-format
msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
msgstr "パスワードの有効日数と無効化するまでの猶予日数を設定"
-#: security/help.pm:95
+#: security/help.pm:104
#, c-format
msgid "Set the password history length to prevent password reuse."
msgstr "パスワードの再利用を禁止するパスワード履歴の長さを設定"
-#: security/help.pm:97
+#: security/help.pm:106
#, c-format
msgid ""
"Set the password minimum length and minimum number of digit and minimum "
"number of capitalized letters."
msgstr "パスワードの最小の長さ、最小の桁数、最小の大文字数を設定"
-#: security/help.pm:99
+#: security/help.pm:108
#, c-format
msgid "Set the root umask."
msgstr "rootのumaskを設定してください。"
-#: security/help.pm:100
+#: security/help.pm:109
#, c-format
msgid "if set to yes, check open ports."
msgstr "'はい'の場合はオープンポートを確認してください。"
-#: security/help.pm:101
+#: security/help.pm:110
#, c-format
msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
"\n"
"- empty passwords,\n"
"\n"
@@ -13739,103 +14041,103 @@ msgstr ""
"\n"
"- root以外の 0 idのユーザ"
-#: security/help.pm:108
+#: security/help.pm:117
#, c-format
msgid "if set to yes, check permissions of files in the users' home."
msgstr "'はい'にするとhomeでのファイルの権限を確認します。"
-#: security/help.pm:109
+#: security/help.pm:118
#, c-format
msgid "if set to yes, check if the network devices are in promiscuous mode."
msgstr "'はい'にするとネットワークデバイスが混乱していないか確認します。"
-#: security/help.pm:110
+#: security/help.pm:119
#, c-format
msgid "if set to yes, run the daily security checks."
msgstr "'はい'にするとデイリーセキュリティチェックを実行します。"
-#: security/help.pm:111
+#: security/help.pm:120
#, c-format
msgid "if set to yes, check additions/removals of sgid files."
msgstr "'はい'の場合はsgidファイルの追加/削除を確認してください。"
-#: security/help.pm:112
+#: security/help.pm:121
#, c-format
msgid "if set to yes, check empty password in /etc/shadow."
msgstr "'はい'にすると/etc/shadowの空のパスワードを確認します。"
-#: security/help.pm:113
+#: security/help.pm:122
#, c-format
msgid "if set to yes, verify checksum of the suid/sgid files."
msgstr "'はい'にするとsuid/sgidファイルのチェックサムを照合します。"
-#: security/help.pm:114
+#: security/help.pm:123
#, c-format
msgid "if set to yes, check additions/removals of suid root files."
msgstr "'はい'にするとsuid rootファイルの追加/削除を確認します。"
-#: security/help.pm:115
+#: security/help.pm:124
#, c-format
msgid "if set to yes, report unowned files."
msgstr "'はい'にすると所有していないファイルを報告します。"
-#: security/help.pm:116
+#: security/help.pm:125
#, c-format
msgid "if set to yes, check files/directories writable by everybody."
msgstr "'はい'にすると全員がファイル/ディレクトリに書きこめるか確認します。"
-#: security/help.pm:117
+#: security/help.pm:126
#, c-format
msgid "if set to yes, run chkrootkit checks."
msgstr "'はい'にするとchkrootkitによる確認を実行します。"
-#: security/help.pm:118
+#: security/help.pm:127
#, c-format
msgid ""
"if set, send the mail report to this email address else send it to root."
msgstr "セットするとメールレポートをrootに送らずこのEmailアドレスに送ります。"
-#: security/help.pm:119
+#: security/help.pm:128
#, c-format
msgid "if set to yes, report check result by mail."
msgstr "'はい'にすると確認結果をメールで報告します。"
-#: security/help.pm:120
+#: security/help.pm:129
#, c-format
msgid "Do not send mails if there's nothing to warn about"
msgstr "警告がない場合はメールを送らない"
-#: security/help.pm:121
+#: security/help.pm:130
#, c-format
msgid "if set to yes, run some checks against the rpm database."
msgstr "'はい'にするとRPMデータベースに対していくつか確認を実行します。"
-#: security/help.pm:122
+#: security/help.pm:131
#, c-format
msgid "if set to yes, report check result to syslog."
msgstr "'はい'にするとsyslogに確認結果を報告します。"
-#: security/help.pm:123
+#: security/help.pm:132
#, c-format
msgid "if set to yes, reports check result to tty."
msgstr "'はい'にすると確認結果をttyに報告します。"
-#: security/help.pm:125
+#: security/help.pm:134
#, c-format
msgid "Set shell commands history size. A value of -1 means unlimited."
msgstr "シェルコマンドの履歴サイズを設定。-1にすると無制限"
-#: security/help.pm:127
+#: security/help.pm:136
#, c-format
msgid "Set the shell timeout. A value of zero means no timeout."
msgstr "シェルのタイムアウトを設定。ゼロはタイムアウトなし"
-#: security/help.pm:127
+#: security/help.pm:136
#, c-format
msgid "Timeout unit is second"
msgstr "タイムアウトの単位は秒です"
-#: security/help.pm:129
+#: security/help.pm:138
#, c-format
msgid "Set the user umask."
msgstr "ユーザのumaskを設定してください。"
@@ -13882,210 +14184,215 @@ msgstr "ディスプレイマネージャ(kdmとgdm)にユーザを表示"
#: security/l10n.pm:20
#, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
msgid "Allow X Window connections"
msgstr "X Window接続を有効にする"
-#: security/l10n.pm:21
+#: security/l10n.pm:22
#, c-format
msgid "Authorize TCP connections to X Window"
msgstr "TCP connections X Windowを認める"
-#: security/l10n.pm:22
+#: security/l10n.pm:23
#, c-format
msgid "Authorize all services controlled by tcp_wrappers"
msgstr "tcp_wrappersで制御する全サービスを認める"
-#: security/l10n.pm:23
+#: security/l10n.pm:24
#, c-format
msgid "Chkconfig obey msec rules"
msgstr "Chkconfigはmsecのルールに従う"
-#: security/l10n.pm:24
+#: security/l10n.pm:25
#, c-format
msgid "Enable \"crontab\" and \"at\" for users"
msgstr "ユーザのcrontabとatを許可"
-#: security/l10n.pm:25
+#: security/l10n.pm:26
#, c-format
msgid "Syslog reports to console 12"
msgstr "Syslogがconsole 12に報告"
-#: security/l10n.pm:26
+#: security/l10n.pm:27
#, c-format
msgid "Name resolution spoofing protection"
msgstr ""
-#: security/l10n.pm:27
+#: security/l10n.pm:28
#, c-format
msgid "Enable IP spoofing protection"
msgstr "IP spoofing protectionを許可"
-#: security/l10n.pm:28
+#: security/l10n.pm:29
#, c-format
msgid "Enable libsafe if libsafe is found on the system"
msgstr "libsafeがシステムにあるときはlibsafeを許可"
-#: security/l10n.pm:29
+#: security/l10n.pm:30
#, c-format
msgid "Enable the logging of IPv4 strange packets"
msgstr "IPv4 strange packetsのログを有効にする"
-#: security/l10n.pm:30
+#: security/l10n.pm:31
#, c-format
msgid "Enable msec hourly security check"
msgstr "定期的なmsecセキュリティチェック"
-#: security/l10n.pm:31
+#: security/l10n.pm:32
#, c-format
msgid "Enable su only from the wheel group members or for any user"
msgstr "ホイールグループのメンバーのみもしくは他のユーザのsuを許可"
-#: security/l10n.pm:32
+#: security/l10n.pm:33
#, c-format
msgid "Use password to authenticate users"
msgstr "ユーザを認証するのにパスワードを使う"
-#: security/l10n.pm:33
+#: security/l10n.pm:34
#, c-format
msgid "Ethernet cards promiscuity check"
msgstr "Ethernetカードのpromiscuityチェック"
-#: security/l10n.pm:34
+#: security/l10n.pm:35
#, c-format
msgid "Daily security check"
msgstr "デイリーセキュリティチェック"
-#: security/l10n.pm:35
+#: security/l10n.pm:36
#, c-format
msgid "Sulogin(8) in single user level"
msgstr "シングルユーザレベルのSulogin(8)"
-#: security/l10n.pm:36
+#: security/l10n.pm:37
#, c-format
msgid "No password aging for"
msgstr "パスワードの時効なし"
-#: security/l10n.pm:37
+#: security/l10n.pm:38
#, c-format
msgid "Set password expiration and account inactivation delays"
msgstr "パスワードの期限とアカウントの無効化を設定"
-#: security/l10n.pm:38
+#: security/l10n.pm:39
#, c-format
msgid "Password history length"
msgstr "パスワード履歴の長さ"
-#: security/l10n.pm:39
+#: security/l10n.pm:40
#, c-format
msgid "Password minimum length and number of digits and upcase letters"
msgstr "パスワードの最小文字数と数字/大文字の数"
-#: security/l10n.pm:40
+#: security/l10n.pm:41
#, c-format
msgid "Root umask"
msgstr "rootのumask"
-#: security/l10n.pm:41
+#: security/l10n.pm:42
#, c-format
msgid "Shell history size"
msgstr "シェル履歴のサイズ"
-#: security/l10n.pm:42
+#: security/l10n.pm:43
#, c-format
msgid "Shell timeout"
msgstr "シェルの時間設定"
-#: security/l10n.pm:43
+#: security/l10n.pm:44
#, c-format
msgid "User umask"
msgstr "ユーザのumask"
-#: security/l10n.pm:44
+#: security/l10n.pm:45
#, c-format
msgid "Check open ports"
msgstr "オープンポートを確認"
-#: security/l10n.pm:45
+#: security/l10n.pm:46
#, c-format
msgid "Check for unsecured accounts"
msgstr "安全でないアカウントを確認"
-#: security/l10n.pm:46
+#: security/l10n.pm:47
#, c-format
msgid "Check permissions of files in the users' home"
msgstr "ユーザのhomeでのファイルの権限を確認"
-#: security/l10n.pm:47
+#: security/l10n.pm:48
#, c-format
msgid "Check if the network devices are in promiscuous mode"
msgstr "ネットワークデバイスが混乱していないか確認"
-#: security/l10n.pm:48
+#: security/l10n.pm:49
#, c-format
msgid "Run the daily security checks"
msgstr "デイリーセキュリティチェックを実行"
-#: security/l10n.pm:49
+#: security/l10n.pm:50
#, c-format
msgid "Check additions/removals of sgid files"
msgstr "sgidファイルの追加/削除を確認"
-#: security/l10n.pm:50
+#: security/l10n.pm:51
#, c-format
msgid "Check empty password in /etc/shadow"
msgstr "/etc/shadowの空のパスワードを確認"
-#: security/l10n.pm:51
+#: security/l10n.pm:52
#, c-format
msgid "Verify checksum of the suid/sgid files"
msgstr "suid/sgidファイルのチェックサムを照合"
-#: security/l10n.pm:52
+#: security/l10n.pm:53
#, c-format
msgid "Check additions/removals of suid root files"
msgstr "suid rootファイルの追加/削除を確認"
-#: security/l10n.pm:53
+#: security/l10n.pm:54
#, c-format
msgid "Report unowned files"
msgstr "所有していないファイルを報告"
-#: security/l10n.pm:54
+#: security/l10n.pm:55
#, c-format
msgid "Check files/directories writable by everybody"
msgstr "全員がファイル/ディレクトリに書きこめるか確認"
-#: security/l10n.pm:55
+#: security/l10n.pm:56
#, c-format
msgid "Run chkrootkit checks"
msgstr "chkrootkitの確認を実行"
-#: security/l10n.pm:56
+#: security/l10n.pm:57
#, c-format
msgid "Do not send mails when unneeded"
msgstr "不要なときはメールを送らない"
-#: security/l10n.pm:57
+#: security/l10n.pm:58
#, c-format
msgid "If set, send the mail report to this email address else send it to root"
msgstr "セットするとメールレポートをroot以外にこのEmailアドレスに送ります。"
-#: security/l10n.pm:58
+#: security/l10n.pm:59
#, c-format
msgid "Report check result by mail"
msgstr "確認結果をメールで報告"
-#: security/l10n.pm:59
+#: security/l10n.pm:60
#, c-format
msgid "Run some checks against the rpm database"
msgstr "RPMデータベースに対していくつか確認を実行"
-#: security/l10n.pm:60
+#: security/l10n.pm:61
#, c-format
msgid "Report check result to syslog"
msgstr "確認結果をsyslogに報告する"
-#: security/l10n.pm:61
+#: security/l10n.pm:62
#, c-format
msgid "Reports check result to tty"
msgstr "確認結果をttyに報告"
@@ -14378,7 +14685,7 @@ msgid ""
"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
"Manager/Windows), and NCP (NetWare) mount points."
msgstr ""
-"全てのネットワークファイルシステム(NFS),SMB(LanManager/Windows),\n"
+"全てのネットワークファイルシステム(NFS), SMB(LanManager/Windows),\n"
"NCP(NetWare)マウントポイントをマウント/アンマウントします。"
#: services.pm:57
@@ -14414,8 +14721,8 @@ msgstr ""
#, c-format
msgid ""
"Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
-msgstr "起動時にコンソールとXFreeで自動的にnumlockを有効にする。"
+"and Xorg at boot."
+msgstr "起動時にコンソールとXorgで自動的にnumlockを有効にする。"
#: services.pm:66
#, c-format
@@ -14506,7 +14813,7 @@ msgstr ""
#, c-format
msgid ""
"The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
msgstr ""
"rwhoプロトコルは、rwhoデーモンを実行しているマシンにログインした\n"
"ユーザのリストを、リモートユーザが取得できるようにします\n"
@@ -14533,8 +14840,8 @@ msgstr "USBデバイスのドライバをロードする"
#: services.pm:91
#, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Xフォントサーバを開始する(XFreeを実行するのに必須)。"
+msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
+msgstr "Xフォントサーバを開始する(Xorgを実行するのに必須)。"
#: services.pm:117 services.pm:159
#, c-format
@@ -14578,7 +14885,7 @@ msgstr "停止中"
#: services.pm:215
#, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
msgstr "サービスとデーモン"
#: services.pm:221
@@ -14590,7 +14897,7 @@ msgstr ""
"このサービスについての\n"
"追加情報はありません。"
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
#, c-format
msgid "Info"
msgstr "情報"
@@ -14603,755 +14910,1289 @@ msgstr "リクエストがあったときに開始"
#: services.pm:229
#, c-format
msgid "On boot"
-msgstr "起動時の動作"
+msgstr "起動時に開始"
-#: services.pm:244
+#: services.pm:246
#, c-format
msgid "Start"
msgstr "開始"
-#: services.pm:244
+#: services.pm:246
#, c-format
msgid "Stop"
msgstr "停止"
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
#, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Mandrakelinuxをお選びいただきありがとうございます</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "Mandrakelinux とは?"
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/01.pl:15
#, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "オープンソースの世界へようこそ"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Mandrakelinux へようこそ"
-#: share/advertising/dis-01.pl:17
-#, fuzzy, c-format
+#: share/advertising/01.pl:17
+#, c-format
msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
msgstr ""
-"Mandrakelinuxは、MandrakeSoftの開発者と世界中の貢献者によるコラボレーションに"
-"よって成り立っています。"
+"Mandrakelinux は Linux カーネルを核にしたオペレーティングシステムとあらゆる"
+"ニーズを満たす多くのアプリケーションからなる Linux ディストリビューションで"
+"す。"
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
#, c-format
msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
+"is also one of the <b>most widely used</b> Linux distributions worldwide!"
msgstr ""
-"この最新リリースの開発に参加してくださった全てのかたがたに感謝いたします。"
+"Mandrakelinuxは ユーザーフレンドリーな Linux ディストリビューションです。世界"
+"中で最も広く使われているディストリビューションのひとつです。"
-#: share/advertising/dis-02.pl:13
-#, fuzzy, c-format
-msgid "<b>Discovery</b>"
-msgstr "ドライバ"
+#: share/advertising/02.pl:13
+#, c-format
+msgid "<b>Open Source</b>"
+msgstr "オープンソース"
-#: share/advertising/dis-02.pl:15
+#: share/advertising/02.pl:15
+#, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "オープンソースの世界へようこそ"
+
+#: share/advertising/02.pl:17
#, c-format
msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Mandrakelinux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
+"team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
+"contributors."
msgstr ""
+"Mandrakelinux はオープンソースモデルに力を注いでいます。この新しいリリースは "
+"Mandrakesoft の開発チームと Mandrakelinux のコントリビュータが生み出した世界"
+"規模のコミュニティによるコラボレーションの成果です。"
-#: share/advertising/dis-02.pl:17
+#: share/advertising/02.pl:19
#, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
-msgstr ""
+msgid ""
+"We would like to <b>thank</b> everyone who participated in the development "
+"of this latest release."
+msgstr "この最新リリースの開発に参加してくださった全てのかたがたに感謝します。"
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:13
#, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr ""
+msgid "<b>The GPL</b>"
+msgstr "GPL"
-#: share/advertising/dis-03.pl:15
+#: share/advertising/03.pl:15
#, c-format
msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
msgstr ""
+"このディストリビューションに含まれるほとんどのソフトウェアと Mandrakelinux の"
+"ツールは、 General Public License でライセンスされています。"
-#: share/advertising/dis-04.pl:13
+#: share/advertising/03.pl:17
#, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
msgstr ""
+"GPL はオープンソースモデルの心です。これによって、すべての人が自由に使用し、"
+"研究し、配布し、改良することができます。改良された結果もまた公表され、すべて"
+"の人がその恩恵に浴することができます。"
-#: share/advertising/dis-04.pl:15
+#: share/advertising/03.pl:19
#, c-format
msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"The main benefit of this is that the number of developers is virtually "
+"<b>unlimited</b>, resulting in <b>very high quality</b> software."
msgstr ""
+"オープンソースの最大の強みは開発者の数が無限だということです。多くの開発者の"
+"協業のなかから高品質なソフトウェアが生まれてきます。"
-#: share/advertising/dis-04.pl:16
+#: share/advertising/04.pl:13
#, c-format
-msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
-msgstr ""
+msgid "<b>Join the Community</b>"
+msgstr "コミュニティへの参加"
-#: share/advertising/dis-04.pl:17
+#: share/advertising/04.pl:15
#, c-format
msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
msgstr ""
+"Mandrakelinux はユーザと開発者から成る世界規模のコミュニティを生み出しまし"
+"た。このコミュニティは様々な役割を果たしています。新しいアプリケーションの開"
+"発に際してはバグを報告し問題の解決を助けます。コミュニティは Mandrakelinux "
+"World で中心的な役割を担っています。"
-#: share/advertising/dis-04.pl:18
+#: share/advertising/04.pl:17
#, c-format
msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"php3</b> if you would like to get <b>involved</b> in the development."
msgstr ""
+"まずは、 www.mandrakelinux.com でこの活気に満ちたコミュニティを覗いてみてくだ"
+"さい。開発への参加に興味のある方は www.mandrakelinux.com/en/cookerdevel.php3 "
+"へどうぞ。"
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
-#, fuzzy, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "インターネット"
+#: share/advertising/05.pl:13
+#, c-format
+msgid "<b>Download Version</b>"
+msgstr "ダウンロードバージョン"
-#: share/advertising/dis-05.pl:15
+#: share/advertising/05.pl:15
#, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
+msgid ""
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
msgstr ""
+"これは Mandrakesoft が無償で提供するダウンロードバージョンです。 "
+"Mandrakesoft は今後もすべての人が利用できる無償版の提供を続けていきたいと思っ"
+"ています。"
-#: share/advertising/dis-05.pl:17
+#: share/advertising/05.pl:17
#, c-format
msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
msgstr ""
+"ダウンロードバージョンにはソースが公開されていないソフトウェアを同梱すること"
+"ができません。したがって、次のものはこのバージョンには含まれていません。"
-#: share/advertising/dis-06.pl:15
+#: share/advertising/05.pl:18
#, c-format
-msgid "You can also:"
-msgstr "このようなことも行えます:"
+msgid ""
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
+msgstr "\t* プロプラエタリ・ドライバ (NVIDIA®/ATI™等のドライバ)"
-#: share/advertising/dis-06.pl:16
+#: share/advertising/05.pl:19
#, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Webの閲覧"
+msgid ""
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
+msgstr ""
+"\t* プロプラエタリ・ソフトウェア (Acrobat®/Reader®/ RealPlayer®/Flash™等)"
-#: share/advertising/dis-06.pl:17
+#: share/advertising/05.pl:21
#, c-format
-msgid "\t- chat"
-msgstr "\t- チャット"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr "Mandrakesoft の有償製品に含まれているサービスはご利用になれません。"
-#: share/advertising/dis-06.pl:18
+#: share/advertising/06.pl:13
#, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- 動画関連の処理"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr "Discovery: 初めての Linux デスクトップ"
-#: share/advertising/dis-06.pl:19
+#: share/advertising/06.pl:15
#, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- Webサイトの作成"
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr "Mandrakelinux Discovery をインストールします。"
-#: share/advertising/dis-06.pl:20
+#: share/advertising/06.pl:17
#, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid ""
+"Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
+"distribution. It includes a hand-picked selection of <b>premium software</b> "
+"for office, multimedia and Internet activities. Its menu is task-oriented, "
+"with a single application per task."
+msgstr ""
+"Discovery は最も簡単でユーザフレンドリな Linux ディストリビューションです。オ"
+"フィス・マルチメディア・インターネットのそれぞれに厳選したプレミアムソフト"
+"ウェアをご用意しました。用途別メニューから目的に合ったアプリケーションをすぐ"
+"にお使い頂けます。"
-#: share/advertising/dis-07.pl:13
+#: share/advertising/07.pl:13
#, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>マルチメディア</b>: 誰もが必要とするもの"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr "PowerPack: Linux デスクトップの決定版"
-#: share/advertising/dis-07.pl:15
+#: share/advertising/07.pl:15
#, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "<b>KsCD</b>でオーディオCDを観賞"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr "Mandrakelinux PowerPack をインストールします。"
-#: share/advertising/dis-07.pl:17
+#: share/advertising/07.pl:17
#, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "<b>Totem</b>で音楽ファイルと動画を楽しむ"
+msgid ""
+"PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
+"includes <b>thousands of applications</b> - everything from the most popular "
+"to the most advanced."
+msgstr ""
+"PowerPack は Mandrakesoft のプレミアム製品です。最も人気の高いものから最先端"
+"に至るまで、 PowerPack には数千のアプリケーションがぎっしり詰まっています。"
-#: share/advertising/dis-07.pl:19
+#: share/advertising/08.pl:13
#, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
-msgstr "<b>GQview</b>と<b>Gimp</b>で画像と写真を処理"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr "PowerPack+: デスクトップ/サーバ向け Linux ソリューション"
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/08.pl:15
#, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrakeコントロールセンタ</b>"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr "Mandrakelinux PowerPack+ をインストールします。"
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/08.pl:17
#, c-format
msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
+"sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
+"applications</b> and a comprehensive selection of world-class <b>server "
+"applications</b>."
msgstr ""
-"Mandrakeコントロールセンタは、Mandrake独自のツールを集めたものです。コン"
-"ピュータの設定を簡単に行うことができます。"
+"PowerPack+ は小中規模ネットワーク向けのフル装備 Linux ソリューションです。 "
+"PowerPack+ には数千のデスクトップ用アプリケーションと包括的にセレクトされた"
+"ワールドクラスのサーバ用アプリケーションが入っています。"
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/09.pl:13
+#, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "Mandrakesoft の製品"
+
+#: share/advertising/09.pl:15
#, c-format
msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
-msgstr ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr "Mandrakesoft は幅広い Mandrakelinux 製品を開発しています。"
+
+#: share/advertising/09.pl:17
+#, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Mandrakelinux 10.1の製品:"
+
+#: share/advertising/09.pl:18
+#, c-format
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr "\t* Discovery: 初めての Linux デスクトップ"
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/09.pl:19
#, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr "\t* PowerPack: Linux デスクトップの決定版"
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/09.pl:20
+#, c-format
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr "\t* PowerPack+: デスクトップ/サーバ向け Linux ソリューション"
+
+#: share/advertising/09.pl:21
#, c-format
msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
msgstr ""
-"MandrakeSoftの製品とサービスは <b>MandrakeStore</b> -- Eコマースでのサービス "
-"をご利用ください。"
+"\t* Mandrakelinux 10.1 for x86-64: 64-bitプロセッサのための Mandrakelinux"
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/10.pl:13
#, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr "<b>www.mandrakestore.com</b> にお立ちよりください"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr "Mandrakesoft の製品 - 行動派のあなたに"
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/10.pl:15
#, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "<b>MandrakeClub</b> のメンバーになりましょう"
+msgid ""
+"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
+"<b>on any computer</b> and without any need to actually install it:"
+msgstr ""
+"Mandrakesoft は Mandrakelinux をインストールすることなしにどのコンピュータで"
+"もお使い頂けるよう、ふたつの製品を開発しました。"
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/10.pl:16
#, c-format
msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
msgstr ""
-"MandrakeClubに参加されると、以下のような製品とサービスを受けることができます:"
+"\t* Move: ブータブルCD一枚で稼動できる Mandrakelinux ディストリビューション"
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/10.pl:17
#, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- 商用アプリケーションへのアクセス"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+"\t* GlobeTrotter: 超コンパクトな LaCie Mobile ハードドライブにプリインストー"
+"ルされた Mandrakelinux ディストリビューション"
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/11.pl:13
#, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr "\t- MandrakeClubメンバー専用のダウンロードミラー"
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "Mandrakesoftの製品 - プロフェッショナル・ユースに"
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/11.pl:15
#, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Mandrakelinuxに何を収録するかを投票"
+msgid ""
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
+msgstr ""
+"Mandrakesoft はプロフェッショナルなニーズを満たすため、次の製品を開発しまし"
+"た。"
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/11.pl:16
#, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- MandrakeStoreでの製品とサービスの優待"
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr "\t* Corporate Desktop: ビジネス向けデスクトップ"
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/11.pl:17
#, c-format
-msgid "\t- Plus much more"
-msgstr "\t- ほかにも各種ございます"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr "\t* Corporate Server: Mandrakelinux サーバ・ソリューション"
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/11.pl:18
#, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "詳しくは <b>www.mandrakeclub.com</b> をご覧ください"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
+msgstr "\t* Multi-Network Firewall: Mandrakelinux セキュリティ・ソリューション"
-#: share/advertising/dis-11.pl:13
+#: share/advertising/12.pl:13
#, c-format
-msgid "Do you require assistance?"
-msgstr "ヘルプが必要ですか?"
+msgid "<b>The KDE Choice</b>"
+msgstr "KDE デスクトップ"
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/12.pl:15
#, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> で技術サポートを行っています。"
+msgid ""
+"With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
+"and user-friendly <b>graphical desktop environment</b> available."
+msgstr ""
+"Discovery で、最も進化したユーザフレンドリなグラフィカルデスクトップ環境 KDE "
+"を体験してください。"
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/12.pl:17
#, c-format
msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
+"won't ever think of running another operating system!"
msgstr ""
-"Linuxに関する質問がありましたらMandrakeExpert <b>www.mandrakeexpert.com</b> "
-"にご参加ください。"
+"KDE で快適な Linux への第一歩を踏み出してください。あまりに快適なのでもう他の"
+"OSは使えなくなるかもしれません!"
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/12.pl:19
#, c-format
msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"KDE also includes a lot of <b>well integrated applications</b> such as "
+"Konqueror, the web browser and Kontact, the personal information manager."
msgstr ""
+"KDE には Konqueror ウェブブラウザや個人情報マネージャ Kontact をはじめとし、"
+"たくさんの統合アプリケーションが含まれています。"
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
#, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Mandrakelinuxのコミュニティに参加してください</b>"
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "お好きなデスクトップ環境を選んでください"
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/13-a.pl:15
#, c-format
msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"With PowerPack, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
msgstr ""
-"いっしょにやってみようと思うかたは、 <b>mandrake-linux.com/cooker</b> の "
-"\"Cooker\" メーリングリストにご参加ください。"
+"PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "
+"Mandrakesoft は KDE をデフォルトに選びました。"
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
#, c-format
msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
+"desktop environment available. It includes a lot of integrated applications."
msgstr ""
-"コミュニティの様子を知るには、 <b>www.mandrake-linux.com</b> を参照してくださ"
-"い。"
+"KDE は最も進化したユーザフレンドリなデスクトップ環境のひとつです。KDE にはた"
+"くさんの統合されたアプリケーションがあります。"
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
#, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Mandrakelinuxとは?</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
+"GNOME をはじめ IceWM その他のデスクトップ環境もお試しになって、お好みのものを"
+"見つけてください。"
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/13-b.pl:15
#, c-format
msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+"With PowerPack+, you will have the choice of the <b>graphical desktop "
+"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
msgstr ""
-"Mandrakelinuxは、何千ものフリーソフトウェアからなるオープンソースディストリ"
-"ビューションです。Mandrakelinuxは世界中で最も広く使われているディストリビュー"
-"ションの1つです。"
+"PowerPack にはいくつものグラフィカルデスクトップ環境が用意されています。 "
+"Mandrakesoft は KDE をデフォルトに選びました。"
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/14.pl:13
+#, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "OpenOffice.org"
+
+#: share/advertising/14.pl:15
+#, c-format
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr "Discovery で OpenOffice.org を体験してください。"
+
+#: share/advertising/14.pl:17
#, c-format
msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
msgstr ""
-"MandrakelinuxにはKDEやGNOMEといった有名なデスクトップ環境や、多くの有名なオー"
-"プンソフトアプリケーションの最新版が含まれています。"
+"OpenOffice.org はワードプロセッサ・表計算ソフト・プレゼンテーションツール・図"
+"形描画ソフトを含むフル機能のオフィススイートです。"
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/14.pl:19
#, c-format
msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
msgstr ""
-"Mandrakelinuxは、インストールが簡単で使いやすいディストリビューションとして広"
-"く知られています。"
+"OpenOffice.org は Microsoft® Office の殆んどの文書に対応しています。(ワード・"
+"エクセル・パワーポイント®など)"
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/15.pl:13
#, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr ""
+msgid "<b>Kontact</b>"
+msgstr "Kontact"
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/15.pl:15
#, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
-msgstr ""
+msgid ""
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
+msgstr "Discovery には KDE グループウェア Kontact が含まれています。"
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/15.pl:17
#, c-format
msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+"More than just a full-featured <b>e-mail client</b>, Kontact also includes "
+"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
+"b>!"
msgstr ""
+"フル機能のメールクライアントだけではなく、 Kontact にはアドレス帳、カレンダー"
+"さらにメモ帳が揃っています。"
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/15.pl:19
#, c-format
msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
-msgstr ""
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
+msgstr "コミュニケーションとスケジュール管理に最適です。"
+
+#: share/advertising/16.pl:13
+#, c-format
+msgid "<b>Surf the Internet</b>"
+msgstr "インターネット"
+
+#: share/advertising/16.pl:15
+#, c-format
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
+msgstr "Discovery からインターネットをフルに活用してください:"
+
+#: share/advertising/16.pl:16
+#, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Web の閲覧には Konqueror"
+
+#: share/advertising/16.pl:17
+#, c-format
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
+msgstr "\t* Kopete で友達とオンラインチャット"
+
+#: share/advertising/16.pl:18
+#, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "\t* KBear でファイルを転送"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
+#, c-format
+msgid "\t* ..."
+msgstr "\t* ..."
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
+msgstr "マルチメディアをエンジョイしよう"
+
+#: share/advertising/17.pl:15
+#, c-format
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr "Discovery ではマルチメディアも簡単にお楽しみ頂けます:"
+
+#: share/advertising/17.pl:16
+#, c-format
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr "\t* お気に入りのビデオは Kaffeine で"
+
+#: share/advertising/17.pl:17
+#, c-format
+msgid "\t* Listen to your <b>music files</b> with amaroK."
+msgstr "\t* 音楽ファイルの再生には Amarok"
+
+#: share/advertising/17.pl:18
+#, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* 画像と写真の編集には The Gimp"
+
+#: share/advertising/18.pl:13
+#, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr "幅広いアプリケーション"
+
+#: share/advertising/18.pl:15
#, c-format
msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
msgstr ""
+"Mandrakelinux のメニューにはあらゆる用途に合った使い易いアプリケーションが"
+"ぎっしり詰まってます:"
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:16
#, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr ""
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr "\t* OpenOffice.org でオフィス文書の作成と編集"
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.pl:17
#, c-format
msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
-msgstr ""
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
+msgstr "\t* 個人データの管理は Kontact と Evolution にお任せください"
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/18.pl:18
+#, c-format
+msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
+msgstr "\t* Web の閲覧には Mozilla と Konqueror"
+
+#: share/advertising/18.pl:19
+#, c-format
+msgid "\t* Participate in online chat with <b>Kopete</b>."
+msgstr "\t* オンラインチャットは Kopete"
+
+#: share/advertising/18.pl:20
#, c-format
msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
-msgstr ""
+"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
+"<b>videos</b>."
+msgstr "\t* オーディオCD・音楽ファイル・ビデオを楽しむ"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* 画像と写真の編集は The Gimp"
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "開発環境"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
#, c-format
msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
-msgstr ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
+msgstr "PowerPack には優れた開発ツールが用意されています。"
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/19.pl:17
#, c-format
msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
msgstr ""
+"KDE に統合されたパワフルな開発環境 KDevelop は多数のプログラム言語をサポート"
+"しています。"
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/19.pl:19
#, c-format
msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
msgstr ""
+"PowerPack にはまた優れた Linux コンパイラ GCC とソースレベルデバッガ GDB が同"
+"梱されています。"
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/20.pl:13
#, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>MandrakeClubのメンバーになる</b>"
+msgid "<b>Development Editors</b>"
+msgstr "開発用エディタ"
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/20.pl:15
#, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>ヘルプが必要ですか?</b>"
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
+msgstr "PowerPack では人気の高いエディタからお好きなものを選べます:"
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/20.pl:16
#, c-format
-msgid "<b>Note</b>"
-msgstr "<b>ご注意</b>"
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* Emacs: カスタマイズ可能なエディタ"
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/20.pl:17
#, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr "これはMandrakelinuxの <b>ダウンロードバージョン</b> です。"
+msgid ""
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
+msgstr "\t* XEmacs: オープンソースによるテキストエディタ/開発システム"
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/20.pl:18
#, c-format
msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
-msgstr ""
-"フリーダウンロードバージョンには商用ソフトが入っていません。従ってモデム(ADSL"
-"とRTCの一部)やビデオカード(ATIやNVIDIAなど)によっては正常に動かない場合があり"
-"ます。"
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
+msgstr "\t* Vim: Vi を拡張した高度なテキストエディタ"
+
+#: share/advertising/21.pl:13
+#, c-format
+msgid "<b>Development Languages</b>"
+msgstr "開発用言語"
-#: share/advertising/ppp-01.pl:17
-#, fuzzy, c-format
+#: share/advertising/21.pl:15
+#, c-format
msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
msgstr ""
-"お使いのMandrakelinuxとそれに含まれる多くのアプリケーションは、MandrakeSoftの"
-"開発者と世界中の寄贈者との共同作業の成果です。"
+"これらのパワフルなツールを使って10以上の言語でプログラムを作成することができ"
+"ます。"
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr "\t* 有名な C 言語"
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
+msgstr "\t* Object oriented languages:"
+
+#: share/advertising/21.pl:18
+#, c-format
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* C++"
+
+#: share/advertising/21.pl:19
+#, c-format
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* Java™"
+
+#: share/advertising/21.pl:20
+#, c-format
+msgid "\t* Scripting languages:"
+msgstr "\t* スクリプト言語:"
+
+#: share/advertising/21.pl:21
+#, c-format
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* Perl"
+
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* Python"
-#: share/advertising/ppp-02.pl:13
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
#, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+msgid "\t* And many more."
+msgstr "\t* その他多数"
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "開発用ツール"
+
+#: share/advertising/22.pl:17
#, c-format
msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"leading Linux compiler <b>GCC</b>, you will be able to create applications "
+"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
msgstr ""
+"KDE に統合されたパワフルな開発環境 KDevelp と優れた Linux コンパイラ GCC を"
+"使って、多数のプログラム言語 (C, C++, Java™, Perl, Python, etc) でアプリケー"
+"ションを作成できます。"
+
+#: share/advertising/23.pl:13
+#, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "グループウェアサーバ"
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/23.pl:15
#, c-format
msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
msgstr ""
+"PowerPack+ ではフル装備の<b>グループウェアサーバ Kolab をお使い頂けます。KDE "
+"のグループウェア Kontact を利用して次のことができます:"
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/23.pl:16
#, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b>デスクトップ環境を選んでください</b>"
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* メールの送受信"
+
+#: share/advertising/23.pl:17
+#, c-format
+msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
+msgstr "\t* アジェンダとアドレス帳の共有"
+
+#: share/advertising/23.pl:18
+#, c-format
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
+msgstr "\t* メモとタスクリストの管理"
+
+#: share/advertising/24.pl:13
+#, c-format
+msgid "<b>Servers</b>"
+msgstr "サーバ"
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:15
#, c-format
msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
-msgstr ""
-"最初にMandrakelinuxにログインするとき、ユーザは以下のようなデスクトップ環境を"
-"選択することができます: KDE, GNOME, WindowMaker, IceWM など"
+"Empower your business network with <b>premier server solutions</b> including:"
+msgstr "最上のサーバソリューションでビジネスネットワークを強化:"
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:16
#, c-format
msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
-msgstr ""
-"Mandrakelinuxのメニューを使うと、用途に応じたアプリを簡単に見つけることができ"
-"ます:"
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
+msgstr "\t* Samba: MS-Windowsクライアントへのファイル/印刷サービス"
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:17
#, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr "\t- <b>OpenOffice.org</b> でオフィス文書の作成と編集"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* Apache: 最も広く使われている Webサーバ"
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
#, c-format
msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
-msgstr "\t- 個人情報の管理は <b>Kontact</b> と <b>Evolution</b>"
+"\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
+"databases."
+msgstr "\t* MySQL と PostgreSQL: 最も有名なオープンソースデータベース。"
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:19
#, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Webの閲覧は <b>Mozilla</b> と <b>Konqueror</b>"
+msgid ""
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
+msgstr "\t* CVS: オープンソースネットワークのバージョン管理システム"
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:20
#, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- オンラインでのチャットは <b>Kopete</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr "\t* ProFTPD: 高度に設定可能な FTPサーバソフトウェア"
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/24.pl:21
#, c-format
msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr "\t- オーディオCDと音楽ファイルの観賞は <b>KsCD</b> と <b>Totem</b>"
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
+msgstr "\t* Postfix と Sendmail: 強力で人気のあるメールサーバ"
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
+#: share/advertising/25.pl:13
#, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- 画像と写真の編集は <b>The Gimp</b>"
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "Mandrakelinux コントロールセンタ"
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/25.pl:15
#, c-format
msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
msgstr ""
+"Mandrakelinux コントロールセンタは、コンピュータの設定を簡単に行えるよう考案"
+"された Mandrakelinux 独自のツール群です。"
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
+#: share/advertising/25.pl:17
#, c-format
msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
-msgstr "\t- <b>Kdevelop</b>: C++用の統合型開発環境"
+"You will immediately appreciate this collection of <b>more than 60</b> handy "
+"utilities for <b>easily configuring your system</b>: hardware devices, mount "
+"points, network and Internet, security level of your computer, etc."
+msgstr ""
+"60種類以上のこの便利なユーティリティを使えば、ハードウェア・マウントポイン"
+"ト・ネットワーク/インターネット・セキュリティレベル等々を簡単に設定することが"
+"できます。"
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/26.pl:13
#, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: GNUコンパイラコレクション"
+msgid "<b>The Open Source Model</b>"
+msgstr "オープンソースモデル"
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/26.pl:15
#, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: GNUプロジェクトデバッガ"
+msgid ""
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
+msgstr ""
+"オープンソースソフトウェアも他のソフトウェアと同様に開発には時間と人が必要で"
+"す。オープンソースの理念を尊重するために、 Mandrakesoft は付加価値商品やサー"
+"ビスを販売して Mandrakelinux の改良を続けています。オープンソースの理念と "
+"Mandrakelinux の開発を支援して下さるのであれば、ぜひ当社の製品またはサービス"
+"の購入をご検討ください。"
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/27.pl:13
#, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: カスタマイズ可能なエディタ"
+msgid "<b>Online Store</b>"
+msgstr "オンラインストア"
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/27.pl:15
#, c-format
msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
-msgstr "\t- <b>Xemacs</b>: オープンソースによるテキストエディタ/開発システム"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
+msgstr ""
+"Mandrakesoft の製品とサービスについては当社の E-コマース をご利用ください。"
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/27.pl:17
+#, c-format
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
+"当社のすべての製品・サービス・サードパーティー製品に関する情報を提供していま"
+"す。"
+
+#: share/advertising/27.pl:19
#, c-format
msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
-msgstr "\t- <b>Vim</b>: Vi を拡張した高度なテキストエディタ"
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr "装いを一新し、効率性とユーザビリティーを向上させました。"
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/27.pl:21
#, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>機能豊富なグループウェア</b>"
+msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgstr "store.mandrakesoft.com にぜひお立ち寄りください。"
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/28.pl:13
#, c-format
-msgid "It includes both server and client features for:"
-msgstr "以下の機能を備えたサーバとクライアントがあります:"
+msgid "<b>Mandrakeclub</b>"
+msgstr "Mandrakeclub"
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/28.pl:15
#, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- メールの送受信"
+msgid ""
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
+msgstr "Mandrakelinux 製品に合わせて Mandrakeclub へのご入会をお勧めします。 "
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/28.pl:17
#, c-format
msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
-msgstr "\t- カレンダー, タスクリスト, メモ, 予定, リクエスト"
+"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
+msgstr "Mandrakeclub にご入会いただくと次のような特典をお楽しみいただけます:"
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/28.pl:18
#, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- アドレスブック"
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
+msgstr "\t* オンラインストア store.mandrakesoft.com での製品とサービスの優待"
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/28.pl:19
#, c-format
msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
-msgstr "<b>最上のサーバソリューション</b>でビジネスネットワークを強化"
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
+msgstr "\t* NVIDIA®/ATI™ をはじめとする商用アプリケーションへのアクセス"
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/28.pl:20
#, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
-msgstr "\t- <b>Samba</b>: MS-Windowsクライアントへのファイル/印刷サービス"
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Mandrakelinux ユーザ・フォーラムへの参加"
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/28.pl:21
#, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: 最も広く使われているWebサーバ"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr "\t* 公式リリースに先立つ Mandrakelinux ISO イメージの早期ダウンロード"
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/29.pl:13
#, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: 最も有名なオープンソースデータベース"
+msgid "<b>Mandrakeonline</b>"
+msgstr "Mandrakeonline"
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/29.pl:15
#, c-format
msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
-msgstr "\t- <b>CVS</b>: オープンソースネットワークのバージョン管理システム"
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
+msgstr ""
+"Mandrakeonline は Mandrakesoft が自信をもってご提案する新しいプリミアムサービ"
+"スです。"
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/29.pl:17
#, c-format
msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr "\t- <b>ProFTPD</b>: 高度に設定可能なFTPサーバソフトウェア"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
+msgstr ""
+"Mandrakeonline は Mandrakelinux システムを簡単に更新して頂けるよう幅広いサー"
+"ビスをご提供します。"
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/29.pl:18
#, c-format
-msgid "\t- And others"
-msgstr "\t- その他"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr "\t* ソフトウェアの自動更新による完璧なシステムセキュリティ"
-#: share/advertising/pwp-01.pl:17
+#: share/advertising/29.pl:19
#, c-format
msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
-msgstr ""
-"お使いのMandrakelinuxは、MandrakeSoftの開発者と世界中の寄贈者との共同作業の成"
-"果です。"
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
+msgstr "\t* メールもしくはデスクトップ上のアプレットが更新をお知らせします"
+
+#: share/advertising/29.pl:20
+#, c-format
+msgid "\t* Flexible <b>scheduled</b> updates."
+msgstr "\t* 更新スケジュールをフレキシブルに設定できます"
-#: share/advertising/pwp-01.pl:19
+#: share/advertising/29.pl:21
#, c-format
msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
-msgstr "この最新リリースの開発に携わった全てのかたがたに感謝いたします。"
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgstr ""
+"\t* ひとつのアカウントでお使いのすべての Mandrakelinux システムを管理して頂け"
+"ます。"
-#: share/advertising/pwp-02.pl:13
+#: share/advertising/30.pl:13
#, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "Mandrakeexpert"
-#: share/advertising/pwp-02.pl:15
+#: share/advertising/30.pl:15
#, c-format
msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
msgstr ""
+"お困りのことがあれば当社のテクニカルサポート www.mandrakeexpert.com で "
+"Mandrakesoft のテクニカルエキスパートに相談してみてください。"
-#: share/advertising/pwp-04.pl:13
+#: share/advertising/30.pl:17
#, c-format
msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
msgstr ""
-"Mandrakelinuxのメニューを使うと、用途に応じたアプリを簡単に見つけることができ"
-"ます:"
+"経験豊富な Mandrakelinux エキスパートに手助けしてもらえば、大切な時間を節約で"
+"きるでしょう。"
-#: share/advertising/pwp-04.pl:16
+#: share/advertising/30.pl:19
#, c-format
msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr "store.mandrakesoft.com でサポートチケットをご購入頂くこともできます。"
+
+#: share/compssUsers.pl:25
+#, c-format
+msgid "Office Workstation"
+msgstr "オフィスワークステーション"
+
+#: share/compssUsers.pl:27
+#, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-"\t- 個人データの管理は <b>Kontact</b> と <b>Evolution</b> にお任せください"
+"オフィスソフト: ワープロ(OpenOffice.org Writer, Kword)/表計算(OpenOffice.org "
+"Calc, Kspread)/PDFビューアなど"
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:28
#, c-format
-msgid "\t- Browse the Web with <b>Mozilla</b> and <b>Konqueror</b>"
-msgstr "\t- Webの閲覧は <b>Mozilla</b> と <b>Konqueror</b>"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"オフィスソフト: ワープロ(kword,abiword),表計算(kspread,gnumeric),\n"
+"pdfビューアなど"
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:33
#, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- オーディオCDと音楽ファイルの観賞は <b>KsCD</b> と <b>Totem</b>"
+msgid "Game station"
+msgstr "ゲームステーション"
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:34
#, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>開発用ツール</b>"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "ゲームプログラム: アーケードゲーム/ボードゲーム/戦略ゲームなど"
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "マルチメディアステーション"
+
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "サウンドと動画の再生/編集ソフト"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "インターネットステーション"
+
+#: share/compssUsers.pl:44
#, c-format
msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
-msgstr "PowerPackにはソフトウェア作成に必要な全てが入っています:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "メールとニュースの送受信用ツール(mutt,tin..)とウェブブラウズ用ツール"
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:49
#, c-format
-msgid "And of course the editors!"
-msgstr "もちろんエディタも。"
+msgid "Network Computer (client)"
+msgstr "ネットワーク(クライアント)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "sshなどの各種プロトコル用クライアント"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "設定"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "お使いのコンピュータを簡単に設定するツール"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "コンソールツール"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "エディタ/シェル/ファイル関連ツール/ターミナル"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C/C++の開発ライブラリ,プログラム,includeファイル"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "ドキュメンテーション"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Linux/フリーソフト関連の文書とHowto"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
+
+#: share/compssUsers.pl:85
+#, c-format
+msgid "Apache"
+msgstr "Apache"
+
+#: share/compssUsers.pl:88
+#, c-format
+msgid "Groupware"
+msgstr "グループウェア"
+
+#: share/compssUsers.pl:89
+#, c-format
+msgid "Kolab Server"
+msgstr "Kolabサーバ"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "ファイアウォール/ルータ"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "インターネットゲートウェイ"
+
+#: share/compssUsers.pl:96
+#, c-format
+msgid "Mail/News"
+msgstr "メール/ニュース"
+
+#: share/compssUsers.pl:97
+#, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfixメールサーバ/Innニュースサーバ"
+
+#: share/compssUsers.pl:100
+#, c-format
+msgid "Directory Server"
+msgstr "ディレクトリサーバ"
+
+#: share/compssUsers.pl:104
+#, c-format
+msgid "FTP Server"
+msgstr "FTPサーバ"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
+msgstr "ProFTPd"
+
+#: share/compssUsers.pl:108
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: share/compssUsers.pl:109
+#, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "ドメイン名/ネットワークインフォメーションサーバ"
+
+#: share/compssUsers.pl:112
+#, c-format
+msgid "File and Printer Sharing Server"
+msgstr "ファイル/プリンタ共有サーバ"
+
+#: share/compssUsers.pl:113
+#, c-format
+msgid "NFS Server, Samba server"
+msgstr "NFSサーバ/Sambaサーバ"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "データベース"
+
+#: share/compssUsers.pl:117
+#, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL/MySQLデータベースサーバ"
+
+#: share/compssUsers.pl:121
+#, c-format
+msgid "Web/FTP"
+msgstr "Web/FTP"
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:122
+#, c-format
+msgid "Apache, Pro-ftpd"
+msgstr "Apache,Pro-ftpd"
+
+#: share/compssUsers.pl:125
+#, c-format
+msgid "Mail"
+msgstr "メール"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Postfixメールサーバ"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL/MySQL データベースサーバ"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "ネットワークコンピュータサーバ"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFSサーバ, SMBサーバ, プロクシサーバ, SSHサーバ"
+
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDEワークステーション"
+
+#: share/compssUsers.pl:147
#, c-format
msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr "\t- <b>Xemacs</b>: オープンソースによるテキストエディタ/開発システム"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:151
+#, c-format
+msgid "GNOME Workstation"
+msgstr "GNOMEワークステーション"
+
+#: share/compssUsers.pl:152
#, c-format
msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
-msgstr "\t- <b>Vim</b>: Vi を拡張した高度なテキストエディタ"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
+
+#: share/compssUsers.pl:155
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "その他のグラフィカルデスクトップ"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
+
+#: share/compssUsers.pl:179
+#, c-format
+msgid "Utilities"
+msgstr "ユーティリティ"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSHサーバ"
+
+#: share/compssUsers.pl:186
+#, c-format
+msgid "Webmin"
+msgstr "Webmin"
+
+#: share/compssUsers.pl:187
+#, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Webminリモート設定サーバ"
+
+#: share/compssUsers.pl:191
+#, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "ネットワークユーティリティ/モニタリング"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoftウィザード"
+
+#: share/compssUsers.pl:197
+#, c-format
+msgid "Wizards to configure server"
+msgstr "サーバ設定ウィザード"
#: standalone.pm:21
#, c-format
@@ -15433,15 +16274,15 @@ msgid ""
"\n"
"OPTIONS:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrake tools\n"
-" --incident - program should be one of mandrake tools"
+" --report - program should be one of mandrakelinux tools\n"
+" --incident - program should be one of mandrakelinux tools"
msgstr ""
-"[OPTIONS] [PROGRAM_NAME]\n"
+"[オプション] [プログラム名]\n"
"\n"
-"OPTIONS:\n"
+"オプション:\n"
" --help - print this help message.\n"
-" --report - program should be one of mandrake tools\n"
-" --incident - program should be one of mandrake tools"
+" --report - program should be one of mandrakelinux tools\n"
+" --incident - program should be one of mandrakelinux tools"
#: standalone.pm:63
#, c-format
@@ -15469,7 +16310,7 @@ msgid ""
"OPTIONS:\n"
"--windows_import : import from all available windows partitions.\n"
"--xls_fonts : show all fonts that already exist from xls\n"
-"--install : accept any font file and any directry.\n"
+"--install : accept any font file and any directory.\n"
"--uninstall : uninstall any font or any directory of font.\n"
"--replace : replace all font if already exist\n"
"--application : 0 none application.\n"
@@ -15483,7 +16324,7 @@ msgstr ""
"OPTIONS:\n"
"--windows_import : import from all available windows partitions.\n"
"--xls_fonts : show all fonts that already exist from xls\n"
-"--install : accept any font file and any directry.\n"
+"--install : accept any font file and any directory.\n"
"--uninstall : uninstall any font or any directory of font.\n"
"--replace : replace all font if already exist\n"
"--application : 0 none application.\n"
@@ -15495,7 +16336,7 @@ msgstr ""
#, c-format
msgid ""
"[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -15508,8 +16349,8 @@ msgid ""
"--delclient : delete a client machine from MTS (requires MAC address, "
"IP, nbi image name)"
msgstr ""
-"[OPTIONS]..\n"
-"Mandrake Terminal Server Configurator\n"
+"[オプション]...\n"
+"Mandrakelinuxターミナルサーバ設定ツール\n"
"--enable : enable MTS\n"
"--disable : disable MTS\n"
"--start : start MTS\n"
@@ -15599,7 +16440,7 @@ msgstr ""
" XFdrake [--noauto] monitor\n"
" XFdrake resolution"
-#: standalone.pm:128
+#: standalone.pm:133
#, c-format
msgid ""
"\n"
@@ -15610,27 +16451,27 @@ msgstr ""
"Usage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
"testing] [-v|--version] "
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
#, c-format
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "ログアウトして Ctrl-Alt-BackSpace を押してください"
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
#, c-format
msgid "You need to log out and back in again for changes to take effect"
msgstr "変更を有効にするには再ログインしてください。"
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
#, c-format
msgid "Useless without Terminal Server"
msgstr "ターミナルサーバなしでは使えません"
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
#, c-format
msgid "%s: %s requires a username...\n"
msgstr "%s: %s にはユーザ名が必要です..\n"
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
#, c-format
msgid ""
"%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15639,79 +16480,73 @@ msgstr ""
"%s: %s には以下が必要です: hostname, MAC address, IP, nbi-image, 0/1 for "
"THIN_CLIENT, 0/1 for Local Config..\n"
-#: standalone/drakTermServ:143
+#: standalone/drakTermServ:131
#, c-format
msgid "%s: %s requires hostname...\n"
msgstr "%s: %s にはホスト名が必要です..\n"
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
#, c-format
msgid "Terminal Server Configuration"
msgstr "ターミナルサーバの設定"
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
#, c-format
msgid "Enable Server"
msgstr "サーバを有効に"
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
#, c-format
msgid "Disable Server"
msgstr "サーバを無効に"
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
#, c-format
msgid "Start Server"
msgstr "サーバを起動"
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
#, c-format
msgid "Stop Server"
msgstr "サーバを停止"
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
#, c-format
msgid "Etherboot Floppy/ISO"
msgstr "Etherboot Floppy/ISO"
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
#, c-format
msgid "Net Boot Images"
msgstr "ネット用起動イメージ"
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
#, c-format
msgid "Add/Del Users"
msgstr "ユーザを追加/削除"
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
#, c-format
msgid "Add/Del Clients"
msgstr "クライアントを追加/削除"
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
#, c-format
msgid "First Time Wizard"
msgstr "初回設定ウィザード"
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
#, c-format
msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
msgstr ""
-#: standalone/drakTermServ:347
+#: standalone/drakTermServ:322
#, c-format
msgid ""
"\n"
" This wizard routine will:\n"
" \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
"\t\n"
"After doing these steps, the wizard will:\n"
"\t\n"
@@ -15728,22 +16563,22 @@ msgid ""
" f) If it's thin clients, ask if you want to restart KDM.\n"
msgstr ""
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
#, c-format
msgid "Cancel Wizard"
msgstr "ウィザードをキャンセル"
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
#, c-format
msgid "Please save dhcpd config!"
msgstr "dhcpdの設定を保存してください"
-#: standalone/drakTermServ:432
-#, fuzzy, c-format
+#: standalone/drakTermServ:407
+#, c-format
msgid "Use thin clients."
-msgstr "thinクライアントを許可"
+msgstr "thinクライアントを使う"
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
#, c-format
msgid ""
"Please select default client type.\n"
@@ -15751,34 +16586,38 @@ msgid ""
"display.\n"
" 'Fat' clients use their own CPU/RAM but the server's filesystem."
msgstr ""
+"デフォルトのクライアントタイプを選んでください\n"
+" 'Thin' clients run everything off the server's CPU/RAM, using the client "
+"display.\n"
+" 'Fat' clients use their own CPU/RAM but the server's filesystem."
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: standalone/drakTermServ:421 standalone/drakTermServ:1034
#, c-format
msgid "Sync client X keyboard settings with server."
-msgstr ""
+msgstr "Xのキーボード設定とサーバを同期"
-#: standalone/drakTermServ:453
+#: standalone/drakTermServ:428
#, c-format
msgid "Creating net boot images for all kernels"
msgstr "全カーネル用のネットブートイメージを作成"
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
#, c-format
msgid "This will take a few minutes."
msgstr "数分かかります。"
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
#, c-format
msgid "Done!"
msgstr "完了"
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
#, c-format
msgid "Syncing server user list with client list, including root."
msgstr "サーバのユーザリストをクライアントのリストと同期(root含む)"
-#: standalone/drakTermServ:484
+#: standalone/drakTermServ:458
#, c-format
msgid ""
"In order to enable changes made for thin clients, the display manager must "
@@ -15787,12 +16626,12 @@ msgstr ""
"thinクライアントの変更を有効にするには、ディスプレイマネージャの再起動が必要"
"です。再起動しますか?"
-#: standalone/drakTermServ:519
-#, fuzzy, c-format
+#: standalone/drakTermServ:493
+#, c-format
msgid "Terminal Server Overview"
-msgstr "drakTermServの概観"
+msgstr "ターミナルサーバの概要"
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
#, c-format
msgid ""
" - Create Etherboot Enabled Boot Images:\n"
@@ -15819,7 +16658,7 @@ msgstr ""
" \tdhcpd.conf, you should create the etherboot images for at least "
"one full kernel."
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
#, c-format
msgid ""
" - Maintain /etc/dhcpd.conf:\n"
@@ -15839,7 +16678,7 @@ msgid ""
"like:"
msgstr ""
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
#, c-format
msgid ""
" While you can use a pool of IP addresses, rather than setup a "
@@ -15850,14 +16689,14 @@ msgid ""
"\t\t\t\n"
" Note: The '#type' entry is only used by drakTermServ. Clients can "
"either be 'thin'\n"
-" or 'fat'. Thin clients run most software on the server via xdmcp, "
+" or 'fat'. Thin clients run most software on the server via XDMCP, "
"while fat clients run \n"
" most software on the client machine. A special inittab, %s is\n"
" written for thin clients. System config files xdm-config, kdmrc, and "
"gdm.conf are \n"
-" modified if thin clients are used, to enable xdmcp. Since there are "
+" modified if thin clients are used, to enable XDMCP. Since there are "
"security issues in \n"
-" using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+" using XDMCP, hosts.deny and hosts.allow are modified to limit access "
"to the local\n"
" subnet.\n"
"\t\t\t\n"
@@ -15878,7 +16717,7 @@ msgid ""
"clients."
msgstr ""
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
#, c-format
msgid ""
" - Maintain /etc/exports:\n"
@@ -15896,7 +16735,7 @@ msgid ""
" \tWith SUBNET/MASK being defined for your network."
msgstr ""
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
#, c-format
msgid ""
" - Maintain %s:\n"
@@ -15907,7 +16746,7 @@ msgid ""
"file."
msgstr ""
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
#, c-format
msgid ""
" - Per client %s:\n"
@@ -15918,7 +16757,7 @@ msgid ""
" \tdrakTermServ will help create these files."
msgstr ""
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
#, c-format
msgid ""
" - Per client system configuration files:\n"
@@ -15938,7 +16777,7 @@ msgid ""
"machine is configured."
msgstr ""
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
#, c-format
msgid ""
" - /etc/xinetd.d/tftp:\n"
@@ -15948,7 +16787,7 @@ msgid ""
"the boot image to \n"
" \teach diskless client.\n"
"\n"
-" \tA typical tftp configuration file looks like:\n"
+" \tA typical TFTP configuration file looks like:\n"
" \t\t\n"
" \tservice tftp\n"
"\t\t\t{\n"
@@ -15968,13 +16807,13 @@ msgid ""
" \tputs its images."
msgstr ""
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
#, c-format
msgid ""
" - Create etherboot floppies/CDs:\n"
" \tThe diskless client machines need either ROM images on the NIC, or "
"a boot floppy\n"
-" \tor CD to initate the boot sequence. drakTermServ will help "
+" \tor CD to initiate the boot sequence. drakTermServ will help "
"generate these\n"
" \timages, based on the NIC in the client machine.\n"
" \t\t\n"
@@ -15988,7 +16827,7 @@ msgstr ""
" - Etherbootフロッピー/CDを作成:\n"
" \tThe diskless client machines need either ROM images on the NIC, or "
"a boot floppy\n"
-" \tor CD to initate the boot sequence. drakTermServ will help "
+" \tor CD to initiate the boot sequence. drakTermServ will help "
"generate these\n"
" \timages, based on the NIC in the client machine.\n"
" \t\t\n"
@@ -15999,62 +16838,62 @@ msgstr ""
" \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
" \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
#, c-format
msgid "Boot Floppy"
msgstr "起動用フロッピー"
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
#, c-format
msgid "Boot ISO"
msgstr "起動用ISO"
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
#, c-format
msgid "PXE Image"
msgstr "PXEイメージ"
-#: standalone/drakTermServ:723
-#, fuzzy, c-format
+#: standalone/drakTermServ:696
+#, c-format
msgid "Default kernel version"
-msgstr "カーネルのバージョンを送る"
+msgstr "デフォルトのカーネルバージョン"
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
#, c-format
msgid "Build Whole Kernel -->"
msgstr "カーネル全体を構築 -->"
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
#, c-format
msgid "No kernel selected!"
msgstr "カーネルを選択していません"
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
#, c-format
msgid "Build Single NIC -->"
msgstr "単一NICを構築 -->"
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
#, c-format
msgid "No NIC selected!"
msgstr "NICを選択していません"
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
#, c-format
msgid "Build All Kernels -->"
msgstr "全カーネルを構築 -->"
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
#, c-format
msgid "<-- Delete"
msgstr "<-- 削除"
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
#, c-format
msgid "Delete All NBIs"
msgstr "全てのNBIを削除"
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
#, c-format
msgid ""
"!!! Indicates the password in the system database is different than\n"
@@ -16065,27 +16904,27 @@ msgstr ""
"パスワードが異なっています。\n"
"ログインするにはターミナルサーバにユーザを削除/再追加してください。"
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
#, c-format
msgid "Add User -->"
msgstr "ユーザを追加 -->"
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
#, c-format
msgid "<-- Del User"
msgstr "<-- ユーザを削除"
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
#, c-format
msgid "type: %s"
msgstr "種類: %s"
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
#, c-format
msgid "local config: %s"
msgstr "ローカル設定: %s"
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
#, c-format
msgid ""
"Allow local hardware\n"
@@ -16094,67 +16933,67 @@ msgstr ""
"ローカルハードウェアの\n"
"設定を許可"
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
#, c-format
msgid "No net boot images created!"
msgstr "ネット用起動イメージを作っていません"
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
#, c-format
msgid "Thin Client"
msgstr "Thinクライアント"
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
#, c-format
msgid "Allow Thin Clients"
msgstr "Thinクライアントを許可"
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
#, c-format
msgid "Add Client -->"
msgstr "クライアントを追加 -->"
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
#, c-format
msgid "type: fat"
msgstr "種類: fat"
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
#, c-format
msgid "type: thin"
msgstr "種類: thin"
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
#, c-format
msgid "local config: false"
msgstr "ローカル設定: false"
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
#, c-format
msgid "local config: true"
msgstr "ローカル設定: true"
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
#, c-format
msgid "<-- Edit Client"
msgstr "<-- クライアントを編集"
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
#, c-format
msgid "Disable Local Config"
msgstr "ローカル設定を無効"
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
#, c-format
msgid "Delete Client"
msgstr "クライアントを削除"
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
#, c-format
msgid "dhcpd Config..."
msgstr "dhcpdを設定中.."
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
#, c-format
msgid ""
"Need to restart the Display Manager for full changes to take effect. \n"
@@ -16163,77 +17002,78 @@ msgstr ""
"全ての変更を有効にするにはディスプレイマネージャを再起動してください。\n"
"(service dm restart - at the console)"
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
#, c-format
msgid "Thin clients won't work with autologin. Disable autologin?"
msgstr ""
+"Thinクライアントでは自動ログインできません。自動ログインを無効にしますか?"
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
#, c-format
msgid "All clients will use %s"
-msgstr ""
+msgstr "全てのクライアントで %s を使います"
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
#, c-format
msgid "Subnet:"
msgstr "サブネット:"
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
#, c-format
msgid "Netmask:"
msgstr "ネットマスク:"
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
#, c-format
msgid "Routers:"
msgstr "ルータ:"
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
#, c-format
msgid "Subnet Mask:"
msgstr "サブネットマスク:"
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
#, c-format
msgid "Broadcast Address:"
msgstr "Broadcastアドレス:"
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
#, c-format
msgid "Domain Name:"
msgstr "ドメイン名:"
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
#, c-format
msgid "Name Servers:"
msgstr "ネームサーバ:"
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
#, c-format
msgid "IP Range Start:"
msgstr "IP幅の最初:"
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
#, c-format
msgid "IP Range End:"
msgstr "IP幅の最後:"
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
#, c-format
msgid "Append TS Includes To Existing Config"
msgstr ""
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
#, c-format
msgid "Write Config"
msgstr "設定を書き込む"
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
#, c-format
msgid "dhcpd Server Configuration"
msgstr "dhcpdサーバを設定"
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
#, c-format
msgid ""
"Most of these values were extracted\n"
@@ -16244,103 +17084,97 @@ msgstr ""
"お使いのシステムから抽出しています。\n"
"必要に応じて変更してください。"
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
#, c-format
msgid "Dynamic IP Address Pool:"
msgstr "Dynamic IP Address Pool:"
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
#, c-format
msgid "Please insert floppy disk:"
msgstr "フロッピーを挿入してください:"
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
#, c-format
msgid "Couldn't access the floppy!"
msgstr "フロッピーにアクセスできません"
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
#, c-format
msgid "Floppy can be removed now"
msgstr "フロッピーを取り除くことができます"
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
#, c-format
msgid "No floppy drive available!"
msgstr "有効なフロッピードライブがありません"
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
#, c-format
msgid "PXE image is %s/%s"
msgstr "PXEイメージは %s/%s"
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
#, c-format
msgid "Error writing %s/%s"
msgstr "%s/%s を書き込み中にエラー"
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISOイメージは %s"
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
#, c-format
msgid "Something went wrong! - Is mkisofs installed?"
msgstr "何かおかしいようです - mkisofsをインストールしていますか?"
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
#, c-format
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "最初に /etc/dhcpd.conf を作ってください"
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
#, c-format
msgid "%s passwd bad in Terminal Server - rewriting...\n"
msgstr "ターミナルサーバの %s passwd に不具合 - 再書き込み..\n"
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
#, c-format
msgid "%s is not a user..\n"
msgstr "%s はユーザではありません..\n"
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
#, c-format
msgid "%s is already a Terminal Server user\n"
msgstr "%s は既にターミナルサーバのユーザです\n"
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
#, c-format
msgid "Addition of %s to Terminal Server failed!\n"
msgstr "%s のターミナルサーバへの追加は失敗しました\n"
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
#, c-format
msgid "%s added to Terminal Server\n"
msgstr "%s をターミナルサーバに追加\n"
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
#, c-format
msgid "Deleted %s...\n"
msgstr "%s を検出..\n"
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
#, c-format
msgid "%s not found...\n"
msgstr "%s が見つかりません..\n"
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s は使用中です\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
#, c-format
msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
msgstr "/etc/hosts.allow と /etc/hosts.deny は設定済みです - 変更しません"
-#: standalone/drakTermServ:1953
+#: standalone/drakTermServ:1921
#, c-format
msgid "Configuration changed - restart clusternfs/dhcpd?"
msgstr "設定を変更しました - clusternfs/dhcpdを再起動しますか?"
@@ -16361,7 +17195,7 @@ msgid "Auto Install Configurator"
msgstr "自動インストールの設定"
#: standalone/drakautoinst:42
-#, fuzzy, c-format
+#, c-format
msgid ""
"You are about to configure an Auto Install floppy. This feature is somewhat "
"dangerous and must be used circumspectly.\n"
@@ -16375,16 +17209,16 @@ msgid ""
"\n"
"Press ok to continue."
msgstr ""
-"インストール自動化フロッピーを設定します。この機能は多少危険を伴うので\n"
-"慎重に操作してください。\n"
+"インストール自動化フロッピーを設定します。この機能は多少危険を伴うので慎重に"
+"操作してください。\n"
"\n"
-"この機能を使うと、このコンピュータで行ったインストールを別のマシンで\n"
-"再現できます。段階によってはプロンプトが出て内容を変更できます。\n"
+"この機能を使うと、このコンピュータで行ったインストールを別のマシンで再現でき"
+"ます。段階によってはプロンプトが出て内容を変更できます。\n"
"\n"
-"安全のためにパーティション設定/フォーマットは決して自動化しないで\n"
-"ください。どのインストール方式を選んだ場合でも自動化はしないでください。\n"
+"安全のためにパーティション設定/フォーマットは決して自動化しないでください。ど"
+"のインストール方式を選んだ場合でも自動化はしないでください。\n"
"\n"
-"続けますか?"
+"OKを押すと続けます"
#: standalone/drakautoinst:60
#, c-format
@@ -16415,14 +17249,14 @@ msgid "Creating auto install floppy"
msgstr "インストール自動化フロッピーを作成"
#: standalone/drakautoinst:90
-#, fuzzy, c-format
+#, c-format
msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "空のフロッピーをドライブ %s に入れてください"
+msgstr "別の空のフロッピーをドライブ %s に挿入 (ドライバディスク)"
#: standalone/drakautoinst:91
-#, fuzzy, c-format
+#, c-format
msgid "Creating auto install floppy (drivers disk)"
-msgstr "インストール自動化フロッピーを作成"
+msgstr "インストール自動化フロッピーを作成 (ドライバディスク)"
#: standalone/drakautoinst:158
#, c-format
@@ -16437,8 +17271,8 @@ msgstr ""
"\n"
"左に自動インストールのパラメータを表示しています"
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
#, c-format
msgid "Congratulations!"
msgstr "おめでとうございます。"
@@ -16477,24 +17311,19 @@ msgstr "hd"
msgid "tape"
msgstr "テープ"
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "デバイスがありません"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
#, c-format
msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
"sessions without user intervention."
msgstr ""
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
#, c-format
msgid "Store the password for this system in drakbackup configuration."
msgstr "パスワードを保存する"
-#: standalone/drakbackup:154
+#: standalone/drakbackup:155
#, c-format
msgid ""
"For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16503,7 +17332,7 @@ msgstr ""
"マルチセッションCDの場合はCD-RWの最初のセッションのみを消去します。\n"
"それ以外の場合はバックアップ前にCD-RWを消去します。"
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
#, c-format
msgid ""
"This option will save files that have changed. Exact behavior depends on "
@@ -16511,14 +17340,14 @@ msgid ""
msgstr ""
"変更があったファイルを保存する。実際の動作はバックアップのモードに依存する。"
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
#, c-format
msgid ""
"Incremental backups only save files that have changed or are new since the "
"last backup."
msgstr "積み重ねバックアップは、前回のバックアップからの差分のみを保存します。"
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
#, c-format
msgid ""
"Differential backups only save files that have changed or are new since the "
@@ -16527,14 +17356,16 @@ msgstr ""
"差分バックアップは、ベースバックアップからの差分のみを\n"
"保存します。"
-#: standalone/drakbackup:158
+#: standalone/drakbackup:159
#, c-format
msgid ""
-"This should be a local user or email addresse that you want the backup "
+"This should be a local user or email address that you want the backup "
"results sent to. You will need to define a functioning mail server."
msgstr ""
+"バックアップの結果を送るローカルユーザもしくはEmailアドレス。有効なメールサー"
+"バを指定してください"
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
#, c-format
msgid ""
"Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16543,7 +17374,7 @@ msgstr ""
".backupignoreで指定したファイル/ワイルドカードは\n"
"バックアップされません。"
-#: standalone/drakbackup:160
+#: standalone/drakbackup:161
#, c-format
msgid ""
"For backups to other media, files are still created on the hard drive, then "
@@ -16555,7 +17386,7 @@ msgstr ""
"このオプションを有効にすると、バックアップ後に\n"
"tarファイルを削除します。"
-#: standalone/drakbackup:161
+#: standalone/drakbackup:162
#, c-format
msgid ""
"Some protocols, like rsync, may be configured at the server end. Rather "
@@ -16563,34 +17394,36 @@ msgid ""
"path."
msgstr ""
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
#, c-format
msgid ""
"Custom allows you to specify your own day and time. The other options use "
"run-parts in /etc/crontab."
msgstr ""
+"カスタムでは日時を自分で指定します。他のオプションでは /etc/crontab のrun-"
+"partsを使います"
-#: standalone/drakbackup:326
+#: standalone/drakbackup:327
#, c-format
msgid "No media selected for cron operation."
-msgstr ""
+msgstr "cron操作をするメディアを選んでいません"
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
#, c-format
msgid "No interval selected for cron operation."
-msgstr ""
+msgstr "cron操作の間隔を選んでいません"
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
#, c-format
msgid "Interval cron not available as non-root"
msgstr "cronの間隔はroot以外では使えません"
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 standalone/logdrake:437
#, c-format
msgid "\"%s\" neither is a valid email nor is an existing local user!"
msgstr "\"%s\" はEmailとしてもローカルユーザ名としても無効です"
-#: standalone/drakbackup:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
#, c-format
msgid ""
"\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16599,22 +17432,22 @@ msgstr ""
"\"%s\" はローカルユーザですが、ローカルsmtpを選んでいないのでEmailアドレスを"
"使ってください"
-#: standalone/drakbackup:475
+#: standalone/drakbackup:476
#, c-format
msgid "Valid user list changed, rewriting config file."
msgstr "ユーザリストを変更しました。設定ファイルを書き換えます"
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
#, c-format
msgid "Old user list:\n"
msgstr "古いユーザリスト:\n"
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
#, c-format
msgid "New user list:\n"
msgstr "新規ユーザリスト:\n"
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
#, c-format
msgid ""
"\n"
@@ -16623,7 +17456,7 @@ msgstr ""
"\n"
" DrakBackupの報告 \n"
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
#, c-format
msgid ""
"\n"
@@ -16632,7 +17465,7 @@ msgstr ""
"\n"
" DrakBackupのデーモンの報告\n"
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
#, c-format
msgid ""
"\n"
@@ -16645,13 +17478,13 @@ msgstr ""
"\n"
"\n"
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
#, c-format
msgid "Total progress"
msgstr "全体の進行"
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -16664,42 +17497,42 @@ msgstr ""
"このプロセスを既に行った場合は、おそらくサーバの\n"
"authorized_keys から項目を削除する必要があります。"
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
#, c-format
msgid "This may take a moment to generate the keys."
msgstr "キーの生成にはしばらく時間がかかります。"
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
#, c-format
msgid "Cannot spawn %s."
msgstr "%s を作れません。"
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
#, c-format
msgid "No password prompt on %s at port %s"
msgstr "%s のパスワードプロンプト(ポート %s)がありません"
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
#, c-format
msgid "Bad password on %s"
msgstr "%s のパスワードが間違っています"
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr "%s を %s に転送する権限がありません"
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
#, c-format
msgid "Can't find %s on %s"
msgstr "%s が %s で見つかりません"
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
#, c-format
msgid "%s not responding"
msgstr "%s が応答しません"
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
#, c-format
msgid ""
"Transfer successful\n"
@@ -16716,47 +17549,47 @@ msgstr ""
"\n"
"パスワードのプロンプトが出なければ成功です。"
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
#, c-format
msgid "WebDAV remote site already in sync!"
msgstr "WebDAVリモートサイトと既に同期済みです"
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
#, c-format
msgid "WebDAV transfer failed!"
msgstr "WebDAV転送に失敗"
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
#, c-format
msgid "No CD-R/DVD-R in drive!"
msgstr "CD-R/DVD-Rがドライブにありません"
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
#, c-format
msgid "Does not appear to be recordable media!"
msgstr "記録可能なメディアではありません"
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
#, c-format
msgid "Not erasable media!"
msgstr "消去可能なメディアではありません"
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
#, c-format
msgid "This may take a moment to erase the media."
msgstr "メディアの消去にはしばらく時間がかかります。"
-#: standalone/drakbackup:829
+#: standalone/drakbackup:832
#, c-format
msgid "Permission problem accessing CD."
msgstr "CDにアクセスする権限に問題が発生"
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
#, c-format
msgid "No tape in %s!"
msgstr "%s にテープがありません"
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
#, c-format
msgid ""
"Backup quota exceeded!\n"
@@ -16765,37 +17598,37 @@ msgstr ""
"Backupの割り当てを超えています\n"
"%d Mb(割り当て量は%d Mb)使用しています"
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
#, c-format
msgid "Backup system files..."
msgstr "システムファイルをバックアップ"
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
#, c-format
msgid "Hard Disk Backup files..."
msgstr "ハードディスクにバックアップ"
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
#, c-format
msgid "Backup User files..."
msgstr "ユーザファイルのバックアップ"
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
#, c-format
msgid "Backup Other files..."
msgstr "他のファイルをバックアップ"
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr "ハードディスクバックアップの進行"
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
#, c-format
msgid "No changes to backup!"
msgstr "バックアップする変更がありません"
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
#, c-format
msgid ""
"\n"
@@ -16806,7 +17639,7 @@ msgstr ""
"%s 経由のDrakbackup:\n"
"\n"
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
#, c-format
msgid ""
"\n"
@@ -16816,18 +17649,18 @@ msgstr ""
"\n"
" FTP接続に問題が発生: FTPでバックアップファイルを送れません。\n"
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
#, c-format
msgid ""
"Error during sending file via FTP. Please correct your FTP configuration."
msgstr "FTPでのファイル送信中にエラーが発生。FTPの設定を修正してください。"
-#: standalone/drakbackup:1120
+#: standalone/drakbackup:1130
#, c-format
msgid "file list sent by FTP: %s\n"
msgstr "FTPで送ったファイルのリスト: %s\n"
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
#, c-format
msgid ""
"\n"
@@ -16838,7 +17671,7 @@ msgstr ""
"CD経由のDrakbackup:\n"
"\n"
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
#, c-format
msgid ""
"\n"
@@ -16849,22 +17682,22 @@ msgstr ""
"テープ経由のDrakbackup:\n"
"\n"
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
#, c-format
msgid "Error sending mail. Your report mail was not sent."
msgstr "メール送信中にエラー。報告メールを送りませんでした。"
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
#, c-format
msgid " Error while sending mail. \n"
msgstr " メール送信中にエラー。 \n"
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
#, c-format
msgid "Can't create catalog!"
msgstr "カタログを作成できません"
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
#, c-format
msgid ""
"\n"
@@ -16873,42 +17706,42 @@ msgstr ""
"\n"
"必要なオプションをチェックしてください。\n"
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr ""
"このオプションを使うと /etc のファイルを全てバックアップ/復元できます。\n"
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr "システムファイルをバックアップする(/etcディレクトリ)"
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr "積み重ね/比較バックアップ (古いバックアップを残す)"
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
#, c-format
msgid "Use Incremental Backups"
msgstr "積み重ねバックアップを行う"
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
#, c-format
msgid "Use Differential Backups"
msgstr "比較バックアップを使う"
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
msgstr "危険なファイル(passwd, group, fstab)は含まない"
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
@@ -16917,177 +17750,177 @@ msgstr ""
"このオプションを使うと、好きなバージョンの /etc ディレクトリを\n"
"復元できます。"
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr "バックアップするユーザにチェックを入れてください。"
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
#, c-format
msgid "Do not include the browser cache"
msgstr "ブラウザのキャッシュは含まない"
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
#, c-format
msgid "Select the files or directories and click on 'OK'"
msgstr "ファイルかディレクトリを選んで'OK'をクリックしてください"
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
#, c-format
msgid "Remove Selected"
msgstr "リストから削除"
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
#, c-format
msgid "Users"
msgstr "ユーザ名"
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
#, c-format
msgid "Use network connection to backup"
msgstr "ネットワーク接続を使用"
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
#, c-format
msgid "Net Method:"
msgstr "ネットの方式:"
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
#, c-format
msgid "Use Expect for SSH"
msgstr "Use Expect for SSH"
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr "SSHのバックアップキーを作成/転送"
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
#, c-format
msgid "Transfer Now"
msgstr "今すぐ転送"
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr "既に他の(drakbackupのものではない)キーがあります"
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
#, c-format
msgid "Host name or IP."
msgstr "ホスト名もしくはIP"
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr "バックアップを保存するディレクトリ(もしくはモジュール名)"
-#: standalone/drakbackup:1621
-#, c-format
-msgid "Login name"
-msgstr "ログイン名"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
#, c-format
msgid "Remember this password"
msgstr "このパスワードを記憶する"
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
#, c-format
msgid "Need hostname, username and password!"
msgstr "ホスト名とユーザ名とパスワードが必要です"
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr "CD/DVDROMにバックアップ"
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
#, c-format
msgid "Choose your CD/DVD device"
msgstr "CD/DVDデバイスを選んでください"
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
#, c-format
msgid "Choose your CD/DVD media size"
msgstr "CD/DVDメディアのサイズを選んでください"
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
#, c-format
msgid "Multisession CD"
msgstr "マルチセッションCD"
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
#, c-format
msgid "CDRW media"
msgstr "CD-RWメディア"
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr "RWメディアを消去(最初のセッション)"
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
#, c-format
msgid " Erase Now "
msgstr "今すぐ消去"
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
#, c-format
msgid "DVD+RW media"
msgstr "DVD+RWメディア"
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
#, c-format
msgid "DVD-R media"
msgstr "DVD-Rメディア"
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
#, c-format
msgid "DVDRAM device"
msgstr "DVDRAMデバイス"
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
#, c-format
msgid "No CD device defined!"
msgstr "CDデバイスを定義していません"
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
#, c-format
msgid "Use tape to backup"
msgstr "テープにバックアップ"
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
#, c-format
msgid "Device name to use for backup"
msgstr "バックアップに使うデバイスの名前"
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr "テープに直接バックアップ"
+
+#: standalone/drakbackup:1878
#, c-format
msgid "Don't rewind tape after backup"
msgstr "バックアップ後にテープを巻き戻さない"
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
#, c-format
msgid "Erase tape before backup"
msgstr "バックアップ前にテープを消去"
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
#, c-format
msgid "Eject tape after the backup"
msgstr "バックアップしたらテープをイジェクト"
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
#, c-format
msgid "Enter the directory to save to:"
msgstr "保存先のディレクトリ:"
-#: standalone/drakbackup:1946
-#, fuzzy, c-format
+#: standalone/drakbackup:1966
+#, c-format
msgid "Directory to save to"
-msgstr "保存先のディレクトリ:"
+msgstr "保存先のディレクトリ"
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
#, c-format
msgid ""
"Maximum size\n"
@@ -17096,309 +17929,309 @@ msgstr ""
"Drakbackupに割り当てる最大の容量を\n"
"MBで入力してください"
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
#, c-format
msgid "CD-R / DVD-R"
msgstr "CDROM/DVDROM"
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
#, c-format
msgid "HardDrive / NFS"
msgstr "ハードドライブ/NFS"
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
#, c-format
msgid "hourly"
msgstr "毎時間"
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
#, c-format
msgid "daily"
msgstr "毎日"
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
#, c-format
msgid "weekly"
msgstr "毎週"
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
#, c-format
msgid "monthly"
msgstr "毎月"
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
#, c-format
msgid "custom"
msgstr "カスタム"
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
#, c-format
msgid "January"
msgstr "1 月"
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
#, c-format
msgid "February"
msgstr "2 月"
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
#, c-format
msgid "March"
msgstr "3 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "April"
msgstr "4 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "May"
msgstr "5 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "June"
msgstr "6 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "July"
msgstr "7 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "August"
msgstr "8 月"
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
#, c-format
msgid "September"
msgstr "9 月"
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
#, c-format
msgid "October"
msgstr "10 月"
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
#, c-format
msgid "November"
msgstr "11 月"
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
#, c-format
msgid "December"
msgstr "12 月"
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
#, c-format
msgid "Sunday"
msgstr "日曜日"
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
#, c-format
msgid "Monday"
msgstr "月曜日"
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
#, c-format
msgid "Tuesday"
msgstr "火曜日"
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
#, c-format
msgid "Wednesday"
msgstr "水曜日"
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
#, c-format
msgid "Thursday"
msgstr "木曜日"
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
#, c-format
msgid "Friday"
msgstr "金曜日"
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
#, c-format
msgid "Saturday"
msgstr "土曜日"
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
#, c-format
msgid "Use daemon"
msgstr "デーモンを使う"
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
#, c-format
msgid "Please choose the time interval between each backup"
msgstr ""
"バックアップの間隔を\n"
"選んでください"
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
#, c-format
msgid "Custom setup/crontab entry:"
msgstr "カスタムセットアップ/crontab項目:"
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
#, c-format
msgid "Minute"
msgstr "分"
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
#, c-format
msgid "Hour"
msgstr "時間"
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
#, c-format
msgid "Day"
msgstr "日"
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
#, c-format
msgid "Month"
msgstr "月"
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
#, c-format
msgid "Weekday"
msgstr "ウィークデー"
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
#, c-format
msgid "Please choose the media for backup."
msgstr "バックアップ先のメディアを選んでください。"
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr "サービスにcronデーモンがあることを確認してください。"
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:2153
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr "注意: 現在すべての'ネット'メディアはハードドライブを使います。"
-#: standalone/drakbackup:2190
-#, fuzzy, c-format
+#: standalone/drakbackup:2201
+#, c-format
msgid "Please choose the compression type"
-msgstr "復元する日付を選んでください:"
+msgstr "圧縮の種類を選んでください"
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
#, c-format
msgid "Use .backupignore files"
msgstr ".backupignoreファイルを使う"
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
#, c-format
msgid "Send mail report after each backup to:"
msgstr "バックアップしたら以下にメールを送る:"
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
#, c-format
msgid "SMTP server for mail:"
msgstr "メールのSMTPサーバ:"
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr "他のメディアにバックアップしたらハードドライブのtarファイルを削除"
-#: standalone/drakbackup:2247
+#: standalone/drakbackup:2258
#, c-format
msgid "What"
msgstr "何を"
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
#, c-format
msgid "Where"
msgstr "どこに"
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
#, c-format
msgid "When"
msgstr "いつ"
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
#, c-format
msgid "More Options"
msgstr "その他のオプション"
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
#, c-format
msgid "Backup destination not configured..."
msgstr "バックアップ先を設定していません.."
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
#, c-format
msgid "Drakbackup Configuration"
msgstr "Drakbackupの設定"
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
#, c-format
msgid "Please choose where you want to backup"
msgstr "バックアップ先を選んでください"
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
#, c-format
msgid "Hard Drive used to prepare backups for all media"
msgstr "全てのメディアにバックアップするための準備用ハードドライブ"
-#: standalone/drakbackup:2319
+#: standalone/drakbackup:2325
#, c-format
msgid "Across Network"
msgstr "ネットワークへ"
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
#, c-format
msgid "On CD-R"
msgstr "CD-Rへ"
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
#, c-format
msgid "On Tape Device"
msgstr "テープデバイスへ"
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
#, c-format
msgid "Backup Users"
msgstr "ユーザをバックアップ"
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
#, c-format
msgid " (Default is all users)"
msgstr " (デフォルトは全ユーザ)"
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
#, c-format
msgid "Please choose what you want to backup"
msgstr "バックアップするものを選んでください"
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
#, c-format
msgid "Backup System"
msgstr "システムをバックアップ"
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
#, c-format
msgid "Select user manually"
msgstr "ユーザを手動で選ぶ"
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
#, c-format
msgid "Please select data to backup..."
msgstr "バックアップするデータを選んでください。"
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
#, c-format
msgid ""
"\n"
@@ -17407,7 +18240,7 @@ msgstr ""
"\n"
"バックアップ元: \n"
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
#, c-format
msgid ""
"\n"
@@ -17416,7 +18249,7 @@ msgstr ""
"\n"
"- システムファイル:\n"
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
#, c-format
msgid ""
"\n"
@@ -17425,7 +18258,7 @@ msgstr ""
"\n"
"- ユーザファイル:\n"
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
#, c-format
msgid ""
"\n"
@@ -17434,7 +18267,7 @@ msgstr ""
"\n"
"- その他のファイル:\n"
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
#, c-format
msgid ""
"\n"
@@ -17443,12 +18276,12 @@ msgstr ""
"\n"
"- ハードドライブの保存パス: %s\n"
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
#, c-format
msgid "\tLimit disk usage to %s MB\n"
msgstr "\tディスクの使用は%s MBまで\n"
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
#, c-format
msgid ""
"\n"
@@ -17457,17 +18290,7 @@ msgstr ""
"\n"
"- バックアップ後にハードドライブのtarファイルを削除\n"
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "いいえ"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "はい"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
#, c-format
msgid ""
"\n"
@@ -17476,22 +18299,22 @@ msgstr ""
"\n"
"- CDに書き込む"
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
#, c-format
msgid "RW"
msgstr "RW"
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
#, c-format
msgid " on device: %s"
msgstr " on device: %s"
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
#, c-format
msgid " (multi-session)"
msgstr " (マルチセッション)"
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
#, c-format
msgid ""
"\n"
@@ -17500,12 +18323,17 @@ msgstr ""
"\n"
"- デバイス %s のテープに保存"
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\tErase=%s"
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr "\tテープに直接バックアップ\n"
+
+#: standalone/drakbackup:2513
#, c-format
msgid ""
"\n"
@@ -17514,7 +18342,7 @@ msgstr ""
"\n"
"- %s から ホスト %s に保存\n"
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -17523,7 +18351,7 @@ msgstr ""
"\t\t ユーザ名: %s\n"
"\t\t パス: %s \n"
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
#, c-format
msgid ""
"\n"
@@ -17532,42 +18360,42 @@ msgstr ""
"\n"
"- オプション:\n"
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
#, c-format
msgid "\tDo not include System Files\n"
msgstr "\tシステムファイルは含まない\n"
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
#, c-format
msgid "\tBackups use tar and bzip2\n"
msgstr "\tバックアップでtarとbzip2を使う\n"
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
#, c-format
msgid "\tBackups use tar and gzip\n"
msgstr "\tバックアップでtarとgzipを使う\n"
-#: standalone/drakbackup:2523
-#, fuzzy, c-format
+#: standalone/drakbackup:2520
+#, c-format
msgid "\tBackups use tar only\n"
-msgstr "\tバックアップでtarとgzipを使う\n"
+msgstr "\tバックアップにtarのみを使う\n"
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
#, c-format
msgid "\tUse .backupignore files\n"
msgstr "\t.backupignoreファイルを使う\n"
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
#, c-format
msgid "\tSend mail to %s\n"
msgstr "\tメールを %s に送ってください\n"
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
#, c-format
msgid "\tUsing SMTP server %s\n"
msgstr "\tSMTPサーバ %s を使う\n"
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
#, c-format
msgid ""
"\n"
@@ -17576,47 +18404,47 @@ msgstr ""
"\n"
"- デーモン, %s via:\n"
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
#, c-format
msgid "\t-Hard drive.\n"
msgstr "\t-ハードドライブ\n"
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
#, c-format
msgid "\t-CD-R.\n"
msgstr "\t-CDROM\n"
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
#, c-format
msgid "\t-Tape \n"
msgstr "\t-テープ \n"
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
#, c-format
msgid "\t-Network by FTP.\n"
msgstr "\t-FTPネットワーク\n"
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
#, c-format
msgid "\t-Network by SSH.\n"
msgstr "\t-SSHネットワーク\n"
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
#, c-format
msgid "\t-Network by rsync.\n"
msgstr "\t-rsyncネットワーク\n"
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
#, c-format
msgid "\t-Network by webdav.\n"
msgstr "\t-webdavネットワーク\n"
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
#, c-format
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr "設定がありません。ウィザードか詳細をクリックしてください\n"
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
#, c-format
msgid ""
"List of data to restore:\n"
@@ -17625,27 +18453,27 @@ msgstr ""
"復元するデータの一覧:\n"
"\n"
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
#, c-format
msgid "- Restore System Files.\n"
msgstr "- システムファイルを復旧\n"
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
#, c-format
msgid " - from date: %s %s\n"
msgstr " - この日付から: %s %s\n"
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
#, c-format
msgid "- Restore User Files: \n"
msgstr "- ユーザファイルを復旧: \n"
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
#, c-format
msgid "- Restore Other Files: \n"
msgstr "- その他のファイルを復旧: \n"
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -17654,127 +18482,127 @@ msgstr ""
"壊れているデータの一覧:\n"
"\n"
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr "次回にチェックを外すか削除してください。"
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
#, c-format
msgid "Backup files are corrupted"
msgstr "バックアップファイルが壊れています"
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
#, c-format
msgid " All of your selected data have been "
msgstr " 選択したデータは全て "
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
#, c-format
-msgid " Successfuly Restored on %s "
+msgid " Successfully Restored on %s "
msgstr " %s に復元しました "
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
#, c-format
msgid " Restore Configuration "
msgstr " 復元の設定 "
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
#, c-format
msgid "OK to restore the other files."
msgstr "OK で他のファイルを復元します"
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr "復元するユーザのリスト(各ユーザの最新の日付だけが重要です)"
-#: standalone/drakbackup:3000
+#: standalone/drakbackup:2994
#, c-format
msgid "Please choose the date to restore:"
msgstr "復元する日付を選んでください:"
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
#, c-format
msgid "Restore from Hard Disk."
msgstr "ハードディスクから復元する"
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
#, c-format
msgid "Enter the directory where backups are stored"
msgstr "バックアップを保存するディレクトリを入力"
-#: standalone/drakbackup:3043
-#, fuzzy, c-format
+#: standalone/drakbackup:3037
+#, c-format
msgid "Directory with backups"
-msgstr "全バックアップを復元"
+msgstr ""
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
#, c-format
msgid "Select another media to restore from"
msgstr "別の復元するメディアを選んでください"
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
#, c-format
msgid "Other Media"
msgstr "その他のメディア"
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
#, c-format
msgid "Restore system"
msgstr "システムを復元"
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
#, c-format
msgid "Restore Users"
msgstr "ユーザを復元"
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
#, c-format
msgid "Restore Other"
msgstr "その他を復元"
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
#, c-format
msgid "Select path to restore (instead of /)"
msgstr "復元するパスを選択( / の代わり)"
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
-#, fuzzy, c-format
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#, c-format
msgid "Path To Restore To"
-msgstr "カスタム復元"
+msgstr "復元先のパス"
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "復元前にバックアップを行う(積み重ねバックアップの場合のみ)"
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
#, c-format
msgid "Remove user directories before restore."
msgstr "復元前にユーザディレクトリを削除"
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
#, c-format
msgid "Filename text substring to search for (empty string matches all):"
msgstr "検索するファイル名(空にすると全てに合致):"
-#: standalone/drakbackup:3204
+#: standalone/drakbackup:3199
#, c-format
msgid "Search Backups"
msgstr "Backupを検索"
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
#, c-format
msgid "No matches found..."
msgstr "合うものがありません"
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
#, c-format
msgid "Restore Selected"
msgstr "選択したものを復元"
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
#, c-format
msgid ""
"Click date/time to see backup files.\n"
@@ -17783,7 +18611,7 @@ msgstr ""
"バックアップファイルを見るには 日付/時刻 をクリック\n"
"複数ファイルの選択はCtrlを押しながらクリック"
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
#, c-format
msgid ""
"Restore Selected\n"
@@ -17792,7 +18620,7 @@ msgstr ""
"選んだカタログ項目を\n"
"復元"
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
#, c-format
msgid ""
"Restore Selected\n"
@@ -17801,17 +18629,17 @@ msgstr ""
"選んだファイルを\n"
"復元"
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
#, c-format
msgid "Backup files not found at %s."
msgstr "%s にバックアップファイルがありません"
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
#, c-format
msgid "Restore From CD"
msgstr "CDから復元する"
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
@@ -17820,17 +18648,17 @@ msgstr ""
"ボリュームラベル %s のCDを\n"
"/mnt/cdrom のCDドライブに入れてください"
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr "CDのラベルが間違っています。このディスクは %s です。"
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
#, c-format
msgid "Restore From Tape"
msgstr "テープから復元"
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
@@ -17839,219 +18667,219 @@ msgstr ""
"ボリュームラベル %s のテープを\n"
"テープドライブ %s に入れてください"
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr "テープのラベルが間違っています。このテープは %s です。"
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
#, c-format
msgid "Restore Via Network"
msgstr "ネットワークから復元"
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr "ネットワークプロトコル %s から復元"
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
#, c-format
msgid "Host Name"
msgstr "ホスト名"
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
#, c-format
msgid "Host Path or Module"
msgstr "ホストのパスかモジュール"
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
#, c-format
msgid "Password required"
msgstr "パスワードが必要です"
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
#, c-format
msgid "Username required"
msgstr "ユーザ名が必要です"
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
#, c-format
msgid "Hostname required"
msgstr "ホスト名が必要です"
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
#, c-format
msgid "Path or Module required"
msgstr "パスかモジュールが必要です"
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
#, c-format
msgid "Files Restored..."
msgstr "ファイルを復元.."
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
#, c-format
msgid "Restore Failed..."
msgstr "復元に失敗しました"
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
#, c-format
msgid "%s not retrieved..."
msgstr "%s が見つかりません.."
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
#, c-format
msgid "Search for files to restore"
msgstr "復元するファイルを検索"
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
#, c-format
msgid "Restore all backups"
msgstr "全バックアップを復元"
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
#, c-format
msgid "Custom Restore"
msgstr "カスタム復元"
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
#, c-format
msgid "Restore From Catalog"
msgstr "カタログから復元"
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
#, c-format
msgid "Unable to find backups to restore...\n"
msgstr "復元するバックアップがありません..\n"
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
#, c-format
msgid "Verify that %s is the correct path"
msgstr "%s が正しいパスなのか確認"
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
#, c-format
msgid " and the CD is in the drive"
msgstr "/CDがドライブに入っているか"
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr ""
"マウント不能なメディア上のバックアップ - 復旧にはCatalogを使ってください"
-#: standalone/drakbackup:3805
+#: standalone/drakbackup:3822
#, c-format
msgid "CD in place - continue."
msgstr "CDを入れる - 継続"
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
#, c-format
msgid "Browse to new restore repository."
msgstr "新しい復元レポジトリを見る"
-#: standalone/drakbackup:3811
-#, fuzzy, c-format
+#: standalone/drakbackup:3828
+#, c-format
msgid "Directory To Restore From"
-msgstr "CDから復元する"
+msgstr "復元もとのディレクトリ"
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
#, c-format
msgid "Restore Progress"
msgstr "復元の進行"
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
#, c-format
msgid "Save"
msgstr "保存"
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
#, c-format
msgid "Build Backup"
msgstr "バックアップを作成"
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
#, c-format
msgid "Restore"
msgstr "復元"
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
#, c-format
msgid "The following packages need to be installed:\n"
msgstr "以下のパッケージをインストールします:\n"
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
#, c-format
msgid "Please select data to restore..."
msgstr "復元するデータを選んでください。"
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
#, c-format
msgid "Backup system files"
msgstr "システムファイルをバックアップ"
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
#, c-format
msgid "Backup user files"
msgstr "ユーザファイルをバックアップ"
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
#, c-format
msgid "Backup other files"
msgstr "その他のファイルをバックアップ"
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
#, c-format
msgid "Total Progress"
msgstr "全体の進行状況"
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
#, c-format
msgid "Sending files by FTP"
msgstr "FTPでファイルを送信中.."
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
#, c-format
msgid "Sending files..."
msgstr "ファイルを送信中.."
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
#, c-format
msgid "Backup Now from configuration file"
msgstr "設定ファイルから今すぐバックアップ"
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
#, c-format
msgid "View Backup Configuration."
msgstr "バックアップの設定を見る"
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
#, c-format
msgid "Wizard Configuration"
msgstr "ウィザード設定"
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
#, c-format
msgid "Advanced Configuration"
msgstr "高度な設定"
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
#, c-format
msgid "View Configuration"
msgstr "設定を見る"
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
#, c-format
msgid "View Last Log"
msgstr "最後のログを見る"
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
#, c-format
msgid "Backup Now"
msgstr "今すぐパックアップ"
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
#, c-format
msgid ""
"No configuration file found \n"
@@ -18060,56 +18888,56 @@ msgstr ""
"設定ファイルが見つかりません。\n"
"ウィザードか詳細をクリックしてください。"
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
#, c-format
msgid "Drakbackup"
msgstr "Drakbackup"
-#: standalone/drakboot:58
+#: standalone/drakboot:64
#, c-format
msgid "Graphical boot theme selection"
msgstr "グラフィカルな起動テーマを選択"
-#: standalone/drakboot:58
+#: standalone/drakboot:64
#, c-format
msgid "System mode"
msgstr "システムモード"
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
#, c-format
msgid "/_File"
msgstr "/ファイル(_F)"
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
#, c-format
msgid "/File/_Quit"
msgstr "/ファイル(F)/終了(_Q)"
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
-#: standalone/drakboot:139
+#: standalone/drakboot:148
#, c-format
msgid "Install themes"
msgstr "テーマをインストール"
-#: standalone/drakboot:140
+#: standalone/drakboot:149
#, c-format
msgid "Create new theme"
msgstr "新しいテーマを作成"
-#: standalone/drakboot:152
+#: standalone/drakboot:161
#, c-format
msgid "Use graphical boot"
msgstr "グラフィカルブートを使う"
-#: standalone/drakboot:157
+#: standalone/drakboot:166
#, c-format
msgid ""
"Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18118,12 +18946,17 @@ msgstr ""
"ブートローダがフレームバッファモードではありません。グラフィカルブートを有効"
"にするには、ブートローダ設定ツールでビデオモードを選んでください。"
-#: standalone/drakboot:164
+#: standalone/drakboot:167
+#, c-format
+msgid "Do you want to configure it now?"
+msgstr "設定しますか?"
+
+#: standalone/drakboot:177
#, c-format
msgid "Theme"
msgstr "テーマ"
-#: standalone/drakboot:167
+#: standalone/drakboot:180
#, c-format
msgid ""
"Display theme\n"
@@ -18132,154 +18965,134 @@ msgstr ""
"コンソールで\n"
"テーマを表示"
-#: standalone/drakboot:176
+#: standalone/drakboot:189
#, c-format
msgid "Launch the graphical environment when your system starts"
msgstr "起動時にXウィンドウを実行"
-#: standalone/drakboot:184
+#: standalone/drakboot:197
#, c-format
msgid "No, I don't want autologin"
msgstr "自動ログインを使わない"
-#: standalone/drakboot:185
+#: standalone/drakboot:198
#, c-format
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "以下のユーザとデスクトップで自動的にログインする"
-#: standalone/drakboot:191
+#: standalone/drakboot:201
#, c-format
msgid "Default user"
msgstr "デフォルトのユーザ"
-#: standalone/drakboot:192
+#: standalone/drakboot:202
#, c-format
msgid "Default desktop"
msgstr "デフォルトのデスクトップ"
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s のインストールに失敗しました。以下のエラーが発生:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
#, c-format
msgid ""
-"To submit a bug report, click on the button report.\n"
-"This will open a web browser window on %s\n"
-" where you'll find a form to fill in. The information displayed above will "
-"be \n"
-"transferred to that server."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
msgstr ""
-"バグを報告する際は'報告'をクリックしてください。\n"
-"ウェブブラウザが開いて %s が表示されます。\n"
-"そこに報告フォームがあるので記入してください。上に表示している情報は\n"
-"そのサーバに転送されます"
+"ビデオモードを選んでください。it will be applied to each of the boot entries "
+"selected below.\n"
+"お使いのビデオカードが指定したモードをサポートしているか注意してください"
-#: standalone/drakbug:48
+#: standalone/drakbug:41
#, c-format
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrakeバグ報告ツール"
+msgid "Mandrakelinux Bug Report Tool"
+msgstr "Mandrakelinuxバグ報告ツール"
-#: standalone/drakbug:53
+#: standalone/drakbug:46
#, c-format
-msgid "Mandrake Control Center"
-msgstr "Mandrakeコントロールセンタ"
+msgid "Mandrakelinux Control Center"
+msgstr "Mandrakelinuxコントロールセンタ"
-#: standalone/drakbug:55
+#: standalone/drakbug:48
#, c-format
msgid "Synchronization tool"
msgstr "同期ツール"
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
#, c-format
msgid "Standalone Tools"
msgstr "スタンドアローンツール"
-#: standalone/drakbug:57
+#: standalone/drakbug:50
#, c-format
msgid "HardDrake"
msgstr "HardDrake"
-#: standalone/drakbug:58
+#: standalone/drakbug:51
#, c-format
-msgid "Mandrake Online"
+msgid "Mandrakeonline"
msgstr "Mandrakeオンライン"
-#: standalone/drakbug:59
+#: standalone/drakbug:52
#, c-format
msgid "Menudrake"
msgstr "Menudrake"
-#: standalone/drakbug:60
+#: standalone/drakbug:53
#, c-format
msgid "Msec"
msgstr "Msec"
-#: standalone/drakbug:61
+#: standalone/drakbug:54
#, c-format
msgid "Remote Control"
msgstr "リモートコントロール"
-#: standalone/drakbug:62
+#: standalone/drakbug:55
#, c-format
msgid "Software Manager"
msgstr "RPMマネージャ"
-#: standalone/drakbug:63
+#: standalone/drakbug:56
#, c-format
msgid "Urpmi"
msgstr "Urpmi"
-#: standalone/drakbug:64
+#: standalone/drakbug:57
#, c-format
msgid "Windows Migration tool"
msgstr "Windows移行ツール"
-#: standalone/drakbug:65
+#: standalone/drakbug:58
#, c-format
msgid "Userdrake"
msgstr "Userdrake"
-#: standalone/drakbug:66
+#: standalone/drakbug:59
#, c-format
msgid "Configuration Wizards"
msgstr "設定ウィザード"
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-"バグを報告する際は報告ボタンをクリックしてください。\n"
-"デフォルトブラウザが開いて上記の情報をアップロード\n"
-"できるようになります。"
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
#, c-format
msgid "Application:"
msgstr "アプリケーション: "
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
#, c-format
msgid "Package: "
msgstr "パッケージ: "
-#: standalone/drakbug:104
+#: standalone/drakbug:85
#, c-format
msgid "Kernel:"
msgstr "カーネル: "
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
#, c-format
msgid "Release: "
msgstr "リリース: "
-#: standalone/drakbug:110
+#: standalone/drakbug:91
#, c-format
msgid ""
"Application Name\n"
@@ -18288,117 +19101,131 @@ msgstr ""
"アプリケーション名か\n"
"フルパス:"
-#: standalone/drakbug:113
+#: standalone/drakbug:94
#, c-format
msgid "Find Package"
msgstr "パッケージを検索"
-#: standalone/drakbug:117
+#: standalone/drakbug:98
#, c-format
msgid "Summary: "
msgstr "概要: "
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "テキストをここに"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
#, c-format
msgid "Bug Description/System Information"
msgstr "バグの説明/システム情報"
-#: standalone/drakbug:136
+#: standalone/drakbug:105
+#, c-format
+msgid "YOUR TEXT HERE"
+msgstr "テキストをここに"
+
+#: standalone/drakbug:108
#, c-format
msgid "Submit kernel version"
msgstr "カーネルのバージョンを送る"
-#: standalone/drakbug:137
+#: standalone/drakbug:109
#, c-format
msgid "Submit cpuinfo"
msgstr "cpuinfoを送る"
-#: standalone/drakbug:138
+#: standalone/drakbug:110
#, c-format
msgid "Submit lspci"
msgstr "lspciを送る"
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, c-format
+msgid ""
+"To submit a bug report, click on the report button.\n"
+"This will open a web browser window on %s\n"
+" where you'll find a form to fill in. The information displayed above will "
+"be \n"
+"transferred to that server."
+msgstr ""
+"バグを報告する際は'報告'をクリックしてください。\n"
+"ウェブブラウザが開いて %s が表示されます。\n"
+"そこに報告フォームがあるので記入してください。上に表示している情報は\n"
+"そのサーバに転送されます"
+
+#: standalone/drakbug:130
#, c-format
msgid "Report"
msgstr "報告"
-#: standalone/drakbug:219
+#: standalone/drakbug:191
#, c-format
msgid "Not installed"
msgstr "インストールしていません"
-#: standalone/drakbug:231
+#: standalone/drakbug:203
#, c-format
msgid "Package not installed"
msgstr "インストールしていません"
-#: standalone/drakbug:248
+#: standalone/drakbug:220
#, c-format
msgid "NOT FOUND"
msgstr "ありません"
-#: standalone/drakbug:259
+#: standalone/drakbug:227
#, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
msgstr "%s に接続中.."
-#: standalone/drakbug:267
+#: standalone/drakbug:235
#, c-format
msgid "No browser available! Please install one"
msgstr "ブラウザがありません。1つはインストールしてください"
-#: standalone/drakbug:286
+#: standalone/drakbug:254
#, c-format
msgid "Please enter a package name."
msgstr "パッケージ名を入力してください"
-#: standalone/drakbug:292
+#: standalone/drakbug:260
#, c-format
msgid "Please enter summary text."
msgstr "summary textを入力してください"
-#: standalone/drakclock:29
+#: standalone/drakclock:30
#, c-format
msgid "DrakClock"
msgstr "DrakClock"
-#: standalone/drakclock:39
-#, fuzzy, c-format
+#: standalone/drakclock:40
+#, c-format
msgid "not defined"
msgstr "設定していません"
-#: standalone/drakclock:41
+#: standalone/drakclock:42
#, c-format
msgid "Change Time Zone"
msgstr "タイムゾーンを変更"
-#: standalone/drakclock:45
+#: standalone/drakclock:46
#, c-format
msgid "Timezone - DrakClock"
msgstr "タイムゾーン - DrakClock"
-#: standalone/drakclock:47
+#: standalone/drakclock:48
#, c-format
msgid "GMT - DrakClock"
msgstr "GMT - DrakClock"
-#: standalone/drakclock:47
+#: standalone/drakclock:48
#, c-format
msgid "Is your hardware clock set to GMT?"
msgstr "ハードウェアクロックをGMTに設定しますか?"
-#: standalone/drakclock:79
+#: standalone/drakclock:76
#, c-format
msgid "Network Time Protocol"
msgstr "ネットワークタイムプロトコル"
-#: standalone/drakclock:81
+#: standalone/drakclock:78
#, c-format
msgid ""
"Your computer can synchronize its clock\n"
@@ -18407,50 +19234,55 @@ msgstr ""
"NTPを使ったリモートタイムサーバで、\n"
"マシンの時計を同期させることができます"
-#: standalone/drakclock:82
+#: standalone/drakclock:79
#, c-format
msgid "Enable Network Time Protocol"
msgstr "ネットワークタイムプロトコルを有効に"
-#: standalone/drakclock:90
+#: standalone/drakclock:87
#, c-format
msgid "Server:"
msgstr "サーバ:"
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr "%s と同期化できませんでした"
+
+#: standalone/drakclock:147 standalone/drakclock:157
#, c-format
msgid "Reset"
msgstr "リセット"
-#: standalone/drakclock:214
+#: standalone/drakclock:225
#, c-format
msgid ""
"We need to install ntp package\n"
" to enable Network Time Protocol\n"
"\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
msgstr ""
"ネットワークタイムプロトコルを有効にするには、\n"
"ntpパッケージが必要です。\n"
"\n"
"ntpをインストールしますか?"
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
#, c-format
msgid "Network configuration (%d adapters)"
msgstr "ネットワークの設定(%d アダプタ)"
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
#, c-format
msgid "Gateway:"
msgstr "ゲートウェイ:"
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
#, c-format
msgid "Interface:"
msgstr "インタフェース:"
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
#, c-format
msgid "Wait please"
msgstr "お待ちください"
@@ -18460,12 +19292,8 @@ msgstr "お待ちください"
msgid "Interface"
msgstr "インタフェース"
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "ドライバ"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
#, c-format
msgid "State"
msgstr "状態"
@@ -18480,7 +19308,7 @@ msgstr "ホスト名: "
msgid "Configure hostname..."
msgstr "ホスト名を設定.."
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
#, c-format
msgid "LAN configuration"
msgstr "LANの設定"
@@ -18490,118 +19318,124 @@ msgstr "LANの設定"
msgid "Configure Local Area Network..."
msgstr "LANを設定"
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
#, c-format
msgid "Apply"
msgstr "適用"
#: standalone/drakconnect:197
-#, fuzzy, c-format
+#, c-format
msgid "Manage connections"
-msgstr "ケーブル接続"
+msgstr "接続を管理"
-#: standalone/drakconnect:218
-#, fuzzy, c-format
+#: standalone/drakconnect:224
+#, c-format
msgid "Device selected"
-msgstr "リストから削除"
+msgstr "選択したデバイス"
-#: standalone/drakconnect:314
-#, fuzzy, c-format
+#: standalone/drakconnect:305
+#, c-format
msgid "IP configuration"
-msgstr "CUPSを設定"
+msgstr "IP設定"
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
#, c-format
msgid "DNS servers"
msgstr "DNSサーバ"
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
#, c-format
msgid "Search Domain"
msgstr "ドメイン検索"
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
#, c-format
msgid "static"
msgstr "スタティック"
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
#, c-format
msgid "DHCP"
+msgstr "DHCP"
+
+#: standalone/drakconnect:436
+#, c-format
+msgid "Metric"
msgstr ""
-#: standalone/drakconnect:493
-#, fuzzy, c-format
+#: standalone/drakconnect:491
+#, c-format
msgid "Flow control"
-msgstr "<control>S"
+msgstr "フロー制御"
-#: standalone/drakconnect:494
-#, fuzzy, c-format
+#: standalone/drakconnect:492
+#, c-format
msgid "Line termination"
-msgstr "インターネットステーション"
+msgstr ""
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
#, c-format
msgid "Modem timeout"
msgstr "モデムのタイムアウト"
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
#, c-format
msgid "Use lock file"
msgstr "ロックファイルを使う"
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
#, c-format
msgid "Wait for dialup tone before dialing"
msgstr "ダイアル前にトーンを待つ"
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
#, c-format
msgid "Busy wait"
msgstr "ビジー待ち"
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
#, c-format
msgid "Modem sound"
msgstr "モデムの音"
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
#, c-format
msgid "Enable"
msgstr "有効"
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
#, c-format
msgid "Disable"
msgstr "無効"
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
#, c-format
msgid "Media class"
msgstr "メディアクラス"
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
#, c-format
msgid "Module name"
msgstr "モジュール名"
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
#, c-format
msgid "Mac Address"
msgstr "Macアドレス"
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
#, c-format
msgid "Bus"
msgstr "バス"
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
#, c-format
msgid "Location on the bus"
msgstr "バスの位置"
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
@@ -18610,20 +19444,20 @@ msgstr ""
"システムにイーサネットアダプタがありません。\n"
"ハードウェア設定ツールを実行してください。"
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
#, c-format
msgid "Remove a network interface"
msgstr "リモートネットワークインタフェース"
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
#, c-format
msgid "Select the network interface to remove:"
msgstr "削除するネットワークインタフェースを選択:"
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
#, c-format
msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
"\n"
"%s"
msgstr ""
@@ -18631,53 +19465,53 @@ msgstr ""
"\n"
"%s"
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
#, c-format
msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
msgstr "\"%s\" ネットワークインタフェースを削除しました"
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
#, c-format
-msgid "No Ip"
-msgstr "Ipなし"
+msgid "No IP"
+msgstr "IPなし"
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
#, c-format
msgid "No Mask"
msgstr "マスクなし"
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
#, c-format
msgid "up"
msgstr "上"
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
#, c-format
msgid "down"
msgstr "下"
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
#, c-format
msgid "Connected"
msgstr "接続完了"
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
#, c-format
msgid "Not connected"
msgstr "接続していません"
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
#, c-format
msgid "Disconnect..."
msgstr "切断.."
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
#, c-format
msgid "Connect..."
msgstr "接続.."
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
#, c-format
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
@@ -18686,17 +19520,17 @@ msgstr ""
"警告: 別のインターネット接続を検出しました。ネットワークは使用中かもしれませ"
"ん"
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
#, c-format
msgid "Deactivate now"
msgstr "いますぐ無効に"
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
#, c-format
msgid "Activate now"
msgstr "いますぐ有効に"
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
#, c-format
msgid ""
"You don't have any configured interface.\n"
@@ -18705,81 +19539,101 @@ msgstr ""
"設定済みのインタフェースがありません。\n"
"'設定'をクリックしてまず設定してください。"
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
#, c-format
msgid "LAN Configuration"
msgstr "LANを設定"
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
#, c-format
msgid "Adapter %s: %s"
msgstr "アダプタ %s: %s"
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
#, c-format
msgid "Boot Protocol"
msgstr "起動プロトコル"
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
#, c-format
msgid "Started on boot"
msgstr "起動時に開始"
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
#, c-format
msgid ""
"This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
msgstr ""
"このインタフェースはまだ設定していません。\n"
-"Mandrakeコントロールセンタの \"インタフェースを追加\" を実行してください"
+"Mandrakelinuxコントロールセンタの \"インタフェースを追加\" を実行してください"
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
#, c-format
msgid ""
"You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
msgstr ""
-"インターネット接続を設定していません。\n"
-"コントロールセンタの'インターネットアクセス'を実行してください"
+"インターネットの接続が設定されていません。\n"
+"Mandrakelinuxコントロールセンタの \"接続の追加\" を実行してください"
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
#, c-format
msgid "Internet connection configuration"
msgstr "インターネット接続の設定"
-#: standalone/drakconnect:949
-#, fuzzy, c-format
+#: standalone/drakconnect:1000
+#, c-format
msgid "Third DNS server (optional)"
-msgstr "DNSサーバ(オプション)"
+msgstr "サードDNSサーバ(オプション)"
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
#, c-format
msgid "Internet Connection Configuration"
msgstr "インターネット接続を設定"
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
#, c-format
msgid "Internet access"
msgstr "インターネット"
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
#, c-format
msgid "Connection type: "
msgstr "接続の種類: "
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
#, c-format
msgid "Status:"
msgstr "状態:"
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (GNOMEディスプレイマネージャ)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (KDEディスプレイマネージャ)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (Mandrakelinuxディスプレイマネージャ)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (Xディスプレイマネージャ)"
+
+#: standalone/drakedm:55
#, c-format
msgid "Choosing a display manager"
msgstr "ディスプレイマネージャを選んでください"
-#: standalone/drakedm:54
+#: standalone/drakedm:56
#, c-format
msgid ""
"X11 Display Manager allows you to graphically log\n"
@@ -18787,93 +19641,102 @@ msgid ""
"several different X sessions on your local machine at the same time."
msgstr "ログインマネージャを選んでください。"
-#: standalone/drakedm:77
+#: standalone/drakedm:79
#, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
msgstr "変更しました。dmサービスを再起動しますか?"
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+msgid ""
+"You are going to close all running programs and lose your current session. "
+"Are you really sure that you want to restart the dm service?"
+msgstr ""
+"動作中のプログラムを全て終了して現在のセッションを閉じます。本当にdmサービス"
+"を再起動しますか?"
+
+#: standalone/drakfloppy:41
#, c-format
msgid "drakfloppy"
msgstr "drakfloppy"
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
#, c-format
msgid "Boot disk creation"
msgstr "起動用ディスクを作成"
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
#, c-format
msgid "General"
msgstr "一般"
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
#, c-format
msgid "Device"
msgstr "デバイス"
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
#, c-format
msgid "Kernel version"
msgstr "カーネルのバージョン"
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
#, c-format
msgid "Preferences"
msgstr "設定"
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
#, c-format
msgid "Advanced preferences"
msgstr "高度な設定"
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
#, c-format
msgid "Size"
msgstr "サイズ"
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
#, c-format
msgid "Mkinitrd optional arguments"
msgstr "Mkinitrdのオプション引数"
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
#, c-format
msgid "force"
msgstr "強制"
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
#, c-format
msgid "omit raid modules"
msgstr "raidモジュールを省略する"
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
#, c-format
msgid "if needed"
msgstr "必要な場合のみ"
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
#, c-format
msgid "omit scsi modules"
msgstr "scsiモジュールを省略する"
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
#, c-format
msgid "Add a module"
msgstr "モジュールを追加"
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
#, c-format
msgid "Remove a module"
msgstr "モジュールを削除"
-#: standalone/drakfloppy:296
+#: standalone/drakfloppy:291
#, c-format
msgid "Be sure a media is present for the device %s"
msgstr "デバイス %s にメディアが入っているか確認してください"
# ../../standalone/drakfloppy_.c:426, c-format
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
#, c-format
msgid ""
"There is no medium or it is write-protected for device %s.\n"
@@ -18882,22 +19745,23 @@ msgstr ""
"デバイス %s のメディアがないか書き込み禁止になっています。\n"
"メディアを入れてください。"
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
#, c-format
msgid "Unable to fork: %s"
msgstr "%s をフォークできません"
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
#, c-format
msgid "Floppy creation completed"
msgstr "フロッピーの作成が完了"
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
#, c-format
msgid "The creation of the boot floppy has been successfully completed \n"
msgstr "起動用フロッピーを作成しました。\n"
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
#, c-format
msgid ""
"Unable to properly close mkbootdisk:\n"
@@ -19038,9 +19902,9 @@ msgstr "フォントのリスト"
#: standalone/drakfont:493
#, c-format
msgid "About"
-msgstr "About"
+msgstr "情報"
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
#, c-format
msgid "Uninstall"
msgstr "アンインストール"
@@ -19050,10 +19914,11 @@ msgstr "アンインストール"
msgid "Import"
msgstr "インポート"
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
#, c-format
msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
"\n"
"\n"
" DUPONT Sebastien (original version)\n"
@@ -19062,7 +19927,7 @@ msgid ""
"\n"
" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
msgstr ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
"\n"
"\n"
" DUPONT Sebastien (original version)\n"
@@ -19071,7 +19936,7 @@ msgstr ""
"\n"
" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
-#: standalone/drakfont:521
+#: standalone/drakfont:523
#, c-format
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
@@ -19106,7 +19971,7 @@ msgstr ""
" along with this program; if not, write to the Free Software\n"
" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-#: standalone/drakfont:537
+#: standalone/drakfont:539
#, c-format
msgid ""
"Thanks:\n"
@@ -19137,12 +20002,12 @@ msgstr ""
"\t by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin \n"
" Convert ttf font files to afm and pfb fonts\n"
-#: standalone/drakfont:556
+#: standalone/drakfont:558
#, c-format
msgid "Choose the applications that will support the fonts:"
msgstr "このフォントを使用するアプリケーションを選んでください:"
-#: standalone/drakfont:557
+#: standalone/drakfont:559
#, c-format
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
@@ -19157,122 +20022,127 @@ msgstr ""
"フォントはたいていインストールできるはずですが、まれに不適切なフォントでXサー"
"バが固まる場合があります。"
-#: standalone/drakfont:567
+#: standalone/drakfont:569
#, c-format
msgid "Ghostscript"
msgstr "Ghostscript"
-#: standalone/drakfont:568
+#: standalone/drakfont:570
#, c-format
msgid "StarOffice"
msgstr "StarOffice"
-#: standalone/drakfont:569
+#: standalone/drakfont:571
#, c-format
msgid "Abiword"
msgstr "Abiword"
-#: standalone/drakfont:570
+#: standalone/drakfont:572
#, c-format
msgid "Generic Printers"
msgstr "一般プリンタ"
-#: standalone/drakfont:586
+#: standalone/drakfont:588
#, c-format
msgid "Select the font file or directory and click on 'Add'"
msgstr "フォントファイルかディレクトリを選んで'追加'をクリック"
-#: standalone/drakfont:587
+#: standalone/drakfont:589
#, c-format
msgid "File Selection"
msgstr "ファイルを選択"
-#: standalone/drakfont:600
+#: standalone/drakfont:604
#, c-format
msgid "You've not selected any font"
msgstr "フォントを選んでいません"
-#: standalone/drakfont:652
+#: standalone/drakfont:656
#, c-format
msgid "Import fonts"
msgstr "フォントをインポート"
-#: standalone/drakfont:657
+#: standalone/drakfont:661
#, c-format
msgid "Install fonts"
msgstr "フォントをインストール"
-#: standalone/drakfont:692
+#: standalone/drakfont:696
#, c-format
msgid "click here if you are sure."
msgstr "よろしければクリックしてください"
-#: standalone/drakfont:694
+#: standalone/drakfont:698
#, c-format
msgid "here if no."
msgstr "here if no."
-#: standalone/drakfont:733
+#: standalone/drakfont:737
#, c-format
msgid "Unselected All"
msgstr "選択を解除"
-#: standalone/drakfont:736
+#: standalone/drakfont:740
#, c-format
msgid "Selected All"
msgstr "全て選択"
-#: standalone/drakfont:739
+#: standalone/drakfont:743
#, c-format
msgid "Remove List"
msgstr "フォントを削除"
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
#, c-format
msgid "Importing fonts"
msgstr "フォントをインポート"
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
#, c-format
msgid "Initial tests"
msgstr "初期テスト"
-#: standalone/drakfont:755
+#: standalone/drakfont:759
#, c-format
msgid "Copy fonts on your system"
msgstr "お使いのシステムのフォントをコピー"
-#: standalone/drakfont:756
+#: standalone/drakfont:760
#, c-format
msgid "Install & convert Fonts"
msgstr "フォントのインストールと変換"
-#: standalone/drakfont:757
+#: standalone/drakfont:761
#, c-format
msgid "Post Install"
msgstr "インストール後の処理"
-#: standalone/drakfont:775
+#: standalone/drakfont:779
#, c-format
msgid "Remove fonts on your system"
msgstr "システムからフォントを削除"
-#: standalone/drakfont:776
+#: standalone/drakfont:780
#, c-format
msgid "Post Uninstall"
msgstr "アンインストール後の処理"
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
#, c-format
msgid "Internet Connection Sharing"
msgstr "インターネット接続を共有"
-#: standalone/drakgw:124
+#: standalone/drakgw:114 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "2.4以上のカーネルのみをサポートしています。"
+
+#: standalone/drakgw:125
#, c-format
msgid "Internet Connection Sharing currently disabled"
msgstr "インターネット接続の共有は現在停止しています"
-#: standalone/drakgw:125
+#: standalone/drakgw:126
#, c-format
msgid ""
"The setup of Internet connection sharing has already been done.\n"
@@ -19285,39 +20155,39 @@ msgstr ""
"\n"
"どうしますか?"
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
#, c-format
msgid "enable"
msgstr "有効に"
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
#: standalone/drakvpn:127
#, c-format
msgid "reconfigure"
msgstr "再設定"
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
#: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
#, c-format
msgid "dismiss"
msgstr "無視"
-#: standalone/drakgw:136
+#: standalone/drakgw:137
#, c-format
msgid "Enabling servers..."
msgstr "サーバを有効にしています.."
-#: standalone/drakgw:148
+#: standalone/drakgw:149
#, c-format
msgid "Internet Connection Sharing is now enabled."
msgstr "インターネット接続の共有が有効になりました。"
-#: standalone/drakgw:151
+#: standalone/drakgw:152
#, c-format
msgid "Internet Connection Sharing currently enabled"
msgstr "インターネット接続の共有は現在有効です"
-#: standalone/drakgw:152
+#: standalone/drakgw:153
#, c-format
msgid ""
"The setup of Internet Connection Sharing has already been done.\n"
@@ -19330,22 +20200,22 @@ msgstr ""
"\n"
"どうしますか?"
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
#, c-format
msgid "disable"
msgstr "無効に"
-#: standalone/drakgw:159
+#: standalone/drakgw:160
#, c-format
msgid "Disabling servers..."
msgstr "サーバを停止しています.."
-#: standalone/drakgw:174
+#: standalone/drakgw:175
#, c-format
msgid "Internet Connection Sharing is now disabled."
msgstr "インターネット接続の共有を停止しました。"
-#: standalone/drakgw:194
+#: standalone/drakgw:195
#, c-format
msgid ""
"You are about to configure your computer to share its Internet connection.\n"
@@ -19364,27 +20234,27 @@ msgstr ""
"注意: ローカルエリアネットワーク(LAN)を構築するには\n"
"専用のネットワークアダプタが必要です。"
-#: standalone/drakgw:237
+#: standalone/drakgw:239
#, c-format
msgid "Interface %s (using module %s)"
msgstr "インタフェース %s(モジュール %s を使用)"
-#: standalone/drakgw:238
+#: standalone/drakgw:240
#, c-format
msgid "Interface %s"
msgstr "インタフェース %s"
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
#, c-format
msgid "No network adapter on your system!"
msgstr "ネットワークアダプタがありません"
-#: standalone/drakgw:254
+#: standalone/drakgw:256
#, c-format
msgid "Network interface"
msgstr "ネットワークインタフェース"
-#: standalone/drakgw:255
+#: standalone/drakgw:257
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -19399,19 +20269,24 @@ msgstr ""
"\n"
"このアダプタでLANを設定します。"
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "ネットワークインタフェースを選択"
+
+#: standalone/drakgw:264
#, c-format
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "LANに接続するネットワークアダプタを選んでください。"
-#: standalone/drakgw:291
+#: standalone/drakgw:293
#, c-format
msgid "Network interface already configured"
msgstr "ネットワークインタフェースは設定済みです"
-#: standalone/drakgw:292
+#: standalone/drakgw:294
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -19426,27 +20301,27 @@ msgstr ""
"\n"
"手動で行うこともできますが、設定には知識が必要です。"
-#: standalone/drakgw:297
+#: standalone/drakgw:299
#, c-format
msgid "Automatic reconfiguration"
msgstr "自動的に再設定"
-#: standalone/drakgw:297
+#: standalone/drakgw:299
#, c-format
msgid "No (experts only)"
msgstr "いいえ(上級者用)"
-#: standalone/drakgw:298
+#: standalone/drakgw:300
#, c-format
msgid "Show current interface configuration"
msgstr "現在のインタフェースの設定を表示"
-#: standalone/drakgw:299
+#: standalone/drakgw:301
#, c-format
msgid "Current interface configuration"
msgstr "現在のインタフェースの設定"
-#: standalone/drakgw:300
+#: standalone/drakgw:302
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -19463,7 +20338,7 @@ msgstr ""
"IP属性: %s\n"
"ドライバ: %s"
-#: standalone/drakgw:313
+#: standalone/drakgw:315
#, c-format
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
@@ -19489,12 +20364,12 @@ msgstr ""
"for you.\n"
"\n"
-#: standalone/drakgw:320
+#: standalone/drakgw:322
#, c-format
msgid "Local Network adress"
msgstr "ローカルネットワークのアドレス"
-#: standalone/drakgw:324
+#: standalone/drakgw:326
#, c-format
msgid ""
"DHCP Server Configuration.\n"
@@ -19507,72 +20382,72 @@ msgstr ""
"ここでDHCPサーバのオプションを設定できます。\n"
"オプションの意味が分からない場合はそのままにしてください。"
-#: standalone/drakgw:328
+#: standalone/drakgw:330
#, c-format
msgid "(This) DHCP Server IP"
msgstr "(この)DHCPサーバのIP"
-#: standalone/drakgw:329
+#: standalone/drakgw:331
#, c-format
msgid "The DNS Server IP"
msgstr "DHCPサーバのIP"
-#: standalone/drakgw:330
+#: standalone/drakgw:332
#, c-format
msgid "The internal domain name"
msgstr "内部ドメイン名"
-#: standalone/drakgw:331
+#: standalone/drakgw:333
#, c-format
msgid "The DHCP start range"
msgstr "DHCPのスタートレンジ"
-#: standalone/drakgw:332
+#: standalone/drakgw:334
#, c-format
msgid "The DHCP end range"
msgstr "DHCPのエンドレンジ"
-#: standalone/drakgw:333
+#: standalone/drakgw:335
#, c-format
msgid "The default lease (in seconds)"
msgstr "標準lease(秒単位)"
-#: standalone/drakgw:334
+#: standalone/drakgw:336
#, c-format
msgid "The maximum lease (in seconds)"
msgstr "最大lease(単位: 秒)"
-#: standalone/drakgw:335
+#: standalone/drakgw:337
#, c-format
msgid "Re-configure interface and DHCP server"
msgstr "インタフェースとDHCPサーバを再設定"
-#: standalone/drakgw:342
+#: standalone/drakgw:344
#, c-format
msgid "The Local Network did not finish with `.0', bailing out."
msgstr "ローカルネットワークが'.0'で終わっていません。中断します。"
-#: standalone/drakgw:352
+#: standalone/drakgw:354
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "現在の %s の設定ではLANアドレスが競合するかもしれません。\n"
-#: standalone/drakgw:362
+#: standalone/drakgw:364
#, c-format
msgid "Configuring..."
msgstr "設定.."
-#: standalone/drakgw:363
+#: standalone/drakgw:365
#, c-format
msgid "Configuring scripts, installing software, starting servers..."
msgstr "スクリプトを設定、ソフトウェアをインストール、サーバを起動"
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
#, c-format
msgid "Problems installing package %s"
msgstr "パッケージ %s のインストールで問題が発生"
-#: standalone/drakgw:599
+#: standalone/drakgw:601
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -19588,14 +20463,14 @@ msgstr ""
#, c-format
msgid ""
" drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
"Usage: \n"
msgstr ""
" drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
@@ -19622,7 +20497,12 @@ msgstr ""
" --doc <link> - link to another web page ( for WM welcome "
"frontend)\n"
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Mandrakelinuxヘルプセンタ"
+
+#: standalone/drakhelp:36
#, c-format
msgid ""
"%s cannot be displayed \n"
@@ -19631,7 +20511,7 @@ msgstr ""
"%sを表示できません。\n"
" このヘルプ項目はありません\n"
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
#, c-format
msgid ""
"No browser is installed on your system, Please install one if you want to "
@@ -19640,42 +20520,42 @@ msgstr ""
"システムにブラウザをインストールしていません。ヘルプシステムを見る場合は\n"
"インストールしてください。"
-#: standalone/drakperm:21
+#: standalone/drakperm:22
#, c-format
msgid "System settings"
msgstr "システム設定"
-#: standalone/drakperm:22
+#: standalone/drakperm:23
#, c-format
msgid "Custom settings"
msgstr "カスタム設定"
-#: standalone/drakperm:23
+#: standalone/drakperm:24
#, c-format
msgid "Custom & system settings"
msgstr "カスタム&システム設定"
-#: standalone/drakperm:43
+#: standalone/drakperm:44
#, c-format
msgid "Editable"
msgstr "編集可"
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
#, c-format
msgid "Path"
msgstr "パス"
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
#, c-format
msgid "User"
msgstr "ユーザ名"
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
#, c-format
msgid "Group"
msgstr "グループ"
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
#, c-format
msgid "Permissions"
msgstr "権限"
@@ -19735,9 +20615,9 @@ msgid "Delete selected rule"
msgstr "選んだルールを削除"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
#, c-format
msgid "Edit"
msgstr "編集"
@@ -19747,47 +20627,65 @@ msgstr "編集"
msgid "Edit current rule"
msgstr "現在のルールを編集"
-#: standalone/drakperm:246
+#: standalone/drakperm:242
#, c-format
msgid "browse"
msgstr "ブラウズ"
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "ユーザ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "グループ"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "その他"
+
+#: standalone/drakperm:252
#, c-format
msgid "Read"
msgstr "読み取り"
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
#, c-format
msgid "Enable \"%s\" to read the file"
msgstr "ファイルを読み込むため%sを有効にする"
-#: standalone/drakperm:260
+#: standalone/drakperm:259
#, c-format
msgid "Write"
msgstr "書き込み"
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
#, c-format
msgid "Enable \"%s\" to write the file"
msgstr "ファイルを書き込むため%sを有効にする"
-#: standalone/drakperm:264
+#: standalone/drakperm:266
#, c-format
msgid "Execute"
msgstr "実行"
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
#, c-format
msgid "Enable \"%s\" to execute the file"
msgstr "ファイルを実行するため%sを有効にする"
-#: standalone/drakperm:267
+#: standalone/drakperm:272
#, c-format
msgid "Sticky-bit"
msgstr "Sticky-bit"
-#: standalone/drakperm:267
+#: standalone/drakperm:272
#, c-format
msgid ""
"Used for directory:\n"
@@ -19796,52 +20694,52 @@ msgstr ""
"ディレクトリ用:\n"
" ディレクトリやファイルの所有者だけが削除できます"
-#: standalone/drakperm:268
+#: standalone/drakperm:273
#, c-format
msgid "Set-UID"
msgstr "UID設定"
-#: standalone/drakperm:268
+#: standalone/drakperm:273
#, c-format
msgid "Use owner id for execution"
msgstr "実行に所有者のIDを使う"
-#: standalone/drakperm:269
+#: standalone/drakperm:274
#, c-format
msgid "Set-GID"
msgstr "GID設定"
-#: standalone/drakperm:269
+#: standalone/drakperm:274
#, c-format
msgid "Use group id for execution"
msgstr "実行にグループのIDを使う"
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
#, c-format
-msgid "User :"
+msgid "User:"
msgstr "ユーザ :"
-#: standalone/drakperm:289
+#: standalone/drakperm:292
#, c-format
-msgid "Group :"
+msgid "Group:"
msgstr "グループ :"
-#: standalone/drakperm:293
+#: standalone/drakperm:296
#, c-format
msgid "Current user"
msgstr "現在のユーザ"
-#: standalone/drakperm:294
+#: standalone/drakperm:297
#, c-format
msgid "When checked, owner and group won't be changed"
msgstr "チェックすると、所有者とグループを変更しません"
-#: standalone/drakperm:304
+#: standalone/drakperm:307
#, c-format
msgid "Path selection"
msgstr "パスを選択"
-#: standalone/drakperm:324
+#: standalone/drakperm:327
#, c-format
msgid "Property"
msgstr "プロパティ"
@@ -19967,54 +20865,42 @@ msgstr ""
msgid "Location of auto_install.cfg file"
msgstr "auto_install.cfg ファイルの場所"
-#: standalone/draksec:44
+#: standalone/draksec:49
#, c-format
msgid "ALL"
msgstr "全て"
-#: standalone/draksec:44
+#: standalone/draksec:50
#, c-format
msgid "LOCAL"
msgstr "ローカル"
-#: standalone/draksec:44 standalone/drakvpn:1146
-#, c-format
-msgid "default"
-msgstr "デフォルト"
-
-#: standalone/draksec:44
+#: standalone/draksec:53
#, c-format
-msgid "ignore"
+msgid "Ignore"
msgstr "無視"
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "いいえ"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "はい"
-
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
#, c-format
msgid ""
"Here, you can setup the security level and administrator of your machine.\n"
"\n"
"\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
"\n"
"\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
"\n"
"\n"
"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -20048,43 +20934,42 @@ msgid ""
"level, but the system is entirely closed and security features are at their\n"
"maximum"
msgstr ""
-"ここではお使いのマシンのセキュリティレベルとセキュリティ\n"
-"\n"
-"管理者を設定します。\n"
-"\n"
-"\n"
-"セキュリティ管理者とはオプション設定時にセキュリティ警告を\n"
+"ここではお使いのマシンのセキュリティレベルとセキュリティ管理者を設定しま"
+"す。\n"
"\n"
-"受け取るひとのことを言います。ユーザ名でもEmailアドレスでも\n"
"\n"
-"構いません。\n"
+"<span weight=\"bold\">セキュリティ管理者</span>とは<span weight=\"bold\">セ"
+"キュリティ警告オプション</span>を設定したときにセキュリティ警告を受け取るひと"
+"のことを言います。ユーザ名でもEmailアドレスでも構いません。\n"
"\n"
"\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">低い</span>: This is a totally unsafe but "
+"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
"very\n"
"easy to use security level. It should only be used for machines not "
"connected to\n"
"any network and that are not accessible to everybody.\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">標準</span>: This is the standard security\n"
+"<span foreground=\"royalblue3\">Standard</span>: This is the standard "
+"security\n"
"recommended for a computer that will be used to connect to the Internet as "
"a\n"
"client.\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">高い</span>: There are already some\n"
+"<span foreground=\"royalblue3\">High</span>: There are already some\n"
"restrictions, and more automatic checks are run every night.\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">かなり高い</span>: The security is now high "
+"<span foreground=\"royalblue3\">Higher</span>: The security is now high "
"enough\n"
"to use the system as a server which can accept connections from many "
"clients. If\n"
@@ -20092,66 +20977,61 @@ msgstr ""
"level.\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">極度に高い</span>: This is similar to the "
+"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
"previous\n"
"level, but the system is entirely closed and security features are at their\n"
"maximum"
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"項目の説明:\n"
+"\n"
+
+#: standalone/draksec:168
#, c-format
msgid "(default value: %s)"
msgstr "(デフォルトの設定: %s)"
-#: standalone/draksec:170
+#: standalone/draksec:210
#, c-format
msgid "Security Level:"
msgstr "セキュリティレベル:"
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "セキュリティ警告:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
#, c-format
msgid "Security Administrator:"
msgstr "セキュリティ管理者:"
-#: standalone/draksec:179
+#: standalone/draksec:219
#, c-format
msgid "Basic options"
msgstr "基本"
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-"以下のオプションでシステムのセキュリティをカスタマイズします。\n"
-"説明が必要でしたらヘルプツールチップをご覧ください。\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
#, c-format
msgid "Network Options"
msgstr "ネットワーク"
-#: standalone/draksec:194
+#: standalone/draksec:233
#, c-format
msgid "System Options"
msgstr "システム"
-#: standalone/draksec:240
+#: standalone/draksec:268
#, c-format
msgid "Periodic Checks"
msgstr "定期的な確認"
-#: standalone/draksec:258
+#: standalone/draksec:299
#, c-format
msgid "Please wait, setting security level..."
msgstr "お待ちください。セキュリティレベルを設定中.."
-#: standalone/draksec:264
+#: standalone/draksec:305
#, c-format
msgid "Please wait, setting security options..."
msgstr "お待ちください。セキュリティのオプションを設定中.."
@@ -20161,7 +21041,8 @@ msgstr "お待ちください。セキュリティのオプションを設定中
msgid "No Sound Card detected!"
msgstr "サウンドカードが検出されませんでした"
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
#, c-format
msgid ""
"No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -20182,7 +21063,7 @@ msgstr ""
"\n"
"http://www.linux-mandrake.com/en/hardware.php3"
-#: standalone/draksound:55
+#: standalone/draksound:57
#, c-format
msgid ""
"\n"
@@ -20314,15 +21195,15 @@ msgstr "コンソールにロゴを表示"
msgid "Make kernel message quiet by default"
msgstr "カーネルメッセージをデフォルトでは少なくする"
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
#, c-format
msgid "Notice"
msgstr "注意"
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
#, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
msgstr "このテーマはまだ %s に起動スプラッシュがありません"
#: standalone/draksplash:167
@@ -20335,189 +21216,207 @@ msgstr "画像を選択"
msgid "saving Bootsplash theme..."
msgstr "起動スプラッシュのテーマを保存中.."
-#: standalone/draksplash:445
+#: standalone/draksplash:435
#, c-format
msgid "ProgressBar color selection"
msgstr "進行バーの色を選ぶ"
-#: standalone/draksplash:464
+#: standalone/draksplash:454
#, c-format
msgid "You must choose an image file first!"
msgstr "まず画像ファイルを選んでください"
-#: standalone/draksplash:469
+#: standalone/draksplash:459
#, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
msgstr "プレビューを生成中.."
#. -PO: First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
#, c-format
msgid "%s BootSplash (%s) preview"
msgstr "%s 起動スプラッシュ(%s)のプレビュー"
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
#, c-format
-msgid "Connected through a serial port or an usb cable"
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
msgstr ""
+"次の理由で画像 \"%s\" をロードできません:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
-#: standalone/drakups:69
-#, fuzzy, c-format
+#: standalone/drakups:74
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "シリアルポートもしくはUSBケーブル経由で接続"
+
+#: standalone/drakups:80
+#, c-format
msgid "Add an UPS device"
-msgstr "アイテムを追加"
+msgstr "UPSデバイスを追加"
-#: standalone/drakups:72
-#, fuzzy, c-format
+#: standalone/drakups:83
+#, c-format
msgid ""
"Welcome to the UPS configuration utility.\n"
"\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
msgstr ""
-"メール設定ユーティリティへようこそ\n"
+"UPS設定ユーティリティへようこそ\n"
"\n"
-"ここでは警告システムを設定します。\n"
+"ここではあなたのシステムにUPSを追加します。\n"
-#: standalone/drakups:79
+#: standalone/drakups:90
#, c-format
msgid ""
"We're going to add an UPS device.\n"
"\n"
-"Do you prefer autodetect UPS devices connected to this machine or ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
msgstr ""
+"UPSデバイスを追加します。\n"
+"\n"
+"UPSデバイスを自動検出するか手動で選択してください"
-#: standalone/drakups:82
-#, fuzzy, c-format
+#: standalone/drakups:93
+#, c-format
msgid "Autodetection"
msgstr "自動検出"
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
#, c-format
msgid "Detection in progress"
msgstr "検出中です"
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
#, c-format
msgid "Congratulations"
msgstr "おめでとうございます"
-#: standalone/drakups:109
-#, fuzzy, c-format
+#: standalone/drakups:121
+#, c-format
msgid "The wizard successfully added the following UPS devices:"
-msgstr "メール警告を無効にしました。"
+msgstr "以下のUPSデバイスを追加しました:"
-#: standalone/drakups:111
-#, fuzzy, c-format
+#: standalone/drakups:123
+#, c-format
msgid "No new UPS devices was found"
-msgstr "デバイスがありません"
+msgstr "新しいUPSデバイスがありません"
-#: standalone/drakups:116 standalone/drakups:128
-#, fuzzy, c-format
+#: standalone/drakups:128 standalone/drakups:140
+#, c-format
msgid "UPS driver configuration"
-msgstr "CUPSプリンタの設定"
+msgstr "UPSドライバの設定"
-#: standalone/drakups:116
-#, fuzzy, c-format
+#: standalone/drakups:128
+#, c-format
msgid "Please select your UPS model."
-msgstr "マウスをテストしてください:"
+msgstr "UPSモデルを選んでください"
-#: standalone/drakups:117
-#, fuzzy, c-format
+#: standalone/drakups:129
+#, c-format
msgid "Manufacturer / Model:"
-msgstr "プリンタのメーカー/機種"
+msgstr "メーカー/モデル:"
-#: standalone/drakups:128
+#: standalone/drakups:140
#, c-format
msgid ""
"We are configuring the \"%s\" UPS from \"%s\".\n"
"Please fill in its name, its driver and its port."
msgstr ""
+"\"%s\" の \"%s\" UPSを設定しています。\n"
+"名前/ドライバ/ポートを入力してください"
-#: standalone/drakups:133
+#: standalone/drakups:145
#, c-format
msgid "Name:"
msgstr "名前:"
-#: standalone/drakups:133
-#, fuzzy, c-format
+#: standalone/drakups:145
+#, c-format
msgid "The name of your ups"
-msgstr "CPUの名前"
+msgstr "UPSの名前"
-#: standalone/drakups:134
+#: standalone/drakups:146
#, c-format
-msgid "The driver that manage your ups"
-msgstr ""
+msgid "The driver that manages your ups"
+msgstr "UPSのドライバ"
-#: standalone/drakups:135
-#, fuzzy, c-format
+#: standalone/drakups:147
+#, c-format
msgid "Port:"
-msgstr "ポート"
+msgstr "ポート:"
-#: standalone/drakups:137
-#, fuzzy, c-format
+#: standalone/drakups:149
+#, c-format
msgid "The port on which is connected your ups"
-msgstr "マウスを接続しているバスの種類"
+msgstr "UPSを接続しているポート"
-#: standalone/drakups:144
-#, fuzzy, c-format
+#: standalone/drakups:156
+#, c-format
msgid "The wizard successfully configured the new \"%s\" UPS device."
-msgstr "メール警告を設定しました。"
+msgstr "新しい \"%s\" UPSデバイスを設定しました"
-#: standalone/drakups:232
-#, fuzzy, c-format
+#: standalone/drakups:246
+#, c-format
msgid "UPS devices"
-msgstr "サービス"
+msgstr "UPSデバイス"
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
#, c-format
msgid "Name"
msgstr "名前"
-#: standalone/drakups:250
-#, fuzzy, c-format
+#: standalone/drakups:265
+#, c-format
msgid "UPS users"
-msgstr "ユーザ名"
+msgstr "UPSユーザ"
-#: standalone/drakups:265
-#, fuzzy, c-format
+#: standalone/drakups:281
+#, c-format
msgid "Access Control Lists"
-msgstr "ネットワークツールへのアクセス"
+msgstr "アクセスコントロールリスト"
-#: standalone/drakups:266
+#: standalone/drakups:282
#, c-format
msgid "IP mask"
-msgstr ""
+msgstr "IPマスク"
-#: standalone/drakups:277
-#, fuzzy, c-format
+#: standalone/drakups:294
+#, c-format
msgid "Rules"
-msgstr "ルータ:"
+msgstr "ルール"
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
msgid "Action"
-msgstr "/アクション(_A)"
+msgstr "アクション"
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
#, c-format
msgid "Level"
msgstr "レベル"
-#: standalone/drakups:278
-#, fuzzy, c-format
+#: standalone/drakups:295
+#, c-format
msgid "ACL name"
-msgstr "LVMの名前を入力"
+msgstr "ACLの名前"
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
-#, fuzzy, c-format
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
+#, c-format
msgid "DrakUPS"
-msgstr "DrakVPN"
+msgstr "DrakUPS"
-#: standalone/drakups:307
-#, fuzzy, c-format
+#: standalone/drakups:335
+#, c-format
msgid "Welcome to the UPS configuration tools"
-msgstr "設定をテストする"
+msgstr "UPS設定ツールへようこそ"
#: standalone/drakvpn:73
#, c-format
@@ -20536,7 +21435,7 @@ msgid ""
"\n"
"It's currently enabled.\n"
"\n"
-"What would you like to do ?"
+"What would you like to do?"
msgstr ""
"VPN接続のセットアップは完了しています。\n"
"\n"
@@ -20566,7 +21465,7 @@ msgid ""
"\n"
"It's currently disabled.\n"
"\n"
-"What would you like to do ?"
+"What would you like to do?"
msgstr ""
"VPN接続のセットアップは完了しています。\n"
"\n"
@@ -20651,7 +21550,7 @@ msgstr "カーネルモジュール"
#: standalone/drakvpn:197
#, c-format
msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
"\n"
"You're running a %s kernel version.\n"
"\n"
@@ -20681,13 +21580,13 @@ msgstr "ファイルを設定"
#: standalone/drakvpn:296
#, c-format
msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
"\n"
"You need to define the Security Policies and then to \n"
"configure the automatic key exchange (IKE) daemon. \n"
"The KAME IKE daemon we're using is called 'racoon'.\n"
"\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
msgstr ""
"設定\n"
"\n"
@@ -20721,12 +21620,12 @@ msgid ""
"The %s file contents\n"
"is divided into sections.\n"
"\n"
-"You can now :\n"
+"You can now:\n"
"\n"
" - display, add, edit, or remove sections, then\n"
" - commit the changes\n"
"\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
msgstr ""
#: standalone/drakvpn:333 standalone/drakvpn:694
@@ -20774,7 +21673,7 @@ msgstr "ipsec.conf の項目"
msgid ""
"The %s file contains different sections.\n"
"\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
"\t\t\t\t\t'conn default' \n"
"\t\t\t\t\t'normal1'\n"
"\t\t\t\t\t'normal2' \n"
@@ -20801,7 +21700,7 @@ msgstr "ノーマル conn"
#: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
#, c-format
-msgid "Exists !"
+msgid "Exists!"
msgstr "存在します"
#: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21020,7 +21919,7 @@ msgstr "セクション名"
#: standalone/drakvpn:590
#, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
msgstr "編集できません"
#: standalone/drakvpn:591
@@ -21028,17 +21927,17 @@ msgstr "編集できません"
msgid ""
"You cannot edit this section.\n"
"\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
"One has to specify version 2.0 on the top\n"
"of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
msgstr ""
"このセッションを編集できません。\n"
"\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
"One has to specify version 2.0 on the top\n"
"of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
#: standalone/drakvpn:600
#, c-format
@@ -21073,7 +21972,7 @@ msgstr ""
msgid ""
"Edit a Security Policy.\n"
"\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
"\n"
"Choose continue when you are done to write the data.\n"
msgstr ""
@@ -21103,7 +22002,7 @@ msgid ""
"The racoon.conf file configuration.\n"
"\n"
"The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
" - display \t\t (display the file contents)\n"
" - add\t\t\t (add one section)\n"
" - edit \t\t\t (modify parameters of an existing section)\n"
@@ -21131,7 +22030,7 @@ msgstr "racoonf.conf の項目"
msgid ""
"The 'add' sections step.\n"
"\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
"\t'path'\n"
"\t'remote'\n"
"\t'sainfo' \n"
@@ -21172,31 +22071,31 @@ msgstr "パスの種類"
#: standalone/drakvpn:750
#, c-format
msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
"a file. See File Inclusion.\n"
"\tExample: path include '/etc/racoon'\n"
"\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
"pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
"\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
"\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
"if a certificate or certificate request is received.\n"
"\tExample: path certificate '/etc/cert' ;\n"
"\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
"other configuration files can be included.\n"
"\tExample: include \"remote.conf\" ;\n"
"\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
"of the identifier and the shared secret key which are used at\n"
"Pre-shared key authentication method in phase 1."
msgstr ""
#: standalone/drakvpn:770 standalone/drakvpn:863
-#, fuzzy, c-format
+#, c-format
msgid "real file"
-msgstr "ファイルを選択"
+msgstr "実際のファイル"
#: standalone/drakvpn:793
#, c-format
@@ -21301,7 +22200,7 @@ msgid ""
"\n"
"\taddress address [/ prefix] [[port]] ul_proto\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"sainfo anonymous (accepts connections from anywhere)\n"
"\tleave blank this entry if you want anonymous\n"
@@ -21329,7 +22228,7 @@ msgid ""
"\n"
"\taddress address [/ prefix] [[port]] ul_proto\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"sainfo anonymous (accepts connections from anywhere)\n"
"\tleave blank this entry if you want anonymous\n"
@@ -21354,7 +22253,7 @@ msgid ""
"\n"
"\taddress address [/ prefix] [[port]] ul_proto\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"sainfo anonymous (accepts connections from anywhere)\n"
"\tleave blank this entry if you want anonymous\n"
@@ -21382,7 +22281,7 @@ msgid ""
"\n"
"\taddress address [/ prefix] [[port]] ul_proto\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"sainfo anonymous (accepts connections from anywhere)\n"
"\tleave blank this entry if you want anonymous\n"
@@ -21402,25 +22301,25 @@ msgid ""
"define the group of Diffie-Hellman exponentiations.\n"
"If you do not require PFS then you can omit this directive.\n"
"Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"group is one of the following: modp768, modp1024, modp1536.\n"
"Or you can define 1, 2, or 5 as the DH group number."
msgstr ""
#: standalone/drakvpn:996
-#, fuzzy, c-format
+#, c-format
msgid "Lifetime number"
-msgstr "番号"
+msgstr ""
#: standalone/drakvpn:997
#, c-format
msgid ""
"define a lifetime of a certain time which will be pro-\n"
"posed in the phase 1 negotiations. Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
"the peer if you do not specify it(them). They can be\n"
"individually specified in each proposal.\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
" lifetime time 1 min; # sec,min,hour\n"
" lifetime time 1 min; # sec,min,hour\n"
@@ -21442,18 +22341,18 @@ msgstr ""
msgid ""
"define a lifetime of a certain time which will be pro-\n"
"posed in the phase 1 negotiations. Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
"the peer if you do not specify it(them). They can be\n"
"individually specified in each proposal.\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
" lifetime time 1 min; # sec,min,hour\n"
" lifetime time 1 min; # sec,min,hour\n"
" lifetime time 30 sec;\n"
" lifetime time 30 sec;\n"
" lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
"\n"
"So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
"'hour'.\n"
@@ -21475,9 +22374,9 @@ msgid "Compression algorithm"
msgstr "圧縮アルゴリズム"
#: standalone/drakvpn:1036
-#, fuzzy, c-format
+#, c-format
msgid "deflate"
-msgstr "デフォルト"
+msgstr ""
#: standalone/drakvpn:1043
#, c-format
@@ -21493,7 +22392,7 @@ msgid ""
"ments apply to all peers which do not match any other remote\n"
"directive.\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"remote anonymous\n"
"remote ::1 [8000]"
@@ -21523,12 +22422,12 @@ msgstr "ポリシーを生成"
#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
#, c-format
msgid "off"
-msgstr ""
+msgstr "off"
#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
-#, fuzzy, c-format
+#, c-format
msgid "on"
-msgstr "下へ"
+msgstr "on"
#: standalone/drakvpn:1062
#, c-format
@@ -21565,17 +22464,17 @@ msgstr ""
#: standalone/drakvpn:1081
#, c-format
msgid "Certificate type"
-msgstr ""
+msgstr "証明の種類"
#: standalone/drakvpn:1083
-#, fuzzy, c-format
+#, c-format
msgid "My certfile"
-msgstr "ファイルを選択"
+msgstr ""
#: standalone/drakvpn:1084
-#, fuzzy, c-format
+#, c-format
msgid "Name of the certificate"
-msgstr "プリンタの名前"
+msgstr "証明の名前"
#: standalone/drakvpn:1085
#, c-format
@@ -21588,9 +22487,9 @@ msgid "Name of the private key"
msgstr "プライベートキーの名前"
#: standalone/drakvpn:1087
-#, fuzzy, c-format
+#, c-format
msgid "Peers certfile"
-msgstr "ファイルを選択"
+msgstr ""
#: standalone/drakvpn:1088
#, c-format
@@ -21598,9 +22497,9 @@ msgid "Name of the peers certificate"
msgstr ""
#: standalone/drakvpn:1089
-#, fuzzy, c-format
+#, c-format
msgid "Verify cert"
-msgstr "優秀"
+msgstr ""
#: standalone/drakvpn:1091
#, c-format
@@ -21618,7 +22517,7 @@ msgstr "自分のID"
#, c-format
msgid ""
"specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation. address, fqdn,\n"
+"type to use in the phase 1 negotiation. address, FQDN,\n"
"user_fqdn, keyid and asn1dn can be used as an idtype.\n"
"they are used like:\n"
"\tmy_identifier address [address];\n"
@@ -21627,7 +22526,7 @@ msgid ""
"\tmy_identifier user_fqdn string;\n"
"\t\tthe type is a USER_FQDN (user fully-qualified\n"
"\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
"\t\tthe type is a FQDN (fully-qualified domain name).\n"
"\tmy_identifier keyid file;\n"
"\t\tthe type is a KEY_ID.\n"
@@ -21636,29 +22535,29 @@ msgid ""
"\t\tstring is omitted, racoon(8) will get DN from\n"
"\t\tSubject field in the certificate.\n"
"\n"
-"Examples : \n"
+"Examples: \n"
"\n"
"my_identifier user_fqdn \"myemail@mydomain.com\""
msgstr ""
#: standalone/drakvpn:1114
-#, fuzzy, c-format
+#, c-format
msgid "Peers identifier"
-msgstr "Printer"
+msgstr ""
#: standalone/drakvpn:1115
-#, fuzzy, c-format
+#, c-format
msgid "Proposal"
-msgstr "プロトコル"
+msgstr ""
#: standalone/drakvpn:1117
#, c-format
msgid ""
"specify the encryption algorithm used for the\n"
"phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
"\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
"\n"
"For other transforms, this statement should not be used."
msgstr ""
@@ -21694,14 +22593,14 @@ msgid "Destination IP range"
msgstr "対象IPの範囲"
#: standalone/drakvpn:1136
-#, fuzzy, c-format
+#, c-format
msgid "Upper-layer protocol"
-msgstr "ヨーロッパのプロトコル"
+msgstr ""
#: standalone/drakvpn:1136 standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
msgid "any"
-msgstr "日"
+msgstr "全て"
#: standalone/drakvpn:1138
#, c-format
@@ -21709,9 +22608,9 @@ msgid "Flag"
msgstr "フラグ"
#: standalone/drakvpn:1139
-#, fuzzy, c-format
+#, c-format
msgid "Direction"
-msgstr "説明"
+msgstr ""
#: standalone/drakvpn:1140
#, c-format
@@ -21719,14 +22618,14 @@ msgid "IPsec policy"
msgstr "IPsecのポリシー"
#: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
msgid "ipsec"
-msgstr "Msec"
+msgstr "ipsec"
#: standalone/drakvpn:1140
-#, fuzzy, c-format
+#, c-format
msgid "discard"
-msgstr "無効化"
+msgstr "破棄"
#: standalone/drakvpn:1143
#, c-format
@@ -21734,14 +22633,14 @@ msgid "Mode"
msgstr "モード"
#: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
msgid "tunnel"
-msgstr "チャンネル"
+msgstr ""
#: standalone/drakvpn:1143
-#, fuzzy, c-format
+#, c-format
msgid "transport"
-msgstr "送信しました"
+msgstr ""
#: standalone/drakvpn:1145
#, c-format
@@ -21754,76 +22653,81 @@ msgid "require"
msgstr ""
#: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
+msgid "default"
+msgstr "デフォルト"
+
+#: standalone/drakvpn:1146
+#, c-format
msgid "use"
-msgstr "マウス"
+msgstr ""
#: standalone/drakvpn:1146
-#, fuzzy, c-format
+#, c-format
msgid "unique"
-msgstr "uniqueids"
+msgstr ""
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
#, c-format
msgid "USA (broadcast)"
msgstr "アメリカ(ブロードキャスト)"
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
#, c-format
msgid "USA (cable)"
msgstr "アメリカ(ケーブル)"
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
#, c-format
msgid "USA (cable-hrc)"
msgstr "アメリカ(ケーブル-hrc)"
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
#, c-format
msgid "Canada (cable)"
msgstr "カナダ(ケーブル)"
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
#, c-format
msgid "Japan (broadcast)"
msgstr "日本(ブロードキャスト)"
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
#, c-format
msgid "Japan (cable)"
msgstr "日本(ケーブル)"
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
#, c-format
msgid "China (broadcast)"
msgstr "中国(ブロードキャスト)"
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
#, c-format
msgid "West Europe"
msgstr "西ヨーロッパ"
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
#, c-format
msgid "East Europe"
msgstr "東ヨーロッパ"
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
#, c-format
msgid "France [SECAM]"
msgstr "フランス(SECAM)"
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
#, c-format
msgid "Newzealand"
msgstr "ニュージーランド"
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
#, c-format
msgid "Australian Optus cable TV"
msgstr "オーストラリアOptusケーブルテレビ"
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
#, c-format
msgid ""
"Please,\n"
@@ -21832,47 +22736,48 @@ msgstr ""
"では\n"
"テレビの方式と国名を入力してください"
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
#, c-format
msgid "TV norm:"
msgstr "テレビの方式:"
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
#, c-format
msgid "Area:"
msgstr "地域:"
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
#, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
msgstr "テレビチャンネルをスキャンしています.."
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
#, c-format
msgid "Scanning for TV channels"
msgstr "テレビチャンネルをスキャン"
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
#, c-format
msgid "There was an error while scanning for TV channels"
msgstr "テレビチャンネルをスキャン中にエラーが発生"
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
#, c-format
msgid "Have a nice day!"
msgstr "終了します"
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
#, c-format
msgid "Now, you can run xawtv (under X Window!) !\n"
msgstr "xawtvをXウィンドウで実行できます。\n"
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
#, c-format
msgid "No TV Card detected!"
msgstr "テレビカードが見つかりません"
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
#, c-format
msgid ""
"No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -21893,49 +22798,23 @@ msgstr ""
"\n"
"http://www.linux-mandrake.com/en/hardware.php3"
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
#, c-format
msgid "Alternative drivers"
msgstr "代替ドライバ"
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
#, c-format
msgid "the list of alternative drivers for this sound card"
msgstr "このサウンドカード用の代替ドライバのリスト"
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
#, c-format
msgid ""
"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
msgstr "デバイスを挿入する物理バス(PCI、USBなど)"
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "チャンネル"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI チャンネル"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter. Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
-msgstr ""
-"Linuxのカーネルは、タイマーのカウンタを初期化するために計算ループを\n"
-"起動時に実行しなければなりません。Its result is stored as bogomips as a way "
-"to \"benchmark\" the cpu."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
#, c-format
msgid "Bus identification"
msgstr "バスの識別"
@@ -21946,7 +22825,7 @@ msgid ""
"- PCI and USB devices: this lists the vendor, device, subvendor and "
"subdevice PCI/USB ids"
msgstr ""
-"- PCIとUSBのデバイス: ベンダー、デバイス、サブベンダー、サブデバイスの\n"
+"- PCIとUSBのデバイス: ベンダ、デバイス、サブベンダ、サブデバイスの\n"
"PCI/USBのIDを表示します。"
#: standalone/harddrake2:30
@@ -21962,132 +22841,284 @@ msgstr ""
#: standalone/harddrake2:33
#, c-format
-msgid "Cache size"
-msgstr "キャッシュのサイズ"
+msgid "Drive capacity"
+msgstr "ドライブの機能"
#: standalone/harddrake2:33
#, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "CPUの第2キャッシュのサイズ"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "このドライブの特別な機能(書き込み機能やDVDサポート)"
#: standalone/harddrake2:34
#, c-format
-msgid "Drive capacity"
-msgstr "ドライブの機能"
+msgid "this field describes the device"
+msgstr "デバイスの説明を表示します"
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
#, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "このドライブの特別な機能(書き込み機能やDVDサポート)"
+msgid "Old device file"
+msgstr "古いデバイスファイル"
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:37
+#: standalone/harddrake2:36
#, c-format
-msgid "Coma bug"
-msgstr "Comaのバグ"
+msgid "old static device name used in dev package"
+msgstr "devパッケージで使われた古い静的デバイス名"
#: standalone/harddrake2:37
#, c-format
-msgid "whether this cpu has the Cyrix 6x86 Coma bug"
-msgstr "このCPUにCyrix 6x86のComaバグがあるかどうか"
-
-#: standalone/harddrake2:38
-#, c-format
-msgid "Cpuid family"
-msgstr "Cpuidのファミリー"
+msgid "New devfs device"
+msgstr "新しいdevfsデバイス"
#: standalone/harddrake2:38
#, c-format
-msgid "family of the cpu (eg: 6 for i686 class)"
-msgstr "CPUのファミリー(例: i686クラスなら 6)"
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "コアカーネルdevfsが生成した新しい動的デバイス名"
-#: standalone/harddrake2:39
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
#, c-format
-msgid "Cpuid level"
-msgstr "Cpuidのレベル"
+msgid "Module"
+msgstr "モジュール"
-#: standalone/harddrake2:39
+#: standalone/harddrake2:41
#, c-format
-msgid "information level that can be obtained through the cpuid instruction"
-msgstr "cpuidの説明に含まれる情報のレベル"
+msgid "the module of the GNU/Linux kernel that handles the device"
+msgstr "デバイスを扱うLinuxカーネルのモジュール"
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
#, c-format
-msgid "Frequency (MHz)"
-msgstr "周波数(MHz)"
+msgid "Extended partitions"
+msgstr "拡張パーティション"
-#: standalone/harddrake2:40
+#: standalone/harddrake2:42
#, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"CPUの周波数(MHz)(Megahertz which in first approximation may be coarsely "
-"assimilated to number of instructions the cpu is able to execute per second)"
+msgid "the number of extended partitions"
+msgstr "拡張パーティションの番号"
-#: standalone/harddrake2:41
+#: standalone/harddrake2:43
#, c-format
-msgid "this field describes the device"
-msgstr "デバイスの説明を表示します"
+msgid "Geometry"
+msgstr "ジオメトリ"
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
#, c-format
-msgid "Old device file"
-msgstr "古いデバイスファイル"
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "ディスクのシリンダ/ヘッド/セクタ ジオメトリ"
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
#, c-format
-msgid "old static device name used in dev package"
-msgstr "devパッケージで使われた古い静的デバイス名"
+msgid "Disk controller"
+msgstr "ディスクコントローラ"
#: standalone/harddrake2:44
#, c-format
-msgid "New devfs device"
-msgstr "新しいdevfsデバイス"
+msgid "the disk controller on the host side"
+msgstr "ホスト側のディスクコントローラ"
#: standalone/harddrake2:45
#, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "コアカーネルdevfsが生成した新しい動的デバイス名"
+msgid "class of hardware device"
+msgstr "ハードウェアデバイスのクラス"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "モデル"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "ハードディスクのモデル"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "ネットワークプリンタのポート"
-#. -PO: here "module" is the "jargon term" for a kernel driver
#: standalone/harddrake2:48
#, c-format
-msgid "Module"
-msgstr "モジュール"
+msgid "Primary partitions"
+msgstr "プライマリパーティション"
#: standalone/harddrake2:48
#, c-format
-msgid "the module of the GNU/Linux kernel that handles the device"
-msgstr "デバイスを扱うLinuxカーネルのモジュール"
+msgid "the number of the primary partitions"
+msgstr "プライマリパーティションの番号"
#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "新しいパーティションを作成"
+#, c-format
+msgid "the vendor name of the device"
+msgstr "デバイスのベンダ名"
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "プロセッサの番号"
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr "バスPCI #"
#: standalone/harddrake2:50
#, c-format
+msgid "the PCI bus on which the device is plugged"
+msgstr "デバイスが挿入されているPCIバス"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device #"
+msgstr "PCIデバイス #"
+
+#: standalone/harddrake2:51
+#, c-format
+msgid "PCI device number"
+msgstr "PCIデバイスの番号"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr "PCIファンクション #"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function number"
+msgstr "PCIファンクションの番号"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "Vendor ID"
+msgstr "ベンダのID"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr "ベンダの識別子"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "Device ID"
+msgstr "デバイスID"
+
+#: standalone/harddrake2:54
+#, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "デバイスの識別子"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr "サブベンダID"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr "ベンダのマイナー識別子"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Sub device ID"
+msgstr "サブデバイスID"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "デバイスのマイナー識別子"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid "Device USB ID"
+msgstr "デバイスUSB ID"
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ".."
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, c-format
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter. Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
+"Linuxのカーネルは、タイマーのカウンタを初期化するために計算ループを\n"
+"起動時に実行しなければなりません。Its result is stored as bogomips as a way "
+"to \"benchmark\" the cpu."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "キャッシュのサイズ"
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "size of the (second level) cpu cache"
+msgstr "CPUの第2キャッシュのサイズ"
+
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:65
+#, c-format
+msgid "Coma bug"
+msgstr "Comaのバグ"
+
+#: standalone/harddrake2:65
+#, c-format
+msgid "whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "このCPUにCyrix 6x86のComaバグがあるかどうか"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuidのファミリー"
+
+#: standalone/harddrake2:66
+#, c-format
+msgid "family of the cpu (eg: 6 for i686 class)"
+msgstr "CPUのファミリー(例: i686クラスなら 6)"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuidのレベル"
+
+#: standalone/harddrake2:67
+#, c-format
+msgid "information level that can be obtained through the cpuid instruction"
+msgstr "cpuidの説明に含まれる情報のレベル"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "周波数(MHz)"
+
+#: standalone/harddrake2:68
+#, c-format
+msgid ""
+"the CPU frequency in MHz (Megahertz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"CPUの周波数(MHz)(Megahertz which in first approximation may be coarsely "
+"assimilated to number of instructions the cpu is able to execute per second)"
+
+#: standalone/harddrake2:69
+#, c-format
msgid "Flags"
msgstr "フラグ"
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
#, c-format
msgid "CPU flags reported by the kernel"
msgstr "カーネルが報告するCPUフラグ"
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
#, c-format
msgid "Fdiv bug"
msgstr "Fdivのバグ"
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
#, c-format
msgid ""
"Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -22096,53 +23127,43 @@ msgid ""
msgstr ""
"初期のIntelペンティアムプロセッサには浮動小数点に関するバグがあります。"
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
#, c-format
msgid "Is FPU present"
msgstr "FPUの状態を表示"
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
#, c-format
msgid "yes means the processor has an arithmetic coprocessor"
msgstr "プロセッサが演算コプロセッサを有しているか"
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
#, c-format
msgid "Whether the FPU has an irq vector"
msgstr "FPUにirq vectorがあるかどうか"
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
#, c-format
msgid "yes means the arithmetic coprocessor has an exception vector attached"
msgstr ""
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
#, c-format
msgid "F00f bug"
msgstr "F00Fのバグ"
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
#, c-format
msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
msgstr ""
"初期のペンティアムはバグ気味で、F00Fバイトコードをデコードすると固まります"
-#: standalone/harddrake2:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "リトライ"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
#, c-format
msgid "Halt bug"
msgstr "停止バグ"
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
#, c-format
msgid ""
"Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -22151,184 +23172,250 @@ msgstr ""
"初期のi486DX-100チップの一部は、'停止'機能を使うと操作に戻れなくことが\n"
"あります"
-#: standalone/harddrake2:60
+#: standalone/harddrake2:77
+#, c-format
+msgid "sub generation of the cpu"
+msgstr "CPUのサブジェネレーション"
+
+#: standalone/harddrake2:78
+#, c-format
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
+msgstr "CPUのジェネレーション(例: Pentium III だと8)"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "Model name"
+msgstr "モデル名"
+
+#: standalone/harddrake2:79
+#, c-format
+msgid "official vendor name of the cpu"
+msgstr "CPUの公式ベンダ名"
+
+#: standalone/harddrake2:80
+#, c-format
+msgid "the name of the CPU"
+msgstr "CPUの名前"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "Processor ID"
+msgstr "プロセッサのID"
+
+#: standalone/harddrake2:81
+#, c-format
+msgid "the number of the processor"
+msgstr "プロセッサの番号"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "Model stepping"
+msgstr "モデルステップ"
+
+#: standalone/harddrake2:82
+#, c-format
+msgid "stepping of the cpu (sub model (generation) number)"
+msgstr "CPU(sub model (generation) number)のステップ"
+
+#: standalone/harddrake2:83
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "プロセッサのベンダ名"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid "Write protection"
+msgstr "書き込み禁止"
+
+#: standalone/harddrake2:84
+#, c-format
+msgid ""
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
+"memory page level, thus enabling the processor to prevent unchecked kernel "
+"accesses to user memory (aka this is a bug guard)"
+msgstr ""
+
+#: standalone/harddrake2:88
#, c-format
msgid "Floppy format"
msgstr "フロッピーの形式"
-#: standalone/harddrake2:60
+#: standalone/harddrake2:88
#, c-format
msgid "format of floppies supported by the drive"
msgstr "ドライブがサポートしているフロッピーの形式"
-#: standalone/harddrake2:61
+#: standalone/harddrake2:92
#, c-format
-msgid "sub generation of the cpu"
-msgstr "CPUのサブジェネレーション"
+msgid "Channel"
+msgstr "チャンネル"
-#: standalone/harddrake2:62
+#: standalone/harddrake2:92
#, c-format
-msgid "class of hardware device"
-msgstr "ハードウェアデバイスのクラス"
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI チャンネル"
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
+#: standalone/harddrake2:93
#, c-format
-msgid "Model"
-msgstr "モデル"
+msgid "Disk identifier"
+msgstr "ディスクの識別子"
-#: standalone/harddrake2:63
+#: standalone/harddrake2:93
#, c-format
-msgid "hard disk model"
-msgstr "ハードディスクのモデル"
+msgid "usually the disk serial number"
+msgstr "多くの場合ディスクのシリアルナンバー"
-#: standalone/harddrake2:64
+#: standalone/harddrake2:94
#, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "CPUのジェネレーション(例: PentiumIII だと8)"
+msgid "Logical unit number"
+msgstr "論理ユニット番号"
-#: standalone/harddrake2:65
+#: standalone/harddrake2:94
#, c-format
-msgid "Model name"
-msgstr "モデル名"
+msgid ""
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
+"identified by a\n"
+"channel number, a target id and a logical unit number"
+msgstr ""
-#: standalone/harddrake2:65
+#: standalone/harddrake2:99
#, c-format
-msgid "official vendor name of the cpu"
-msgstr "CPUの公式ベンダー名"
+msgid "Device file"
+msgstr "デバイスファイル"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:99
#, c-format
-msgid "Number of buttons"
-msgstr "ボタンの数"
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr "このデバイスファイルはマウス用のカーネルドライバとの通信に使います"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:100
#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "マウスボタンの数"
+msgid "Emulated wheel"
+msgstr "ホイールをエミュレート"
-#: standalone/harddrake2:67
+#: standalone/harddrake2:100
#, c-format
-msgid "the name of the CPU"
-msgstr "CPUの名前"
+msgid "whether the wheel is emulated or not"
+msgstr "ホイールをエミュレートする/しない"
-#: standalone/harddrake2:68
+#: standalone/harddrake2:101
#, c-format
-msgid "network printer port"
-msgstr "ネットワークプリンタのポート"
+msgid "the type of the mouse"
+msgstr "マウスの種類"
-#: standalone/harddrake2:69
+#: standalone/harddrake2:102
#, c-format
-msgid "Processor ID"
-msgstr "プロセッサのID"
+msgid "the name of the mouse"
+msgstr "マウスの名前"
-#: standalone/harddrake2:69
+#: standalone/harddrake2:103
#, c-format
-msgid "the number of the processor"
-msgstr "プロセッサの番号"
+msgid "Number of buttons"
+msgstr "ボタンの数"
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "パーティションをフォーマット"
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "マウスボタンの数"
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "プロセッサの番号"
+#: standalone/harddrake2:104
+#, c-format
+msgid "the type of bus on which the mouse is connected"
+msgstr "マウスを接続しているバスの種類"
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
#, c-format
-msgid "Model stepping"
-msgstr "モデルステップ"
+msgid "Mouse protocol used by X11"
+msgstr "X11で使用するマウスプロトコル"
-#: standalone/harddrake2:71
+#: standalone/harddrake2:105
#, c-format
-msgid "stepping of the cpu (sub model (generation) number)"
-msgstr "CPU(sub model (generation) number)のステップ"
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr "グラフィカルデスクトップがマウスを使う際のプロトコル"
-#: standalone/harddrake2:72
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
#, c-format
-msgid "the type of bus on which the mouse is connected"
-msgstr "マウスを接続しているバスの種類"
+msgid "Identification"
+msgstr "識別"
-#: standalone/harddrake2:73
+#: standalone/harddrake2:113 standalone/harddrake2:129
#, c-format
-msgid "the vendor name of the device"
-msgstr "デバイスのベンダー名"
+msgid "Connection"
+msgstr "接続"
-#: standalone/harddrake2:74
+#: standalone/harddrake2:122
#, c-format
-msgid "the vendor name of the processor"
-msgstr "プロセッサのベンダー名"
+msgid "Performances"
+msgstr "パフォーマンス"
-#: standalone/harddrake2:75
+#: standalone/harddrake2:123
#, c-format
-msgid "Write protection"
-msgstr "書き込み禁止"
+msgid "Bugs"
+msgstr "バグ"
-#: standalone/harddrake2:75
+#: standalone/harddrake2:124
#, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
-msgstr ""
+msgid "FPU"
+msgstr "FPU"
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "パーティション"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "機能"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
#, c-format
msgid "/_Options"
msgstr "/オプション(_O)"
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
#, c-format
msgid "/_Help"
msgstr "/ヘルプ(_H)"
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
#, c-format
msgid "/Autodetect _printers"
msgstr "/プリンタを自動検出(_P)"
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
#, c-format
msgid "/Autodetect _modems"
msgstr "/モデムを自動検出(_M)"
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
#, c-format
msgid "/Autodetect _jaz drives"
msgstr "/_jazドライブを自動検出"
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
#, c-format
msgid "/_Quit"
msgstr "/終了(_Q)"
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
#, c-format
msgid "/_Fields description"
msgstr "/項目の説明(_F)"
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
#, c-format
msgid "Harddrake help"
msgstr "Harddrakeのヘルプ"
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"項目の説明:\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
#, c-format
msgid ""
"Once you've selected a device, you'll be able to see the device information "
@@ -22337,249 +23424,261 @@ msgstr ""
"デバイスを選択すると右のフレーム(インフォメーション)にデバイスの情報が\n"
"表示されます。"
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
#, c-format
msgid "/_Report Bug"
msgstr "/バグ報告(_R)"
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
#, c-format
msgid "/_About..."
msgstr "/情報(_A)"
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
#, c-format
msgid "About Harddrake"
msgstr "Harddrakeについて"
#. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
#, c-format
msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
msgstr ""
-"HardDrakeはMandrakeのハードウェア設定ツールです。\n"
+"HardDrakeはMandrakelinuxのハードウェア設定ツールです。\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
#, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 version %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
#, c-format
msgid "Detected hardware"
msgstr "検出したハードウェア"
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
#, c-format
msgid "Configure module"
msgstr "モジュールを設定"
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
#, c-format
msgid "Run config tool"
msgstr "設定ツールを実行"
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
#, c-format
msgid "unknown"
msgstr "不明"
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
#, c-format
msgid "Unknown"
msgstr "不明"
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, c-format
+msgid "Misc"
+msgstr "その他"
+
+#: standalone/harddrake2:332
#, c-format
msgid ""
"Click on a device in the left tree in order to display its information here."
msgstr "情報を表示するには左のデバイスをクリックしてください。"
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
#, c-format
msgid "secondary"
msgstr "2次"
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
#, c-format
msgid "primary"
msgstr "1次"
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
#, c-format
msgid "burner"
msgstr "ライタ"
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
#, c-format
msgid "DVD"
msgstr "DVD"
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
#, c-format
msgid "Please, choose your keyboard layout."
msgstr "キーボードの配列を選んでください。"
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
#, c-format
msgid "Do you want the BackSpace to return Delete in console?"
msgstr "BackSpaceキーがコンソールでDeleteの働きをするようにしますか?"
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
#, c-format
msgid "The change is done, but to be effective you must logout"
msgstr "変更は完了しました。有効にするにはログアウトしてください。"
-#: standalone/logdrake:51
+#: standalone/logdrake:50
#, c-format
-msgid "Mandrake Tools Logs"
-msgstr "Mandrakeツールのログ"
+msgid "Mandrakelinux Tools Logs"
+msgstr "Mandrakelinuxツールのログ"
-#: standalone/logdrake:52
+#: standalone/logdrake:51
#, c-format
msgid "Logdrake"
msgstr "Logdrake"
-#: standalone/logdrake:65
+#: standalone/logdrake:64
#, c-format
msgid "Show only for the selected day"
msgstr "選んだ日の分だけ表示"
-#: standalone/logdrake:72
+#: standalone/logdrake:71
#, c-format
msgid "/File/_New"
msgstr "/ファイル(F)/新規(_N)"
-#: standalone/logdrake:72
+#: standalone/logdrake:71
#, c-format
msgid "<control>N"
msgstr "<control>N"
-#: standalone/logdrake:73
+#: standalone/logdrake:72
#, c-format
msgid "/File/_Open"
msgstr "/ファイル(F)/開く(_O)"
-#: standalone/logdrake:73
+#: standalone/logdrake:72
#, c-format
msgid "<control>O"
msgstr "<control>O"
-#: standalone/logdrake:74
+#: standalone/logdrake:73
#, c-format
msgid "/File/_Save"
msgstr "/ファイル(F)/保存(_S)"
-#: standalone/logdrake:74
+#: standalone/logdrake:73
#, c-format
msgid "<control>S"
msgstr "<control>S"
-#: standalone/logdrake:75
+#: standalone/logdrake:74
#, c-format
msgid "/File/Save _As"
msgstr "/ファイル(F)/名前をつけて保存(_A)"
-#: standalone/logdrake:76
+#: standalone/logdrake:75
#, c-format
msgid "/File/-"
msgstr "/ファイル(F)/-"
-#: standalone/logdrake:79
+#: standalone/logdrake:78
#, c-format
msgid "/Options/Test"
msgstr "/オプション(O)/テスト"
-#: standalone/logdrake:81
+#: standalone/logdrake:80
#, c-format
msgid "/Help/_About..."
msgstr "/ヘルプ(H)/情報(_A)"
-#: standalone/logdrake:110
+#: standalone/logdrake:109
#, c-format
msgid ""
"_:this is the auth.log log file\n"
"Authentication"
msgstr "Authentication"
-#: standalone/logdrake:111
+#: standalone/logdrake:110
#, c-format
msgid ""
"_:this is the user.log log file\n"
"User"
msgstr "User"
-#: standalone/logdrake:112
+#: standalone/logdrake:111
#, c-format
msgid ""
"_:this is the /var/log/messages log file\n"
"Messages"
msgstr "Messages"
-#: standalone/logdrake:113
+#: standalone/logdrake:112
#, c-format
msgid ""
"_:this is the /var/log/syslog log file\n"
"Syslog"
msgstr "Syslog"
-#: standalone/logdrake:117
+#: standalone/logdrake:116
#, c-format
msgid "search"
msgstr "検索"
-#: standalone/logdrake:129
+#: standalone/logdrake:128
#, c-format
msgid "A tool to monitor your logs"
msgstr "ログを監視するツール"
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
#, c-format
msgid "Settings"
msgstr "設定"
-#: standalone/logdrake:135
+#: standalone/logdrake:134
#, c-format
msgid "Matching"
msgstr "一致するもの"
-#: standalone/logdrake:136
+#: standalone/logdrake:135
#, c-format
msgid "but not matching"
msgstr "一致しないもの"
-#: standalone/logdrake:140
+#: standalone/logdrake:139
#, c-format
msgid "Choose file"
msgstr "ファイルを選択"
-#: standalone/logdrake:149
+#: standalone/logdrake:148
#, c-format
msgid "Calendar"
msgstr "カレンダー"
-#: standalone/logdrake:159
+#: standalone/logdrake:158
#, c-format
msgid "Content of the file"
msgstr "ファイルの内容"
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
#, c-format
msgid "Mail alert"
msgstr "メール警告"
-#: standalone/logdrake:170
+#: standalone/logdrake:169
#, c-format
-msgid "The alert wizard had unexpectly failled:"
+msgid "The alert wizard has failed unexpectedly:"
msgstr "警告ウィザードは失敗しました:"
#: standalone/logdrake:221
@@ -22587,62 +23686,57 @@ msgstr "警告ウィザードは失敗しました:"
msgid "please wait, parsing file: %s"
msgstr "お待ちください。ファイル %s を探しています。"
-#: standalone/logdrake:406
+#: standalone/logdrake:376
#, c-format
msgid "Apache World Wide Web Server"
msgstr "Apache WWWサーバ"
-#: standalone/logdrake:407
+#: standalone/logdrake:377
#, c-format
msgid "Domain Name Resolver"
msgstr "ドメイン名の解決"
-#: standalone/logdrake:408
+#: standalone/logdrake:378
#, c-format
msgid "Ftp Server"
msgstr "ftpサーバ"
-#: standalone/logdrake:409
+#: standalone/logdrake:379
#, c-format
msgid "Postfix Mail Server"
msgstr "Postfixメールサーバ"
-#: standalone/logdrake:410
+#: standalone/logdrake:380
#, c-format
msgid "Samba Server"
msgstr "sambaサーバ"
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "SSHサーバ"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
#, c-format
msgid "Webmin Service"
msgstr "Webminサービス"
-#: standalone/logdrake:413
+#: standalone/logdrake:383
#, c-format
msgid "Xinetd Service"
msgstr "Xinetdサービス"
-#: standalone/logdrake:424
+#: standalone/logdrake:394
#, c-format
msgid "Configure the mail alert system"
msgstr "メール警告システムを設定"
-#: standalone/logdrake:425
+#: standalone/logdrake:395
#, c-format
msgid "Stop the mail alert system"
msgstr "メール警告システムを停止"
-#: standalone/logdrake:432
+#: standalone/logdrake:402
#, c-format
msgid "Mail alert configuration"
msgstr "メール警告を設定"
-#: standalone/logdrake:433
+#: standalone/logdrake:403
#, c-format
msgid ""
"Welcome to the mail configuration utility.\n"
@@ -22653,66 +23747,66 @@ msgstr ""
"\n"
"ここでは警告システムを設定します。\n"
-#: standalone/logdrake:436
+#: standalone/logdrake:406
#, c-format
msgid "What do you want to do?"
msgstr "何をしますか?"
-#: standalone/logdrake:443
+#: standalone/logdrake:413
#, c-format
msgid "Services settings"
msgstr "サービスの設定"
-#: standalone/logdrake:444
+#: standalone/logdrake:414
#, c-format
msgid ""
"You will receive an alert if one of the selected services is no longer "
"running"
msgstr "選択したサービスが動いていないときに警報を送ります。"
-#: standalone/logdrake:451
+#: standalone/logdrake:421
#, c-format
msgid "Load setting"
msgstr "負荷の設定"
-#: standalone/logdrake:452
+#: standalone/logdrake:422
#, c-format
msgid "You will receive an alert if the load is higher than this value"
msgstr "負荷がこの値より大きくなると警告します"
-#: standalone/logdrake:453
+#: standalone/logdrake:423
#, c-format
msgid ""
"_: load here is a noun, the load of the system\n"
"Load"
msgstr "ロード"
-#: standalone/logdrake:458
+#: standalone/logdrake:428
#, c-format
msgid "Alert configuration"
msgstr "警告の設定"
-#: standalone/logdrake:459
+#: standalone/logdrake:429
#, c-format
msgid "Please enter your email address below "
msgstr "メールアドレスを入力してください"
-#: standalone/logdrake:460
+#: standalone/logdrake:430
#, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
msgstr "/使用するSMTPサーバの名前(か IP)を入力"
-#: standalone/logdrake:479
+#: standalone/logdrake:449
#, c-format
msgid "The wizard successfully configured the mail alert."
msgstr "メール警告を設定しました。"
-#: standalone/logdrake:485
+#: standalone/logdrake:455
#, c-format
msgid "The wizard successfully disabled the mail alert."
msgstr "メール警告を無効にしました。"
-#: standalone/logdrake:544
+#: standalone/logdrake:514
#, c-format
msgid "Save as.."
msgstr "名前をつけて保存"
@@ -22737,27 +23831,76 @@ msgstr "マウスのテスト"
msgid "Please test your mouse:"
msgstr "マウスをテストしてください:"
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, c-format
+msgid "Network is up on interface %s"
+msgstr "インタフェース %s のネットワークが動作"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr ""
+"インタフェース %s のネットワークが落ちています。\"ネットワークを設定\" をク"
+"リック"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "%s に接続"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "%s から切断"
+
+#: standalone/net_applet:55
+#, c-format
+msgid "Monitor Network"
+msgstr "ネットワークをモニタ"
+
+#: standalone/net_applet:56
+#, c-format
+msgid "Configure Network"
+msgstr "ネットワークを設定"
+
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/net_applet:57 standalone/printerdrake:245
+#, c-format
+msgid "Refresh"
+msgstr "更新"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr "オンラインヘルプを見る"
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "起動時に開始"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
#, c-format
msgid "Network Monitoring"
-msgstr "ネットワークの監視"
+msgstr "ネットワークのモニタ"
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
#, c-format
msgid "Global statistics"
msgstr "全体の統計"
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
#, c-format
msgid "Instantaneous"
-msgstr "即時"
+msgstr "瞬間"
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
#, c-format
msgid "Average"
msgstr "平均"
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
#, c-format
msgid ""
"Sending\n"
@@ -22766,7 +23909,7 @@ msgstr ""
"送信\n"
"速度:"
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
#, c-format
msgid ""
"Receiving\n"
@@ -22775,90 +23918,83 @@ msgstr ""
"受信\n"
"速度:"
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
#, c-format
msgid ""
"Connection\n"
"time: "
-msgstr ""
-"接続\n"
-"時間: "
+msgstr "接続時間: "
+
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr "受信と送信に同じスケールを使う"
-#: standalone/net_monitor:122
+#: standalone/net_monitor:139
#, c-format
msgid "Wait please, testing your connection..."
msgstr "お待ちください。接続をテストしています.."
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
#, c-format
msgid "Disconnecting from Internet "
msgstr "インターネットから切断 "
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
#, c-format
msgid "Connecting to Internet "
msgstr "インターネットに接続 "
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
#, c-format
msgid "Disconnection from Internet failed."
msgstr "インターネットの切断に失敗"
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
#, c-format
msgid "Disconnection from Internet complete."
msgstr "インターネットを切断しました。"
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
#, c-format
msgid "Connection complete."
msgstr "接続完了"
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
#, c-format
msgid ""
"Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
msgstr ""
"接続は失敗しました。\n"
-"Mandrakeコントロールセンタの設定を確認してください。"
+"Mandrakelinuxコントロールセンタの設定を確認してください。"
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
#, c-format
msgid "Color configuration"
msgstr "色の設定"
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
#, c-format
msgid "sent: "
msgstr "送信しました: "
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
#, c-format
msgid "received: "
msgstr "受信しました: "
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
#, c-format
msgid "average"
msgstr "平均"
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
#, c-format
msgid "Local measure"
msgstr "ローカル基準"
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "送信しました"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "受信しました"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
#, c-format
msgid ""
"Warning, another internet connection has been detected, maybe using your "
@@ -22867,351 +24003,340 @@ msgstr ""
"警告: 別のインターネット接続を検出しました。\n"
"ネットワークを使用しているようです"
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "%s から切断"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "%s に接続"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
#, c-format
msgid "No internet connection configured"
msgstr "インターネット接続を設定していません"
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
#, c-format
msgid "Loading printer configuration... Please wait"
msgstr "プリンタ設定をロード..お待ちください"
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
#, c-format
msgid "Reading data of installed printers..."
msgstr "インストールしたプリンタのデータを読み込み中.."
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s プリンタの管理ツール"
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
#, c-format
msgid "/_Actions"
msgstr "/アクション(_A)"
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_プリンタを追加"
+
+#: standalone/printerdrake:149
#, c-format
msgid "/Set as _Default"
msgstr "/デフォルトに指定する(_D)"
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
#, c-format
msgid "/_Edit"
msgstr "/編集(_E)"
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
#, c-format
msgid "/_Delete"
msgstr "/削除(_D)"
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
#, c-format
msgid "/_Expert mode"
msgstr "/_エキスパートモード"
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
#, c-format
msgid "/_Refresh"
msgstr "/更新(_R)"
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_プリンタを追加"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
#, c-format
msgid "/_Configure CUPS"
msgstr "/_CUPSを設定"
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
#, c-format
msgid "Search:"
msgstr "検索:"
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
#, c-format
msgid "Apply filter"
msgstr "フィルタを適用"
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
#, c-format
msgid "Def."
msgstr "Def."
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
#, c-format
msgid "Printer Name"
msgstr "プリンタ名"
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
#, c-format
msgid "Connection Type"
msgstr "接続の種類"
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
#, 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:227
+#: standalone/printerdrake:233
#, c-format
msgid "Add Printer"
msgstr "プリンタを追加"
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
#, 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:230
+#: standalone/printerdrake:236
#, c-format
msgid "Set as default"
msgstr "デフォルトに設定"
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
#, c-format
msgid "Set selected printer as the default printer"
msgstr "選んだプリンタをデフォルトにする"
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
#, c-format
msgid "Edit selected printer"
msgstr "選んだプリンタを編集"
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
#, c-format
msgid "Delete selected printer"
msgstr "選んだプリンタを削除"
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "更新"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
#, 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:242
+#: standalone/printerdrake:248
#, c-format
msgid "Configure CUPS"
msgstr "CUPSを設定"
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
#, c-format
msgid "Configure CUPS printing system"
msgstr "CUPS印刷システムを設定"
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, c-format
+msgid "Enabled"
+msgstr "有効"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "無効"
+
+#: standalone/printerdrake:572
#, c-format
msgid "Authors: "
msgstr "作者: "
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
#, c-format
msgid "Printer Management \n"
msgstr "プリンタの管理 \n"
-#: standalone/scannerdrake:50
-#, fuzzy, c-format
+#: standalone/scannerdrake:51
+#, c-format
msgid ""
"SANE packages need to be installed to use scanners.\n"
"\n"
"Do you want to install the SANE packages?"
-msgstr "パッケージ %s が必要です。インストールしますか?"
+msgstr ""
+"スキャナを使うにはSANEパッケージが必要です。\n"
+"\n"
+"SANEパッケージをインストールしますか?"
-#: standalone/scannerdrake:54
-#, fuzzy, c-format
+#: standalone/scannerdrake:55
+#, c-format
msgid "Aborting Scannerdrake."
-msgstr "Scannerdrake"
+msgstr "Scannerdrakeを中止"
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
#, c-format
msgid ""
"Could not install the packages needed to set up a scanner with Scannerdrake."
msgstr ""
"Scannerdrakeでスキャナを設定するのに必要なファイルをインストールできません"
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
#, c-format
msgid "Scannerdrake will not be started now."
msgstr "Scannerdrakeは起動しません。"
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
#, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
msgstr "設定したスキャナを検索中.."
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
#, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
msgstr "新しいスキャナを検索中.."
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
#, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
msgstr "設定したスキャナのリストを再生成中.."
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
#, c-format
msgid "The %s is not supported by this version of %s."
msgstr "%s はこのバージョンの %s ではサポートしていません"
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
#, c-format
msgid "%s found on %s, configure it automatically?"
msgstr "%s が %s で見つかりました。自動的に設定しますか?"
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
#, c-format
msgid "%s is not in the scanner database, configure it manually?"
msgstr "%s はスキャナのデータベースにありません。手動で設定しますか?"
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
#, c-format
msgid "Select a scanner model"
msgstr "スキャナの機種を選んでください"
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
#, c-format
msgid " ("
msgstr " ("
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
#, c-format
msgid "Detected model: %s"
msgstr "検出した機種: %s"
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
#, c-format
msgid "Port: %s"
msgstr "ポート: %s"
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "%s はこのバージョンのScannerdrakeでは判別できません。"
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
#, c-format
msgid "Do not install firmware file"
msgstr "ファームウェアファイルをインストールしない"
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
#, c-format
msgid ""
"It is possible that your %s needs its firmware to be uploaded everytime when "
"it is turned on."
msgstr ""
-#: standalone/scannerdrake:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
#, c-format
msgid "If this is the case, you can make this be done automatically."
-msgstr ""
+msgstr "この場合は自動的にこれを行うことができます"
-#: standalone/scannerdrake:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
#, c-format
msgid ""
"To do so, you need to supply the firmware file for your scanner so that it "
"can be installed."
msgstr ""
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
#, c-format
msgid ""
"You find the file on the CD or floppy coming with the scanner, on the "
"manufacturer's home page, or on your Windows partition."
msgstr ""
+"ファイルはスキャナに付いているCD/フロッピーにあります。またはメーカーのホーム"
+"ページ/お使いのWindowsのパーティションを見てください"
-#: standalone/scannerdrake:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
#, c-format
msgid "Install firmware file from"
msgstr "以下からファームウェアをインストール"
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
#, c-format
msgid "Select firmware file"
msgstr "ファームウェアファイルを選択"
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
#, c-format
msgid "The firmware file %s does not exist or is unreadable!"
msgstr "ファームウェアファイル %s は存在しないか読めません"
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:220
#, c-format
msgid ""
"It is possible that your scanners need their firmware to be uploaded "
"everytime when they are turned on."
msgstr ""
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
#, c-format
msgid ""
"To do so, you need to supply the firmware files for your scanners so that it "
"can be installed."
msgstr ""
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
#, c-format
msgid ""
"If you have already installed your scanner's firmware you can update the "
"firmware here by supplying the new firmware file."
msgstr ""
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
#, c-format
msgid "Install firmware for the"
msgstr "以下からファームウェアをインストール"
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
#, c-format
msgid "Select firmware file for the %s"
msgstr "%s のファームウェアファイルを選択"
-#: standalone/scannerdrake:274
-#, fuzzy, c-format
+#: standalone/scannerdrake:270
+#, c-format
msgid "Could not install the firmware file for the %s!"
-msgstr "ファームウェアファイルをインストールしない"
+msgstr "%s のファームウェアファイルをインストールできません"
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
#, c-format
msgid "The firmware file for your %s was successfully installed."
msgstr "%s のファームウェアファイルをインストールしました"
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:293
#, c-format
msgid "The %s is unsupported"
msgstr "%s はサポートしていません"
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
#, c-format
msgid ""
"The %s must be configured by printerdrake.\n"
@@ -23220,47 +24345,45 @@ msgstr ""
"%s はprinterdrakeで設定してください。\n"
"printerdrakeは %s コントロールセンタのハードウェア欄で起動できます。"
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
#, c-format
msgid "Auto-detect available ports"
msgstr "利用可能なポートを自動的に検出"
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
#, c-format
msgid "Please select the device where your %s is attached"
msgstr "%s を接続しているデバイスを選んでください"
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
#, c-format
msgid "(Note: Parallel ports cannot be auto-detected)"
msgstr ""
" \n"
"(注意: パラレルポートは自動検出されません)"
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
#, c-format
msgid "choose device"
msgstr "デバイスを選択"
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
#, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
msgstr "スキャナを検索中.."
-#: standalone/scannerdrake:380
-#, fuzzy, c-format
+#: standalone/scannerdrake:376
+#, c-format
msgid ""
"Your %s has been configured.\n"
"You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/"
"Graphics in the applications menu."
msgstr ""
"%s を設定しました。\n"
-"アプリケーションメニューの マルチメディア ->\n"
-"グラフィックス にある\n"
-"Xsaneを使って文書をスキャンできます。"
+"\"XSane\" もしくは \"Kooka\" を使って文書をスキャンできます。"
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
#, c-format
msgid ""
"The following scanners\n"
@@ -23273,7 +24396,7 @@ msgstr ""
"%s\n"
"をシステムで利用できます。\n"
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
#, c-format
msgid ""
"The following scanner\n"
@@ -23286,42 +24409,42 @@ msgstr ""
"%s\n"
"をシステムで利用できます。\n"
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
#, c-format
msgid "There are no scanners found which are available on your system.\n"
msgstr "お使いのシステムには利用可能なスキャナがありません。\n"
-#: standalone/scannerdrake:425
+#: standalone/scannerdrake:421
#, c-format
msgid "Search for new scanners"
msgstr "新しいスキャナを検索"
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
#, c-format
msgid "Add a scanner manually"
msgstr "手動でスキャナを追加"
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
#, c-format
msgid "Install/Update firmware files"
msgstr "ファームウェアファイルをインストール/更新"
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
#, c-format
msgid "Scanner sharing"
msgstr "スキャナを共有"
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
#, c-format
msgid "All remote machines"
msgstr "全てのリモートマシンで"
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
#, c-format
msgid "This machine"
msgstr "このマシン"
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
#, c-format
msgid ""
"Here you can choose whether the scanners connected to this machine should be "
@@ -23330,7 +24453,7 @@ msgstr ""
"このマシンのスキャナにリモートマシンからアクセスできるよう\n"
"設定することができます。"
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:552
#, c-format
msgid ""
"You can also decide here whether scanners on remote machines should be made "
@@ -23340,125 +24463,124 @@ msgstr ""
"このマシンからリモートマシンのスキャナにアクセスするよう\n"
"設定することも可能です。"
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
#, c-format
msgid "The scanners on this machine are available to other computers"
msgstr "このマシンのスキャナをリモートマシンで利用する"
-#: standalone/scannerdrake:561
+#: standalone/scannerdrake:557
#, c-format
msgid "Scanner sharing to hosts: "
msgstr "このホストにスキャナを共有させる: "
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
#, c-format
msgid "Use scanners on remote computers"
msgstr "リモートマシンのスキャナをこのマシンで利用する"
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
#, c-format
msgid "Use the scanners on hosts: "
msgstr "このホストのスキャナを共有する: "
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
#, c-format
msgid "Sharing of local scanners"
msgstr "ローカルスキャナを共有"
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
#, c-format
msgid ""
"These are the machines on which the locally connected scanner(s) should be "
"available:"
msgstr "このマシンのスキャナを利用するリモートマシン:"
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
#, c-format
msgid "Add host"
msgstr "ホストを追加"
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
#, c-format
msgid "Edit selected host"
msgstr "選んだホストを編集"
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
#, c-format
msgid "Remove selected host"
msgstr "選んだホストを削除"
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
#, c-format
msgid "Name/IP address of host:"
msgstr "ホストの名前/IPアドレス:"
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
#, c-format
msgid "Choose the host on which the local scanners should be made available:"
msgstr "スキャナを利用するホストを選んでください:"
-#: standalone/scannerdrake:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
#, c-format
msgid "You must enter a host name or an IP address.\n"
msgstr "ホスト名かIPアドレスを入力してください。\n"
-#: standalone/scannerdrake:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
#, c-format
msgid "This host is already in the list, it cannot be added again.\n"
msgstr "このホストは既にリストにあります。重複することはできません。\n"
-#: standalone/scannerdrake:755
+#: standalone/scannerdrake:751
#, c-format
msgid "Usage of remote scanners"
msgstr "リモートスキャナの使用"
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
#, c-format
msgid "These are the machines from which the scanners should be used:"
msgstr "このマシンが利用するスキャナを接続しているリモートマシン:"
-#: standalone/scannerdrake:913
-#, fuzzy, c-format
+#: standalone/scannerdrake:909
+#, c-format
msgid ""
"saned needs to be installed to share the local scanner(s).\n"
"\n"
"Do you want to install the saned package?"
msgstr ""
-"ネットワークタイムプロトコルを有効にするには、\n"
-"ntpパッケージが必要です。\n"
+"ローカルスキャナの共有にはsanedが必要です。\n"
"\n"
-"ntpをインストールしますか?"
+"sanedパッケージをインストールしますか?"
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
#, c-format
msgid "Your scanner(s) will not be available on the network."
msgstr "お使いのスキャナはネットワークで使用できません"
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
#, c-format
msgid "Some devices in the \"%s\" hardware class were removed:\n"
msgstr "%s ハードウェアクラスのデバイスの一部を削除しました:\n"
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
#, c-format
msgid "- %s was removed\n"
-msgstr ""
+msgstr "- %s を削除しました\n"
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
#, c-format
msgid "Some devices were added: %s\n"
msgstr "いくつかのデバイスを追加しました: %s\n"
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
#, c-format
msgid "- %s was added\n"
-msgstr ""
+msgstr "- %s を追加しました\n"
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
#, c-format
msgid "Hardware probing in progress"
msgstr "ハードウェアを検出中"
@@ -23469,9 +24591,9 @@ msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
msgstr ""
#: standalone/service_harddrake_confirm:8
-#, fuzzy, c-format
-msgid "Do you want to run the appropriate config tool ?"
-msgstr "この設定で試してみますか?"
+#, c-format
+msgid "Do you want to run the appropriate config tool?"
+msgstr "適切な設定ツールを起動しますか?"
#: steps.pm:14
#, c-format
@@ -23563,22 +24685,22 @@ msgstr "システムを更新"
msgid "Exit install"
msgstr "インストール終了"
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
#, c-format
msgid "Is this correct?"
msgstr "正しいですか?"
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
#, c-format
msgid "Expand Tree"
msgstr "ツリーを展開する"
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
#, c-format
msgid "Collapse Tree"
msgstr "ツリーを縮める"
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
#, c-format
msgid "Toggle between flat and group sorted"
msgstr "フラットとグループ別表示を切り替える"
@@ -23597,349 +24719,312 @@ msgstr ""
msgid "Installation failed"
msgstr "インストール失敗"
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "オフィスワークステーション"
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "匿名BINDを使う "
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"オフィスソフト: ワープロ(kword,abiword),表計算(kspread,gnumeric),\n"
-"pdfビューアなど"
+#~ msgid "OK"
+#~ msgstr "OK"
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "ゲームステーション"
+#~ msgid "NO"
+#~ msgstr "いいえ"
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "ゲームプログラム: アーケードゲーム/ボードゲーム/戦略ゲームなど"
+#~ msgid "YES"
+#~ msgstr "はい"
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "マルチメディアステーション"
+#~ msgid ""
+#~ "The following options can be set to customize your\n"
+#~ "system security. If you need an explanation, look at the help tooltip.\n"
+#~ msgstr ""
+#~ "以下のオプションでシステムのセキュリティをカスタマイズします。\n"
+#~ "説明が必要でしたらヘルプツールチップをご覧ください。\n"
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "サウンドと動画の再生/編集ソフト"
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "%s はこのバージョンのScannerdrakeでは判別できません。"
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "インターネットステーション"
+#~ msgid "Hide Release Notes"
+#~ msgstr "リリースノートを隠す"
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr "メールとニュースの送受信用ツール(mutt,tin..)とウェブブラウズ用ツール"
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "チェコ(QWERTZ)"
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "ネットワーク(クライアント)"
+#~ msgid "German"
+#~ msgstr "ドイツ"
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "sshなどの各種プロトコル用クライアント"
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "設定"
+#~ msgid "Spanish"
+#~ msgstr "スペイン"
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "お使いのコンピュータを簡単に設定するツール"
+#~ msgid "Finnish"
+#~ msgstr "フィンランド"
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "コンソールツール"
+#~ msgid "French"
+#~ msgstr "フランス"
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "エディタ/シェル/ファイル関連ツール/ターミナル"
+#~ msgid "Norwegian"
+#~ msgstr "ノルウェー"
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDEワークステーション"
+#~ msgid "Polish"
+#~ msgstr "ポーランド"
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr "KDE - さまざまなツールを含む定番グラフィカル環境"
+#~ msgid "Russian"
+#~ msgstr "ロシア"
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "GNOMEワークステーション"
+#~ msgid "Swedish"
+#~ msgstr "スウェーデン"
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "使いやすいアプリケーションとデスクトップツールを含むグラフィカル環境"
+#~ msgid "Albanian"
+#~ msgstr "アルバニア"
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "その他のグラフィカルデスクトップ"
+#~ msgid "Armenian (old)"
+#~ msgstr "アルメニア(古い)"
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwmなど"
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "アルメニア(タイプライター)"
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C/C++の開発ライブラリ,プログラム,includeファイル"
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "アルメニア(発音記号)"
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "ドキュメンテーション"
+#~ msgid "Arabic"
+#~ msgstr "アラビア"
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Linux/フリーソフト関連の文書とHowto"
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "アゼルバイジャン(ラテン)"
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "Belgian"
+#~ msgstr "ベルギー"
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base,サードパーティのアプリケーションをサポート"
+#~ msgid "Bengali"
+#~ msgstr "ベンガル"
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+#~ msgid "Bulgarian (phonetic)"
+#~ msgstr "アルメニア(発音記号)"
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache,Pro-ftpd"
+#~ msgid "Bulgarian (BDS)"
+#~ msgstr "ブルガリア(BDS)"
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "メール"
+#~ msgid "Brazilian (ABNT-2)"
+#~ msgstr "ブラジル"
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Postfixメールサーバ"
+#~ msgid "Bosnian"
+#~ msgstr "ボスニア"
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "データベース"
+#~ msgid "Belarusian"
+#~ msgstr "ベラルーシ"
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL/MySQL データベースサーバ"
+#~ msgid "Swiss (German layout)"
+#~ msgstr "スイス(ドイツ)"
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "ファイアウォール/ルータ"
+#~ msgid "Swiss (French layout)"
+#~ msgstr "スイス(フランス)"
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "インターネットゲートウェイ"
+#~ msgid "Czech (QWERTY)"
+#~ msgstr "チェコ(QWERTY)"
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "ネットワークコンピュータサーバ"
+#~ msgid "German (no dead keys)"
+#~ msgstr "ドイツ(デッドキーなし)"
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFSサーバ,SMBサーバ,プロクシサーバ,SSHサーバ"
+#~ msgid "Devanagari"
+#~ msgstr "デヴァナガーリー"
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "メールとニュースの閲覧/送信ツールと、ウェブブラウズ用ツール"
+#~ msgid "Danish"
+#~ msgstr "デンマーク"
-#~ msgid ""
-#~ "You can export using NFS or SMB. Please select which you'd like to use."
-#~ msgstr "エクスポートにはNFSかSMBを使えます。どちらにしますか?"
+#~ msgid "Dvorak (US)"
+#~ msgstr "Dvorak(US)"
-#~ msgid ""
-#~ "You can export using NFS or Samba. Please select which you'd like to use."
-#~ msgstr "エクスポートにはNFSかSambaを使えます。どちらにしますか?"
+#~ msgid "Dvorak (Esperanto)"
+#~ msgstr "Dvorak (エスペラント)"
-#~ msgid "The package %s is going to be removed."
-#~ msgstr "パッケージ %s を削除します"
+#~ msgid "Dvorak (Norwegian)"
+#~ msgstr "Dvorak(ノルウェー)"
-#~ msgid "You must be root to read configuration file. \n"
-#~ msgstr "設定ファイルを読み込むにはrootになってください\n"
+#~ msgid "Dvorak (Swedish)"
+#~ msgstr "Dvorak(スウェーデン)"
-#~ msgid "Can't open %s!"
-#~ msgstr "%s を開けません"
+#~ msgid "Estonian"
+#~ msgstr "エストニア"
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "このカードはXFree %s でのみ3Dアクセラレーションが可能です。\n"
-#~ "2DのサポートについてはXFree %s のほうが優れています。"
+#~ msgid "Georgian (\"Russian\" layout)"
+#~ msgstr "グルジア(ロシア配列)"
-#~ msgid ""
-#~ "Your card can have 3D hardware acceleration support but only with XFree %"
-#~ "s,\n"
-#~ "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-#~ "Your card is supported by XFree %s which may have a better support in 2D."
-#~ msgstr ""
-#~ "このカードは3Dアクセラレーションが可能ですが、XFree %sが必要です。\n"
-#~ "注意: これは実験的なサポートなので、マシンがフリーズする可能性がありま"
-#~ "す。\n"
-#~ "2DのサポートについてはXFree %s のほうが優れています。"
+#~ msgid "Georgian (\"Latin\" layout)"
+#~ msgstr "グルジア(ラテン配列)"
-#~ msgid "Xpmac (installation display driver)"
-#~ msgstr "Xpmac(インストールディスプレイドライバ)"
+#~ msgid "Greek"
+#~ msgstr "ギリシャ"
-#~ msgid "4 billion colors (32 bits)"
-#~ msgstr "40億色 (32 bits)"
+#~ msgid "Greek (polytonic)"
+#~ msgstr "ギリシャ(polytonic)"
-#~ msgid "XFree86 server: %s\n"
-#~ msgstr "XFree86サーバ: %s\n"
+#~ msgid "Gujarati"
+#~ msgstr "グジャラート"
-#~ msgid "Here is the full list of keyboards available"
-#~ msgstr "利用可能なキーボードの全リスト"
+#~ msgid "Gurmukhi"
+#~ msgstr "グルムキ"
-#~ msgid "Please insert the Boot floppy used in drive %s"
-#~ msgstr "使用した起動用フロッピーをドライブ %s に入れてください"
+#~ msgid "Hungarian"
+#~ msgstr "ハンガリー"
-#~ msgid ""
-#~ "Take advantage of valuable benefits, products and services by joining "
-#~ "Mandrake Club, such as:"
-#~ msgstr ""
-#~ "Mandrake Clubのメンバーになると、以下のような製品とサービスを受けられます:"
+#~ msgid "Croatian"
+#~ msgstr "クロアチア"
-#~ msgid "TCP/IP"
-#~ msgstr "TCP/IP"
+#~ msgid "Irish"
+#~ msgstr "Irish"
-#~ msgid "Account"
-#~ msgstr "アカウント"
+#~ msgid "Israeli"
+#~ msgstr "イスラエル"
-#~ msgid "Wireless"
-#~ msgstr "ワイヤレス"
+#~ msgid "Israeli (Phonetic)"
+#~ msgstr "イスラエル(発音記号)"
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTVをインストールしていません"
+#~ msgid "Iranian"
+#~ msgstr "イラン"
-#~ msgid "Provider dns 1 (optional)"
-#~ msgstr "プロバイダのdns 1(オプション)"
+#~ msgid "Icelandic"
+#~ msgstr "アイスランド"
-#~ msgid "Provider dns 2 (optional)"
-#~ msgstr "プロバイダのdns 2(オプション)"
+#~ msgid "Italian"
+#~ msgstr "イタリア"
-#~ msgid "Ethernet Card"
-#~ msgstr "イーサネットカード"
+#~ msgid "Inuktitut"
+#~ msgstr "イヌクティトト"
-#~ msgid "DHCP Client"
-#~ msgstr "DHCPクライアント"
+#~ msgid "Japanese 106 keys"
+#~ msgstr "日本語106キーボード"
-#~ msgid "Display"
-#~ msgstr "表示"
+#~ msgid "Kannada"
+#~ msgstr "カンナダ"
-#~ msgid "Display configuration"
-#~ msgstr "設定を表示"
+#~ msgid "Korean keyboard"
+#~ msgstr "韓国式キーボード"
-#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
-#~ msgstr "tarとbzip2を使う(tarとgzipではなく)"
+#~ msgid "Kyrgyz keyboard"
+#~ msgstr "Kyrgyzキーボード"
-#~ msgid ""
-#~ "Change\n"
-#~ "Restore Path"
-#~ msgstr ""
-#~ "復元パスを\n"
-#~ "変更"
+#~ msgid "Latin American"
+#~ msgstr "ラテンアメリカ"
-#~ msgid "European protocol"
-#~ msgstr "ヨーロッパのプロトコル"
+#~ msgid "Laotian"
+#~ msgstr "ラオス"
-#~ msgid "Found \"%s\" interface do you want to use it ?"
-#~ msgstr "%s インタフェースが見つかりました。使用しますか?"
+#~ msgid "Lithuanian AZERTY (old)"
+#~ msgstr "リトアニア AZERTY(旧)"
-#~ msgid "Bewan USB modem"
-#~ msgstr "Bewan USB modem"
+#~ msgid "Lithuanian AZERTY (new)"
+#~ msgstr "リトアニア AZERTY(新)"
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "お使いのISDN接続を選んでください。"
+#~ msgid "Lithuanian \"number row\" QWERTY"
+#~ msgstr "リトアニア(数字列QWERTY)"
-#~ msgid "Do you want to start a new configuration ?"
-#~ msgstr "新しい設定を開始しますか?"
+#~ msgid "Lithuanian \"phonetic\" QWERTY"
+#~ msgstr "リトアニア(発音QWERTY)"
-#~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
-#~ "select a PCI card on the next screen."
-#~ msgstr ""
-#~ "ISDNカードを検出しましたが、種類が分かりません。次の画面からPCIカードを\n"
-#~ "選んでください。"
+#~ msgid "Latvian"
+#~ msgstr "ラトヴィア"
-#~ msgid "No ISDN PCI card found. Please select one on the next screen."
-#~ msgstr "ISDN PCIカードは見つかりませんでした。下記の中から選んでください"
+#~ msgid "Malayalam"
+#~ msgstr "マレー半島"
-#~ msgid "DrakTermServ"
-#~ msgstr "DrakTermServ"
+#~ msgid "Macedonian"
+#~ msgstr "マケドニア"
-#~ msgid "Under Devel ... please wait."
-#~ msgstr "開発中です。お待ちください。"
+#~ msgid "Myanmar (Burmese)"
+#~ msgstr "ミャンマー(ビルマ)"
-#~ msgid "Windows (FAT32)"
-#~ msgstr "Windows(FAT32)"
+#~ msgid "Mongolian (cyrillic)"
+#~ msgstr "モンゴル(cyrillic)"
-#~ msgid ""
-#~ "Please enter the name of the interface connected to the "
-#~ "internet. \n"
-#~ " \n"
-#~ "Examples:\n"
-#~ " ppp+ for modem or DSL connections, \n"
-#~ " eth0, or eth1 for cable connection, \n"
-#~ " ippp+ for a isdn connection.\n"
-#~ msgstr ""
-#~ "ネット接続のインタフェースを入力してくださ"
-#~ "い。 \n"
-#~ " \n"
-#~ "例:\n"
-#~ " ppp+(モデム/DSL接続の場合)\n"
-#~ " eth0, eth1(ケーブル接続の場合)\n"
-#~ " ippp+(ISDN接続の場合)\n"
+#~ msgid "Maltese (UK)"
+#~ msgstr "マルタ(UK)"
-#~ msgid ""
-#~ "Enter your CD Writer device name\n"
-#~ " ex: 0,1,0"
-#~ msgstr ""
-#~ "CDライタのデバイス名を入力してください\n"
-#~ "例: 0,1,0"
+#~ msgid "Maltese (US)"
+#~ msgstr "マルタ(US)"
-#~ msgid "Tone dialing"
-#~ msgstr "トーンダイアル"
+#~ msgid "Dutch"
+#~ msgstr "オランダ"
-#~ msgid "Pulse dialing"
-#~ msgstr "パルスダイアル"
+#~ msgid "Oriya"
+#~ msgstr "オリヤー"
-#~ msgid "Scientific Workstation"
-#~ msgstr "科学ワークステーション"
+#~ msgid "Polish (qwerty layout)"
+#~ msgstr "ポーランド(qwerty)"
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "gnuplotのような科学用アプリケーション"
+#~ msgid "Polish (qwertz layout)"
+#~ msgstr "ポーランド(qwertz)"
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#~ msgid "Portuguese"
+#~ msgstr "ポルトガル"
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "ドメイン名サーバ(DNS)とネットワーク情報サーバ(NIS)"
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "カナダ(ケベック)"
-#~ msgid ""
-#~ "If you plan to use aboot, be carefull to leave a free space (2048 sectors "
-#~ "is enough)\n"
-#~ "at the beginning of the disk"
-#~ msgstr ""
-#~ "abootを使う場合はディスクの先頭に空き領域(2048セクタほど)\n"
-#~ "を残してください"
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "ルーマニア(qwertz)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "ルーマニア(qwerty)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "ロシア(発音記号)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Saami (norwegian)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "サーミ(swedish/finnish)"
+
+#~ msgid "Slovenian"
+#~ msgstr "スロベニア"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "スロバキア(QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "スロバキア(QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "セルビア(cyrillic)"
+
+#~ msgid "Syriac"
+#~ msgstr "シリア"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "シリア(発音記号)"
+
+#~ msgid "Telugu"
+#~ msgstr "テルグ"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "タミール(ISCII)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "タミール(タイプライタ)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "タイ式キーボード"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "タジク式キーボード"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "トルコ(伝統的Fモデル)"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "トルコ(モダンQモデル)"
+
+#~ msgid "Ukrainian"
+#~ msgstr "ウクライナ"
-#~ msgid "I can't add any more partition"
-#~ msgstr "これ以上パーティションを追加できません"
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "ウズベキスタン(cyrillic)"
-#~ msgid "No wireless network adapter on your system!"
-#~ msgstr "ワイヤレスネットワークアダプタがありません"
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "ベトナム(数字列)"
-#~ msgid "Can't create log file!"
-#~ msgstr "ログファイルを作成できません"
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "ユーゴスラビア(ラテン)"
-#~ msgid "dhcp"
-#~ msgstr "dhcp"
+#~ msgid "No devices found"
+#~ msgstr "デバイスがありません"