Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion qml/AlreadyRestoredPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions qml/AppBanner.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/AssetsView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Pane {
RowLayout {
spacing: 0
LinkButton {
text: 'Fund your wallet'
text: 'Fund Your Wallet'
}
Label {
color: '#929292'
Expand Down
2 changes: 1 addition & 1 deletion qml/CreateAccountPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/JadeBasicUpdateView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <b>%1</b> now!').arg(self.firmware.version)
text: qsTr('Keep your Jade secure, upgrade to firmware version <b>%1</b> now.').arg(self.firmware.version)
textFormat: Label.StyledText
}
PrimaryButton {
Expand Down
4 changes: 2 additions & 2 deletions qml/JadeDetailsDrawer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
}
Expand Down
2 changes: 1 addition & 1 deletion qml/JadeGenuineCheckDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/JadeGenuineCheckPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/JadeInstructionsView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion qml/JadeNotificationDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions qml/JadeUninitializedView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand All @@ -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()
}
}
Expand Down
10 changes: 5 additions & 5 deletions qml/NotificationToast.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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.'
}
}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down
6 changes: 3 additions & 3 deletions qml/NotificationsDrawer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion qml/OutagePage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ import QtQuick.Layouts
LoadingPage {
id: page
padding: 0
title: 'Partial service outage'
title: 'Partial Service Outage'
}
2 changes: 1 addition & 1 deletion qml/PreferencesDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion qml/RequestSupportPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
6 changes: 3 additions & 3 deletions qml/SecurityPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/TransactionsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qml/TwoFactorExpiredSelectAccountPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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 users key and Blockstreams 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 {
Expand Down
2 changes: 1 addition & 1 deletion qml/UseDevicePage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
}
}
2 changes: 1 addition & 1 deletion qml/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down