6 files changed, 26 insertions, 21 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 4f29ca3..6587eaa 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -291,13 +291,13 @@
 { "Owner:","Besitzer:" },
 { "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
 { "Pick a date to display","Wähle einen Tag zum anzeigen aus" },
 { "Please specify a valid due date.","Bitte gültiges Fälligkeitsdatum angeben."},
-{ "Please specify a valid end date, for example '%1'.","Bitte gültiges Enddatum angeben, z.B.'%1'." },
+{ "Please specify a valid end date,\nfor example '%1'.","Bitte gültiges Enddatum angeben,\nz.B.'%1'." },
 { "Please specify a valid start date.","Bitte gültiges Startdatum angeben." },
-{ "Please specify a valid start date, for example '%1'.","Bitte gültiges Startdatum angeben, z.B. '%1'." },
+{ "Please specify a valid start date,\nfor example '%1'.","Bitte gültiges Startdatum angeben,\nz.B. '%1'." },
 { "Please specify a valid start time.","Bitte gültige Startzeit angeben."},
-{ "Please specify a valid start time, for example '%1'.","Bitte gültige Startzeit angeben, z.B. '%1'." },
+{ "Please specify a valid start time,\nfor example '%1'.","Bitte gültige Startzeit angeben,\nz.B. '%1'." },
 { "Preferences - some settings need a restart (nr)","Einstellungen - teilweise Neustart erforderlich (bn)" },
 { "&Previous Day","Vorheriger Tag" },
 { "Previous month","Vorheriger Monat" },
 { "Previous Month","Vorheriger Monat" },
@@ -1231,11 +1231,11 @@
 { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." },
 { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
 { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
 { "Error","Fehler" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ ""You entered an invalid date!\n Date changed  to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },
+{ "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },
+{ "Warning","Warnung" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index adc733b..2a49528 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -396,17 +396,17 @@ bool KOEditorGeneralEvent::validateInput()
 {
 
   if (!mStartDateEdit->inputIsValid()) {
     KMessageBox::sorry( 0,
-        i18n("Please specify a valid start date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( QDate::currentDate() ) ) );
+        i18n("Please specify a valid start date,\nfor example '%1'.")
+                        .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) );
     return false;
   }
 
   if (!mEndDateEdit->inputIsValid()) {
     KMessageBox::sorry( 0,
-        i18n("Please specify a valid end date, for example '%1'.")
-        .arg( KGlobal::locale()->formatDate( QDate::currentDate() ) ) );
+        i18n("Please specify a valid end date,\nfor example '%1'.")
+        .arg( KGlobal::locale()->formatDate( QDate::currentDate(), true ) ) );
     return false;
   }
 
   QDateTime startDt,endDt;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index da81586..f595d35 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -552,9 +552,9 @@ void MonthViewCell::insertTodo(Todo *todo)
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
-        text += i18n("Td: %1").arg(todo->summary());
+        text += i18n("T: %1").arg(todo->summary());
 
         MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 44db209..0e847c2 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -270,9 +270,9 @@ bool KOTodoViewItem::isAlternate()
   KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
   if (lv && lv->alternateBackground().isValid())
   {
     KOTodoViewItem *above = 0;
-    above = dynamic_cast<KOTodoViewItem *>(itemAbove());
+    above = static_cast<KOTodoViewItem *>(itemAbove());
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
@@ -282,23 +282,23 @@ bool KOTodoViewItem::isAlternate()
        KOTodoViewItem *item;
        bool previous = true;
        if (QListViewItem::parent())
        {
-          item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent());
+          item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
           if (item)
              previous = item->m_odd;
-          item = dynamic_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
+          item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
        }
        else
        {
-          item = dynamic_cast<KOTodoViewItem *>(lv->firstChild());
+          item = static_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
        while(item)
        {
           item->m_odd = previous = !previous;
           item->m_known = true;
-          item = dynamic_cast<KOTodoViewItem *>(item->nextSibling());
+          item = static_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 10665f4..391b3bb 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -614,9 +614,13 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
         tempText += i18n("-no summary-"); 
     if ( bDay  ) {
         noc = ev->getNextOccurence( cdt.addDays(-1), &ok );
         if ( ok ) {
-            int years = noc.date().year() - ev->dtStart().date().year();
+            int years = 0;
+            if ( ev->type() =="Todo" ) {
+                years = noc.date().year() -((Todo*)ev)->dtDue().date().year();
+            } else
+                years = noc.date().year() - ev->dtStart().date().year();
             tempText += i18n(" (%1 y.)"). arg( years );
         }
     } 
     
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index c4c0081..2c78ea3 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -425,12 +425,13 @@ void KDateEdit::lineEnterPressed()
           } else {
               if ( !mDateEdit->text().isEmpty() ) {
                   mTextChanged = false;
                   QString text = i18n( "You entered an invalid date!\n Will use current date instead." );
-                  if ( KMessageBox::warningContinueCancel( 0, text ) == KMessageBox::Continue ) {
-                      setDate( QDate::currentDate() );
-                      emit dateChanged( QDate::currentDate() );
-                  }
+                  if ( isVisible() )
+                      if ( KMessageBox::warningContinueCancel( 0, text ) == KMessageBox::Continue ) {
+                          setDate( QDate::currentDate() );
+                          emit dateChanged( QDate::currentDate() );
+                      }
               }
           }
       }
 }