diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-11 20:31:02 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-11 20:31:02 +0100 |
| commit | b0d0974561ad8bf4aa574ca03e299090103ae5d5 (patch) | |
| tree | 99fb650f02edc61223d494e78d9c96d3ce837431 /components | |
| parent | fd4619628cf0e87cc6e06b44b6a9193fb8af2218 (diff) | |
| parent | c45cc3de416858a0674af36975003e3dee53afe3 (diff) | |
| download | monzero-gui-b0d0974561ad8bf4aa574ca03e299090103ae5d5.tar.gz monzero-gui-b0d0974561ad8bf4aa574ca03e299090103ae5d5.tar.xz monzero-gui-b0d0974561ad8bf4aa574ca03e299090103ae5d5.zip | |
Merge pull request #550
c45cc3d enabled translations in some places (kenshi84)
6364530 updated Japanese translation (kenshi84)
Diffstat (limited to 'components')
| -rw-r--r-- | components/DaemonConsole.qml | 4 | ||||
| -rw-r--r-- | components/NetworkStatusItem.qml | 2 | ||||
| -rw-r--r-- | components/PasswordDialog.qml | 2 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/components/DaemonConsole.qml b/components/DaemonConsole.qml index ba07f523..1a1cd82d 100644 --- a/components/DaemonConsole.qml +++ b/components/DaemonConsole.qml @@ -105,7 +105,7 @@ Window { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("Close") + text: qsTr("Close") + translationManager.emptyString onClicked: { root.close() root.accepted() @@ -116,7 +116,7 @@ Window { MoneroComponents.LineEdit { id: sendCommandText width: 300 - placeholderText: qsTr("command + enter (e.g help)") + placeholderText: qsTr("command + enter (e.g help)") + translationManager.emptyString onAccepted: { if(text.length > 0) daemonManager.sendCommand(text,currentWallet.testnet); diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index 7b0187b4..5ba77585 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -82,7 +82,7 @@ Row { font.family: "Arial" font.pixelSize: 12 color: "#545454" - text: qsTr("Network status") + text: qsTr("Network status") + translationManager.emptyString } Text { diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index f5bb7313..f509ada2 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -144,7 +144,7 @@ Window { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("Cancel") + text: qsTr("Cancel") + translationManager.emptyString KeyNavigation.tab: passwordInput onClicked: { root.close() diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 42760f5c..d4243b4b 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -109,7 +109,7 @@ Window { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - text: qsTr("Cancel") + text: qsTr("Cancel") + translationManager.emptyString onClicked: { root.close() root.rejected() |