summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-23 06:49:54 (UTC)
committer zautrix <zautrix>2004-10-23 06:49:54 (UTC)
commit65989e4ab454f228fb6cd2fa532145ed54366701 (patch) (side-by-side diff)
treea93a8cd6ef806dd5b6c38e8792a6e007b9e5e413
parent0f0dc54f0edc8c4ec5b320118c82fa5150591fed (diff)
downloadkdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.zip
kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.gz
kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.bz2
statusmessage added topwm.fixed initialization problem.changed sring in translation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kaddressbook/germantranslation.txt2
-rw-r--r--bin/kdepim/kaddressbook/usertranslation.txt2
-rw-r--r--bin/kdepim/korganizer/usertranslation.txt2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp2
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.h2
-rw-r--r--kabc/plugins/qtopia/resourceqtopia.cpp2
-rw-r--r--kabc/plugins/qtopia/resourceqtopiaconfig.cpp3
-rw-r--r--korganizer/wordsgerman.h2
-rw-r--r--pwmanager/pwmanager/pwm.cpp9
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
@@ -140,7 +140,7 @@
{ "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"..." },
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
@@ -140,7 +140,7 @@
{ "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"..." },
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
@@ -868,7 +868,7 @@
{ "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..." },
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
@@ -37,9 +37,7 @@ $Id$
#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
@@ -30,8 +30,6 @@ $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
@@ -43,8 +43,6 @@ $Id$
#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
@@ -38,9 +38,6 @@ $Id$
#include <qdir.h>
#include <qfile.h>
#include "resourceqtopia.h"
-//US #include <qpe/qpeapplication.h>
-
-//US #include "stdaddressbook.h"
#include "resourceqtopiaconfig.h"
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index b2651d4..c5cae20 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -869,7 +869,7 @@
{ "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..." },
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
@@ -40,6 +40,11 @@
#include <kcmultidialog.h>
#endif
+
+#ifndef DESKTOP_VERSION
+#include <qpe/global.h>
+#endif
+
#include <qpixmap.h>
#include <qcheckbox.h>
#include <qspinbox.h>
@@ -165,6 +170,7 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc,
, forceQuit (false)
, forceMinimizeToTray (false)
{
+ virgin = !virginity;
init = _init;
connect(doc, SIGNAL(docClosed(PwMDoc *)),
this, SLOT(docClosed(PwMDoc *)));
@@ -1359,6 +1365,9 @@ void PwM::showStatMsg(const QString &msg)
statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000);
#else
qDebug("Statusbar : %s",msg.latin1());
+#ifndef DESKTOP_VERSION
+ Global::statusMessage(msg);
+#endif
#endif
}