Merge pull request #799

995a5e0 updated translations (Jona)
13a6550 added hebrew translation file and flag (Jona)
This commit is contained in:
Riccardo Spagni 2017-08-23 21:21:28 +02:00
commit 73ba192a58
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
6 changed files with 2179 additions and 1 deletions

BIN
lang/flags/israel.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

View File

@ -35,4 +35,5 @@ List of available languages for your wallet's seed:
<language display_name="Русский язык" locale="ru_RU" wallet_language="русский язык" flag="/lang/flags/russia.png" qs="none"/>
<language display_name="简体中文 (中国)" locale="zh-cn_CN" wallet_language="简体中文 (中国)" flag="/lang/flags/china.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"/>
</languages>

2
monero

@ -1 +1 @@
Subproject commit c9063c0b8f78a1fca4c2306d5b1df5f664c030c2
Subproject commit ab594cfee94dff87bb7039724563f6177a892b8b

View File

@ -301,6 +301,7 @@ TRANSLATIONS = \ # English is default language, no explicit translation file
$$PWD/translations/monero-core_sv.ts \ # Swedish
$$PWD/translations/monero-core_zh-cn.ts \ # Chinese (Simplified-China)
$$PWD/translations/monero-core_zh-tw.ts \ # Chinese (Traditional-Taiwan)
$$PWD/translations/monero-core_he.ts \ # Hebrew
CONFIG(release, debug|release) {
DESTDIR = release/bin

View File

@ -119,6 +119,7 @@
<file>lang/flags/taiwan.png</file>
<file>lang/flags/uk.png</file>
<file>lang/flags/usa.png</file>
<file>lang/flags/israel.png</file>
<file>wizard/WizardManageWalletUI.qml</file>
<file>wizard/WizardRecoveryWallet.qml</file>
<file>wizard/WizardMemoTextInput.qml</file>

File diff suppressed because it is too large Load Diff