Skip to content

Commit ade3943

Browse files
authored
Revise wordings related to SOCKS4 proxy
The affected options are not really incompatible with SOCKS4 but it is due to Qt missing implementation. Therefore 'unavailable' is more suitable. PR #22483.
1 parent 830d2c2 commit ade3943

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/gui/optionsdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ void OptionsDialog::adjustProxyOptions()
16891689

16901690
if (currentProxyType == Net::ProxyType::None)
16911691
{
1692-
m_ui->labelProxyTypeIncompatible->setVisible(false);
1692+
m_ui->labelProxyTypeUnavailable->setVisible(false);
16931693

16941694
m_ui->lblProxyIP->setEnabled(false);
16951695
m_ui->textProxyIP->setEnabled(false);
@@ -1714,7 +1714,7 @@ void OptionsDialog::adjustProxyOptions()
17141714

17151715
if (currentProxyType == Net::ProxyType::SOCKS4)
17161716
{
1717-
m_ui->labelProxyTypeIncompatible->setVisible(true);
1717+
m_ui->labelProxyTypeUnavailable->setVisible(true);
17181718

17191719
m_ui->checkProxyHostnameLookup->setEnabled(false);
17201720
m_ui->checkProxyRSS->setEnabled(false);
@@ -1723,7 +1723,7 @@ void OptionsDialog::adjustProxyOptions()
17231723
else
17241724
{
17251725
// SOCKS5 or HTTP
1726-
m_ui->labelProxyTypeIncompatible->setVisible(false);
1726+
m_ui->labelProxyTypeUnavailable->setVisible(false);
17271727

17281728
m_ui->checkProxyHostnameLookup->setEnabled(true);
17291729
m_ui->checkProxyRSS->setEnabled(true);

src/gui/optionsdialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2077,14 +2077,14 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.</st
20772077
</layout>
20782078
</item>
20792079
<item>
2080-
<widget class="QLabel" name="labelProxyTypeIncompatible">
2080+
<widget class="QLabel" name="labelProxyTypeUnavailable">
20812081
<property name="font">
20822082
<font>
20832083
<italic>true</italic>
20842084
</font>
20852085
</property>
20862086
<property name="text">
2087-
<string>Some options are incompatible with the chosen proxy type!</string>
2087+
<string>Some functions are unavailable with the chosen proxy type!</string>
20882088
</property>
20892089
</widget>
20902090
</item>
@@ -2144,7 +2144,7 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.</st
21442144
<item>
21452145
<widget class="QLabel" name="label_23">
21462146
<property name="text">
2147-
<string>Info: The password is saved unencrypted</string>
2147+
<string>Note: The password is saved unencrypted</string>
21482148
</property>
21492149
</widget>
21502150
</item>

src/webui/www/private/views/preferences.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@
537537
</tbody>
538538
</table>
539539
<div class="formRow">
540-
<span>QBT_TR(Info: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]</span>
540+
<span>QBT_TR(Note: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]</span>
541541
</div>
542542
</fieldset>
543543

0 commit comments

Comments
 (0)