status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-24 20:48:50 +00:00
Code Issues Projects Releases Wiki Activity

fix(wallet): Renamed KeyPair to key pair throughout the entire app (#15051)

Browse Source 
* fix(wallet): Renamed KeyPair to key pair throughout the entire app

replaced the keypair occurances with key pair in the entire qml ui files
fixes: #13612 
---------

Co-authored-by: belalshehab <belal@status.im>
Co-authored-by: Valentina Novgorodtceva <valentina@status.im>
This commit is contained in:
Belal Shehab 2024-06-07 16:29:09 +03:00 committed by GitHub
parent 70d2a1dd75
commit f0bcea0044
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/constants/wallet.py
View File

@ -26,7 +26,7 @@ class WalletNetworkSettings(Enum):
class WalletAccountSettings(Enum):
STATUS_ACCOUNT_ORIGIN = 'Derived from your default Status keypair'
STATUS_ACCOUNT_ORIGIN = 'Derived from your default Status key pair'
WATCHED_ADDRESS_ORIGIN = 'Watched address'
STORED_ON_DEVICE = 'On device'
WATCHED_ADDRESSES_KEYPAIR_LABEL = 'Watched addresses'
@ -70,7 +70,7 @@ class WalletScreensHeaders(Enum):
class WalletRenameKeypair(Enum):
WALLET_SUCCESSFUL_RENAMING = 'You successfully renamed your keypair\n'
WALLET_SUCCESSFUL_RENAMING = 'You successfully renamed your key pair\n'
class WalletSeedPhrase(Enum):

6
ui/app/AppLayouts/Communities/panels/SharedAddressesSigningPanel.qml
View File

@ -86,7 +86,7 @@ ColumnLayout {
Layout.preferredWidth: parent.width
elide: Text.ElideRight
font.pixelSize: Constants.keycard.general.fontSize2
text: qsTr("To share %n address(s) with <b>%1</b>, authenticate the associated keypairs...", "", d.selectedSharedAddressesCount).arg(root.communityName)
text: qsTr("To share %n address(s) with <b>%1</b>, authenticate the associated key pairs...", "", d.selectedSharedAddressesCount).arg(root.communityName)
}
RowLayout {
@ -292,8 +292,8 @@ ColumnLayout {
Layout.fillWidth: true
text: !d.anyOfSelectedAddressesToRevealBelongToProfileKeypair &&
d.thereAreMoreThanOneNonProfileRegularKeypairs?
qsTr("Authenticate via “%1” keypair").arg(userProfile.name)
: qsTr("The following keypairs will be authenticated via “%1” keypair").arg(userProfile.name)
qsTr("Authenticate via “%1” key pair").arg(userProfile.name)
: qsTr("The following key pairs will be authenticated via “%1” key pair").arg(userProfile.name)
font.pixelSize: Constants.keycard.general.fontSize2
color: Theme.palette.baseColor1
wrapMode: Text.WrapAnywhere

2
ui/app/AppLayouts/Onboarding/views/ProfileFetchingView.qml
View File

@ -100,7 +100,7 @@ Item {
case Constants.onboarding.profileFetching.entity.settings:
return qsTr("Settings")
case Constants.onboarding.profileFetching.entity.keypairs:
return qsTr("Keypairs")
return qsTr("Key pairs")
case Constants.onboarding.profileFetching.entity.watchOnlyAccounts:
return qsTr("Watched addresses")
}

2
ui/app/AppLayouts/Onboarding/views/SeedPhraseInputView.qml
View File

@ -29,7 +29,7 @@ Item {
onWrongSeedPhraseChanged: {
if (wrongSeedPhrase) {
if (root.startupStore.startupModuleInst.flowType === Constants.startupFlow.firstRunOldUserImportSeedPhrase) {
seedPhraseView.setWrongSeedPhraseMessage(qsTr("Profile keypair for the inserted seed phrase is already set up"))
seedPhraseView.setWrongSeedPhraseMessage(qsTr("Profile key pair for the inserted seed phrase is already set up"))
return
}
seedPhraseView.setWrongSeedPhraseMessage(qsTr("Seed phrase doesn’t match the profile of an existing Keycard user on this device"))

8
ui/app/AppLayouts/Profile/popups/RemoveKeypairPopup.qml
View File

@ -23,7 +23,7 @@ StatusDialog {
signal confirmClicked()
title: qsTr("Remove %1 keypair").arg(name)
title: qsTr("Remove %1 key pair").arg(name)
width: 521
ColumnLayout {
@ -32,7 +32,7 @@ StatusDialog {
StatusBaseText {
Layout.fillWidth: true
text: qsTr("Are you sure you want to remove %1 keypair? The keypair will be removed from all of your synced devices. Make sure you have a backup of your keys or seed phrase before proceeding.").arg(name)
text: qsTr("Are you sure you want to remove %1 key pair? The key pair will be removed from all of your synced devices. Make sure you have a backup of your keys or seed phrase before proceeding.").arg(name)
wrapMode: Text.WordWrap
font.pixelSize: 15
}
@ -41,7 +41,7 @@ StatusDialog {
Layout.fillWidth: true
spacing: 8
StatusBaseText {
text: qsTr("Accounts related to this keypair will also be removed:")
text: qsTr("Accounts related to this key pair will also be removed:")
font.pixelSize: 15
}
@ -98,7 +98,7 @@ StatusDialog {
}
StatusButton {
type: StatusBaseButton.Type.Danger
text: qsTr("Remove keypair and derived accounts")
text: qsTr("Remove key pair and derived accounts")
onClicked: root.confirmClicked()
Keys.onReturnPressed: function(event) {
root.confirmClicked()

8
ui/app/AppLayouts/Profile/popups/RenameKeypairPopup.qml
View File

@ -22,7 +22,7 @@ StatusModal {
required property string name
required property var accounts
headerSettings.title: qsTr("Rename keypair")
headerSettings.title: qsTr("Rename key pair")
focus: visible
padding: Style.current.padding
@ -44,7 +44,7 @@ StatusModal {
}
d.entryValid = d.entryValid && !root.accountsModule.keypairNameExists(nameInput.text)
if (!d.entryValid) {
nameInput.errorMessageCmp.text = qsTr("Keypair name already in use")
nameInput.errorMessageCmp.text = qsTr("Key pair name already in use")
nameInput.valid = false
}
}
@ -66,7 +66,7 @@ StatusModal {
Layout.preferredHeight: 120
topPadding: 8
bottomPadding: 8
label: qsTr("Keypair name")
label: qsTr("Key pair name")
charLimit: Constants.keypair.nameLengthMax
validators: Constants.validators.keypairName
input.clearable: true
@ -81,7 +81,7 @@ StatusModal {
StatusBaseText {
Layout.preferredWidth: parent.width
Layout.topMargin: Style.current.padding
text: qsTr("Accounts derived from this keypair")
text: qsTr("Accounts derived from this key pair")
font.pixelSize: Style.current.primaryTextFontSize
}

8
ui/app/AppLayouts/Profile/popups/WalletKeypairAccountMenu.qml
View File

@ -35,7 +35,7 @@ StatusMenu {
}
StatusAction {
text: enabled? root.keyPair.migratedToKeycard? qsTr("Stop using Keycard") : qsTr("Move keypair to a Keycard") : ""
text: enabled? root.keyPair.migratedToKeycard? qsTr("Stop using Keycard") : qsTr("Move key pair to a Keycard") : ""
enabled: !!root.keyPair && root.keyPair.pairType !== Constants.keypair.type.privateKeyImport
icon.name: !!root.keyPair && root.keyPair.migratedToKeycard? "keycard-crossed" : "keycard"
icon.color: Theme.palette.primaryColor1
@ -48,7 +48,7 @@ StatusMenu {
}
StatusAction {
text: enabled? qsTr("Import keypair from device via encrypted QR") : ""
text: enabled? qsTr("Import key pair from device via encrypted QR") : ""
enabled: root.hasPairedDevices &&
!!root.keyPair &&
root.keyPair.pairType !== Constants.keypair.type.profile &&
@ -79,7 +79,7 @@ StatusMenu {
}
StatusAction {
text: enabled? qsTr("Rename keypair") : ""
text: enabled? qsTr("Rename key pair") : ""
objectName: "renameKeypairMenuItem"
enabled: !!root.keyPair &&
root.keyPair.pairType !== Constants.keypair.type.profile
@ -96,7 +96,7 @@ StatusMenu {
}
StatusAction {
text: enabled? qsTr("Remove keypair and derived accounts") : ""
text: enabled? qsTr("Remove key pair and derived accounts") : ""
enabled: !!root.keyPair &&
root.keyPair.pairType !== Constants.keypair.type.profile
type: StatusAction.Type.Danger

2
ui/app/AppLayouts/Profile/views/keycard/DetailsView.qml
View File

@ -113,7 +113,7 @@ ColumnLayout {
StatusListItem {
Layout.fillWidth: true
title: qsTr("Stop using Keycard for this keypair")
title: qsTr("Stop using Keycard for this key pair")
components: [
StatusIcon {
icon: "tiny/chevron-right"

4
ui/app/AppLayouts/Profile/views/wallet/AccountView.qml
View File

@ -145,7 +145,7 @@ ColumnLayout {
}
StatusBaseText {
objectName: "Keypair_TextLabel"
text: qsTr("Keypair")
text: qsTr("Key pair")
Layout.leftMargin: 16
Layout.topMargin: 12
font.pixelSize: 13
@ -173,7 +173,7 @@ ColumnLayout {
if(!!root.keyPair) {
switch(root.keyPair.pairType) {
case Constants.keypair.type.profile:
return qsTr("Derived from your default Status keypair")
return qsTr("Derived from your default Status key pair")
case Constants.keypair.type.seedImport:
return qsTr("Imported from seed phrase")
case Constants.keypair.type.privateKeyImport:

8
ui/app/AppLayouts/Profile/views/wallet/MainView.qml
View File

@ -198,12 +198,12 @@ Column {
spacing: 8
StatusBaseText {
text: qsTr("Import keypairs from this device to your other synced devices")
text: qsTr("Import key pairs from this device to your other synced devices")
font.pixelSize: 15
}
StatusButton {
text: qsTr("Show encrypted QR of keypairs on device")
text: qsTr("Show encrypted QR of key pairs on device")
icon.name: "qr"
onClicked: {
root.walletStore.runKeypairImportPopup("", Constants.keypairImportPopup.mode.exportKeypairQr)
@ -228,12 +228,12 @@ Column {
spacing: 8
StatusBaseText {
text: qsTr("%n keypair(s) require import to use on this device", "", d.unimportedNonProfileKeypairs)
text: qsTr("%n key pair(s) require import to use on this device", "", d.unimportedNonProfileKeypairs)
font.pixelSize: 15
}
StatusButton {
text: qsTr("Import missing keypairs")
text: qsTr("Import missing key pairs")
type: StatusBaseButton.Type.Warning
icon.name: "download"
onClicked: {

10
ui/app/mainui/AppMain.qml
View File

@ -159,7 +159,7 @@ Item {
function onShowToastKeypairRenamed(oldName: string, newName: string) {
Global.displayToastMessage(
qsTr("You successfully renamed your keypair\nfrom \"%1\" to \"%2\"").arg(oldName).arg(newName),
qsTr("You successfully renamed your key pair\nfrom \"%1\" to \"%2\"").arg(oldName).arg(newName),
"",
"checkmark-circle",
false,
@ -184,7 +184,7 @@ Item {
function onShowToastKeypairRemoved(keypairName: string) {
Global.displayToastMessage(
qsTr("“%1” keypair and its derived accounts were successfully removed from all devices").arg(keypairName),
qsTr("“%1” key pair and its derived accounts were successfully removed from all devices").arg(keypairName),
"",
"checkmark-circle",
false,
@ -197,13 +197,13 @@ Item {
let notification = qsTr("Please re-generate QR code and try importing again")
if (error !== "") {
if (error.startsWith("one or more expected keystore files are not found among the sent files")) {
notification = qsTr("Make sure you're importing the exported keypair on paired device")
notification = qsTr("Make sure you're importing the exported key pair on paired device")
}
}
else {
notification = qsTr("%1 keypair successfully imported").arg(keypairName)
notification = qsTr("%1 key pair successfully imported").arg(keypairName)
if (keypairsCount > 1) {
notification = qsTr("%n keypair(s) successfully imported", "", keypairsCount)
notification = qsTr("%n key pair(s) successfully imported", "", keypairsCount)
}
}
Global.displayToastMessage(

6
ui/app/mainui/activitycenter/views/ActivityNotificationNewKeypairFromPairedDevice.qml
View File

@ -12,7 +12,7 @@ ActivityNotificationBase {
id: root
ctaComponent: StatusLinkText {
text: qsTr("View keypair import options")
text: qsTr("View key pair import options")
color: Theme.palette.primaryColor1
font.pixelSize: Theme.primaryTextFontSize
font.weight: Font.Normal
@ -51,13 +51,13 @@ ActivityNotificationBase {
Layout.fillWidth: true
StatusMessageHeader {
displayNameLabel.text: qsTr("New keypair added")
displayNameLabel.text: qsTr("New key pair added")
timestamp: root.notification.timestamp
}
StatusBaseText {
Layout.fillWidth: true
text: qsTr("%1 keypair was added to one of your synced devices").arg(root.notification.message.unparsedText)
text: qsTr("%1 key pair was added to one of your synced devices").arg(root.notification.message.unparsedText)
font.italic: true
wrapMode: Text.WordWrap
color: Theme.palette.baseColor1

6
ui/imports/shared/controls/GetSyncCodeDesktopInstructions.qml
View File

@ -56,7 +56,7 @@ Column {
}
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
return qsTr("Show encrypted QR of keypairs on this device")
return qsTr("Show encrypted QR of key pairs on this device")
}
return qsTr("Syncing tab")
}
@ -86,7 +86,7 @@ Column {
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
if (root.type === SyncingCodeInstructions.Type.EncryptedKey) {
return qsTr("encrypted keypairs code")
return qsTr("encrypted key pairs code")
}
return qsTr("on this device")
}
@ -117,7 +117,7 @@ Column {
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
if (root.type === SyncingCodeInstructions.Type.EncryptedKey) {
return qsTr("encrypted keypairs code")
return qsTr("encrypted key pairs code")
}
return ""
}

6
ui/imports/shared/controls/GetSyncCodeMobileInstructions.qml
View File

@ -61,7 +61,7 @@ Column {
}
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
return qsTr("Show encrypted keypairs code")
return qsTr("Show encrypted key pairs code")
}
return qsTr("Syncing")
}
@ -91,7 +91,7 @@ Column {
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
if (root.type === SyncingCodeInstructions.Type.EncryptedKey) {
return qsTr("encrypted keypairs code")
return qsTr("encrypted key pairs code")
}
return qsTr("on this device")
}
@ -122,7 +122,7 @@ Column {
text2: {
if (root.purpose === SyncingCodeInstructions.Purpose.KeypairSync) {
if (root.type === SyncingCodeInstructions.Type.EncryptedKey) {
return qsTr("encrypted keypairs code")
return qsTr("encrypted key pairs code")
}
return ""
}

6
ui/imports/shared/controls/ImportKeypairInfo.qml
View File

@ -10,9 +10,9 @@ import utils 1.0
Rectangle {
id: root
property string title: qsTr("Import keypair to use this account")
property string info: qsTr("This account was added to one of your synced devices. To use this account you will first need import the associated keypair to this device.")
property string buttonName: qsTr("Import missing keypair")
property string title: qsTr("Import key pair to use this account")
property string info: qsTr("This account was added to one of your synced devices. To use this account you will first need import the associated key pair to this device.")
property string buttonName: qsTr("Import missing key pair")
signal runImport()

2
ui/imports/shared/panels/private/DidYouKnowMessages.qml
View File

@ -15,7 +15,7 @@ QtObject {
qsTr("Status uses the latest encryption and security tools to secure your messages and transactions"),
qsTr("Status enables pseudo-anonymous interaction with Web3, DeFi, and society in general"),
qsTr("The Status Network token (SNT) is a modular utility token that fuels the Status network"),
qsTr("Your cryptographic keypair encrypts all of your messages which can only be unlocked by the intended recipient"),
qsTr("Your cryptographic key pair encrypts all of your messages which can only be unlocked by the intended recipient"),
qsTr("Status’ Web3 browser requires all DApps to ask permission before connecting to your wallet"),
qsTr("Your non-custodial wallet gives you full control over your funds without the use of a server"),
qsTr("Status is decentralized and serverless - chat, transact, and browse without surveillance and censorship"),

2
ui/imports/shared/popups/addaccount/states/EnterKeypairName.qml
View File

@ -47,7 +47,7 @@ Item {
validators: [
StatusMinLengthValidator {
errorMessage: qsTr("Keypair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
errorMessage: qsTr("Key pair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
minLength: Constants.addAccountPopup.keyPairAccountNameMinLength
}
]

4
ui/imports/shared/popups/common/EnterPrivateKey.qml
View File

@ -36,7 +36,7 @@ Item {
StatusBaseText {
width: parent.width
text: root.store.isAddAccountPopup? qsTr("Private key") : qsTr("Enter seed phrase for %1 keypair").arg(root.store.selectedKeypair.name)
text: root.store.isAddAccountPopup? qsTr("Private key") : qsTr("Enter seed phrase for %1 key pair").arg(root.store.selectedKeypair.name)
font.pixelSize: Constants.addAccountPopup.labelFontSize1
elide: Text.ElideRight
}
@ -179,7 +179,7 @@ Item {
validators: [
StatusMinLengthValidator {
errorMessage: qsTr("Keypair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
errorMessage: qsTr("Key pair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
minLength: Constants.addAccountPopup.keyPairAccountNameMinLength
}
]

4
ui/imports/shared/popups/common/EnterSeedPhrase.qml
View File

@ -27,7 +27,7 @@ Item {
StatusBaseText {
width: parent.width
text: root.store.isAddAccountPopup? qsTr("Enter seed phrase") : qsTr("Enter private key for %1 keypair").arg(root.store.selectedKeypair.name)
text: root.store.isAddAccountPopup? qsTr("Enter seed phrase") : qsTr("Enter private key for %1 key pair").arg(root.store.selectedKeypair.name)
font.pixelSize: Constants.addAccountPopup.labelFontSize1
elide: Text.ElideRight
}
@ -90,7 +90,7 @@ Item {
validators: [
StatusMinLengthValidator {
errorMessage: qsTr("Keypair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
errorMessage: qsTr("Key pair name must be at least %n character(s)", "", Constants.addAccountPopup.keyPairAccountNameMinLength)
minLength: Constants.addAccountPopup.keyPairAccountNameMinLength
}
]

2
ui/imports/shared/popups/keycard/KeycardPopup.qml
View File

@ -53,7 +53,7 @@ StatusModal {
if (root.sharedKeycardModule.forceFlow) {
return qsTr("Enable password login on this device")
}
return qsTr("Migrate a keypair from Keycard to Status")
return qsTr("Migrate a key pair from Keycard to Status")
case Constants.keycardSharedFlow.migrateFromAppToKeycard:
if (root.sharedKeycardModule.forceFlow) {
return qsTr("Enable Keycard login on this device")

4
ui/imports/shared/popups/keycard/states/EnterSeedPhrase.qml
View File

@ -73,7 +73,7 @@ Item {
text: {
switch (root.sharedKeycardModule.currentState.flowType) {
case Constants.keycardSharedFlow.migrateFromKeycardToApp:
return qsTr("Enter seed phrase for %1 keypair").arg(root.sharedKeycardModule.keyPairForProcessing.name)
return qsTr("Enter seed phrase for %1 key pair").arg(root.sharedKeycardModule.keyPairForProcessing.name)
}
return ""
@ -88,7 +88,7 @@ Item {
text: {
switch (root.sharedKeycardModule.currentState.flowType) {
case Constants.keycardSharedFlow.migrateFromKeycardToApp:
return qsTr("Enter seed phrase for %1 keypair").arg(root.sharedKeycardModule.keyPairForProcessing.name)
return qsTr("Enter seed phrase for %1 key pair").arg(root.sharedKeycardModule.keyPairForProcessing.name)
}
return ""

28
ui/imports/shared/popups/keycard/states/KeycardInit.qml
View File

@ -664,7 +664,7 @@ Item {
return qsTr("Migrating key pair to Keycard")
}
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.migratingKeypairToApp) {
return qsTr("Migrating keypair to Status")
return qsTr("Migrating key pair to Status")
}
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.creatingAccountNewSeedPhrase) {
return qsTr("Creating new account...")
@ -1075,7 +1075,7 @@ Item {
target: title
text: {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.keyPairMigrateSuccess) {
return qsTr("Keypair successfully migrated")
return qsTr("Key pair successfully migrated")
}
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.creatingAccountNewSeedPhraseSuccess) {
return qsTr("New account successfully created")
@ -1131,7 +1131,7 @@ Item {
text: {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.keyPairMigrateSuccess) {
if (root.sharedKeycardModule.currentState.flowType === Constants.keycardSharedFlow.migrateFromKeycardToApp) {
return qsTr("Keypair was removed from Keycard and is now stored on device.\nYou no longer need this Keycard to transact with the below accounts.")
return qsTr("Key pair was removed from Keycard and is now stored on device.\nYou no longer need this Keycard to transact with the below accounts.")
}
if (root.sharedKeycardModule.currentState.flowType === Constants.keycardSharedFlow.migrateFromAppToKeycard) {
return qsTr("To complete migration close Status and sign in with your Keycard")
@ -1167,7 +1167,7 @@ Item {
target: title
text: {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.keyPairMigrateFailure) {
return qsTr("Failed to migrate keypair")
return qsTr("Failed to migrate key pair")
}
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.creatingAccountNewSeedPhraseFailure) {
return qsTr("Creating new account failed")
@ -1434,10 +1434,10 @@ Item {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.migrateKeypairToApp) {
if (root.sharedKeycardModule.keyPairForProcessing.pairType === Constants.keycard.keyPairType.profile) {
if (root.sharedKeycardModule.forceFlow) {
return qsTr("Your profile keypair has been\nmigrated from Keycard to Status")
return qsTr("Your profile key pair has been\nmigrated from Keycard to Status")
}
}
return qsTr("Are you sure you want to migrate\nthis keypair to Status?")
return qsTr("Are you sure you want to migrate\nthis key pair to Status?")
}
return ""
}
@ -1457,17 +1457,17 @@ Item {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.migrateKeypairToApp) {
if (root.sharedKeycardModule.keyPairForProcessing.pairType === Constants.keycard.keyPairType.profile) {
if (root.sharedKeycardModule.forceFlow) {
return qsTr("In order to continue using this profile on this device, you need to enter the keypairs seed phrase and create a new password to log in with on this device.")
return qsTr("In order to continue using this profile on this device, you need to enter the key pairs seed phrase and create a new password to log in with on this device.")
}
let t = qsTr("%1 is your default Status keypair.").arg(root.sharedKeycardModule.keyPairForProcessing.name)
t += qsTr(" Migrating this keypair will mean you will no longer require this Keycard to login to Status or transact with the keypair’s derived accounts.")
t += qsTr(" The keypair and accounts will be fully removed from Keycard and stored on device.")
let t = qsTr("%1 is your default Status key pair.").arg(root.sharedKeycardModule.keyPairForProcessing.name)
t += qsTr(" Migrating this key pair will mean you will no longer require this Keycard to login to Status or transact with the key pair’s derived accounts.")
t += qsTr(" The key pair and accounts will be fully removed from Keycard and stored on device.")
return t
}
let t = qsTr("%1 keypair and its derived accounts will be fully removed from Keycard and stored on device.").arg(root.sharedKeycardModule.keyPairForProcessing.name)
t += qsTr(" This will make your keypair and derived accounts less secure as you will no longer require this Keycard to transact.")
let t = qsTr("%1 key pair and its derived accounts will be fully removed from Keycard and stored on device.").arg(root.sharedKeycardModule.keyPairForProcessing.name)
t += qsTr(" This will make your key pair and derived accounts less secure as you will no longer require this Keycard to transact.")
return t
}
return ""
@ -1488,7 +1488,7 @@ Item {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.migrateKeypairToKeycard) {
if (root.sharedKeycardModule.keyPairForProcessing.pairType === Constants.keycard.keyPairType.profile) {
if (root.sharedKeycardModule.forceFlow) {
return qsTr("Your profile keypair has been\nmigrated from Status to Keycard")
return qsTr("Your profile key pair has been\nmigrated from Status to Keycard")
}
}
}
@ -1510,7 +1510,7 @@ Item {
if (root.sharedKeycardModule.currentState.stateType === Constants.keycardSharedState.migrateKeypairToKeycard) {
if (root.sharedKeycardModule.keyPairForProcessing.pairType === Constants.keycard.keyPairType.profile) {
if (root.sharedKeycardModule.forceFlow) {
return qsTr("In order to continue using this profile on this device, you need to login using the Keycard that this profile keypair was migrated to.")
return qsTr("In order to continue using this profile on this device, you need to login using the Keycard that this profile key pair was migrated to.")
}
}
}

14
ui/imports/shared/popups/keypairimport/KeypairImportPopup.qml
View File

@ -24,14 +24,14 @@ StatusModal {
headerSettings.title: {
switch (root.store.currentState.stateType) {
case Constants.keypairImportPopup.state.selectKeypair:
return qsTr("Import missing keypairs")
return qsTr("Import missing key pairs")
case Constants.keypairImportPopup.state.exportKeypair:
if (!!root.store.selectedKeypair.name) {
return qsTr("Encrypted QR for %1 keypair").arg(root.store.selectedKeypair.name)
return qsTr("Encrypted QR for %1 key pair").arg(root.store.selectedKeypair.name)
}
return qsTr("Encrypted QR for keypairs on this device")
return qsTr("Encrypted QR for key pairs on this device")
case Constants.keypairImportPopup.state.importQr:
return qsTr("Scan encrypted keypair QR code")
return qsTr("Scan encrypted key pair QR code")
case Constants.keypairImportPopup.state.displayInstructions:
if (root.store.syncViaQr) {
return Constants.keypairImportPopup.instructionsLabelForQr
@ -39,7 +39,7 @@ StatusModal {
return Constants.keypairImportPopup.instructionsLabelForEncryptedKey
}
return qsTr("Import %1 keypair").arg(root.store.selectedKeypair.name)
return qsTr("Import %1 key pair").arg(root.store.selectedKeypair.name)
}
onClosed: {
@ -173,10 +173,10 @@ StatusModal {
if (root.store.syncViaQr) {
return qsTr("Done")
}
return qsTr("Import keypair")
return qsTr("Import key pair")
case Constants.keypairImportPopup.state.importPrivateKey:
case Constants.keypairImportPopup.state.importSeedPhrase:
return qsTr("Import keypair")
return qsTr("Import key pair")
}
return ""

6
ui/imports/shared/popups/keypairimport/states/ExportKeypair.qml
View File

@ -22,10 +22,10 @@ Item {
Layout.margins: 16
visible: !!root.store.keypairImportModule.connectionString
connectionStringLabel: qsTr("Encrypted keypairs code")
connectionStringLabel: qsTr("Encrypted key pairs code")
connectionString: root.store.keypairImportModule.connectionString
importCodeInstructions: qsTr("On your other device, navigate to the Wallet screen<br>and select ‘Import missing keypairs’. For security reasons,<br>do not save this code anywhere.")
codeExpiredMessage: qsTr("Your QR and encrypted keypairs code have expired.")
importCodeInstructions: qsTr("On your other device, navigate to the Wallet screen<br>and select ‘Import missing key pairs’. For security reasons,<br>do not save this code anywhere.")
codeExpiredMessage: qsTr("Your QR and encrypted key pairs code have expired.")
onConnectionStringChanged: {
if (!!connectionString) {

4
ui/imports/shared/popups/keypairimport/states/ScanOrEnterQrCode.qml
View File

@ -23,8 +23,8 @@ Item {
firstTabName: qsTr("Scan encrypted QR code")
secondTabName: qsTr("Enter encrypted key")
syncQrErrorMessage: qsTr("This does not look like the correct keypair QR code")
syncCodeErrorMessage: qsTr("This does not look like an encrypted keypair code")
syncQrErrorMessage: qsTr("This does not look like the correct key pair QR code")
syncCodeErrorMessage: qsTr("This does not look like an encrypted key pair code")
firstInstructionButtonName: Constants.keypairImportPopup.instructionsLabelForQr
secondInstructionButtonName: Constants.keypairImportPopup.instructionsLabelForEncryptedKey
syncCodeLabel: qsTr("Paste encrypted key")

4
ui/imports/shared/popups/keypairimport/states/SelectKeypair.qml
View File

@ -45,7 +45,7 @@ Item {
Layout.fillWidth: true
Layout.leftMargin: d.margin
Layout.rightMargin: d.margin
text: qsTr("To use the associated accounts on this device, you need to import their keypairs.")
text: qsTr("To use the associated accounts on this device, you need to import their key pairs.")
wrapMode: Text.WordWrap
}
@ -53,7 +53,7 @@ Item {
Layout.fillWidth: true
Layout.leftMargin: d.margin
Layout.rightMargin: d.margin
text: qsTr("Import keypairs from your other device")
text: qsTr("Import key pairs from your other device")
}
StatusListItem {

4
ui/imports/utils/Constants.qml
View File

@ -522,7 +522,7 @@ QtObject {
StatusValidator {
name: "startsWithSpaceValidator"
validate: function (t) { return !t.startsWith(" ") }
errorMessage: qsTr("Keypair starting with whitespace are not allowed")
errorMessage: qsTr("Key pair starting with whitespace are not allowed")
},
StatusRegularExpressionValidator {
regularExpression: /^[a-zA-Z0-9\-_ ]+$/
@ -530,7 +530,7 @@ QtObject {
},
StatusMinLengthValidator {
minLength: keypair.nameLengthMin
errorMessage: qsTr("Keypair must be at least %n character(s)", "", keypair.nameLengthMin)
errorMessage: qsTr("Key pair must be at least %n character(s)", "", keypair.nameLengthMin)
}
]

4
ui/imports/utils/Utils.qml
View File

@ -869,10 +869,10 @@ QtObject {
} else if (keypair.syncedFrom === Constants.keypair.syncedFrom.backup) {
if (keypair.pairType === Constants.keypair.type.seedImport ||
keypair.pairType === Constants.keypair.type.privateKeyImport) {
return qsTr("Restored from backup. Import keypair to use derived accounts.")
return qsTr("Restored from backup. Import key pair to use derived accounts.")
}
}
return qsTr("Import keypair to use derived accounts")
return qsTr("Import key pair to use derived accounts")
}
return ""