-rw-r--r-- | korganizer/koprefs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index dd978bf..5d7db4f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -32,24 +32,25 @@ | |||
32 | #include <qregexp.h> | 32 | #include <qregexp.h> |
33 | #include <qfont.h> | 33 | #include <qfont.h> |
34 | #include <qcolor.h> | 34 | #include <qcolor.h> |
35 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | #include <kglobal.h> | 38 | #include <kglobal.h> |
39 | #include <kconfig.h> | 39 | #include <kconfig.h> |
40 | #include <klocale.h> | 40 | #include <klocale.h> |
41 | #include <kdebug.h> | 41 | #include <kdebug.h> |
42 | #include <kemailsettings.h> | 42 | #include <kemailsettings.h> |
43 | #include <kstaticdeleter.h> | 43 | #include <kstaticdeleter.h> |
44 | #include <libkdepim/kpimglobalprefs.h> | ||
44 | 45 | ||
45 | #include "koprefs.h" | 46 | #include "koprefs.h" |
46 | #include "mainwindow.h" | 47 | #include "mainwindow.h" |
47 | 48 | ||
48 | const char *germanwords[][2] = { | 49 | const char *germanwords[][2] = { |
49 | #include "wordsgerman.h" | 50 | #include "wordsgerman.h" |
50 | "", "" | 51 | "", "" |
51 | }; | 52 | }; |
52 | 53 | ||
53 | KOPrefs *KOPrefs::mInstance = 0; | 54 | KOPrefs *KOPrefs::mInstance = 0; |
54 | static KStaticDeleter<KOPrefs> insd; | 55 | static KStaticDeleter<KOPrefs> insd; |
55 | 56 | ||
@@ -381,24 +382,25 @@ QStringList KOPrefs::getDefaultList() | |||
381 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") | 382 | << i18n("Education")<< i18n("Family") << i18n("Favorites") << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts") |
382 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") | 383 | << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") |
383 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") | 384 | << i18n("Lunch") << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel") |
384 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") | 385 | << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping") |
385 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") | 386 | << i18n("Speach") << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University") |
386 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; | 387 | << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent") ; |
387 | retval.sort(); | 388 | retval.sort(); |
388 | return retval; | 389 | return retval; |
389 | } | 390 | } |
390 | 391 | ||
391 | void KOPrefs::usrReadConfig() | 392 | void KOPrefs::usrReadConfig() |
392 | { | 393 | { |
394 | mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; | ||
393 | mLocaleDict = 0; | 395 | mLocaleDict = 0; |
394 | // pending LR fix translation | 396 | // pending LR fix translation |
395 | // qDebug("KOPrefs::usrReadConfig() fix translation "); | 397 | // qDebug("KOPrefs::usrReadConfig() fix translation "); |
396 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) { | 398 | if ( mPreferredLanguage > 0 && mPreferredLanguage < 4 ) { |
397 | if ( mPreferredLanguage == 1 ) { | 399 | if ( mPreferredLanguage == 1 ) { |
398 | mLocaleDict = new QDict<QString>; | 400 | mLocaleDict = new QDict<QString>; |
399 | int i = 0; | 401 | int i = 0; |
400 | QString fw ( germanwords[i] [0]); | 402 | QString fw ( germanwords[i] [0]); |
401 | while ( !fw.isEmpty() ) { | 403 | while ( !fw.isEmpty() ) { |
402 | mLocaleDict->insert( fw, new QString (germanwords[i] [1] )); | 404 | mLocaleDict->insert( fw, new QString (germanwords[i] [1] )); |
403 | ++i; | 405 | ++i; |
404 | fw = germanwords[i] [0]; | 406 | fw = germanwords[i] [0]; |