mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-12-24 11:40:31 -05:00
Merge branch 'release-2.3.0' into develop
This commit is contained in:
Bill Somerville
commit
db53fcafe3
@ -103,18 +103,18 @@ namespace
|
||||
// 7050 - 7060 DM WB(<2700Hz) with 7050 - 7053 ACDS
|
||||
//
|
||||
// 7040 PSK31
|
||||
// 7043.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 7043.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
// 7070 PSK31
|
||||
// 7073.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 7073.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
// 7090 LSB QRP CoA
|
||||
//
|
||||
// R2: 7040 - 7050 DM NB(<500Hz) with 7047 - 7050 ACDS
|
||||
// 7050 - 7053 DM WB(<2700Hz) ACDS shared with all modes
|
||||
//
|
||||
// 7040 RTTY DX
|
||||
// 7043.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 7043.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
// 7070 PSK31 (also LSB EMCOMM)
|
||||
// 7073.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 7073.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
// 7080 - 7125 RTTY/Data
|
||||
// 7090 LSB QRP CoA
|
||||
//
|
||||
@ -122,7 +122,7 @@ namespace
|
||||
//
|
||||
// 7030 - 7100 DM WB(<3000Hz) JA 7045 - 7100 shared with all modes
|
||||
//
|
||||
// 7026.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 7026.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
// 7035 PSK31
|
||||
// 7050 JA LSB EMCOMM
|
||||
// 7090 LSB QRP CoA
|
||||
@ -143,7 +143,7 @@ namespace
|
||||
// 10139.25 OLIVIA, Contestia, etc.
|
||||
// 10142 PSK31
|
||||
// 10142.25 OLIVIA, Contestia, etc.
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
//
|
||||
// R2: 10130 - 10140 DM NB(<500Hz) shared with ACDS
|
||||
// 10140 - 10150 DM WB(<2700Hz)
|
||||
@ -153,14 +153,14 @@ namespace
|
||||
// 10140 - 10150 Packet
|
||||
// 10142 PSK31
|
||||
// 10142.25 OLIVIA, Contestia, etc.
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
//
|
||||
// R3: 10130 - 10150 DM NB(<2000Hz)
|
||||
//
|
||||
// 10139.25 OLIVIA, Contestia, etc.
|
||||
// 10142 PSK31
|
||||
// 10142.25 OLIVIA, Contestia, etc.
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRQ)
|
||||
// 10143.25 OLIVIA, Contestia, etc. (main QRG)
|
||||
//
|
||||
{10136000, Modes::FT8, IARURegions::ALL},
|
||||
{10138000, Modes::JT65, IARURegions::ALL},
|
||||
|
||||
@ -510,7 +510,7 @@ Format:
|
||||
<message>
|
||||
<location filename="../Configuration.cpp" line="1880"/>
|
||||
<source>Pending DNS lookup, please try again later</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>DNS参照できず、後で再度行ってください</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.cpp" line="2223"/>
|
||||
@ -530,12 +530,12 @@ Format:
|
||||
<message>
|
||||
<location filename="../Configuration.cpp" line="2435"/>
|
||||
<source>UDP server DNS lookup failed</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>UDPサーバーのDNS参照失敗</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.cpp" line="2459"/>
|
||||
<source>MAC-ambiguous multicast groups addresses not supported</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>曖昧なMACアドレスを使ったマルチキャストはサポートしていません</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.cpp" line="2477"/>
|
||||
@ -2253,12 +2253,12 @@ Error(%2): %3</source>
|
||||
<message>
|
||||
<location filename="../widgets/mainwindow.ui" line="1143"/>
|
||||
<source>Decode other Hounds calling above 1000 Hz audio offset</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>1000Hzより上で呼んでいるHoundsをデコード</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/mainwindow.ui" line="1192"/>
|
||||
<source>Enable auto response to the first decode from a new DXCC or new call on the current band.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>バンドの未交信DXCCまたは未交信局を自動的に応答</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/mainwindow.ui" line="2615"/>
|
||||
@ -5281,7 +5281,7 @@ Error(%2): %3</source>
|
||||
<message>
|
||||
<location filename="../widgets/widegraph.cpp" line="24"/>
|
||||
<source>User Defined</source>
|
||||
<translation type="unfinished">ユーサー定義</translation>
|
||||
<translation>ユーサー定義</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../widgets/widegraph.cpp" line="28"/>
|
||||
@ -6058,27 +6058,28 @@ transmitting periods.</source>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="1888"/>
|
||||
<source><html><head/><body><p>Enter the service port number of the UDP server that WSJT-X should send updates to. If this is zero no updates will be sent.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head/><body><p>WSJT-Xがデータを送るUDPサーバーのポート番号を入力. もし0のときはデータを送らない.</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="1898"/>
|
||||
<source>Outgoing interfaces:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>データ送出インターフェイス:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="1908"/>
|
||||
<source><html><head/><body><p>When sending updates to a multicast group address it is necessary to specify which network interface(s) to send them to. If the loop-back interface is multicast capable then at least that one will be selected.</p><p>For most users the loop-back interface is all that is needed, that will allow multiple other applications on the same machine to interoperate with WSJT-X. If applications running on other hosts are to receive status updates then a suitable network interface should be used.</p><p>On some Linux systems it may be necessary to enable multicast on the loop-back network interface.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head/><body><p>マルチキャストグループアドレスにデータを送る場合はどのネットワークインターフェイスを使うかを指定する必要があります.</p><p>ほとんどのユーザーにはループバックインターフェイスだけ指定すれば問題ありません.そうすれば、同一PC上で走る他のアプリはWSJT-Xとデータをやり取りできます.もしほかのPCで走るアプリがデータを受信しなければならない場合は正しいネットワークインターフェイスを指定しなければなりません.</p><p>
|
||||
いくつかのLinuxシステムではループバックネットワークインターフェイスでマルチキャスト機能をオンにしなければならないかもしれません.</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="1915"/>
|
||||
<source><html><head/><body><p>Sets the number or router hops that multicast datagrams are allowed to make. Almost everyone should set this to 1 to keep outgoing multicast traffic withn the local subnet.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation><html><head/><body><p>マルチキャストパケットを配信するホップ数を設定.、マルチキャストパケットがローカルサブネット内だけに配信されるように、ほとんどのケースでここは1を設定すればよいでしょう.</p></body></html></translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="1928"/>
|
||||
<source>Multicast TTL:</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>マルチキャストTTL:</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../Configuration.ui" line="2434"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user