Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/minor UI fixes 4 version #375

Merged
merged 4 commits into from
Oct 16, 2023
Merged

Bugfix/minor UI fixes 4 version #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
221d45f
fixed pageSettingsDns width
Nethius Oct 16, 2023
8e0eef3
fixed selection of default container after installing a new container
Nethius Oct 16, 2023
cdb18de
brought back the ability to share wireguard native format configs
Nethius Oct 16, 2023
e01b1db
text corrections
Nethius Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions client/translations/amneziavpn_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,13 @@ Already installed containers were found on the server. All installed containers
<translation>Авто-запуск</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time %1 starts</source>
<translation>Запускать приложение при каждом включении %1</translation>
<translation type="vanished">Запускать приложение при каждом включении %1</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time the device is starts</source>
<translation>Запускать приложение при каждом включении устройства</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
Expand Down Expand Up @@ -1184,52 +1188,52 @@ Already installed containers were found on the server. All installed containers
<translation>DNS сервер</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="50"/>
<source>If AmneziaDNS is not used or installed</source>
<translation>Эти адреса будут использоваться, если не включен или не установлен AmneziaDNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="57"/>
<source>Primary DNS</source>
<translation>Первичный DNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="69"/>
<source>Secondary DNS</source>
<translation>Вторичный DNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="87"/>
<source>Restore default</source>
<translation>Восстановить по умолчанию</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
<source>Restore default DNS settings?</source>
<translation>Восстановить настройки DNS по умолчанию?</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
<source>Continue</source>
<translation>Продолжить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="92"/>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="100"/>
<source>Settings have been reset</source>
<translation>Настройки сброшены</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="112"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="121"/>
<source>Settings saved</source>
<translation>Сохранить настройки</translation>
</message>
Expand Down Expand Up @@ -2638,6 +2642,16 @@ This means that AmneziaWG keeps the fast performance of the original while addin
<source>error 0x%1: %2</source>
<translation>error 0x%1: %2</translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
<source>WireGuard Configuration Highlighter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
<source>&amp;Randomize colors</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectLanguageDrawer</name>
Expand Down
38 changes: 26 additions & 12 deletions client/translations/amneziavpn_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,9 +1046,13 @@ And if you don&apos;t like the app, all the more support it - the donation will
<translation type="obsolete"> 启动时自动运行运用程序</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time %1 starts</source>
<translation>运行应用软件在%1系统启动时</translation>
<translation type="vanished">运行应用软件在%1系统启动时</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="73"/>
<source>Launch the application every time the device is starts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsApplication.qml" line="93"/>
Expand Down Expand Up @@ -1266,52 +1270,52 @@ And if you don&apos;t like the app, all the more support it - the donation will
<translation>DNS服务器</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="49"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="50"/>
<source>If AmneziaDNS is not used or installed</source>
<translation>如果未使用或未安装AmneziaDNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="56"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="57"/>
<source>Primary DNS</source>
<translation>首选 DNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="68"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="69"/>
<source>Secondary DNS</source>
<translation>备用 DNS</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="86"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="87"/>
<source>Restore default</source>
<translation>恢复默认配置</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="89"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
<source>Restore default DNS settings?</source>
<translation>是否恢复默认DNS配置？</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="90"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
<source>Continue</source>
<translation>继续</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="91"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="92"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="99"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="100"/>
<source>Settings have been reset</source>
<translation>已重置</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="111"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="112"/>
<source>Save</source>
<translation>保存</translation>
</message>
<message>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="120"/>
<location filename="../ui/qml/Pages2/PageSettingsDns.qml" line="121"/>
<source>Settings saved</source>
<translation>配置已保存</translation>
</message>
Expand Down Expand Up @@ -2771,6 +2775,16 @@ While it offers a blend of security, stability, and speed, it&apos;s essential t
<source>error 0x%1: %2</source>
<translation>错误 0x%1: %2</translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="39"/>
<source>WireGuard Configuration Highlighter</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../3rd/wireguard-tools/contrib/highlighter/gui/highlight.cpp" line="82"/>
<source>&amp;Randomize colors</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SelectLanguageDrawer</name>
Expand Down
2 changes: 1 addition & 1 deletion client/ui/controllers/installController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ void InstallController::installContainer(DockerContainer container, QJsonObject
}

if (ContainerProps::containerService(container) == ServiceType::Vpn) {
m_containersModel->setData(m_containersModel->index(0, 0), container, ContainersModel::Roles::IsDefaultRole);
m_containersModel->setData(m_containersModel->index(container), true, ContainersModel::Roles::IsDefaultRole);
}
emit installContainerFinished(finishMessage, ContainerProps::containerService(container) == ServiceType::Other);
return;
Expand Down
2 changes: 1 addition & 1 deletion client/ui/qml/Pages2/PageSettingsApplication.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ PageType {
Layout.margins: 16

text: qsTr("Auto start")
descriptionText: qsTr("Launch the application every time %1 starts").arg(Qt.platform.os)
descriptionText: qsTr("Launch the application every time the device is starts")

checked: SettingsController.isAutoStartEnabled()
onCheckedChanged: {
Expand Down
1 change: 1 addition & 0 deletions client/ui/qml/Pages2/PageSettingsDns.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ PageType {
}

ParagraphTextType {
Layout.fillWidth: true
text: qsTr("If AmneziaDNS is not used or installed")
}

Expand Down
2 changes: 1 addition & 1 deletion client/ui/qml/Pages2/PageShare.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ PageType {

if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
root.connectionTypesModel.push(openVpnConnectionFormat)
} else if (index === ContainerProps.containerFromString("amnezia-awg")) {
} else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
root.connectionTypesModel.push(wireGuardConnectionFormat)
}
}
Expand Down