1 diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp
2 --- qt-x11-opensource-src-4.2.1.orig/tools/designer/src/designer/qdesigner.cpp 2006-10-20 17:35:40.000000000 +0200
3 +++ qt-x11-opensource-src-4.2.1.chng/tools/designer/src/designer/qdesigner.cpp 2006-11-28 14:22:20.000000000 +0100
5 QTranslator *qtTranslator = new QTranslator(this);
7 const QString localSysName = QLocale::system().name();
8 - QString translatorFileName = QLatin1String("designer_");
9 + QString translatorFileName = QLatin1String("qt4-designer_");
10 translatorFileName += localSysName;
11 translator->load(translatorFileName, resourceDir);
13 - translatorFileName = QLatin1String("qt_");
14 + translatorFileName = QLatin1String("qt4_");
15 translatorFileName += localSysName;
16 qtTranslator->load(translatorFileName, resourceDir);
17 installTranslator(translator);
18 diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp
19 --- qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp 2006-10-20 17:35:26.000000000 +0200
20 +++ qt-x11-opensource-src-4.2.1.chng/tools/linguist/linguist/main.cpp 2006-11-28 14:21:19.000000000 +0100
22 QTranslator translator;
23 QTranslator qtTranslator;
24 QString sysLocale = QLocale::system().name();
25 - if (translator.load(QLatin1String("linguist_") + sysLocale, resourceDir)) {
26 + if (translator.load(QLatin1String("qt4-linguist_") + sysLocale, resourceDir)) {
27 app.installTranslator(&translator);
28 - if (qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir))
29 + if (qtTranslator.load(QLatin1String("qt4_") + sysLocale, resourceDir))
30 app.installTranslator(&qtTranslator);
32 app.removeTranslator(&translator);
33 --- qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp.orig 2010-09-10 11:05:25.000000000 +0200
34 +++ qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp 2010-09-21 21:36:42.645202096 +0200
36 #include "qtranslator_p.h"
38 +#include <qlibraryinfo.h>
39 #include "qresource.h"
41 #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
45 delims = search_delimiters.isNull() ? QString::fromLatin1("_.") : search_delimiters;
49 + if (directory == QLibraryInfo::location(QLibraryInfo::TranslationsPath)) {
51 + int idelim = 0, leftmost;
54 + leftmost = filename.size();
55 + for (int i = 0; i < (int)delims.length(); i++) {
56 + int k = filename.indexOf(delims[i], idelim);
57 + if ((k > 0)&&(k < leftmost))
61 + if (leftmost == filename.size())
64 + idelim = leftmost + 1;
65 + fname = filename.left(leftmost);
66 + locale = filename.mid(leftmost+1);
68 + while (!locale.isEmpty()) {
70 + realname = prefix + locale + QString::fromLatin1("/LC_MESSAGES/") + fname + QString::fromLatin1(".qm");
72 + fi.setFile(realname);
73 + if (fi.isReadable())
77 + for (int i = 0; i < (int)delims.length(); i++) {
78 + int k = locale.lastIndexOf(delims[i]);
82 + locale.truncate(rightmost);
84 + if (!locale.isEmpty())
91 + realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
92 + fi.setFile(realname);
93 + if (fi.isReadable())
96 + realname = prefix + fname;
97 + fi.setFile(realname);
98 + if (fi.isReadable())
102 + for (int i = 0; i < (int)delims.length(); i++) {
103 + int k = fname.lastIndexOf(delims[i]);
108 + // no truncations? fail
109 + if (rightmost == 0)
113 - //search for translations on other drives, e.g. Qt may be in Z, while app is in C
114 - //note this uses symbian search rules, i.e. y:->a:, followed by z:
115 - TFindFile finder(qt_s60GetRFs());
116 - QString fname2 = fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
117 - TInt err = finder.FindByDir(
118 - qt_QString2TPtrC(fname2),
119 - qt_QString2TPtrC(nativePrefix));
120 - if (err != KErrNone)
121 - err = finder.FindByDir(qt_QString2TPtrC(fname), qt_QString2TPtrC(nativePrefix));
122 - if (err == KErrNone) {
123 - fi.setFile(qt_TDesC2QString(finder.File()));
124 - realname = fi.canonicalFilePath();
125 - if (fi.isReadable() && fi.isFile())
130 - realname = prefix + fname + (suffix.isNull() ? QString::fromLatin1(".qm") : suffix);
131 - fi.setFile(realname);
132 - if (fi.isReadable() && fi.isFile())
135 - realname = prefix + fname;
136 - fi.setFile(realname);
137 - if (fi.isReadable() && fi.isFile())
141 - for (int i = 0; i < (int)delims.length(); i++) {
142 - int k = fname.lastIndexOf(delims[i]);
147 - // no truncations? fail
148 - if (rightmost == 0)
151 - fname.truncate(rightmost);
152 + fname.truncate(rightmost);
156 // realname is now the fully qualified name of a readable file.