diff --git a/qml/AlreadyRestoredPage.qml b/qml/AlreadyRestoredPage.qml index 729b4b366..c6dbb886c 100644 --- a/qml/AlreadyRestoredPage.qml +++ b/qml/AlreadyRestoredPage.qml @@ -33,7 +33,7 @@ StackViewPage { Layout.alignment: Qt.AlignCenter Layout.minimumWidth: 325 Layout.topMargin: 80 - text: 'Switch to wallet' + text: 'Switch to Wallet' onClicked: self.openWallet(self.wallet) } RegularButton { diff --git a/qml/AppBanner.qml b/qml/AppBanner.qml index 524fcc832..24ad48c63 100644 --- a/qml/AppBanner.qml +++ b/qml/AppBanner.qml @@ -137,7 +137,7 @@ Collapsible { fillColor: '#FFFFFF' font.pixelSize: 12 font.weight: 500 - text: 'Try again' + text: 'Try Again' textColor: '#1C1C1C' onClicked: banner.notification.trigger() } @@ -159,7 +159,7 @@ Collapsible { color: '#070B0E' font.pixelSize: 13 font.weight: 700 - text: 'Some coins are no longer 2FA protected (%1 accounts)'.arg(banner.notification.accounts.length) + text: 'Some funds are no longer 2FA protected (%1 accounts)'.arg(banner.notification.accounts.length) wrapMode: Label.WordWrap } PrimaryButton { diff --git a/qml/AssetsView.qml b/qml/AssetsView.qml index ee3c8d995..9f0061d06 100644 --- a/qml/AssetsView.qml +++ b/qml/AssetsView.qml @@ -61,7 +61,7 @@ Pane { RowLayout { spacing: 0 LinkButton { - text: 'Fund your wallet' + text: 'Fund Your Wallet' } Label { color: '#929292' diff --git a/qml/CreateAccountPage.qml b/qml/CreateAccountPage.qml index 41f3640b6..f45a2b4b8 100644 --- a/qml/CreateAccountPage.qml +++ b/qml/CreateAccountPage.qml @@ -275,7 +275,7 @@ StackViewPage { font.pixelSize: 14 font.weight: 400 horizontalAlignment: Qt.AlignCenter - text: `This feature is coming soon on desktop, but it's already available on Blockstream mobile now!` + text: `This feature is coming soon on desktop, but it's already available on the Blockstream app for mobile.` wrapMode: Label.WordWrap } LinkButton { diff --git a/qml/JadeBasicUpdateView.qml b/qml/JadeBasicUpdateView.qml index 29c80c67d..2789c4405 100644 --- a/qml/JadeBasicUpdateView.qml +++ b/qml/JadeBasicUpdateView.qml @@ -92,7 +92,7 @@ StackViewPage { Layout.alignment: Qt.AlignCenter font.pixelSize: 14 font.weight: 400 - text: qsTr('Keep your Jade secure, upgrade to firmware version %1 now!').arg(self.firmware.version) + text: qsTr('Keep your Jade secure, upgrade to firmware version %1 now.').arg(self.firmware.version) textFormat: Label.StyledText } PrimaryButton { diff --git a/qml/JadeDetailsDrawer.qml b/qml/JadeDetailsDrawer.qml index a9d3f2fe3..d2c1842f4 100644 --- a/qml/JadeDetailsDrawer.qml +++ b/qml/JadeDetailsDrawer.qml @@ -48,7 +48,7 @@ AbstractDrawer { const board_type = self.device.versionInfo.BOARD_TYPE return board_type === 'JADE_V2' } - text: 'Genuine check' + text: 'Genuine Check' } Label { Layout.fillWidth: true @@ -105,7 +105,7 @@ AbstractDrawer { Label { Layout.fillWidth: true horizontalAlignment: Label.AlignRight - text: self.device.versionInfo.JADE_CONFIG ? 'YES' : 'NO' + text: self.device.versionInfo.JADE_CONFIG ? 'Yes' : 'No' } Separator { } diff --git a/qml/JadeGenuineCheckDialog.qml b/qml/JadeGenuineCheckDialog.qml index fed796b4c..2aae207da 100644 --- a/qml/JadeGenuineCheckDialog.qml +++ b/qml/JadeGenuineCheckDialog.qml @@ -237,7 +237,7 @@ Dialog { font.pixelSize: 14 font.weight: 400 horizontalAlignment: Label.AlignHCenter - text: 'We could successfully verify your jade, enjoy the best Blockstream can offer you with your brand new jade.' + text: 'We successfully verified your Jade. Enjoy the best Blockstream can offer with your brand new Jade.' wrapMode: Label.WordWrap } PrimaryButton { diff --git a/qml/JadeGenuineCheckPage.qml b/qml/JadeGenuineCheckPage.qml index 22980ebc5..67c40c53c 100644 --- a/qml/JadeGenuineCheckPage.qml +++ b/qml/JadeGenuineCheckPage.qml @@ -59,7 +59,7 @@ StackViewPage { font.pixelSize: 14 font.weight: 400 horizontalAlignment: Label.AlignHCenter - text: 'Genuine Check is mandatory for first time Jade connection. This way we make sure that you have a safe Jade.' + text: 'Genuine Check is required for first-time Jade connections. This verifies that your Jade was manufactured by Blockstream and is safe to use.' wrapMode: Label.WordWrap } VSpacer { diff --git a/qml/JadeInstructionsView.qml b/qml/JadeInstructionsView.qml index e8044e575..0ecb3bffe 100644 --- a/qml/JadeInstructionsView.qml +++ b/qml/JadeInstructionsView.qml @@ -47,7 +47,7 @@ Pane { } StepPane { step: 3 - title: 'Connect using USB' + title: 'Connect Using USB' text: 'Choose a USB connection on Jade after verifying your recovery phrase' } } diff --git a/qml/JadeNotificationDialog.qml b/qml/JadeNotificationDialog.qml index 6af6899f2..631453dfe 100644 --- a/qml/JadeNotificationDialog.qml +++ b/qml/JadeNotificationDialog.qml @@ -72,7 +72,7 @@ Dialog { PrimaryButton { Layout.alignment: Qt.AlignCenter Layout.minimumWidth: 325 - text: 'Set up Jade' + text: 'Set Up Jade' onClicked: self.setupClicked(self.device) } LinkButton { diff --git a/qml/JadeUninitializedView.qml b/qml/JadeUninitializedView.qml index 2582c26ad..aea861318 100644 --- a/qml/JadeUninitializedView.qml +++ b/qml/JadeUninitializedView.qml @@ -57,7 +57,7 @@ VFlickable { Layout.topMargin: 10 busy: !(controller.monitor?.idle ?? true) || self.device.status === JadeDevice.StatusHandleClientMessage enabled: (controller.monitor?.idle ?? true) && self.device.status !== JadeDevice.StatusHandleClientMessage - text: 'Set up Jade' + text: 'Set Up Jade' onClicked: self.setup() } } @@ -70,7 +70,7 @@ VFlickable { Layout.topMargin: 20 busy: !(controller.monitor?.idle ?? true) || self.device.status === JadeDevice.StatusHandleClientMessage enabled: (controller.monitor?.idle ?? true) && self.device.status !== JadeDevice.StatusHandleClientMessage - text: 'Set up Jade' + text: 'Set Up Jade' onClicked: self.setup() } } diff --git a/qml/NotificationToast.qml b/qml/NotificationToast.qml index 8b9b711f0..4ffc94b27 100644 --- a/qml/NotificationToast.qml +++ b/qml/NotificationToast.qml @@ -80,7 +80,7 @@ ColumnLayout { // BackupToast { // } WarningToast { - title: 'Backup your wallet' + title: 'Back Up Your Wallet' message: 'Write down your recovery phrase and store it safely.' } } @@ -286,7 +286,7 @@ ColumnLayout { textColor: '#000000' font.pixelSize: 12 font.weight: 600 - text: 'Backup now' + text: 'Back Up Now' padding: 6 leftPadding: 10 rightPadding: 10 @@ -300,7 +300,7 @@ ColumnLayout { textColor: '#FFFFFF' font.pixelSize: 12 font.weight: 600 - text: 'Remind me later' + text: 'Remind Me Later' padding: 6 leftPadding: 10 rightPadding: 10 @@ -470,7 +470,7 @@ ColumnLayout { fillColor: '#FFFFFF' font.pixelSize: 12 font.weight: 600 - text: 'Try again' + text: 'Try Again' textColor: '#000000' padding: 6 leftPadding: 10 @@ -582,7 +582,7 @@ ColumnLayout { color: toast.textColor font.pixelSize: 13 font.weight: 700 - text: 'Some coins are no longer 2FA protected (%1 accounts)'.arg(toast.notification.accounts.length) + text: 'Some funds are no longer 2FA protected (%1 accounts)'.arg(toast.notification.accounts.length) wrapMode: Label.WordWrap } diff --git a/qml/NotificationsDrawer.qml b/qml/NotificationsDrawer.qml index 7243b119d..f5c35d02c 100644 --- a/qml/NotificationsDrawer.qml +++ b/qml/NotificationsDrawer.qml @@ -315,7 +315,7 @@ AbstractDrawer { fillColor: '#FFFFFF' font.pixelSize: 12 font.weight: 500 - text: 'Try again' + text: 'Try Again' textColor: '#1C1C1C' onClicked: { stack_view.push(outage_page, { @@ -362,14 +362,14 @@ AbstractDrawer { Layout.alignment: Qt.AlignRight spacing: 10 PrimaryButton { - text: 'Backup now' + text: 'Back Up Now' borderColor: '#FFFFFF' fillColor: '#FFFFFF' textColor: '#000000' onClicked: warningView.notification.trigger() } PrimaryButton { - text: 'Remind me later' + text: 'Remind Me Later' borderColor: '#FFFFFF' fillColor: 'transparent' textColor: '#FFFFFF' diff --git a/qml/OutagePage.qml b/qml/OutagePage.qml index 3f2b71915..b3f584e66 100644 --- a/qml/OutagePage.qml +++ b/qml/OutagePage.qml @@ -7,5 +7,5 @@ import QtQuick.Layouts LoadingPage { id: page padding: 0 - title: 'Partial service outage' + title: 'Partial Service Outage' } diff --git a/qml/PreferencesDialog.qml b/qml/PreferencesDialog.qml index 749a7f20f..db9400783 100644 --- a/qml/PreferencesDialog.qml +++ b/qml/PreferencesDialog.qml @@ -431,7 +431,7 @@ AbstractDialog { VSpacer { } SubButton { - text: 'Give us your feedback' + text: 'Give Us Your Feedback' onClicked: { page.StackView.view.push(request_support_page, { type: 'feedback', diff --git a/qml/RequestSupportPage.qml b/qml/RequestSupportPage.qml index 7b43af045..e36cbf70d 100644 --- a/qml/RequestSupportPage.qml +++ b/qml/RequestSupportPage.qml @@ -23,7 +23,7 @@ StackViewPage { objectName: "RequestSupportPage" id: self title: { - if (self.type === 'incident') return 'Contact us' + if (self.type === 'incident') return 'Contact Us' if (self.type === 'feedback') return 'Feedback' return qsTrId('id_support') } diff --git a/qml/SecurityPage.qml b/qml/SecurityPage.qml index 858df6295..617813e52 100644 --- a/qml/SecurityPage.qml +++ b/qml/SecurityPage.qml @@ -362,7 +362,7 @@ Page { ColumnLayout { spacing: 8 Label { - text: 'Upgrade Your Security with Jade.' + text: 'Upgrade Your Security with Jade' font.pixelSize: 20 font.weight: 600 color: '#FFFFFF' @@ -469,7 +469,7 @@ Page { InfoCard { iconSource: 'qrc:/svg3/Stamp.svg' title: 'Genuine Check' - description: 'Verify that your device is authentic and safe to use prior to managing funds.' + description: 'Verify that your device is authentic and safe to use before managing funds.' linkButtons: [] iconSide: true rightAction: Action { @@ -496,7 +496,7 @@ Page { InfoCard { iconSource: 'qrc:/svg3/Graphic-card.svg' title: 'Firmware Upgrade' - description: 'Update your Jade Firmware for the latest features, improvements, and protection for your assets.' + description: 'Update your Jade firmware for the latest features, improvements, and protection for your assets.' linkButtons: [ Component { RowLayout { diff --git a/qml/TransactionsPage.qml b/qml/TransactionsPage.qml index 5921ed7bb..f9cac4223 100644 --- a/qml/TransactionsPage.qml +++ b/qml/TransactionsPage.qml @@ -332,7 +332,7 @@ Page { } } ListPage { - emptyText: `You don't have any coins yet.` + emptyText: `You don't have any funds yet.` model: CoinModel { id: coin_model context: self.context diff --git a/qml/TwoFactorExpiredSelectAccountPage.qml b/qml/TwoFactorExpiredSelectAccountPage.qml index 662e22017..8833f8816 100644 --- a/qml/TwoFactorExpiredSelectAccountPage.qml +++ b/qml/TwoFactorExpiredSelectAccountPage.qml @@ -44,7 +44,7 @@ StackViewPage { font.weight: 400 horizontalAlignment: Label.AlignJustify opacity: 0.6 - text: `2FA Protected accounts are 2-of-2 wallets needing the user’s key and Blockstream’s 2FA signature. After a ~1-year timelock, they become 1-of-1, disabling 2FA, to ultimately keep you in control. Redeposit your coins to reactivate 2FA protection.` + text: `2FA Protected accounts are 2-of-2 wallets needing the user's key and Blockstream's 2FA signature. After a ~1-year timelock, they become 1-of-1, disabling 2FA, to ultimately keep you in control. Redeposit your funds to reactivate 2FA protection.` wrapMode: Label.Wrap } Repeater { diff --git a/qml/UseDevicePage.qml b/qml/UseDevicePage.qml index 7591c9123..b5e458915 100644 --- a/qml/UseDevicePage.qml +++ b/qml/UseDevicePage.qml @@ -155,7 +155,7 @@ StackViewPage { LinkButton { Layout.alignment: Qt.AlignCenter Layout.topMargin: 20 - text: 'Don’t have a Jade? Check our store' + text: 'Don’t Have a Jade? Check Our Store' onClicked: Qt.openUrlExternally('https://store.blockstream.com/') } } diff --git a/qml/util.js b/qml/util.js index 2da0d415e..08e075c51 100644 --- a/qml/util.js +++ b/qml/util.js @@ -246,7 +246,7 @@ function csvTimeLabel(blocks) { if (hours < 24) return hours + ' ' + qsTrId('id_hours') const days = Math.round(blocks / 6 / 24) if (days <= 1) return '1 ' + qsTrId('id_day') - if (days < 30) return days + qsTrId('id_days') + if (days < 30) return days + ' ' + qsTrId('id_days') const months = Math.round(blocks / 6 / 24 / 30) if (months <= 1) return '1 ' + qsTrId('id_month') return months + ' ' + qsTrId('id_months')