summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig.pm
blob: 72590f2120d765c15dcf1a8229ad962453fe2bc3 (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
package Xconfig; # $Id$

use diagnostics;
use strict;

use common qw(:common :file :system);
use mouse;
use devices;
use Xconfigurator;

# otherwise uses the rule substr($keymap, 0, 2)
my %keymap_translate = (
    cf => "ca_enhanced",
    uk => "gb",
);


1;

sub keymap_translate {
    $keymap_translate{$_[0]} || substr($_[0], 0, 2);
}


sub getinfo {
    my $o = shift || {};
    getinfoFromDDC($o);
    getinfoFromSysconfig($o);

    add2hash($o->{mouse}, mouse::detect()) unless $o->{mouse}{XMOUSETYPE};

    $o->{mouse}{device} ||= "mouse" if -e "/dev/mouse";
    $o;
}

sub getinfoFromXF86Config {
    my $o = shift || {}; #- original $::o->{X} which must be changed only if sure!
    my $prefix = shift || "";
    my (%keyboard, %mouse, %wacom, %card, %monitor);
    my (%c, $depth, $driver);

    local $_;
    local *G; open G, "$prefix/etc/X11/XF86Config-4";
    while (<G>) {
	if (my $i = /^Section "InputDevice"/ .. /^EndSection/) {
	    %c = () if $i == 1;

	    $c{driver} = $1 if /^\s*Driver\s+"(.*?)"/;
	    $c{xkb_keymap} ||= $1 if /^\s*Option\s+"XkbLayout"\s+"(.*?)"/;
	    $c{XMOUSETYPE} ||= $1 if /^\s*Option\s+"Protocol"\s+"(.*?)"/;
	    $c{device} ||= $1 if /^\s*Option\s+"Device"\s+"\/dev\/(.*?)"/;
	    $c{chordmiddle} ||= $1 if /^\s*Option\s+"ChordMiddle"\s+"\/dev\/(.*?)"/;
	    $c{nbuttons}   = 2 if /^\s*Option\s+"Emulate3Buttons"\s+/;
	    $c{nbuttons} ||= 3 if /^\s*#\s*Option\s+"Emulate3Buttons"\s+/;
	    $c{nbuttons} ||= 5 if /^\s*#\s*Option\s+"ZAxisMapping"\s.*5/;
	    $c{nbuttons}   = 7 if /^\s*#\s*Option\s+"ZAxisMapping"\s.*7/;

	    if ($i =~ /E0/) {
		@keyboard{qw(xkb_keymap)} = @c{qw(xkb_keymap)}
		  if $c{driver} =~ /keyboard/i;
		@mouse{qw(XMOUSETYPE device chordmiddle nbuttons)} = @c{qw(XMOUSETYPE device chordmiddle nbuttons)}
		  if $c{driver} =~ /mouse/i;
		@wacom{qw(device)} = @c{qw(device)}
		  if $c{driver} =~ /wacom/i;
	    }
	} elsif (/^Section "Monitor"/ .. /^EndSection/) {
	    $monitor{type} ||= $1 if /^\s*Identifier\s+"(.*?)"/;
	    $monitor{hsyncrange} ||= $1 if /^\s*HorizSync\s+(.*)/;
	    $monitor{vsyncrange} ||= $1 if /^\s*VertRefresh\s+(.*)/;
	    $monitor{vendor} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
	    $monitor{model} ||= $1 if /^\s*ModelName\s+"(.*?)"/;
	    $monitor{modelines}{"$1_$2"} = $_ if /^\s*Mode[lL]ine\s+(\S+)\s+(\S+)\s+/;
	} elsif (my $s = /^Section "Screen"/ .. /^EndSection/) {
	    $card{default_depth} ||= $1 if /^\s*DefaultColorDepth\s+(\d+)/;
	    if (my $i = /^\s*Subsection\s+"Display"/ .. /^\s*EndSubsection/) {
		undef $depth if $i == 1;
		$depth = $1 if /^\s*Depth\s+(\d*)/;
		if (/^\s*Modes\s+(.*)/) {
		    my $a = 0;
		    unshift @{$card{depth}{$depth || 8} ||= []}, #- insert at the beginning for resolution_wanted!
		      grep { $_->[0] >= 640 } map { [ /"(\d+)x(\d+)"/ ] } split ' ', $1;
		}
	    }
	}
    }
    close G;
    local *F; open F, "$prefix/etc/X11/XF86Config";
    while (<F>) {
	if (/^Section "Keyboard"/ .. /^EndSection/) {
	    $keyboard{xkb_keymap} ||= $1 if /^\s*XkbLayout\s+"(.*?)"/;
	} elsif (/^Section "Pointer"/ .. /^EndSection/) {
	    $mouse{XMOUSETYPE} ||= $1 if /^\s*Protocol\s+"(.*?)"/;
	    $mouse{device} ||= $1 if m|^\s*Device\s+"/dev/(.*?)"|;
	    $mouse{cleardtrrts} ||= 1 if m/^\s*ClearDTR\s+/;
	    $mouse{cleardtrrts} ||= 1 if m/^\s*ClearRTS\s+/;
	    $mouse{chordmiddle} ||= 1 if m/^\s*ChordMiddle\s+/;
	    $mouse{nbuttons}   = 2 if m/^\s*Emulate3Buttons\s+/;
	    $mouse{nbuttons} ||= 3 if m/^\s*#\s*Emulate3Buttons\s+/;
	    $mouse{nbuttons} ||= 5 if m/^\s*ZAxisMapping\s.*5/;
	    $mouse{nbuttons}   = 7 if m/^\s*ZAxisMapping\s.*7/;
	} elsif (/^Section "XInput"/ .. /^EndSection/) {
	    if (/^\s*SubSection "Wacom/ .. /^\s*EndSubSection/) {
		$wacom{device} ||= $1 if /^\s*Port\s+"\/dev\/(.*?)"/;
	    }
	} elsif (/^Section "Monitor"/ .. /^EndSection/) {
	    $monitor{type} ||= $1 if /^\s*Identifier\s+"(.*?)"/;
	    $monitor{hsyncrange} ||= $1 if /^\s*HorizSync\s+(.*)/;
	    $monitor{vsyncrange} ||= $1 if /^\s*VertRefresh\s+(.*)/;
	    $monitor{vendor} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
	    $monitor{model} ||= $1 if /^\s*ModelName\s+"(.*?)"/;
	    $monitor{modelines}{"$1_$2"} = $_ if /^\s*Mode[lL]ine\s+(\S+)\s+(\S+)\s+/;
	} elsif (my $i = /^Section "Device"/ .. /^EndSection/) {
	    %c = () if $i == 1;

	    $c{type} ||= $1 if /^\s*Identifier\s+"(.*?)"/;
	    $c{memory} ||= $1 if /VideoRam\s+(\d+)/;
	    $c{flags}{needVideoRam} ||= 1 if /^\s*VideoRam\s+/;
	    $c{vendor} ||= $1 if /^\s*VendorName\s+"(.*?)"/;
	    $c{board} ||= $1 if /^\s*BoardName\s+"(.*?)"/;
	    $c{driver} ||= $1 if /^\s*Driver\s+"(.*?)"/;
	    $c{options_xf3}{$1} ||= 1 if /^\s*Option\s+"(.*?)"/;
	    $c{options_xf3}{$1} ||= 0 if /^\s*#\s*Option\s+"(.*?)"/;

	    add2hash(\%card, \%c) if ($i =~ /E0/ && $c{type} && $c{type} ne "Generic VGA");
	} elsif (my $s = /^Section "Screen"/ .. /^EndSection/) {
	    undef $driver if $s == 1;
	    $driver = $1 if /^\s*Driver\s+"(.*?)"/;
	    if ($driver eq $Xconfigurator::serversdriver{$card{server}}) {
		$card{default_depth} ||= $1 if /^\s*DefaultColorDepth\s+(\d+)/;
		if (my $i = /^\s*Subsection\s+"Display"/ .. /^\s*EndSubsection/) {
		    undef $depth if $i == 1;
		    $depth = $1 if /^\s*Depth\s+(\d*)/;
		    if (/^\s*Modes\s+(.*)/) {
			my $a = 0;
			unshift @{$card{depth}{$depth || 8} ||= []}, #- insert at the beginning for resolution_wanted!
		            grep { $_->[0] >= 640 } map { [ /"(\d+)x(\d+)"/ ] } split ' ', $1;
		    }
		}
	    }
	}
    }
    close F;

    #- clean up modeline by those automatically given by $modelines_text.
    foreach (split /\n/, $Xconfigurator::modelines_text) {
	delete $monitor{modelines_}{"$1_$2"} if /^\s*Mode[lL]ine\s+(\S+)\s+(\S+)\s+(.*)/;
    }
    $monitor{modelines} .= $_ foreach values %{$monitor{modelines_}}; delete $monitor{modelines_};

    #- get the default resolution according the the current file.
    #- suggestion to take into account, but that have to be checked.
    $o->{card}{suggest_depth} = $card{default_depth};
    if (my @depth = keys %{$card{depth}}) {
	$o->{card}{suggest_wres} = ($card{depth}{$o->{card}{suggest_depth} || $depth[0]}[0][0]);
    }

    #- try to merge with $o, the previous has been obtained by ddcxinfos.
    add2hash($o->{keyboard} ||= {}, \%keyboard);
    add2hash($o->{mouse} ||= {}, \%mouse);
    $o->{wacom} ||= $wacom{device};
    add2hash($o->{monitor} ||= {}, \%monitor);

    $o;
}

sub getinfoFromSysconfig {
    my $o = shift || {};
    my $prefix = shift || "";

    add2hash($o->{mouse} ||= {}, { getVarsFromSh("$prefix/etc/sysconfig/mouse") });

    if (my %keyboard = getVarsFromSh "$prefix/etc/sysconfig/keyboard") {
	$o->{keyboard}{xkb_keymap} ||= keymap_translate($keyboard{KEYTABLE}) if $keyboard{KEYTABLE};
    }
    $o;
}

sub getinfoFromDDC {
    my $o = shift || {};
    my $O = $o->{monitor} ||= {};
    #- return $o if $O->{hsyncrange} && $O->{vsyncrange} && $O->{modelines};
    my ($m, @l) = `ddcxinfos`;
    $? == 0 or return $o;

    $o->{card}{memory} ||= to_int($m);
    local $_;
    while (($_ = shift @l) ne "\n") {
	my ($depth, $x, $y) = split;
	$depth = int(log($depth) / log(2));
	if ($depth >= 8 && $x >= 640) {
	    push @{$o->{card}{depth}{$depth}}, [ $x, $y ] unless scalar grep { $_->[0] == $x && $_->[1] == $y } @{$o->{card}{depth}{$depth}};
	    push @{$o->{card}{depth}{32}}, [ $x, $y ] if $depth == 24 && ! scalar grep { $_->[0] == $x && $_->[1] == $y } @{$o->{card}{depth}{32}};
	}
    }
    my ($h, $v, $size, @m) = @l;

    chop $h; chop $v;
    $O->{hsyncrange} ||= $h;
    $O->{vsyncrange} ||= $v;
    $O->{size} ||= to_float($size);
    $O->{modelines} ||= join '', @m;
    $o;
}
iv>
msgstr "ndiswrapperドライバ %s を使用"
-#: network/netconnect.pm:988
+#: network/netconnect.pm:989
#, c-format
msgid "Install a new driver"
msgstr "新しいドライバをインストール"
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1001
#, c-format
msgid "Select a device:"
msgstr "デバイスを選択:"
-#: network/netconnect.pm:1029
+#: network/netconnect.pm:1030
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "このカードのワイヤレスパラメータを入力してください:"
-#: network/netconnect.pm:1032 standalone/drakconnect:404
+#: network/netconnect.pm:1033 standalone/drakconnect:404
+#: standalone/drakroam:52
#, c-format
msgid "Operating Mode"
msgstr "操作モード"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Ad-hoc"
msgstr "Ad-hoc"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Managed"
msgstr "Managed"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Master"
msgstr "マスター"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Repeater"
msgstr "リピータ"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Secondary"
msgstr "2次"
-#: network/netconnect.pm:1033
+#: network/netconnect.pm:1034
#, c-format
msgid "Auto"
msgstr "自動"
-#: network/netconnect.pm:1036 standalone/drakconnect:405
-#: standalone/drakroam:107
+#: network/netconnect.pm:1037 standalone/drakconnect:405
+#: standalone/drakroam:115
#, c-format
msgid "Network name (ESSID)"
msgstr "ネットワーク名(ESSID)"
-#: network/netconnect.pm:1037 standalone/drakroam:108
+#: network/netconnect.pm:1038 standalone/drakroam:116
#, c-format
msgid "Encryption mode"
msgstr "暗号化方式"
-#: network/netconnect.pm:1042
+#: network/netconnect.pm:1043
#, c-format
msgid "Allow access point roaming"
msgstr "アクセスポイントローミングを許可"
-#: network/netconnect.pm:1044 standalone/drakconnect:406
+#: network/netconnect.pm:1045 standalone/drakconnect:406
#, c-format
msgid "Network ID"
msgstr "ネットワークID"
-#: network/netconnect.pm:1045 standalone/drakconnect:407
+#: network/netconnect.pm:1046 standalone/drakconnect:407
#, c-format
msgid "Operating frequency"
msgstr "動作周波数"
-#: network/netconnect.pm:1046 standalone/drakconnect:408
+#: network/netconnect.pm:1047 standalone/drakconnect:408
#, c-format
msgid "Sensitivity threshold"
msgstr "感度のしきい値"
-#: network/netconnect.pm:1047 standalone/drakconnect:409
+#: network/netconnect.pm:1048 standalone/drakconnect:409
#, c-format
msgid "Bitrate (in b/s)"
msgstr "ビットレート(b/s)"
-#: network/netconnect.pm:1048 standalone/drakconnect:420
+#: network/netconnect.pm:1049 standalone/drakconnect:420
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1050
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10916,17 +10917,17 @@ msgstr ""
"メカニズムを無効にする最大パケットサイズと同じです。\n"
"このパラメータをauto/fixed/offに設定することもできます。"
-#: network/netconnect.pm:1056 standalone/drakconnect:421
+#: network/netconnect.pm:1057 standalone/drakconnect:421
#, c-format
msgid "Fragmentation"
msgstr "フラグメンテーション"
-#: network/netconnect.pm:1057 standalone/drakconnect:422
+#: network/netconnect.pm:1058 standalone/drakconnect:422
#, c-format
msgid "iwconfig command extra arguments"
msgstr "iwconfigコマンドの補助引数"
-#: network/netconnect.pm:1058
+#: network/netconnect.pm:1059
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -10942,12 +10943,12 @@ msgstr ""
"詳しくは'man iwconfig(8)'を参照してください。"
#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1065 standalone/drakconnect:423
+#: network/netconnect.pm:1066 standalone/drakconnect:423
#, c-format
msgid "iwspy command extra arguments"
msgstr "iwspyコマンドの補助引数"
-#: network/netconnect.pm:1066
+#: network/netconnect.pm:1067
#, c-format
msgid ""
"iwspy is used to set a list of addresses in a wireless network\n"
@@ -10966,12 +10967,12 @@ msgstr ""
"\n"
"詳しくは'man iwspy(8)'を参照してください。"
-#: network/netconnect.pm:1075 standalone/drakconnect:424
+#: network/netconnect.pm:1076 standalone/drakconnect:424
#, c-format
msgid "iwpriv command extra arguments"
msgstr "iwprivコマンドの補助引数"
-#: network/netconnect.pm:1076
+#: network/netconnect.pm:1077
#, c-format
msgid ""
"iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10995,7 +10996,7 @@ msgstr ""
"明されています。\n"
"詳しくは'man iwpriv(8)'を参照してください。"
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1092
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -11004,7 +11005,7 @@ msgstr ""
"単位は k, M, G で入力してください(2.46 GHzの場合は 2.46G)。\n"
"もしくは0(ゼロ)で桁を増やしてください。"
-#: network/netconnect.pm:1095
+#: network/netconnect.pm:1096
#, c-format
msgid ""
"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -11013,37 +11014,37 @@ msgstr ""
"単位は k, M, G で入力してください(例: 11M)。\n"
"もしくは0(ゼロ)で桁を増やしてください。"
-#: network/netconnect.pm:1138
+#: network/netconnect.pm:1139
#, c-format
msgid "DVB configuration"
msgstr "DVBの設定"
-#: network/netconnect.pm:1139
+#: network/netconnect.pm:1140
#, c-format
msgid "DVB Adapter"
msgstr "DVBアダプタ"
-#: network/netconnect.pm:1156
+#: network/netconnect.pm:1157
#, c-format
msgid "DVB adapter settings"
msgstr "DVBアダプタの設定"
-#: network/netconnect.pm:1159
+#: network/netconnect.pm:1160
#, c-format
msgid "Adapter card"
msgstr "アダプタカード"
-#: network/netconnect.pm:1160
+#: network/netconnect.pm:1161
#, c-format
msgid "Net demux"
msgstr "Net demux"
-#: network/netconnect.pm:1161
+#: network/netconnect.pm:1162
#, c-format
msgid "PID"
msgstr "PID"
-#: network/netconnect.pm:1189
+#: network/netconnect.pm:1190
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -11055,67 +11056,67 @@ msgstr ""
"'mybox.mylab.myco.com'のように完全修飾ホスト名を\n"
"入れてください。ゲートウェイのIPアドレスも入力できます。"
-#: network/netconnect.pm:1194
+#: network/netconnect.pm:1195
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
msgstr "DNSサーバのIPアドレスも入力できます。"
-#: network/netconnect.pm:1196 standalone/drakconnect:991
+#: network/netconnect.pm:1197 standalone/drakconnect:991
#, c-format
msgid "Host name (optional)"
msgstr "ホスト名(オプション)"
-#: network/netconnect.pm:1196 standalone/drakhosts:197
+#: network/netconnect.pm:1197 standalone/drakhosts:197
#, c-format
msgid "Host name"
msgstr "ホスト名:"
-#: network/netconnect.pm:1198
+#: network/netconnect.pm:1199
#, c-format
msgid "DNS server 1"
msgstr "DNSサーバ 1"
-#: network/netconnect.pm:1199
+#: network/netconnect.pm:1200
#, c-format
msgid "DNS server 2"
msgstr "DNSサーバ 2"
-#: network/netconnect.pm:1200
+#: network/netconnect.pm:1201
#, c-format
msgid "DNS server 3"
msgstr "DNSサーバ 3"
-#: network/netconnect.pm:1201
+#: network/netconnect.pm:1202
#, c-format
msgid "Search domain"
msgstr "検索ドメイン"
-#: network/netconnect.pm:1202
+#: network/netconnect.pm:1203
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1204
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "ゲートウェイ(例 %s)"
-#: network/netconnect.pm:1205
+#: network/netconnect.pm:1206
#, c-format
msgid "Gateway device"
msgstr "ゲートウェイデバイス"
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1215
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNSサーバのアドレスは 1.2.3.4 のように入力してください"
-#: network/netconnect.pm:1219 standalone/drakconnect:685
+#: network/netconnect.pm:1220 standalone/drakconnect:685
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1233
#, c-format
msgid ""
"If desired, enter a Zeroconf hostname.\n"
@@ -11128,67 +11129,67 @@ msgstr ""
"共有リソースを提示する時に使用する名前です。\n"
"たいていのネットワークでは必要ありません。"
-#: network/netconnect.pm:1236
+#: network/netconnect.pm:1237
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconfホスト名"
-#: network/netconnect.pm:1239
+#: network/netconnect.pm:1240
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconfホスト名は以下を含んではいけません:"
-#: network/netconnect.pm:1249
+#: network/netconnect.pm:1250
#, c-format
msgid "Do you want to allow users to start the connection?"
msgstr "ユーザに接続の開始を許可しますか?"
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1263
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr "起動時に接続を開始しますか?"
-#: network/netconnect.pm:1278
+#: network/netconnect.pm:1279
#, c-format
msgid "Automatically at boot"
msgstr "起動時に自動的に開始"
-#: network/netconnect.pm:1280
+#: network/netconnect.pm:1281
#, c-format
msgid "By using Net Applet in the system tray"
msgstr "システムトレイのNetアプレットを使う"
-#: network/netconnect.pm:1282
+#: network/netconnect.pm:1283
#, c-format
msgid "Manually (the interface would still be activated at boot)"
msgstr "手動(インターフェースは起動時に自動的に始動します)"
-#: network/netconnect.pm:1291
+#: network/netconnect.pm:1292
#, c-format
msgid "How do you want to dial this connection?"
msgstr "この接続にどのようにダイアルしますか?"
-#: network/netconnect.pm:1304
+#: network/netconnect.pm:1305
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "すぐにインターネットに接続しますか?"
-#: network/netconnect.pm:1312 standalone/drakconnect:1023
+#: network/netconnect.pm:1313 standalone/drakconnect:1023
#, c-format
msgid "Testing your connection..."
msgstr "接続をテストしています.."
-#: network/netconnect.pm:1332
+#: network/netconnect.pm:1333
#, c-format
msgid "The system is now connected to the Internet."
msgstr "インターネットに接続しました。"
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1334
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "セキュリティ上の理由で、接続を切ります。"
-#: network/netconnect.pm:1334
+#: network/netconnect.pm:1335
#, c-format
msgid ""
"The system does not seem to be connected to the Internet.\n"
@@ -11197,7 +11198,7 @@ msgstr ""
"このシステムはインターネットにつながっていないようです。\n"
"接続を再設定してください。"
-#: network/netconnect.pm:1349
+#: network/netconnect.pm:1350
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
@@ -11207,7 +11208,7 @@ msgstr ""
"インターネットの設定が完了しました。\n"
"\n"
-#: network/netconnect.pm:1352
+#: network/netconnect.pm:1353
#, c-format
msgid ""
"After this is done, we recommend that you restart your X environment to "
@@ -11216,7 +11217,7 @@ msgstr ""
"設定が完了したら、ホスト名に関連した問題を避けるために、Xを再起動することをお"
"勧めします。"
-#: network/netconnect.pm:1353
+#: network/netconnect.pm:1354
#, c-format
msgid ""
"Problems occurred during configuration.\n"
@@ -11227,28 +11228,28 @@ msgstr ""
"net_monitorかMCCで接続をテストしてください。接続できない場合は\n"
"再設定してください。"
-#: network/netconnect.pm:1364
+#: network/netconnect.pm:1365
#, c-format
msgid "(detected on port %s)"
msgstr "(ポート %s で検出)"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:1366
+#: network/netconnect.pm:1367
#, c-format
msgid "(detected %s)"
msgstr "(%s を検出)"
-#: network/netconnect.pm:1366
+#: network/netconnect.pm:1367
#, c-format
msgid "(detected)"
msgstr "(検出)"
-#: network/netconnect.pm:1367
+#: network/netconnect.pm:1368
#, c-format
msgid "Network Configuration"
msgstr "ネットワークを設定"
-#: network/netconnect.pm:1368
+#: network/netconnect.pm:1369
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -11260,12 +11261,12 @@ msgstr ""
"現在の設定をそのまま使うには OK をクリックしてください。ネットワーク/\n"
"インターネットを再設定する場合はキャンセルを押します。\n"
-#: network/netconnect.pm:1371
+#: network/netconnect.pm:1372
#, c-format
msgid "The network needs to be restarted. Do you want to restart it?"
msgstr "ネットワークの再起動が必要です。再起動しますか?"
-#: network/netconnect.pm:1372
+#: network/netconnect.pm:1373
#, c-format
msgid ""
"A problem occurred while restarting the network: \n"
@@ -11276,7 +11277,7 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1373
+#: network/netconnect.pm:1374
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -11289,12 +11290,12 @@ msgstr ""
"\n"
"続けるには %s を押してください。"
-#: network/netconnect.pm:1374
+#: network/netconnect.pm:1375
#, c-format
msgid "Configuration is complete, do you want to apply settings?"
msgstr "設定が完了しました。適用しますか?"
-#: network/netconnect.pm:1375
+#: network/netconnect.pm:1376
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -11305,12 +11306,12 @@ msgstr ""
"お使いになるものを選んでください。\n"
"\n"
-#: network/netconnect.pm:1376
+#: network/netconnect.pm:1377
#, c-format
msgid "Internet connection"
msgstr "インターネット接続"
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1394
#, c-format
msgid ""
"An unexpected error has happened:\n"
@@ -11319,32 +11320,32 @@ msgstr ""
"予期せぬエラーが発生しました:\n"
"%s"
-#: network/network.pm:403 network/network.pm:404
+#: network/network.pm:409 network/network.pm:410
#, c-format
msgid "Proxies configuration"
msgstr "プロクシの設定"
-#: network/network.pm:405
+#: network/network.pm:411
#, c-format
msgid "HTTP proxy"
msgstr "HTTPプロクシ"
-#: network/network.pm:406
+#: network/network.pm:412
#, c-format
msgid "FTP proxy"
msgstr "FTPプロクシ"
-#: network/network.pm:409
+#: network/network.pm:415
#, c-format
msgid "Proxy should be http://..."
msgstr "プロクシは http://.. で始まります"
-#: network/network.pm:410
+#: network/network.pm:416
#, c-format
msgid "URL should begin with 'ftp:' or 'http:'"
msgstr "URLは ftp: か http: で始まります"
-#: network/shorewall.pm:50
+#: network/shorewall.pm:55
#, c-format
msgid ""
"Please enter the name of the interface connected to the internet.\n"
@@ -11361,14 +11362,14 @@ msgstr ""
"\t\teth0, eth1(ケーブル接続の場合)\n"
"\t\tippp+(ISDN接続の場合)\n"
-#: network/thirdparty.pm:218
+#: network/thirdparty.pm:231
#, c-format
msgid "Copy the Alcatel microcode as mgmt.o in /usr/share/speedtouch/"
msgstr ""
"Alcatel microcode を/usr/share/speedtouch に mgmt.o という名前でコピーしてく"
"ださい。"
-#: network/thirdparty.pm:227
+#: network/thirdparty.pm:240
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -11380,24 +11381,24 @@ msgstr ""
"\n"
"http://eciadsl.flashtux.org/ からダウンロードできます。"
-#: network/thirdparty.pm:306
+#: network/thirdparty.pm:319
#, c-format
msgid "Could not install the packages (%s)!"
msgstr "パッケージ(%s)をインストールできませんでした"
-#: network/thirdparty.pm:314
+#: network/thirdparty.pm:327
#, c-format
msgid "Some packages (%s) are required but aren't available."
msgstr "パッケージ(%s)が必要ですが入手できません"
-#: network/thirdparty.pm:315
+#: network/thirdparty.pm:328
#, c-format
msgid ""
"These packages can be found in Mandriva Club or in Mandriva commercial "
"releases."
msgstr "これらのパッケージはMandrivaクラブまたはMandrivaの有償版にあります"
-#: network/thirdparty.pm:317
+#: network/thirdparty.pm:330
#, c-format
msgid ""
"The required files can also be installed from this URL:\n"
@@ -11406,22 +11407,22 @@ msgstr ""
"必要なファイルは次のURLからもインストールできます:\n"
"%s"
-#: network/thirdparty.pm:357
+#: network/thirdparty.pm:370
#, c-format
msgid "Unable to find \"%s\" on your Windows system!"
msgstr "Windowsシステムに %s がみつかりません"
-#: network/thirdparty.pm:359
+#: network/thirdparty.pm:372
#, c-format
msgid "No Windows system has been detected!"
msgstr "Windowsシステムを検出できませんでした"
-#: network/thirdparty.pm:369
+#: network/thirdparty.pm:382
#, c-format
msgid "Insert floppy"
msgstr "フロッピーを挿入"
-#: network/thirdparty.pm:370
+#: network/thirdparty.pm:383
#, c-format
msgid ""
"Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -11430,12 +11431,12 @@ msgstr ""
"%2$s をルートディレクトリに置いて、FAT形式のフロッピーをドライブ %1$s に\n"
"挿入し、%3$s を押してください。"
-#: network/thirdparty.pm:380
+#: network/thirdparty.pm:393
#, c-format
msgid "Floppy access error, unable to mount device %s"
msgstr "フロッピーアクセスエラー: デバイス %s をマウントできません"
-#: network/thirdparty.pm:390
+#: network/thirdparty.pm:403
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -11446,38 +11447,38 @@ msgstr ""
"フロッピー/Windowsパーティションから今供給するか、スキップして\n"
"後で行うことができます。"
-#: network/thirdparty.pm:394 network/thirdparty.pm:396
+#: network/thirdparty.pm:407 network/thirdparty.pm:409
#, c-format
msgid "Use a floppy"
msgstr "フロッピーを使う"
-#: network/thirdparty.pm:394
+#: network/thirdparty.pm:407
#, c-format
msgid "Use my Windows partition"
msgstr "Windowsのパーティションを使う"
-#: network/thirdparty.pm:404
+#: network/thirdparty.pm:417
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr "ファームウェアのコピーに失敗。ファイル %s が見つかりません。"
-#: network/thirdparty.pm:409 standalone/drakautoinst:250
+#: network/thirdparty.pm:422 standalone/drakautoinst:250
#: standalone/drakvpn:888 standalone/scannerdrake:405
#, c-format
msgid "Congratulations!"
msgstr "おめでとうございます"
-#: network/thirdparty.pm:409
+#: network/thirdparty.pm:422
#, c-format
msgid "Firmware copy succeeded"
msgstr "ファームウェアをコピーしました"
-#: network/thirdparty.pm:477
+#: network/thirdparty.pm:490
#, c-format
msgid "Looking for required software and drivers..."
msgstr "必要なソフトウェアとドライバーを探しています.."
-#: network/thirdparty.pm:482
+#: network/thirdparty.pm:495
#, c-format
msgid "Please wait, running device configuration commands..."
msgstr "デバイス設定コマンドを実行しています。お待ちください.."
@@ -13173,7 +13174,7 @@ msgstr "リモートプリンタ名がありません"
#: standalone/drakbackup:605 standalone/drakbackup:640
#: standalone/drakbackup:741 standalone/draknfs:203
#: standalone/draksambashare:623 standalone/draksambashare:790
-#: standalone/harddrake2:259
+#: standalone/harddrake2:256
#, c-format
msgid "Information"
msgstr "情報"
@@ -16291,6 +16292,11 @@ msgstr ""
msgid "How to maintain your system up-to-date?"
msgstr ""
+#: share/advertising/skype.pl:3
+#, c-format
+msgid "Skype lets you make calls through the Internet for free."
+msgstr ""
+
#: share/compssUsers.pl:26
#, c-format
msgid "Office Workstation"
@@ -20128,7 +20134,7 @@ msgstr ""
"Mandriva Linuxコントロールセンタの \"%s\" を実行してください。"
#. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:976 standalone/drakroam:30 standalone/net_applet:52
+#: standalone/drakconnect:976 standalone/drakroam:34 standalone/net_applet:52
#, c-format
msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
msgstr "新しいネットワーク・インターフェースを設定 (LAN/ISDN/ADSL等)"
@@ -20946,12 +20952,12 @@ msgstr "ログ"
msgid "Clear logs"
msgstr "ログを消去"
-#: standalone/drakids:62 standalone/drakids:67 standalone/net_applet:439
+#: standalone/drakids:62 standalone/drakids:67 standalone/net_applet:464
#, c-format
msgid "Blacklist"
msgstr "ブラックリスト"
-#: standalone/drakids:63 standalone/drakids:80 standalone/net_applet:444
+#: standalone/drakids:63 standalone/drakids:80 standalone/net_applet:469
#, c-format
msgid "Whitelist"
msgstr "ホワイトリスト"
@@ -20973,7 +20979,7 @@ msgstr "ホワイトリストから削除"
#: standalone/drakids:136 standalone/drakids:145 standalone/drakids:170
#: standalone/drakids:179 standalone/drakids:189 standalone/drakids:265
-#: standalone/drakroam:140 standalone/net_applet:180 standalone/net_applet:354
+#: standalone/drakroam:182 standalone/net_applet:201 standalone/net_applet:379
#, c-format
msgid "Unable to contact daemon"
msgstr "デーモンに接続できません"
@@ -20998,7 +21004,7 @@ msgstr "攻撃のタイプ"
msgid "Service"
msgstr "サービス"
-#: standalone/drakids:206
+#: standalone/drakids:206 standalone/net_applet:72
#, c-format
msgid "Network interface"
msgstr "ネットワークインターフェース"
@@ -21573,7 +21579,7 @@ msgstr "ユーザ: %s"
msgid "Group: %s"
msgstr "グループ: %s"
-#: standalone/drakroam:29
+#: standalone/drakroam:33
#, c-format
msgid ""
"You do not have any wireless interface.\n"
@@ -21582,38 +21588,38 @@ msgstr ""
"ワイヤレスインターフェースがありません。\n"
"Mandriva Linux コントロールセンタで %s を実行してください。"
-#: standalone/drakroam:44
+#: standalone/drakroam:48
#, c-format
msgid "SSID"
msgstr "SSID"
-#: standalone/drakroam:46
-#, c-format
-msgid "Encryption"
-msgstr "暗号化"
-
-#: standalone/drakroam:47
+#: standalone/drakroam:49
#, c-format
msgid "Signal strength"
msgstr "シグナルの強さ"
-#: standalone/drakroam:104
+#: standalone/drakroam:51
+#, c-format
+msgid "Encryption"
+msgstr "暗号化"
+
+#: standalone/drakroam:112
#, c-format
msgid "Please enter settings for wireless network \"%s\""
msgstr "ワイヤレスネットワーク %s の設定を入力してください"
-#: standalone/drakroam:115
+#: standalone/drakroam:123
#, c-format
msgid "DNS server"
msgstr "DNSサーバ"
-#: standalone/drakroam:166
+#: standalone/drakroam:228
#, c-format
msgid "Connect"
msgstr "接続"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakroam:167 standalone/printerdrake:251
+#: standalone/drakroam:229 standalone/printerdrake:251
#, c-format
msgid "Refresh"
msgstr "更新"
@@ -22023,7 +22029,7 @@ msgstr "ユーザ情報"
msgid "User name:"
msgstr "ユーザ名:"
-#: standalone/draksambashare:929 standalone/harddrake2:551
+#: standalone/draksambashare:929 standalone/harddrake2:563
#, c-format
msgid "Password:"
msgstr "パスワード:"
@@ -22118,7 +22124,7 @@ msgstr "全て"
msgid "LOCAL"
msgstr "ローカル"
-#: standalone/draksec:53 standalone/net_applet:449
+#: standalone/draksec:53 standalone/net_applet:474
#, c-format
msgid "Ignore"
msgstr "無視"
@@ -22519,7 +22525,7 @@ msgstr ""
msgid "Autodetection"
msgstr "自動検出"
-#: standalone/drakups:101 standalone/harddrake2:246
+#: standalone/drakups:101 standalone/harddrake2:356
#, c-format
msgid "Detection in progress"
msgstr "検出中です"
@@ -24935,7 +24941,7 @@ msgstr "グラフィカルデスクトップが使用するマウスプロトコ
#: standalone/harddrake2:128 standalone/harddrake2:137
#: standalone/harddrake2:144 standalone/harddrake2:152
-#: standalone/harddrake2:319
+#: standalone/harddrake2:322
#, c-format
msgid "Identification"
msgstr "識別"
@@ -25073,69 +25079,69 @@ msgstr ""
msgid "Harddrake2"
msgstr "Harddrake2"
-#: standalone/harddrake2:256
+#: standalone/harddrake2:253
#, c-format
msgid "Detected hardware"
msgstr "検出したハードウェア"
-#: standalone/harddrake2:261
+#: standalone/harddrake2:258
#, c-format
msgid "Configure module"
msgstr "モジュールを設定"
-#: standalone/harddrake2:268
+#: standalone/harddrake2:265
#, c-format
msgid "Run config tool"
msgstr "設定ツールを実行"
-#: standalone/harddrake2:307 standalone/printerdrake:306
+#: standalone/harddrake2:289
+#, c-format
+msgid ""
+"Click on a device in the left tree in order to display its information here."
+msgstr "情報を表示するには左のデバイスをクリックしてください。"
+
+#: standalone/harddrake2:310 standalone/printerdrake:306
#: standalone/printerdrake:320
#, c-format
msgid "Unknown"
msgstr "不明"
-#: standalone/harddrake2:327
+#: standalone/harddrake2:330
#, c-format
msgid "Misc"
msgstr "その他"
-#: standalone/harddrake2:342
-#, c-format
-msgid ""
-"Click on a device in the left tree in order to display its information here."
-msgstr "情報を表示するには左のデバイスをクリックしてください。"
-
-#: standalone/harddrake2:394
+#: standalone/harddrake2:406
#, c-format
msgid "secondary"
msgstr "2次"
-#: standalone/harddrake2:394
+#: standalone/harddrake2:406
#, c-format
msgid "primary"
msgstr "1次"
-#: standalone/harddrake2:398
+#: standalone/harddrake2:410
#, c-format
msgid "burner"
msgstr "ライタ"
-#: standalone/harddrake2:398
+#: standalone/harddrake2:410
#, c-format
msgid "DVD"
msgstr "DVD"
-#: standalone/harddrake2:545 standalone/harddrake2:548
+#: standalone/harddrake2:557 standalone/harddrake2:560
#, c-format
msgid "Upload the hardware list"
msgstr "ハードウェアのリストを送信"
-#: standalone/harddrake2:550
+#: standalone/harddrake2:562
#, c-format
msgid "Account:"
msgstr "アカウント:"
-#: standalone/harddrake2:552
+#: standalone/harddrake2:564
#, c-format
msgid "Hostname:"
msgstr "ホスト名:"
@@ -25274,7 +25280,7 @@ msgstr "検索"
msgid "A tool to monitor your logs"
msgstr "ログを監視するツール"
-#: standalone/logdrake:128 standalone/net_applet:316 standalone/net_monitor:93
+#: standalone/logdrake:128 standalone/net_applet:341 standalone/net_monitor:93
#, c-format
msgid "Settings"
msgstr "設定"
@@ -25477,12 +25483,14 @@ msgstr ""
"インターフェース %s のネットワークが落ちています。'ネットワークを設定'をク"
"リックしてください"
-#: standalone/net_applet:56 standalone/net_monitor:468
+#: standalone/net_applet:56 standalone/net_applet:76
+#: standalone/net_monitor:468
#, c-format
msgid "Connect %s"
msgstr "%s に接続"
-#: standalone/net_applet:57 standalone/net_monitor:468
+#: standalone/net_applet:57 standalone/net_applet:76
+#: standalone/net_monitor:468
#, c-format
msgid "Disconnect %s"
msgstr "%s を切断"
@@ -25507,92 +25515,92 @@ msgstr "ネットワークを設定"
msgid "Watched interface"
msgstr "監視中のインターフェース"
-#: standalone/net_applet:72
+#: standalone/net_applet:92
#, c-format
msgid "Profiles"
msgstr "プロファイル"
-#: standalone/net_applet:81
+#: standalone/net_applet:101
#, c-format
msgid "Get Online Help"
msgstr "オンラインヘルプを見る"
-#: standalone/net_applet:305
+#: standalone/net_applet:329
#, c-format
msgid "Interactive Firewall automatic mode"
msgstr "対話式ファイアウォールの自動モード"
-#: standalone/net_applet:310
+#: standalone/net_applet:334
#, c-format
msgid "Always launch on startup"
msgstr "起動時に開始"
-#: standalone/net_applet:314
+#: standalone/net_applet:338
#, c-format
msgid "Wireless networks"
msgstr "ワイヤレスネットワーク"
-#: standalone/net_applet:398
+#: standalone/net_applet:423
#, c-format
msgid "Interactive Firewall: intrusion detected"
msgstr "対話型ファイアウォール: 侵入を検知しました "
-#: standalone/net_applet:411
+#: standalone/net_applet:436
#, c-format
msgid "What do you want to do with this attacker?"
msgstr "この攻撃者をどうしますか?"
-#: standalone/net_applet:414
+#: standalone/net_applet:439
#, c-format
msgid "Attack details"
msgstr "攻撃の詳細"
-#: standalone/net_applet:418
+#: standalone/net_applet:443
#, c-format
msgid "Attack time: %s"
msgstr "攻撃の時間: %s"
-#: standalone/net_applet:419
+#: standalone/net_applet:444
#, c-format
msgid "Network interface: %s"
msgstr "ネットワークインターフェース: %s"
-#: standalone/net_applet:420
+#: standalone/net_applet:445
#, c-format
msgid "Attack type: %s"
msgstr "攻撃のタイプ: %s"
-#: standalone/net_applet:421
+#: standalone/net_applet:446
#, c-format
msgid "Protocol: %s"
msgstr "プロトコル: %s"
-#: standalone/net_applet:422
+#: standalone/net_applet:447
#, c-format
msgid "Attacker IP address: %s"
msgstr "攻撃者のIPアドレス: %s"
-#: standalone/net_applet:423
+#: standalone/net_applet:448
#, c-format
msgid "Attacker hostname: %s"
msgstr "攻撃者のhostname: %s"
-#: standalone/net_applet:426
+#: standalone/net_applet:451
#, c-format
msgid "Service attacked: %s"
msgstr "攻撃されたサービス: %s"
-#: standalone/net_applet:427
+#: standalone/net_applet:452
#, c-format
msgid "Port attacked: %s"
msgstr "攻撃されたポート: %s"
-#: standalone/net_applet:429
+#: standalone/net_applet:454
#, c-format
msgid "Type of ICMP attack: %s"
msgstr "ICMP攻撃のタイプ: %s"
-#: standalone/net_applet:434
+#: standalone/net_applet:459
#, c-format
msgid "Always blacklist (do not ask again)"
msgstr "常にブラックリストに載せる(今後は確認しない)"
@@ -26384,7 +26392,7 @@ msgstr "いくつかのデバイスを追加しました: %s\n"
msgid "- %s was added\n"
msgstr "- %s を追加しました\n"
-#: standalone/service_harddrake:207
+#: standalone/service_harddrake:206
#, c-format
msgid "Hardware probing in progress"
msgstr "ハードウェアを検出中"