statusmessage added topwm.fixed initialization problem.changed sring in translation

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
@@ -135,17 +135,17 @@
 { "&Undo","&Undo" },
 { "Re&do","Re&do" },
 { "&Delete Contact","&Delete Contact" },
 { "Configure &Resources...","Configure &Resources..." },
 { "&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..." },
 { "Licence","Licence" },
 { "Faq","Faq" },
 { "What's New?","What's New?" },
 { "Sync HowTo","Sync HowTo" },
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
@@ -135,17 +135,17 @@
 { "&Undo","&Undo" },
 { "Re&do","Re&do" },
 { "&Delete Contact","&Delete Contact" },
 { "Configure &Resources...","Configure &Resources..." },
 { "&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..." },
 { "Licence","Licence" },
 { "Faq","Faq" },
 { "What's New?","What's New?" },
 { "Sync HowTo","Sync HowTo" },
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
@@ -863,17 +863,17 @@
 { " 80 %"," 80 %" },
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "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?" },
 { "&Edit...","&Editiere..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
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
@@ -32,19 +32,17 @@ $Id$
 
 #include "qtopiaconverter.h"
 
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 //#include <.h>
 
-//#include <qpe/categories.h>
 #include <libkdepim/ksyncprofile.h>
-//US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 
 QtopiaConverter::QtopiaConverter()
 {
     m_edit = 0;
 }
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
@@ -25,18 +25,16 @@ $Id$
 */
 
 #ifndef KABC_QTOPIACONVERTER_H
 #define KABC_QTOPIACONVERTER_H
 
 #include <qstring.h>
 
 #include "addressee.h"
-//#include <qpe/pim/contact.h>
-//#include <qpe/quuid.h>
 
 #include <xml/qdom.h> 
 class Categories;
 
 namespace KABC {
 
 
 
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
@@ -38,18 +38,16 @@ $Id$
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
-#include <qpe/pim/addressbookaccess.h>
-
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 
 #include "resourceqtopia.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
@@ -33,19 +33,16 @@ $Id$
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
 #include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include "resourceqtopia.h"
-//US #include <qpe/qpeapplication.h>
-
-//US #include "stdaddressbook.h"
 
 #include "resourceqtopiaconfig.h"
 
 using namespace KABC;
 
 ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
diff --git a/korganizer/wordsgerman.h b/korganizer/wordsgerman.h
index b2651d4..c5cae20 100644
--- a/korganizer/wordsgerman.h
+++ b/korganizer/wordsgerman.h
@@ -864,17 +864,17 @@
 { " 80 %"," 80 %" },
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "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?" },
 { "&Edit...","&Editiere..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
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
@@ -35,16 +35,21 @@
 #include <qmessagebox.h>
 #include <pwmprefs.h>
 #include <kpimglobalprefs.h>
 #include <kcmconfigs/kcmpwmconfig.h>
 #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>
 #include <qfileinfo.h>
 #include <qclipboard.h>
 
 
@@ -160,16 +165,17 @@ enum {
 
 PwM::PwM(PwMInit *_init, PwMDoc *doc,
 	 bool virginity,
 	 QWidget *parent, const char *name)
  : KMainWindow(parent, "HALLO")
  , forceQuit (false)
  , forceMinimizeToTray (false)
 {
+    virgin = !virginity;
 	init = _init;
 	connect(doc, SIGNAL(docClosed(PwMDoc *)),
 		this, SLOT(docClosed(PwMDoc *)));
 	initMenubar();
 	initToolbar();
 	initMetrics();
 	setVirgin(virginity);
 	setFocusPolicy(QWidget::WheelFocus);
@@ -1354,16 +1360,19 @@ void PwM::copyToClipboard(const QString &s)
 
 void PwM::showStatMsg(const QString &msg)
 {
 #ifndef PWM_EMBEDDED
 	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)
 {
 	if (e->gotFocus()) {
 		emit gotFocus(this);
 	} else if (e->lostFocus()) {