Merge pull request #132

c3baf46 Update languages.xml (signo88)
c111f47 Update monero-core_it.ts (signo88)
2f684e6 Update languages.xml (signo88)
5faaff6 Other minor changes to it file (signo88)
9c09bab Changes on italian translation file (signo88)
928ab56 Activation of the italian language (signo88)
9721ed8 Some italian translations (signo88)
71e0036 Wizard modification for italian translation (signo88)
This commit is contained in:
Riccardo Spagni 2016-11-11 12:43:03 +02:00
commit d6f200ff06
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
3 changed files with 167 additions and 161 deletions

View file

@ -17,7 +17,7 @@ List of available languages for your wallet's seed:
<language display_name="RPA" locale="en_SA" wallet_language="English" flag="/lang/flags/rpa.png" qs="none"/> <language display_name="RPA" locale="en_SA" wallet_language="English" flag="/lang/flags/rpa.png" qs="none"/>
<language display_name="Palestine" locale="ar_PS" wallet_language="English" flag="/lang/flags/palestine.png" qs="none"/> <language display_name="Palestine" locale="ar_PS" wallet_language="English" flag="/lang/flags/palestine.png" qs="none"/>
<language display_name="India" locale="hi_IN" wallet_language="English" flag="/lang/flags/india.png" qs="none"/> <language display_name="India" locale="hi_IN" wallet_language="English" flag="/lang/flags/india.png" qs="none"/>
<language display_name="Italy" locale="it_IT" wallet_language="Italian" flag="/lang/flags/italy.png" qs="none"/> <language display_name="Italiano" locale="it_IT" wallet_language="Italian" flag="/lang/flags/italy.png" qs="none"/>
<language display_name="German" locale="de_DE" wallet_language="German" flag="/lang/flags/german.png" qs="none"/> <language display_name="German" locale="de_DE" wallet_language="German" flag="/lang/flags/german.png" qs="none"/>
<language display_name="China" locale="zh_CN" wallet_language="English" flag="/lang/flags/china.png" qs="none"/> <language display_name="China" locale="zh_CN" wallet_language="English" flag="/lang/flags/china.png" qs="none"/>
<language display_name="Brazil" locale="pt_BR" wallet_language="Portuguese" flag="/lang/flags/brazil.png" qs="none"/> <language display_name="Brazil" locale="pt_BR" wallet_language="Portuguese" flag="/lang/flags/brazil.png" qs="none"/>

File diff suppressed because it is too large Load diff

View file

@ -82,8 +82,9 @@ Item {
wrapMode: Text.Wrap wrapMode: Text.Wrap
// hack to implement dynamic translation // hack to implement dynamic translation
// https://wiki.qt.io/How_to_do_dynamic_translation_in_QML // https://wiki.qt.io/How_to_do_dynamic_translation_in_QML
text: qsTr("Welcome") /*+ text: qsTr("Welcome") +
translationManager.emptyString*/ translationManager.emptyString
} }
Text { Text {
@ -95,8 +96,7 @@ Item {
//renderType: Text.NativeRendering //renderType: Text.NativeRendering
color: "#4A4646" color: "#4A4646"
wrapMode: Text.Wrap wrapMode: Text.Wrap
text: qsTr("Please choose a language and regional format.") text: qsTr("Please choose a language and regional format.") + translationManager.emptyString
// + translationManager.emptyString
} }
} }
// Flags model // Flags model