diff options
| -rw-r--r-- | LeftPanel.qml | 2 | ||||
| -rw-r--r-- | main.qml | 9 | ||||
| -rw-r--r-- | translations/monero-core_de.ts | 37 | ||||
| -rw-r--r-- | translations/monero-core_en.ts | 37 | ||||
| -rw-r--r-- | translations/monero-core_it.ts | 37 | ||||
| -rw-r--r-- | translations/monero-core_pl.ts | 37 | ||||
| -rw-r--r-- | translations/monero-core_ru.ts | 43 | ||||
| -rw-r--r-- | translations/monero-core_zh.ts | 37 | ||||
| -rw-r--r-- | wizard/WizardMain.qml | 1 | ||||
| -rw-r--r-- | wizard/WizardWelcome.qml | 16 |
10 files changed, 122 insertions, 134 deletions
diff --git a/LeftPanel.qml b/LeftPanel.qml index e23d353c..6e067d03 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -100,7 +100,7 @@ Rectangle { spacing: 6 Label { - text: qsTr("Balance") + text: qsTr("Balance") + translationManager.emptyString anchors.left: parent.left anchors.leftMargin: 50 tipText: qsTr("Test tip 1<br/><br/>line 2") @@ -125,8 +125,16 @@ ApplicationWindow { function initialize() { console.log("initializing..") + + // setup language + var locale = persistentSettings.locale + if (locale !== "") { + translationManager.setLanguage(locale.split("_")[0]); + } + middlePanel.paymentClicked.connect(handlePayment); + if (typeof wizard.settings['wallet'] !== 'undefined') { wallet = wizard.settings['wallet']; } else { @@ -262,6 +270,7 @@ ApplicationWindow { Settings { id: persistentSettings property string language + property string locale property string account_name property string wallet_path property bool auto_donations_enabled : true diff --git a/translations/monero-core_de.ts b/translations/monero-core_de.ts index 53c8bef3..f2c59688 100644 --- a/translations/monero-core_de.ts +++ b/translations/monero-core_de.ts @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation type="unfinished"></translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/monero-core_en.ts b/translations/monero-core_en.ts index 957bfdd0..f8f7b3ea 100644 --- a/translations/monero-core_en.ts +++ b/translations/monero-core_en.ts @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation type="unfinished"></translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/monero-core_it.ts b/translations/monero-core_it.ts index a24a0501..3b4e2760 100644 --- a/translations/monero-core_it.ts +++ b/translations/monero-core_it.ts @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation type="unfinished"></translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/monero-core_pl.ts b/translations/monero-core_pl.ts index 67e8a0aa..6c15a0b0 100644 --- a/translations/monero-core_pl.ts +++ b/translations/monero-core_pl.ts @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation type="unfinished"></translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/monero-core_ru.ts b/translations/monero-core_ru.ts index ab0d509c..7921567d 100644 --- a/translations/monero-core_ru.ts +++ b/translations/monero-core_ru.ts @@ -138,7 +138,7 @@ <message> <location filename="../components/DashboardTable.qml" line="172"/> <source>Balance</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Баланс</translation> </message> <message> <location filename="../components/DashboardTable.qml" line="193"/> @@ -240,7 +240,7 @@ <message> <location filename="../components/HistoryTable.qml" line="202"/> <source>Balance</source> - <translation type="unfinished"></translation> + <translation type="unfinished">Баланс</translation> </message> <message> <location filename="../components/HistoryTable.qml" line="223"/> @@ -253,7 +253,7 @@ <message> <location filename="../LeftPanel.qml" line="103"/> <source>Balance</source> - <translation type="unfinished"></translation> + <translation>Баланс</translation> </message> <message> <location filename="../LeftPanel.qml" line="106"/> @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation>Добро пожаловать</translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation>Пожалуйста выберите язык и региональный формат.</translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/translations/monero-core_zh.ts b/translations/monero-core_zh.ts index d47f1c24..0a2faf01 100644 --- a/translations/monero-core_zh.ts +++ b/translations/monero-core_zh.ts @@ -582,7 +582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardMain.qml" line="308"/> + <location filename="../wizard/WizardMain.qml" line="309"/> <source>USE MONERO</source> <translation type="unfinished"></translation> </message> @@ -666,13 +666,12 @@ <context> <name>WizardWelcome</name> <message> - <location filename="../wizard/WizardWelcome.qml" line="49"/> - <location filename="../wizard/WizardWelcome.qml" line="73"/> + <location filename="../wizard/WizardWelcome.qml" line="69"/> <source>Welcome</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../wizard/WizardWelcome.qml" line="86"/> + <location filename="../wizard/WizardWelcome.qml" line="82"/> <source>Please choose a language and regional format.</source> <translation type="unfinished"></translation> </message> @@ -680,75 +679,75 @@ <context> <name>main</name> <message> - <location filename="../main.qml" line="140"/> - <location filename="../main.qml" line="195"/> - <location filename="../main.qml" line="224"/> + <location filename="../main.qml" line="148"/> + <location filename="../main.qml" line="203"/> + <location filename="../main.qml" line="232"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="141"/> + <location filename="../main.qml" line="149"/> <source>Couldn't open wallet: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="196"/> + <location filename="../main.qml" line="204"/> <source>Can't create transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="208"/> + <location filename="../main.qml" line="216"/> <source>Confirmation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="209"/> + <location filename="../main.qml" line="217"/> <source>Please confirm transaction: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="210"/> + <location filename="../main.qml" line="218"/> <source> Address: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="211"/> + <location filename="../main.qml" line="219"/> <source> Payment ID: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="212"/> + <location filename="../main.qml" line="220"/> <source> Amount: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="213"/> + <location filename="../main.qml" line="221"/> <source> Fee: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="225"/> + <location filename="../main.qml" line="233"/> <source>Couldn't send the money: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="228"/> + <location filename="../main.qml" line="236"/> <source>Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="229"/> + <location filename="../main.qml" line="237"/> <source>Money sent successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../main.qml" line="300"/> + <location filename="../main.qml" line="309"/> <source>Initializing Wallet...</source> <translation type="unfinished"></translation> </message> diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 3c4103ce..987ac897 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -147,6 +147,7 @@ Rectangle { // persist settings appWindow.persistentSettings.language = settings.language + appWindow.persistentSettings.locale = settings.locale appWindow.persistentSettings.account_name = settings.account_name appWindow.persistentSettings.wallet_path = settings.wallet_path appWindow.persistentSettings.allow_background_mining = settings.allow_background_mining diff --git a/wizard/WizardWelcome.qml b/wizard/WizardWelcome.qml index 72bf27cc..bc4c5a1b 100644 --- a/wizard/WizardWelcome.qml +++ b/wizard/WizardWelcome.qml @@ -45,19 +45,6 @@ Item { } -// function retranslateUi() { -// welcomeText.text = qsTr("Welcome") -// } - - -// Connections { -// target: translationManager -// onEmptyStringChanged: { -// console.log("languageChanged") -// retranslateUi() -// } -// } - Column { id: headerColumn anchors.left: parent.left @@ -132,9 +119,6 @@ Item { width: gridView.cellWidth height: gridView.cellHeight - - - Rectangle { id: flagRect width: 60; height: 60 |
