author | zautrix <zautrix> | 2004-10-23 06:49:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 06:49:54 (UTC) |
commit | 65989e4ab454f228fb6cd2fa532145ed54366701 (patch) (side-by-side diff) | |
tree | a93a8cd6ef806dd5b6c38e8792a6e007b9e5e413 | |
parent | 0f0dc54f0edc8c4ec5b320118c82fa5150591fed (diff) | |
download | kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.zip kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.gz kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.bz2 |
statusmessage added topwm.fixed initialization problem.changed sring in translation
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/usertranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/usertranslation.txt | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.h | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopia.cpp | 2 | ||||
-rw-r--r-- | kabc/plugins/qtopia/resourceqtopiaconfig.cpp | 3 | ||||
-rw-r--r-- | korganizer/wordsgerman.h | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 9 |
9 files changed, 13 insertions, 13 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index a5ba794..16c4178 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -139,9 +139,9 @@ { "&Configure %1...","&Configure %1..." }, { "Configure S&hortcuts...","Configure S&hortcuts..." }, { "Show Jump Bar","Show Jump Bar" }, { "Show Details","Show Details" }, -{ "Beam receice enabled","Beam receice enabled" }, +{ "Beam receive enabled","Beam receice enabled" }, { "Set Who Am I","Set Who Am I" }, { "Set Categories","Set Categories" }, { "Remove "voice"...","Remove "voice"..." }, { "Import from Outlook...","Import from Outlook..." }, diff --git a/bin/kdepim/kaddressbook/usertranslation.txt b/bin/kdepim/kaddressbook/usertranslation.txt index a5ba794..16c4178 100644 --- a/bin/kdepim/kaddressbook/usertranslation.txt +++ b/bin/kdepim/kaddressbook/usertranslation.txt @@ -139,9 +139,9 @@ { "&Configure %1...","&Configure %1..." }, { "Configure S&hortcuts...","Configure S&hortcuts..." }, { "Show Jump Bar","Show Jump Bar" }, { "Show Details","Show Details" }, -{ "Beam receice enabled","Beam receice enabled" }, +{ "Beam receive enabled","Beam receice enabled" }, { "Set Who Am I","Set Who Am I" }, { "Set Categories","Set Categories" }, { "Remove "voice"...","Remove "voice"..." }, { "Import from Outlook...","Import from Outlook..." }, diff --git a/bin/kdepim/korganizer/usertranslation.txt b/bin/kdepim/korganizer/usertranslation.txt index 0236b92..f4c4698 100644 --- a/bin/kdepim/korganizer/usertranslation.txt +++ b/bin/kdepim/korganizer/usertranslation.txt @@ -867,9 +867,9 @@ { "What's Next","What's Next" }, { "Complete calendar...","Kompletten Kalender..." }, { "Filtered calendar...","Gefilterten Kalender..." }, { "Export to phone","Exportiere zum Handy" }, -{ "Beam receice enabled","Beam Empfang an" }, +{ "Beam receive enabled","Beam Empfang an" }, { "What's new?","Was ist neu?" }, { "FAQ...","FAQ..." }, { "Licence...","Licence..." }, { "What's This?","What's This?" }, diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index 106596f..39d366b 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp @@ -36,11 +36,9 @@ $Id$ #include <qdir.h> #include <qtextstream.h> //#include <.h> -//#include <qpe/categories.h> #include <libkdepim/ksyncprofile.h> -//US #include <qpe/categoryselect.h> using namespace KABC; diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h index d318ded..cb5b433 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.h +++ b/kabc/plugins/qtopia/qtopiaconverter.h @@ -29,10 +29,8 @@ $Id$ #include <qstring.h> #include "addressee.h" -//#include <qpe/pim/contact.h> -//#include <qpe/quuid.h> #include <xml/qdom.h> class Categories; diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp index 4ee3c3c..95fa541 100644 --- a/kabc/plugins/qtopia/resourceqtopia.cpp +++ b/kabc/plugins/qtopia/resourceqtopia.cpp @@ -42,10 +42,8 @@ $Id$ //US #include <ksavefile.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <qpe/pim/addressbookaccess.h> - #include "resourceqtopiaconfig.h" #include "stdaddressbook.h" diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp index b2310c4..0505d0b 100644 --- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp +++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp @@ -37,11 +37,8 @@ $Id$ #include <qdir.h> #include <qfile.h> #include "resourceqtopia.h" -//US #include <qpe/qpeapplication.h> - -//US #include "stdaddressbook.h" #include "resourceqtopiaconfig.h" using namespace KABC; diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h index b2651d4..c5cae20 100644 --- a/korganizer/wordsgerman.h +++ b/korganizer/wordsgerman.h @@ -868,9 +868,9 @@ { "What's Next","What's Next" }, { "Complete calendar...","Kompletten Kalender..." }, { "Filtered calendar...","Gefilterten Kalender..." }, { "Export to phone","Exportiere zum Handy" }, -{ "Beam receice enabled","Beam Empfang an" }, +{ "Beam receive enabled","Beam Empfang an" }, { "What's new?","Was ist neu?" }, { "FAQ...","FAQ..." }, { "Licence...","Licence..." }, { "What's This?","What's This?" }, diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index ac0c978..9798e8e 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp @@ -39,8 +39,13 @@ #include <kcmconfigs/kcmkdepimconfig.h> #include <kcmultidialog.h> #endif + +#ifndef DESKTOP_VERSION +#include <qpe/global.h> +#endif + #include <qpixmap.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qlineedit.h> @@ -164,8 +169,9 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc, : KMainWindow(parent, "HALLO") , forceQuit (false) , forceMinimizeToTray (false) { + virgin = !virginity; init = _init; connect(doc, SIGNAL(docClosed(PwMDoc *)), this, SLOT(docClosed(PwMDoc *))); initMenubar(); @@ -1358,8 +1364,11 @@ void PwM::showStatMsg(const QString &msg) KStatusBar *statBar = statusBar(); statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); #else qDebug("Statusbar : %s",msg.latin1()); +#ifndef DESKTOP_VERSION + Global::statusMessage(msg); +#endif #endif } void PwM::focusInEvent(QFocusEvent *e) |