| 70ca9eec |
1 | --- qt-x11-free-3.2.0/tools/assistant/main.cpp.orig 2003-08-09 13:32:43.000000000 +0200 |
| 2 | +++ qt-x11-free-3.2.0/tools/assistant/main.cpp 2003-08-09 13:56:54.000000000 +0200 |
| 3 | @@ -249,11 +249,11 @@ |
| 4 | fprintf( stderr, "Resource file directory '%s' does not exist!\n", resourceDir.latin1() ); |
| 5 | |
| 6 | QTranslator translator( 0 ); |
| 7 | - translator.load( QString("assistant_") + QTextCodec::locale(), resourceDir ); |
| 826f136f |
8 | + translator.load( QString("assistant"), resourceDir + QString("/") + QString::fromLatin1(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| 70ca9eec |
9 | a.installTranslator( &translator ); |
| 10 | |
| 11 | QTranslator qtTranslator( 0 ); |
| 12 | - qtTranslator.load( QString("qt_") + QTextCodec::locale(), resourceDir ); |
| 826f136f |
13 | + qtTranslator.load( QString("qt"), resourceDir + QString("/") + QString::fromLatin1(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| 70ca9eec |
14 | a.installTranslator( &qtTranslator ); |
| 15 | |
| 16 | Config *conf = Config::loadConfig( profileName ); |
| 826f136f |
17 | --- qt-x11-free-3.2.0/tools/designer/app/main.cpp.orig 2003-08-12 20:00:11.821715736 +0200 |
| 18 | +++ qt-x11-free-3.2.0/tools/designer/app/main.cpp 2003-08-12 19:59:12.017807312 +0200 |
| 19 | @@ -41,6 +41,7 @@ |
| 20 | #include <qsettings.h> |
| 21 | #include <qsplashscreen.h> |
| 22 | #include <qdir.h> |
| 23 | +#include <qtextcodec.h> |
| 70ca9eec |
24 | |
| 826f136f |
25 | #include <stdlib.h> |
| 26 | #include <signal.h> |
| 27 | @@ -179,6 +180,14 @@ |
| f57ef8d5 |
28 | signal( SIGTERM, exitHandler ); |
| 29 | } |
| 30 | |
| 31 | + QString resourceDir = qInstallPathTranslations(); |
| 32 | + |
| 33 | + QTranslator translator( 0 ); |
| 826f136f |
34 | + translator.load( QString("designer"), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| f57ef8d5 |
35 | + a.installTranslator( &translator ); |
| 36 | + QTranslator qtTranslator( 0 ); |
| 826f136f |
37 | + qtTranslator.load( QString("qt"), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| f57ef8d5 |
38 | + |
| 39 | extern void qInitImages_designercore(); |
| 40 | qInitImages_designercore(); |
| 41 | |
| 826f136f |
42 | --- qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp.orig 2003-05-13 09:08:55.000000000 +0200 |
| 43 | +++ qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp 2003-08-12 20:10:04.402629744 +0200 |
| 44 | @@ -34,6 +34,7 @@ |
| 45 | #include <qtranslator.h> |
| 46 | #include <qsettings.h> |
| 47 | #include <qsplashscreen.h> |
| 48 | +#include <qtextcodec.h> |
| 49 | |
| 50 | int main( int argc, char **argv ) |
| 51 | { |
| 52 | @@ -41,10 +42,16 @@ |
| 53 | QApplication::setOverrideCursor( Qt::waitCursor ); |
| 54 | |
| 55 | |
| 56 | + QString resourceDir = qInstallPathTranslations(); |
| 57 | QTranslator translator( 0 ); |
| 58 | - translator.load( QString( "linguist_" ) + QTextCodec::locale(), "." ); |
| 59 | + translator.load( QString( "linguist" ), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| 60 | app.installTranslator( &translator ); |
| 61 | |
| 62 | + QTranslator qttranslator( 0 ); |
| 63 | + qttranslator.load( QString( "qt" ), resourceDir + QString("/") + QString(QTextCodec::locale()) + QString("/LC_MESSAGES") ); |
| 64 | + app.installTranslator( &qttranslator ); |
| 65 | + |
| 66 | + |
| 67 | bool showSplash = TRUE; |
| 68 | |
| 69 | QString keybase("/Qt Linguist/3.1/"); |
projects / packages / qt4.git / blame