Merge pull request #2088

15a5f76 add missing TranslationManager.emptyString (selsta)
This commit is contained in:
luigi1111
2019-04-16 16:54:17 -04:00
21 changed files with 765 additions and 65 deletions

View File

@@ -90,7 +90,7 @@ Window {
}
Text {
text: qsTr("Starting local node in %1 seconds").arg(countDown);
text: qsTr("Starting local node in %1 seconds").arg(countDown) + translationManager.emptyString;
font.pixelSize: 18
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
@@ -108,7 +108,7 @@ Window {
id: okButton
visible:false
fontSize: 14
text: qsTr("Start daemon (%1)").arg(countDown)
text: qsTr("Start daemon (%1)").arg(countDown) + translationManager.emptyString
KeyNavigation.tab: cancelButton
onClicked: {
timer.stop();
@@ -121,7 +121,7 @@ Window {
MoneroComponents.StandardButton {
id: cancelButton
fontSize: 14
text: qsTr("Use custom settings")
text: qsTr("Use custom settings") + translationManager.emptyString
onClicked: {
timer.stop();

View File

@@ -145,7 +145,7 @@ Item {
small: true
width: 120
fontSize: 14
text: qsTr("Ok")
text: qsTr("Ok") + translationManager.emptyString
KeyNavigation.tab: cancelButton
onClicked: {
root.close()

View File

@@ -126,7 +126,7 @@ Item {
MoneroComponents.LabelButton {
id: copyButtonId
text: qsTr("Copy")
text: qsTr("Copy") + translationManager.emptyString
anchors.right: parent.right
onClicked: {
if (input.text.length > 0) {

View File

@@ -134,7 +134,7 @@ ColumnLayout {
MoneroComponents.LabelButton {
id: copyButtonId
visible: copyButton && input.text !== ""
text: qsTr("Copy")
text: qsTr("Copy") + translationManager.emptyString
onClicked: {
if (input.text.length > 0) {
console.log("Copied to clipboard");
@@ -147,7 +147,7 @@ ColumnLayout {
MoneroComponents.LabelButton {
id: pasteButtonId
onClicked: item.onPaste(clipboard.text())
text: qsTr("Paste")
text: qsTr("Paste") + translationManager.emptyString
visible: pasteButton
}
}

View File

@@ -101,7 +101,7 @@ Item {
Layout.maximumWidth: 400 * scaleRatio
Label {
text: qsTr("Please enter new password")
text: qsTr("Please enter new password") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
@@ -179,7 +179,7 @@ Item {
}
Label {
text: qsTr("Please confirm new password")
text: qsTr("Please confirm new password") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
@@ -280,7 +280,7 @@ Item {
}
MoneroComponents.StandardButton {
id: okButton
text: qsTr("Continue")
text: qsTr("Continue") + translationManager.emptyString
KeyNavigation.tab: cancelButton
enabled: passwordInput1.text === passwordInput2.text
onClicked: {

View File

@@ -111,7 +111,7 @@ Item {
Layout.maximumWidth: 400 * scaleRatio
Label {
text: root.walletName.length > 0 ? qsTr("Please enter wallet device passphrase for: ") + root.walletName : qsTr("Please enter wallet device passphrase")
text: (root.walletName.length > 0 ? qsTr("Please enter wallet device passphrase for: ") + root.walletName : qsTr("Please enter wallet device passphrase")) + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
@@ -121,7 +121,7 @@ Item {
}
Label {
text: qsTr("Warning: passphrase entry on host is a security risk as it can be captured by malware. It is advised to prefer device-based passphrase entry.");
text: qsTr("Warning: passphrase entry on host is a security risk as it can be captured by malware. It is advised to prefer device-based passphrase entry.") + translationManager.emptyString
Layout.fillWidth: true
wrapMode: Text.Wrap
@@ -211,7 +211,7 @@ Item {
}
Label {
text: qsTr("Please re-enter")
text: qsTr("Please re-enter") + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
@@ -312,7 +312,7 @@ Item {
}
MoneroComponents.StandardButton {
id: okButton
text: qsTr("Continue")
text: qsTr("Continue") + translationManager.emptyString
KeyNavigation.tab: cancelButton
enabled: passphaseInput1.text === passphaseInput2.text
onClicked: {

View File

@@ -99,7 +99,7 @@ Item {
Layout.maximumWidth: 400 * scaleRatio
Label {
text: root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")
text: (root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password")) + translationManager.emptyString
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
@@ -232,7 +232,7 @@ Item {
MoneroComponents.StandardButton {
id: okButton
small: true
text: qsTr("Continue")
text: qsTr("Continue") + translationManager.emptyString
KeyNavigation.tab: cancelButton
onClicked: {
root.close()