Update AdLabel.qml

amn prem short description

client/core/controllers/gatewayController.cpp

@@ -26,10 +26,6 @@ namespace
         constexpr char apiPayload[] = "api_payload";
         constexpr char keyPayload[] = "key_payload";
     }
-
-    constexpr QLatin1String errorResponsePattern1("No active configuration found for");
-    constexpr QLatin1String errorResponsePattern2("No non-revoked public key found for");
-    constexpr QLatin1String errorResponsePattern3("Account not found.");
 }
 
 GatewayController::GatewayController(const QString &gatewayEndpoint, bool isDevEnvironment, int requestTimeoutMsecs, QObject *parent)
@@ -266,16 +262,7 @@ bool GatewayController::shouldBypassProxy(QNetworkReply *reply, const QByteArray
     } else if (responseBody.contains("html")) {
         qDebug() << "The response contains an html tag";
         return true;
-    } else if (reply->error() == QNetworkReply::NetworkError::ContentNotFoundError) {
-        if (responseBody.contains(errorResponsePattern1) || responseBody.contains(errorResponsePattern2)
-            || responseBody.contains(errorResponsePattern3)) {
-            return false;
-        } else {
-            return true;
-        }
-    } else if (reply->error() != QNetworkReply::NetworkError::NoError) {
-        return true;
-    } else if (checkEncryption) {
+    } else if (reply->error() == QNetworkReply::NetworkError::NoError && checkEncryption) {
         try {
             QSimpleCrypto::QBlockCipher blockCipher;
             static_cast<void>(blockCipher.decryptAesBlockCipher(responseBody, key, iv, "", salt));

client/ui/models/api/apiServicesModel.cpp

@@ -65,8 +65,8 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     case CardDescriptionRole: {
         auto speed = apiServiceData.serviceInfo.speed;
         if (serviceType == serviceType::amneziaPremium) {
-            return tr("Amnezia Premium is classic VPN for seamless work, downloading large files, and watching videos. "
-                      "Access all websites and online resources. Speeds up to %1 Mbps.")
+            return tr("Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. "
+                      "Works for any sites with no restrictions. Speed up to %1 MBit/s. Unlimited traffic.")
                     .arg(speed);
         } else if (serviceType == serviceType::amneziaFree) {
             QString description = tr("AmneziaFree provides free unlimited access to a basic set of web sites, such as Facebook, Instagram, Twitter (X), Discord, Telegram, and others. YouTube is not included in the free plan.");
@@ -79,8 +79,8 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
     }
     case ServiceDescriptionRole: {
         if (serviceType == serviceType::amneziaPremium) {
-            return tr("Amnezia Premium is classic VPN for for seamless work, downloading large files, and watching videos. "
-                      "Access all websites and online resources.");
+            return tr("Amnezia Premium is VPN for comfortable work, downloading large files and watching videos in 8K resolution. "
+                      "Works for any sites with no restrictions.");
         } else {
             return tr("AmneziaFree provides free unlimited access to a basic set of web sites, such as Facebook, Instagram, Twitter (X), Discord, Telegram, and others. YouTube is not included in the free plan.");
         }

client/ui/qml/Components/AdLabel.qml

@@ -54,7 +54,7 @@ Rectangle {
             Layout.rightMargin: 10
             Layout.leftMargin: 10
 
-            text: qsTr("Amnezia Premium - for access to all websites and online resources")
+            text: qsTr("Amnezia Premium - all websites and online resources")
             color: AmneziaStyle.color.pearlGray
 
             lineHeight: 18

client/ui/qml/Pages2/PageSettingsApiDevices.qml

@@ -42,7 +42,7 @@ PageType {
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                headerText: qsTr("Active Devices")
+                headerText: qsTr("Active devices")
                 descriptionText: qsTr("Manage currently connected devices")
             }
 

client/ui/qml/Pages2/PageSettingsApiNativeConfigs.qml

@@ -45,7 +45,7 @@ PageType {
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                headerText: qsTr("Configuration Files")
+                headerText: qsTr("Configuration files")
                 descriptionText: qsTr("For router setup or the AmneziaWG app")
             }
         }

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -26,7 +26,7 @@ PageType {
     QtObject {
         id: statusObject
 
-        readonly property string title: qsTr("Subscription Status")
+        readonly property string title: qsTr("Subscription status")
         readonly property string contentKey: "subscriptionStatus"
         readonly property string objectImageSource: "qrc:/images/controls/info.svg"
     }
@@ -34,7 +34,7 @@ PageType {
     QtObject {
         id: endDateObject
 
-        readonly property string title: qsTr("Valid Until")
+        readonly property string title: qsTr("Valid until")
         readonly property string contentKey: "endDate"
         readonly property string objectImageSource: "qrc:/images/controls/history.svg"
     }
@@ -42,7 +42,7 @@ PageType {
     QtObject {
         id: deviceCountObject
 
-        readonly property string title: qsTr("Active Connections")
+        readonly property string title: qsTr("Active connections")
         readonly property string contentKey: "connectedDevices"
         readonly property string objectImageSource: "qrc:/images/controls/monitor.svg"
     }
@@ -183,7 +183,7 @@ PageType {
 
                 visible: false //footer.isVisibleForAmneziaFree
 
-                text: qsTr("Subscription Key")
+                text: qsTr("Subscription key")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
@@ -191,7 +191,7 @@ PageType {
 
                     shareConnectionDrawer.openTriggered()
                     shareConnectionDrawer.isSelfHostedConfig = false;
-                    shareConnectionDrawer.shareButtonText = qsTr("Save VPN key as a file")
+                    shareConnectionDrawer.shareButtonText = qsTr("Save VPN key to file")
                     shareConnectionDrawer.copyButtonText = qsTr("Copy VPN key")
 
 
@@ -213,7 +213,7 @@ PageType {
 
                 visible: footer.isVisibleForAmneziaFree
 
-                text: qsTr("Configuration Files")
+                text: qsTr("Configuration files")
 
                 descriptionText: qsTr("Manage configuration files")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
@@ -233,7 +233,7 @@ PageType {
 
                 visible: footer.isVisibleForAmneziaFree
 
-                text: qsTr("Active Devices")
+                text: qsTr("Active devices")
 
                 descriptionText: qsTr("Manage currently connected devices")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"

client/ui/qml/Pages2/PageSettingsApiSupport.qml

@@ -27,7 +27,7 @@ PageType {
     QtObject {
         id: techSupport
 
-        readonly property string title: qsTr("Email")
+        readonly property string title: qsTr("Email Support")
         readonly property string description: qsTr("support@amnezia.org")
         readonly property string link: "mailto:support@amnezia.org"
     }

client/ui/qml/Pages2/PageSettingsConnection.qml

@@ -140,7 +140,7 @@ PageType {
                 }
                 onClicked: {
                     if (!checkable) {
-                        PageController.showNotificationMessage(qsTr("Cannot change KillSwitch settings during active connection"))
+                        PageController.showNotificationMessage(qsTr("Cannot change killSwitch settings during active connection"))
                     }
                 }
             }