From e7c948b76a46c923c21f2f35c677912b462fa1f4 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 25 Oct 2004 23:39:31 +0000 Subject: kopiemail fixes --- 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 @@ -15,7 +15,7 @@ { "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" }, @@ -33,9 +33,9 @@ { "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" }, @@ -97,7 +97,7 @@ { "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" }, @@ -117,8 +117,8 @@ { "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)" }, @@ -193,9 +193,9 @@ { "Store mail(s) to","Speichere Mail(s) nach" }, { "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..." }, @@ -235,6 +235,10 @@ { "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 @@ -452,7 +452,7 @@ { "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:" }, @@ -913,7 +913,7 @@ { "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:" }, diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 35ad367..5f7a76f 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -110,20 +111,33 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m 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 + } diff --git a/kmicromail/composemailui.ui b/kmicromail/composemailui.ui index 0a5a750..c66b0c8 100644 --- a/kmicromail/composemailui.ui +++ b/kmicromail/composemailui.ui @@ -13,7 +13,7 @@ 0 0 276 - 262 + 263 @@ -447,7 +447,7 @@ text - Save + S diff --git a/kmicromail/selectstoreui.ui b/kmicromail/selectstoreui.ui index 2da103b..89f6ebc 100644 --- a/kmicromail/selectstoreui.ui +++ b/kmicromail/selectstoreui.ui @@ -12,8 +12,8 @@ 0 0 - 279 - 304 + 230 + 307 @@ -182,7 +182,7 @@ text - Prefix will prepend, no need to enter it! + Prefix will prepend, do not enter alignment @@ -246,7 +246,7 @@ text - apply only to mails smaller + only mails smaller 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 @@ -330,7 +330,7 @@ void KDEPIMConfigWidget::setupTimeZoneTab() 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; -- cgit v0.9.0.2