Merge pull request #546

ea1d2c3 Last translation files update for PR (Roy Jacobs)
a2f01ea Added missing Receive/Settings/Sign/Transfer translations (Roy Jacobs)
1a1a7a9 Added missing AddressBook translations (Roy Jacobs)
e3daa4b Updated translation files and improved the dutch translation (Roy Jacobs)
c30586c Fixed missing translation (Roy Jacobs)
c9825c5 Updated dutch translation (Roy Jacobs)
ab809b0 Updates translation files (Roy Jacobs)
5589ef7 Fixes missing translations (Roy Jacobs)
This commit is contained in:
Riccardo Spagni 2017-03-10 14:31:25 +00:00
commit b8745299ba
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
23 changed files with 11663 additions and 4892 deletions

View file

@ -157,7 +157,7 @@ Rectangle {
Label { Label {
id: unlockedBalanceLabel id: unlockedBalanceLabel
text: qsTr("Unlocked balance") text: qsTr("Unlocked balance") + translationManager.emptyString
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 50 anchors.leftMargin: 50
tipText: qsTr("Test tip 2<br/><br/>line 2") + translationManager.emptyString tipText: qsTr("Test tip 2<br/><br/>line 2") + translationManager.emptyString

View file

@ -42,8 +42,9 @@ Rectangle {
property Item currentView property Item currentView
property Item previousView property Item previousView
property bool basicMode : false property bool basicMode : false
property string balanceLabelText: qsTr("Balance") property string balanceLabelText: qsTr("Balance") + translationManager.emptyString
property string balanceText property string balanceText
property string unlockedBalanceLabelText: qsTr("Unlocked Balance") + translationManager.emptyString
property string unlockedBalanceText property string unlockedBalanceText
property Transfer transferView: Transfer { } property Transfer transferView: Transfer { }
@ -239,6 +240,7 @@ Rectangle {
} }
Text { Text {
id: availableBalanceLabel
width: 116 width: 116
height: 20 height: 20
font.family: "Arial" font.family: "Arial"
@ -248,7 +250,7 @@ Rectangle {
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
color: "#535353" color: "#535353"
text: qsTr("Unlocked Balance:") text: root.unlockedBalanceLabelText + ":"
} }
Text { Text {

View file

@ -57,7 +57,7 @@ Rectangle {
anchors.top: newEntryText.bottom anchors.top: newEntryText.bottom
anchors.leftMargin: 17 anchors.leftMargin: 17
anchors.topMargin: 17 anchors.topMargin: 17
text: qsTr("Address") text: qsTr("Address") + translationManager.emptyString
fontSize: 14 fontSize: 14
tipText: qsTr("<b>Tip tekst test</b>") + translationManager.emptyString tipText: qsTr("<b>Tip tekst test</b>") + translationManager.emptyString
} }
@ -150,7 +150,7 @@ Rectangle {
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
text: qsTr("Add") text: qsTr("Add") + translationManager.emptyString
enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet) enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
onClicked: { onClicked: {
@ -158,11 +158,11 @@ Rectangle {
informationPopup.title = qsTr("Error") + translationManager.emptyString; informationPopup.title = qsTr("Error") + translationManager.emptyString;
// TODO: check currentWallet.addressBook.errorString() instead. // TODO: check currentWallet.addressBook.errorString() instead.
if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address) if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Address)
informationPopup.text = qsTr("Invalid address") informationPopup.text = qsTr("Invalid address") + translationManager.emptyString
else if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Payment_Id) else if(currentWallet.addressBook.errorCode() === AddressBook.Invalid_Payment_Id)
informationPopup.text = currentWallet.addressBook.errorString() informationPopup.text = currentWallet.addressBook.errorString()
else else
informationPopup.text = qsTr("Can't create entry") informationPopup.text = qsTr("Can't create entry") + translationManager.emptyString
informationPopup.onCloseCallback = null informationPopup.onCloseCallback = null
informationPopup.open(); informationPopup.open();

View file

@ -241,7 +241,7 @@ Rectangle {
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
text: qsTr("Generate") text: qsTr("Generate") + translationManager.emptyString;
anchors.right: parent.right anchors.right: parent.right
onClicked: { onClicked: {
appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId(); appWindow.persistentSettings.payment_id = appWindow.currentWallet.generatePaymentId();
@ -379,7 +379,7 @@ Rectangle {
id: qrMenu id: qrMenu
title: "QrCode" title: "QrCode"
MenuItem { MenuItem {
text: qsTr("Save As") text: qsTr("Save As") + translationManager.emptyString;
onTriggered: qrFileDialog.open() onTriggered: qrFileDialog.open()
} }
} }

View file

@ -117,7 +117,7 @@ Rectangle {
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
pressedColor: "#FF4304" pressedColor: "#FF4304"
text: qsTr("Show seed") text: qsTr("Show seed") + translationManager.emptyString
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
onClicked: { onClicked: {
settingsPasswordDialog.open(); settingsPasswordDialog.open();
@ -225,7 +225,7 @@ Rectangle {
Layout.preferredWidth: 200 Layout.preferredWidth: 200
Layout.fillWidth: true Layout.fillWidth: true
text: (daemonAddress !== undefined) ? daemonAddress[0] : "" text: (daemonAddress !== undefined) ? daemonAddress[0] : ""
placeholderText: qsTr("Hostname / IP") placeholderText: qsTr("Hostname / IP") + translationManager.emptyString
} }
@ -234,7 +234,7 @@ Rectangle {
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.fillWidth: true Layout.fillWidth: true
text: (daemonAddress !== undefined) ? daemonAddress[1] : "18081" text: (daemonAddress !== undefined) ? daemonAddress[1] : "18081"
placeholderText: qsTr("Port") placeholderText: qsTr("Port") + translationManager.emptyString
} }
} }
@ -253,7 +253,7 @@ Rectangle {
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.fillWidth: true Layout.fillWidth: true
text: persistentSettings.daemonUsername text: persistentSettings.daemonUsername
placeholderText: qsTr("Username") placeholderText: qsTr("Username") + translationManager.emptyString
} }
@ -262,7 +262,7 @@ Rectangle {
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.fillWidth: true Layout.fillWidth: true
text: persistentSettings.daemonPassword text: persistentSettings.daemonPassword
placeholderText: qsTr("Password") placeholderText: qsTr("Password") + translationManager.emptyString
echoMode: TextInput.Password echoMode: TextInput.Password
} }
@ -400,7 +400,7 @@ Rectangle {
id: daemonConsolePopup id: daemonConsolePopup
height:500 height:500
width:800 width:800
title: qsTr("Daemon log") title: qsTr("Daemon log") + translationManager.emptyString
onAccepted: { onAccepted: {
close(); close();
} }

View file

@ -192,7 +192,7 @@ Rectangle {
FileDialog { FileDialog {
id: signFileDialog id: signFileDialog
title: "Please choose a file to sign" title: qsTr("Please choose a file to sign") + translationManager.emptyString;
folder: "file://" folder: "file://"
nameFilters: [ "*"] nameFilters: [ "*"]
@ -377,7 +377,7 @@ Rectangle {
FileDialog { FileDialog {
id: verifyFileDialog id: verifyFileDialog
title: "Please choose a file to verify" title: qsTr("Please choose a file to verify") + translationManager.emptyString;
folder: "file://" folder: "file://"
nameFilters: [ "*"] nameFilters: [ "*"]

View file

@ -41,7 +41,7 @@ Rectangle {
signal sweepUnmixableClicked() signal sweepUnmixableClicked()
color: "#F0EEEE" color: "#F0EEEE"
property string startLinkText: "<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>" property string startLinkText: qsTr("<style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font>") + translationManager.emptyString
property bool showAdvanced: false property bool showAdvanced: false
function scaleValueToMixinCount(scaleValue) { function scaleValueToMixinCount(scaleValue) {
@ -462,7 +462,7 @@ Rectangle {
Label { Label {
id: costLabel id: costLabel
fontSize: 14 fontSize: 14
text: qsTr("Transaction cost") text: qsTr("Transaction cost") + translationManager.emptyString
anchors.right: parent.right anchors.right: parent.right
} }
} }
@ -581,7 +581,7 @@ Rectangle {
//SignTxDialog //SignTxDialog
FileDialog { FileDialog {
id: signTxDialog id: signTxDialog
title: "Please choose a file" title: qsTr("Please choose a file") + translationManager.emptyString
folder: "file://" +moneroAccountsDir folder: "file://" +moneroAccountsDir
nameFilters: [ "Unsigned transfers (*)"] nameFilters: [ "Unsigned transfers (*)"]
@ -642,7 +642,7 @@ Rectangle {
//SignTxDialog //SignTxDialog
FileDialog { FileDialog {
id: submitTxDialog id: submitTxDialog
title: "Please choose a file" title: qsTr("Please choose a file") + translationManager.emptyString
folder: "file://" +moneroAccountsDir folder: "file://" +moneroAccountsDir
nameFilters: [ "signed transfers (*)"] nameFilters: [ "signed transfers (*)"]

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff