terminology: use "Accounts" over "Credentials"

This commit is contained in:
Dag Heyman 2019-10-08 14:56:42 +02:00
parent eb55f50ef7
commit 38b9576d5a
7 changed files with 21 additions and 21 deletions

View File

@ -237,7 +237,7 @@ Pane {
function deleteCard() {
navigator.confirm(
"Delete " + formattedName() + " ?",
qsTr("This will permanently delete the credential from the YubiKey, and your ability to generate codes for it."),
qsTr("This will permanently delete the account from the YubiKey, and your ability to generate codes for it."),
function () {
if (settings.otpMode) {
yubiKey.otpDeleteCredential(credential,
@ -250,7 +250,7 @@ Pane {
entries.deleteEntry(
credential.key)
navigator.snackBar(
qsTr("Credential deleted"))
qsTr("Account deleted"))
} else {
navigator.snackBarError(
resp.error_id)
@ -269,7 +269,7 @@ Pane {
credential.key)
yubiKey.updateNextCalculateAll()
navigator.snackBar(
qsTr("Credential deleted"))
qsTr("Account deleted"))
} else {
navigator.snackBarError(
resp.error_id)

View File

@ -11,7 +11,7 @@ ScrollView {
id: newCredentialViewId
objectName: 'newCredentialView'
property string title: qsTr("New Credential")
property string title: qsTr("Add Account")
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
ScrollBar.vertical.width: 8
@ -38,12 +38,12 @@ ScrollView {
function callback(resp) {
if (resp.success) {
yubiKey.calculateAll(navigator.goToCredentials)
navigator.snackBar(qsTr("Credential added"))
navigator.snackBar(qsTr("Account added"))
} else {
if (resp.error_id === 'credential_already_exists') {
navigator.confirm(
qsTr("Overwrite?"),
qsTr("A credential with this name already exists, do you want to overwrite it?"),
qsTr("A account with this name already exists, do you want to overwrite it?"),
_ccidAddCredentialOverwrite)
} else {
navigator.snackBarError(navigator.getErrorMessage(resp.error_id))
@ -184,7 +184,7 @@ ScrollView {
}
StyledButton {
text: qsTr("Enter manually")
toolTipText: qsTr("Enter credential details manually")
toolTipText: qsTr("Enter account details manually")
flat: true
onClicked: manualEntryPane.expandAction()
Material.foreground: formText
@ -195,7 +195,7 @@ ScrollView {
}
StyledStepperPanel {
label: qsTr("Add credential")
label: qsTr("Add account")
description: !manualEntry ? qsTr("Edit and confirm settings") : qsTr("Use manual entry if there's no QR code available.")
id: manualEntryPane
@ -325,7 +325,7 @@ ScrollView {
StyledButton {
id: addBtn
text: qsTr("Add")
toolTipText: qsTr("Add credential to YubiKey")
toolTipText: qsTr("Add account to YubiKey")
enabled: settings.otpMode ? secretKeyLbl.validated && acceptableInput() : secretKeyLbl.validated && acceptableInput() && nameLbl.validated
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
onClicked: addCredential()

View File

@ -24,7 +24,7 @@ ColumnLayout {
}
Label {
text: qsTr("No credentials")
text: qsTr("No accounts")
Layout.rowSpan: 1
wrapMode: Text.WordWrap
font.pixelSize: 16
@ -35,7 +35,7 @@ ColumnLayout {
}
Label {
text: qsTr("Add credentials to this YubiKey in order to be able to generate security codes from it.")
text: qsTr("Add accounts to this YubiKey in order to be able to generate security codes from it.")
horizontalAlignment: Qt.AlignHCenter
Layout.minimumWidth: 320
Layout.maximumWidth: app.width - dynamicMargin

View File

@ -24,7 +24,7 @@ ColumnLayout {
}
Label {
text: qsTr("No credentials found")
text: qsTr("No accounts found")
Layout.rowSpan: 1
wrapMode: Text.WordWrap
font.pixelSize: 16
@ -34,7 +34,7 @@ ColumnLayout {
color: formText
}
Label {
text: qsTr("No credentials matching your search criteria. Check your spelling and try again.")
text: qsTr("No accounts matching your search criteria. Check your spelling and try again.")
horizontalAlignment: Qt.AlignHCenter
Layout.minimumWidth: 320
Layout.maximumWidth: app.width - dynamicMargin

View File

@ -281,7 +281,7 @@ ScrollView {
flat: true
onClicked: navigator.confirm(
qsTr("Remove password?"),
qsTr("A password will not be required to access the credentials anymore."),
qsTr("A password will not be required to access the accounts anymore."),
function () {
removePassword()
})
@ -298,14 +298,14 @@ ScrollView {
StyledExpansionPanel {
label: qsTr("Reset")
description: qsTr("Warning: Reset will delete all credentials and restore factory defaults.")
description: qsTr("Warning: Reset will delete all accounts from the YubiKey and restore factory defaults.")
isEnabled: false
visible: !!yubiKey.currentDevice && !settings.otpMode
toolButtonIcon: "../images/reset.svg"
toolButtonToolTip: qsTr("Reset OATH Application")
toolButton.onClicked: navigator.confirm(
qsTr("Reset OATH application?"),
qsTr("This will delete all credentials and restore factory defaults."),
qsTr("This will delete all accounts and restore factory defaults."),
function () {
navigator.goToLoading()
yubiKey.reset(function (resp) {
@ -370,7 +370,7 @@ ScrollView {
StyledExpansionPanel {
id: interfacePanel
label: qsTr("Interface")
description: qsTr("Configure how credentials are read from the YubiKey.")
description: qsTr("Configure how to communicate with the YubiKey.")
property bool otpModeSelected: interfaceCombobox.currentIndex === 2
property bool customReaderSelected: interfaceCombobox.currentIndex === 1
property bool aboutToChange: (otpModeSelected !== settings.otpMode)

View File

@ -416,11 +416,11 @@ ToolBar {
KeyNavigation.tab: navigator
Accessible.role: Accessible.Button
Accessible.name: "Add"
Accessible.description: "Add credential"
Accessible.name: qsTr("Add")
Accessible.description: qsTr("Add account")
ToolTip {
text: qsTr("Add a new credential")
text: qsTr("Add a new account")
delay: 1000
parent: addCredentialBtn
visible: parent.hovered

View File

@ -161,7 +161,7 @@ ApplicationWindow {
if (credential && credential.touch) {
sysTrayIcon.showMessage(
qsTr("Touch required"),
qsTr("Touch your YubiKey now to generate code for protected credential."),
qsTr("Touch your YubiKey now to generate security code."),
SystemTrayIcon.NoIcon)
}
if (settings.otpMode) {