changed translation management so that not only the PC language setting is used but also the country
This commit is contained in:
parent
db7a7599b6
commit
dbb0148a70
2 changed files with 15 additions and 15 deletions
|
@ -587,7 +587,7 @@ int main ( int argc, char** argv )
|
||||||
|
|
||||||
if ( bUseGUI && bUseTranslation )
|
if ( bUseGUI && bUseTranslation )
|
||||||
{
|
{
|
||||||
if ( myappTranslator.load ( ":/translations/translation.qm" ) )
|
if ( myappTranslator.load ( QLocale(), "translation", "_", ":/translations" ) )
|
||||||
{
|
{
|
||||||
pApp->installTranslator ( &myappTranslator );
|
pApp->installTranslator ( &myappTranslator );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,24 +1,24 @@
|
||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/translations" lang="de">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_de_DE.qm</file>
|
<file alias="translation_de_DE.qm">res/translation/translation_de_DE.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="fr">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_fr_FR.qm</file>
|
<file alias="translation_fr_FR.qm">res/translation/translation_fr_FR.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="pt">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_pt_PT.qm</file>
|
<file alias="translation_pt_PT.qm">res/translation/translation_pt_PT.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="es">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_es_ES.qm</file>
|
<file alias="translation_es_ES.qm">res/translation/translation_es_ES.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="nl">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_nl_NL.qm</file>
|
<file alias="translation_nl_NL.qm">res/translation/translation_nl_NL.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="it">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_it_IT.qm</file>
|
<file alias="translation_it_IT.qm">res/translation/translation_it_IT.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/translations" lang="pl">
|
<qresource prefix="/translations">
|
||||||
<file alias="translation.qm">res/translation/translation_pl_PL.qm</file>
|
<file alias="translation_pl_PL.qm">res/translation/translation_pl_PL.qm</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
|
|
||||||
<qresource prefix="/png/LEDs">
|
<qresource prefix="/png/LEDs">
|
||||||
|
|
Loading…
Reference in a new issue