5 files changed, 27 insertions, 11 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a9b6c87..943aaef 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -9,4 +9,6 @@ In the search dialog you can switch now the focus from search line edit to the l
 OM/Pi:
 Fixed a refresh problem of outgoing/sent/sendfailed folders after sending mails.
+Added missing German translation.
+Added warning if path is specified in local folder settings of account config.
 
 ********** VERSION 2.0.12 ************
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 0d858a8..86a9569 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -266,9 +266,13 @@
 { "Mail saved as draft!","Mail als Entwurf gespeichert!" },
 { "Save signature","Speichere Signatur" },
+{ "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." },
+{ "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" },
+{ "Sending all mails","Senden aller Mails" },
+{ "SMTP Account:","SMTP Zugang:" },
+{ "Select SMTP Account","Wähle SMTP Zugang" },
+{ "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" },
+{ "Error sending mail","Fehler beim Mailversand" },
+{ "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." },
 { "","" },
 { "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ "","" },
\ No newline at end of file
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 8253c91..f1075c0 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -382,4 +382,10 @@ void IMAPconfig::fillValues()
 void IMAPconfig::accept()
 {
+    if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
+        QMessageBox::information( this, i18n( "Error" ),
+                                  i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
+                                  i18n( "Ok" ) );
+        return;
+    }
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
@@ -455,4 +461,10 @@ void POP3config::fillValues()
 void POP3config::accept()
 {
+    if ( localFolder->text().contains("/") ||localFolder->text().contains("\\") ) {
+        QMessageBox::information( this, i18n( "Error" ),
+                                  i18n( "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically." ),
+                                  i18n( "Ok" ) );
+        return;
+    }
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 197f7ec..b701446 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -206,8 +206,8 @@ void OpieMail::slotSendQueued()
     if (smtpList.count()==0)
     {
-        QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
+        QMessageBox::information(0,i18n("Info"),i18n("Define a smtp\n account first!\n"));
         return;
     }
-    if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
+    if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to\nsend all queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
         return;
     if (smtpList.count()==1)
@@ -220,7 +220,5 @@ void OpieMail::slotSendQueued()
         selectsmtp selsmtp;
         selsmtp.setSelectionlist(&smtpList);
-#ifndef DESKTOP_VERSION
-        selsmtp.showMaximized();
-#endif
+        selsmtp.resize( selsmtp.sizeHint() );
         if (  selsmtp.exec() == QDialog::Accepted )
         {
diff --git a/kmicromail/selectsmtp.cpp b/kmicromail/selectsmtp.cpp
index ff8b524..10b6d79 100644
--- a/kmicromail/selectsmtp.cpp
+++ b/kmicromail/selectsmtp.cpp
@@ -20,5 +20,5 @@ selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
     folderSelection->hide();
     folderLabel->hide();
-    accountlabel->setText("<center>SMTP Accounts</center>");
+    //accountlabel->setText(i18n("SMTP\nAccount:"));
     Line1->hide();
     newFoldersel->hide();