2 files changed, 5 insertions, 5 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 6723dc5..0b928ef 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1527,9 +1527,9 @@
 { "Sending back file ...","Sende Datei zurück..." },
 { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" },
 { "Created","Angelegt" },
 { "Last Modified Sub","Zuletzt geändertes Sub" },
-{ "","" },
+{ "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f9685e9..ab69158 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -676,9 +676,11 @@ void CalendarView::nextConflict( bool all, bool allday )
     Event * cE2 = 0;
     QPtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
+        qApp->processEvents();
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
             Event * test2 = testlist2.first();
@@ -2767,20 +2769,18 @@ void CalendarView::checkConflictForEvent()
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    if (  mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
-        mConflictingEvent = 0;
-        return;
-    }
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     QDateTime current = QDateTime::currentDateTime();
     while ( test ) {
+        qApp->processEvents();
         if ( !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal;