8 files changed, 41 insertions, 23 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
@@ -6,45 +6,45 @@
 { "Global","Global" },
 { "Email","Email" },
 { "Phone","Phone" },
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Language:(needs restart)","Sprache (Neustart!)" },
 { "English","Englisch" },
 { "German","Deutsch" },
 { "French","Französich" },
 { "Italian","Italienisch" },
-{ "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
+{ "User defined (usertranslation.txt)","Benutzerdef.(usertranslation.txt)" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "Locale","Localisation" },
 { "Date Format:","Datums Format:" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "User defined","Benutzerdefiniert" },
 { "User long date:","Format langes Datum:" },
 { "User short date:","Format kurzes Datum:" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
 { "Date Format","Datums Format" },
 { "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." },
 { "Daylight start:","Sommerzeit Beginn:" },
 { "Mon","Mo" },
 { "Tue","Di" },
 { "Wed","Mi" },
 { "Thu","Do" },
 { "Fri","Fr" },
 { "Sat","Sa" },
 { "Sun","So" },
 { "January","Januar" },
 { "February","Februar" },
 { "March","März" },
@@ -88,46 +88,46 @@
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Delete","Löschen" },
 { "New","Neu" },
 { "Edit","Bearbeite" },
 { "Close","Schließen" },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Please set at","Bitte einstellen in" },
 { "Settings@General TAB","Einstellungen@Allgemein TAB" },
 { "KOpieMail/Pi","KOpieMail/Pi" },
 { "Mail","Mail" },
-{ "Settings","Einstellungen" },
+{ "Settings","Konfig" },
 { "Get all new mails","Hole alle neuen Mails" },
 { "Get new messages","Hole neue mails" },
 { "Compose new mail","Schreibe neue Mail" },
 { "Send queued mails","Sende gespeicherte Mails" },
 { "Show/Hide folders","Zeige Verzeichnisse" },
 { "Delete Mail","Lösche Mail" },
 { "Edit settings","Ändere Einstellungen" },
 { "Configure accounts","Konfiguriere Zugänge" },
 { "Mailbox","Mailbox" },
 { "Subject","Betreff" },
 { "Sender","Sender" },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Close","Schliessen" },
 { "Help","Hilfe" },
 { "About","Über" },
 { "Licence","Lizenz" },
 { "LibEtPan Licence","LibEtPan Lizenz" },
 { "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" },
 { "Send mails later","Sende Mails später" },
 { "Application(nr)","Applikation(nr)" },
 { "OK","OK" },
 { "Compose mail:","Verfasse Mail:" },
 { "Dear Mr.","Hallo Herr" },
 { "Read mail:","Lese Mail:" },
 { "Hello","Hallo" },
 { "Configure Accounts","Konfigure Zugänge" },
 { "Name of the Account","Name des Zugangs" },
 { "News","News" },
 { "Account","Zugang" },
@@ -184,27 +184,27 @@
 { "Move/Copie all mails","Verschiebe/kopiere alle Mails" },
 { "Delete all mails","Lösche alle Mails" },
 { "Create new subfolder","Neues Unterverzeichnis" },
 { "Delete folder","Lösche Verzeichnis" },
 { "Refresh folder list","Aktualisiere Verzeichnis Liste" },
 { "Create new folder","Neues Verzeichnis" },
 { "Disconnect","Disconnect" },
 { "Set offline","Gehe offline" },
 { "Select target box","Wähle Ziel Box" },
 { "<b>Store mail(s) to</b>","<b>Speichere Mail(s) nach</b>" },
 { "Folder:","Verzeichnis:" },
 { "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" },
 { " message %1 of %2"," Nachricht %1 von %2" },
 { "Copying...","Am Kopieren..." },
 { "Copy message %1 of %2","Kopiere Nachricht %1 von %2" },
 { "Do you really want to delete\nall selected mails?","Wollen Sie wirklich alle\nselektierten Mails Löschen?" },
 { "Delete All Mails","Lösche alle Mails" },
 { "Deleting ...","Am Löschen..." },
 { "Delete message %1 of %2","Lösche Nachricht %1 von %2" },
 { "Compose Message","Verfasse Nachricht" },
 { "Reply-To","Antwort-An" },
 { "BCC","BCC" },
 { "Signature","Signatur" },
@@ -226,18 +226,22 @@
 { "Select Type","Selektiere Typ" },
 { "Select Account Type","Wähle Art des Zugangs" },
 { "IMAP","IMAP (online lesen)" },
 { "POP3","POP3 (holen)" },
 { "SMTP","SMTP (senden)" },
 { "<p>Do you really want to delete the selected Account?</p>","<p>Möchten Sie wirklich den ausgewählten Account löschen?</p>" },
 { "Question","Eine Frage..." },
 { "Send this message?","Nachricht wirklich senden?" },
 { "Stop editing message","Stop editing message" },
 { "Sending mail %1 of %2","Sende Mail %1 von %2" },
 { "%1 of %2 bytes send","%1 von %2 Bytes gesendet" },
 { "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
@@ -443,25 +443,25 @@
 { "Working Hours","Tägliche Arbeitszeit" },
 { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" },
 { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" },
 { "Write back synced file","Syncronisierte Datei zurückschreiben" },
 { "Yearly","Jährlich" },
 { "year(s)","Jahr(e)" },
 { "Yes","Ja" },
 { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
 { "week(s) on:","Woche(n) am: " },
 { "Full menu bar(nr)","Volle Menuleiste(bn)" },
 { "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." },
 { "Daylight start:","Sommerzeit Beginn:" },
 { "Daylight end:","Sommerzeit Ende:" },
 { "Time Zone","Zeitzone" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
 { "minutely","minütlich" },
 { "hourly","stündlich" },
 { "daily","täglich" },
 { "weekly","wöchentlich" },
 { "monthly","monatlich" },
 { "day-monthly","tag-monatlich" },
@@ -904,25 +904,25 @@
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Italian","Italienisch" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "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" },
 { "Channel:","Channel:" },
 { "Message:","Message:" },
 { "Parameters:","Parameter:" },
 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
 { "extra Message:","extra Message:" },
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "24 hours","24 Std." },
 { "3 hours","3 Std." },
 { "1 hour","1 Std." },
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 35ad367..5f7a76f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -9,24 +9,25 @@
 
 /* OPIE */
 //#include <opie2/ofiledialog.h>
 //#include <opie2/odebug.h>
 #include <kfiledialog.h>
 //#include <qpe/resource.h>
 #include <qpe/global.h>
 //#include <qpe/contact.h>
 
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
+#include <qiconset.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <kabc/addresseedialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
 #ifdef DESKTOP_VERSION
 #include <kabc/addresseedialog.h>
@@ -101,38 +102,51 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
            smtpAccounts.append( smtp );
         }
     }
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
     connect( SaveButton, SIGNAL( clicked() ), SLOT( saveAsDraft()) );
     mMail = 0;
     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 ) {
         fillValues( smtpAccountBox->currentItem() );
     } else {
         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
+
  
 }
 
 void ComposeMail::fillSettings()
 {
     if ( QApplication::desktop()->width() < 320 )
         fromBox->setMaximumWidth( 100 );
     QStringList mailList = QStringList::split(";",KOPrefs::instance()->mEmail);
     QStringList::ConstIterator sit = mailList.begin();
     int pref = 0;
     for (;sit!=mailList.end();++sit) {
         fromBox->insertItem((*sit));
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 0a5a750..c66b0c8 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -4,25 +4,25 @@
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>ComposeMailUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>276</width>
-            <height>262</height>
+            <height>263</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Compose Message</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
@@ -438,25 +438,25 @@
                     <vsizetype>0</vsizetype>
                 </sizepolicy>
             </property>
         </widget>
         <widget row="0"  column="3" >
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>SaveButton</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Save</string>
+                <string> S</string>
             </property>
         </widget>
     </grid>
 </widget>
 <tabstops>
     <tabstop>fromBox</tabstop>
     <tabstop>toButton</tabstop>
     <tabstop>toLine</tabstop>
     <tabstop>subjectLine</tabstop>
     <tabstop>message</tabstop>
     <tabstop>tabWidget</tabstop>
     <tabstop>ccButton</tabstop>
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 2da103b..89f6ebc 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -3,26 +3,26 @@
 <include location="local">tr.h</include>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>selectstoreui</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>279</width>
-            <height>304</height>
+            <width>230</width>
+            <height>307</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Select target box</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
@@ -173,25 +173,25 @@
                 <name>enabled</name>
                 <bool>false</bool>
             </property>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>newFolderLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Prefix will prepend, no need to enter it!</string>
+                <string>Prefix will prepend, do not enter</string>
             </property>
             <property stdset="1">
                 <name>alignment</name>
                 <set>WordBreak|AlignCenter</set>
             </property>
             <property>
                 <name>hAlign</name>
             </property>
             <property>
                 <name>wordwrap</name>
             </property>
         </widget>
@@ -237,25 +237,25 @@
                 <name>text</name>
                 <string>Move mail(s)</string>
             </property>
         </widget>
         <widget row="7"  column="0" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>useSize</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>apply only to mails smaller</string>
+                <string>only mails smaller</string>
             </property>
         </widget>
         <widget row="7"  column="1" >
             <class>QSpinBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>sizeSpinBox</cstring>
             </property>
             <property stdset="1">
                 <name>suffix</name>
                 <string> kB</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
@@ -321,25 +321,25 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   int nCurrentlySet = 11;
   for (int i = 0; i < mTimeZoneCombo->count(); i++)
     {
       if (mTimeZoneCombo->text(i) == sCurrentlySet)
         {
          nCurrentlySet = i;
          break;
         }
     }
   mTimeZoneCombo->setCurrentItem(nCurrentlySet);
   int iii = 1;
   KPrefsWidBool *sb =
-      addWidBool(i18n("Add 30 min (+00:30)  to selected Timezone"),
+      addWidBool(i18n("Add 30 min to selected Timezone"),
                  &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii;  
   sb =
       addWidBool(i18n("Timezone has daylight saving"),
                  &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii; 
   QLabel* lab; 
 
   lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);