From af0c5e6baec2d8744c8c81ddd3e8ede325bfbf4f Mon Sep 17 00:00:00 2001
From: Alexander Bilyak <alexander.bilyak@proton.ch>
Date: Wed, 27 Oct 2021 14:32:56 +0200
Subject: [PATCH] GODT-1378: varia GUI fixes

---
 internal/frontend/qml/AccountDelegate.qml            |  1 +
 internal/frontend/qml/GeneralSettings.qml            |  4 ++--
 internal/frontend/qml/HelpView.qml                   |  2 +-
 .../frontend/qml/Notifications/Notifications.qml     | 12 ++++++------
 internal/frontend/qml/StatusWindow.qml               |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/internal/frontend/qml/AccountDelegate.qml b/internal/frontend/qml/AccountDelegate.qml
index 01d89535..659db9e2 100644
--- a/internal/frontend/qml/AccountDelegate.qml
+++ b/internal/frontend/qml/AccountDelegate.qml
@@ -123,6 +123,7 @@ Item {
             Item { implicitHeight: root.type == AccountDelegate.LargeView ? 6 : 0 }
 
             RowLayout {
+                spacing: 0
                 Label {
                     colorScheme: root.colorScheme
                     text: root.user && root.user.loggedIn ? root.usedSpace : qsTr("Signed out")
diff --git a/internal/frontend/qml/GeneralSettings.qml b/internal/frontend/qml/GeneralSettings.qml
index e1bdada9..175bd61f 100644
--- a/internal/frontend/qml/GeneralSettings.qml
+++ b/internal/frontend/qml/GeneralSettings.qml
@@ -71,8 +71,8 @@ SettingsView {
     SettingsItem {
         id: beta
         colorScheme: root.colorScheme
-        text: qsTr("Enable Beta access")
-        description: qsTr("Be the first one to see new features.")
+        text: qsTr("Beta access")
+        description: qsTr("Be among the first to try new features.")
         type: SettingsItem.Toggle
         checked: root.backend.isBetaEnabled
         onClicked: {
diff --git a/internal/frontend/qml/HelpView.qml b/internal/frontend/qml/HelpView.qml
index 9f4e6b77..9fade7a7 100644
--- a/internal/frontend/qml/HelpView.qml
+++ b/internal/frontend/qml/HelpView.qml
@@ -98,7 +98,7 @@ SettingsView {
 
         horizontalAlignment: Text.AlignHCenter
 
-        text: qsTr("Proton Mail Bridge v%1<br>© 2021 Proton Technologies AG<br>%2 %3").
+        text: qsTr("Proton Mail Bridge v%1<br>© 2021 Proton AG<br>%2 %3").
             arg(root.backend.version).
             arg(link("file://"+root.backend.licensePath, qsTr("License"))).
             arg(link(root.backend.releaseNotesLink, qsTr("Release notes")))
diff --git a/internal/frontend/qml/Notifications/Notifications.qml b/internal/frontend/qml/Notifications/Notifications.qml
index 01d3a4d4..c0788699 100644
--- a/internal/frontend/qml/Notifications/Notifications.qml
+++ b/internal/frontend/qml/Notifications/Notifications.qml
@@ -329,7 +329,7 @@ QtObject {
         }
 
         action: Action {
-            text: qsTr("Ok")
+            text: qsTr("OK")
 
             onTriggered: {
                 root.updateIsLatestVersion.active = false
@@ -373,8 +373,8 @@ QtObject {
     }
 
     property Notification enableBeta: Notification {
-        text: qsTr("Enable beta access?")
-        description: qsTr("Bridge will update to the latest beta version according to your update preferences. Disabling beta access later on will reset Bridge and require you to reconfigure your client.")
+        text: qsTr("Enable Beta access")
+        description: qsTr("Be the first to get new updates and use new features. Bridge will update to the latest beta version.")
         icon: "./icons/ic-info-circle-filled.svg"
         type: Notification.NotificationType.Info
         group: Notifications.Group.Update | Notifications.Group.Dialogs
@@ -467,7 +467,7 @@ QtObject {
 
         action: [
             Action {
-                text: qsTr("Ok")
+                text: qsTr("OK")
                 onTriggered: {
                     root.bugReportSendSuccess.active = false
                 }
@@ -489,7 +489,7 @@ QtObject {
         }
 
         action: Action {
-            text: qsTr("Ok")
+            text: qsTr("OK")
             onTriggered: {
                 root.bugReportSendError.active = false
             }
@@ -574,7 +574,7 @@ QtObject {
 
         action: [
             Action {
-                text: qsTr("Ok")
+                text: qsTr("OK")
                 onTriggered: {
                     root.cacheLocationChangeSuccess.active = false
                 }
diff --git a/internal/frontend/qml/StatusWindow.qml b/internal/frontend/qml/StatusWindow.qml
index 7ab0fc91..f4717c71 100644
--- a/internal/frontend/qml/StatusWindow.qml
+++ b/internal/frontend/qml/StatusWindow.qml
@@ -245,7 +245,7 @@ Window {
                 Button {
                     colorScheme: root.colorScheme
                     secondary: true
-                    text: qsTr("Open ProtonBridge")
+                    text: qsTr("Open Bridge")
 
                     borderless: true
                     labelType: Label.LabelType.Caption_semibold
@@ -296,7 +296,7 @@ Window {
                         }
                         MenuItem {
                             colorScheme: root.colorScheme
-                            text: qsTr("Quit ProtonBridge")
+                            text: qsTr("Quit Bridge")
                             onClicked: {
                                 root.quit()
                                 root.close()