summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/kopiemail/filesave.pngbin0 -> 728 bytes
-rw-r--r--bin/kdepim/kopiemail/germantranslation.txt20
-rw-r--r--bin/kdepim/kopiemail/icons22/filesave.pngbin0 -> 821 bytes
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--kmicromail/composemail.cpp28
-rw-r--r--kmicromail/composemailui.ui4
-rw-r--r--kmicromail/selectstoreui.ui8
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp2
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
Binary files differ
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
@@ -12,13 +12,13 @@
{ "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:" },
@@ -30,15 +30,15 @@
{ "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" },
@@ -94,13 +94,13 @@
{ "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" },
@@ -114,14 +114,14 @@
{ "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" },
@@ -190,15 +190,15 @@
{ "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" },
@@ -232,12 +232,16 @@
{ "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
Binary files differ
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
@@ -449,13 +449,13 @@
{ "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" },
@@ -910,13 +910,13 @@
{ "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:" },
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 35ad367..5f7a76f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -15,12 +15,13 @@
#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>
@@ -107,26 +108,39 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
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 )
diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui
index 0a5a750..c66b0c8 100644
--- a/kmicromail/composemailui.ui
+++ b/kmicromail/composemailui.ui
@@ -10,13 +10,13 @@
<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>
@@ -444,13 +444,13 @@
<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>
diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui
index 2da103b..89f6ebc 100644
--- a/kmicromail/selectstoreui.ui
+++ b/kmicromail/selectstoreui.ui
@@ -9,14 +9,14 @@
</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>
@@ -179,13 +179,13 @@
<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>
@@ -243,13 +243,13 @@
<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>
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
@@ -327,13 +327,13 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
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);