Merge branch 'mandrill-pie-master'

This commit is contained in:
luigi1111 2017-10-21 07:53:48 -05:00
commit 605f81314a
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 2169 additions and 0 deletions

BIN
lang/flags/romania.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

View file

@ -37,4 +37,5 @@ List of available languages for your wallet's seed:
<language display_name="繁體中文 (台灣)" locale="zh-tw_CN" wallet_language="English" flag="/lang/flags/taiwan.png" qs="none"/> <language display_name="繁體中文 (台灣)" locale="zh-tw_CN" wallet_language="English" flag="/lang/flags/taiwan.png" qs="none"/>
<language display_name="עברית" locale="he_HE" wallet_language="English" flag="/lang/flags/israel.png" qs="none"/> <language display_name="עברית" locale="he_HE" wallet_language="English" flag="/lang/flags/israel.png" qs="none"/>
<language display_name="한국어" locale="ko_KO" wallet_language="English" flag="/lang/flags/south_korea.png" qs="none"/> <language display_name="한국어" locale="ko_KO" wallet_language="English" flag="/lang/flags/south_korea.png" qs="none"/>
<language display_name="Română" locale="ro_RO" wallet_language="English" flag="/lang/flags/romania.png" qs="none"/>
</languages> </languages>

View file

@ -303,6 +303,7 @@ TRANSLATIONS = \ # English is default language, no explicit translation file
$$PWD/translations/monero-core_zh-tw.ts \ # Chinese (Traditional-Taiwan) $$PWD/translations/monero-core_zh-tw.ts \ # Chinese (Traditional-Taiwan)
$$PWD/translations/monero-core_he.ts \ # Hebrew $$PWD/translations/monero-core_he.ts \ # Hebrew
$$PWD/translations/monero-core_ko.ts \ # Korean $$PWD/translations/monero-core_ko.ts \ # Korean
$$PWD/translations/monero-core_ro.ts \ # Romanian
CONFIG(release, debug|release) { CONFIG(release, debug|release) {
DESTDIR = release/bin DESTDIR = release/bin

View file

@ -121,6 +121,7 @@
<file>lang/flags/usa.png</file> <file>lang/flags/usa.png</file>
<file>lang/flags/israel.png</file> <file>lang/flags/israel.png</file>
<file>lang/flags/south_korea.png</file> <file>lang/flags/south_korea.png</file>
<file>lang/flags/romania.png</file>
<file>wizard/WizardManageWalletUI.qml</file> <file>wizard/WizardManageWalletUI.qml</file>
<file>wizard/WizardRecoveryWallet.qml</file> <file>wizard/WizardRecoveryWallet.qml</file>
<file>wizard/WizardMemoTextInput.qml</file> <file>wizard/WizardMemoTextInput.qml</file>

File diff suppressed because it is too large Load diff