--- ica/ica.qrc~ 2008-05-30 14:44:20.000000000 +0200 +++ ica/ica.qrc 2008-11-03 10:09:16.000000000 +0100 @@ -9,7 +9,7 @@ <file>resources/pl.qm</file> <file>resources/sl.qm</file> <file>resources/uk.qm</file> - <file>resources/zh.qm</file> + <file>resources/zh_cn.qm</file> <file>resources/fi.qm</file> <file>resources/sk.qm</file> <file>resources/ru.qm</file> --- ima/italc.qrc~ 2008-05-30 14:44:21.000000000 +0200 +++ ima/italc.qrc 2008-11-03 10:10:40.000000000 +0100 @@ -42,6 +42,7 @@ <file>resources/ru.qm</file> <file>resources/pt_br.qm</file> <file>resources/el.qm</file> + <file>resources/zh_cn.qm</file> <file>resources/demoquality.png</file> <file>resources/error.png</file> <file>resources/filesave.png</file> @@ -81,7 +82,7 @@ <file>resources/qt_ru.qm</file> <file>resources/qt_sk.qm</file> <file>resources/qt_zh.qm</file> - <file>resources/qt_zh_CN.qm</file> + <file>resources/qt_zh_cn.qm</file> <file>resources/reboot.png</file> <file>resources/reload.png</file> <file>resources/remote_control.png</file> --- lib/italc_core.qrc~ 2008-05-30 14:44:21.000000000 +0200 +++ lib/italc_core.qrc 2008-11-03 10:15:27.000000000 +0100 @@ -12,7 +12,7 @@ <file alias="resources/pl-core.qm">resources/pl.qm</file> <file alias="resources/sl-core.qm">resources/sl.qm</file> <file alias="resources/uk-core.qm">resources/uk.qm</file> - <file alias="resources/zh-core.qm">resources/zh.qm</file> + <file alias="resources/zh_cn-core.qm">resources/zh_cn.qm</file> <file alias="resources/fi-core.qm">resources/fi.qm</file> <file alias="resources/ru-core.qm">resources/ru.qm</file> <file alias="resources/sk-core.qm">resources/sk.qm</file> --- ica/src/ica_main.cpp~ 2008-02-10 20:20:52.000000000 +0100 +++ ica/src/ica_main.cpp 2008-11-03 21:40:18.000000000 +0100 @@ -136,7 +136,12 @@ app->setEventFilter( eventFilter ); #endif - const QString loc = QLocale::system().name().left( 2 ); + QString loc = QLocale::system().name().toLower(); + if( loc.left( 2 ) == loc.right( 2 ) ) + { + loc = loc.left( 2 ); + } + QTranslator core_tr; core_tr.load( ":/resources/" + loc + "-core.qm" ); app->installTranslator( &core_tr );