kopiemail fixes

8 files changed, 42 insertions, 24 deletions

diff --git a/bin/kdepim/kopiemail/filesave.png b/bin/kdepim/kopiemail/filesave.png
new file mode 100644
index 0000000..14d339d
--- a/dev/null
+++ b/bin/kdepim/kopiemail/filesave.png
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 7a53d36..1abe14a 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -17,3 +17,3 @@
 { "Italian","Italienisch" },
-{ "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
+{ "User defined (usertranslation.txt)","Benutzerdef.(usertranslation.txt)" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
@@ -35,5 +35,5 @@
 { "Timezone:","Zeitzone:" },
-{ "Add 30 min (+00:30)  to selected Timezone","Addiere 30 min zur selektierten Zeitzone" },
+{ "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
-{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
+{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
@@ -99,3 +99,3 @@
 { "Mail","Mail" },
-{ "Settings","Einstellungen" },
+{ "Settings","Konfig" },
 { "Get all new mails","Hole alle neuen Mails" },
@@ -119,4 +119,4 @@
 { "Settings - some need a restart (nr)","Einstellungen - manche benötigen einen Neustart (nr)" },
-{ "HINT: Separate multiple\neMail addresses by ";"","Hinweis: Trenne mehrere Addressen mit einem ";"" },
-{ "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich" stattdessen!" },
+{ "HINT: Separate multiple\neMail addresses by ";"","Hinweis:Trenne mehrere\nAddressen mit einem ";"" },
+{ "Ignore above settings and\nuse KA/Pi "Who am I" instead!","Ignoriere obige Einstellungen und\nbenutze KA/Pi "Wer bin ich"\nstattdessen!" },
 { "View mail as html","Zeige Mails als html" },
@@ -195,5 +195,5 @@
 { "Account:","Zugang:" },
-{ "Prefix will prepend, no need to enter it!","Prefix wird vorangestellt, braucht nicht eingegeben zu werden!" },
+{ "Prefix will prepend, do not enter","Pfad-Prefix wird vorangestellt" },
 { "Move mail(s)","Verschiebe Mail(s)" },
-{ "apply only to mails smaller","wende nur auf Mails an, kleiner als" },
+{ "only mails smaller","nur Mails kleiner" },
 { " kB"," kB" },
@@ -237,2 +237,6 @@
 { "Refresh header list","Aktualisiere Titel Liste" },
+{ "Define a smtp\n account first!\n","Bitte zuerst einen\nSMTP Account anlegen!\n" },
+{ "Mail queue flushed","Gespeicherte Mails gesendet!" },
+{ "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n","Bitte legen Sie einen\nSMTP Account an.\nDer SMTP Account wird\nfür das Versenden von\nMails benötigt!" },
+{ "","" },
 { "","" },
diff --git a/bin/kdepim/kopiemail/icons22/filesave.png b/bin/kdepim/kopiemail/icons22/filesave.png
new file mode 100644
index 0000000..3bc2a37
--- a/dev/null
+++ b/bin/kdepim/kopiemail/icons22/filesave.png
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index c5cae20..8251259 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -454,3 +454,3 @@
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
-{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der Sonntag\nvor diesem Datum!" },
+{ "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
@@ -915,3 +915,3 @@
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
-{ "Add 30 min (+00:30)  to selected Timezone","Addiere 30 min zur selektierten Zeitzone" },
+{ "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
 { "Used Mail Client","Benutzter Mail Client" },
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 35ad367..5f7a76f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -20,2 +20,3 @@
 #include <qcheckbox.h>
+#include <qiconset.h>
 #include <qtimer.h>
@@ -112,2 +113,19 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     warnAttach = true; 
+    QIconSet icon;
+    //icon = SmallIcon("fileexport");
+    icon = SmallIcon("filesave");
+    SaveButton->setIconSet (icon ) ;
+    if ( QApplication::desktop()->width() < 320 ) {
+        SaveButton->setText ("") ;
+        SaveButton->setMaximumSize ( SaveButton->sizeHint().height(),SaveButton->sizeHint().height()) ;
+    }
+    else
+        SaveButton->setText (i18n("Save"));
+#ifndef DESKTOP_VERSION
+    QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
+    QPEApplication::setStylusOperation( senderNameEdit, QPEApplication::RightOnHold );
+    QPEApplication::setStylusOperation( subjectLine, QPEApplication::RightOnHold );
+#endif
+    message->setFont ( KOPrefs::instance()->mComposeFont );
+    message->setWordWrap (QMultiLineEdit::WidgetWidth);
     if ( smtpAccounts.count() > 0 ) {
@@ -116,12 +134,8 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
         QMessageBox::information( 0, i18n( "Problem" ),
-                                  i18n( "Please create an SMTP account first.\nThe SMTP is needed for sending mail.\n" ),
+                                  i18n( "Please create an\nSMTP account first.\nThe SMTP is needed\nfor sending mail.\n" ),
                                   i18n( "Ok" ) );
         return;
-    }
+    } 
     connect( smtpAccountBox, SIGNAL( activated(int) ), SLOT( fillValues(int) ) );
-    message->setFont ( KOPrefs::instance()->mComposeFont );
-    message->setWordWrap (QMultiLineEdit::WidgetWidth);
-#ifndef DESKTOP_VERSION
-    QPEApplication::setStylusOperation( message, QPEApplication::RightOnHold );
-#endif
+
  
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 0a5a750..c66b0c8 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -15,3 +15,3 @@
             <width>276</width>
-            <height>262</height>
+            <height>263</height>
         </rect>
@@ -449,3 +449,3 @@
                 <name>text</name>
-                <string>Save</string>
+                <string> S</string>
             </property>
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 2da103b..89f6ebc 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -14,4 +14,4 @@
             <y>0</y>
-            <width>279</width>
-            <height>304</height>
+            <width>230</width>
+            <height>307</height>
         </rect>
@@ -184,3 +184,3 @@
                 <name>text</name>
-                <string>Prefix will prepend, no need to enter it!</string>
+                <string>Prefix will prepend, do not enter</string>
             </property>
@@ -248,3 +248,3 @@
                 <name>text</name>
-                <string>apply only to mails smaller</string>
+                <string>only mails smaller</string>
             </property>
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 1fae41f..4817a3f 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -332,3 +332,3 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   KPrefsWidBool *sb =
-      addWidBool(i18n("Add 30 min (+00:30)  to selected Timezone"),
+      addWidBool(i18n("Add 30 min to selected Timezone"),
                  &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame);