6 files changed, 28 insertions, 11 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 593806b..708ac19 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1473,8 +1473,19 @@
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
-{ "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
+{ "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
+{ "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
+{ "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 70a1d2d..678143d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -475,4 +475,5 @@ void CalendarView::init()
     connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
+    connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles()  ));
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) );
    
@@ -682,8 +683,6 @@ void CalendarView::scrollBarValue(int val )
 
 }
-
-void CalendarView::checkAlarms()
+void CalendarView::checkFiles()
 {
-
     QString message;
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
@@ -696,7 +695,13 @@ void CalendarView::checkAlarms()
     }
     if ( !message.isEmpty() ) {
-        message = KGlobal::formatMessage( i18n("The loading of one or more calendar failed:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); 
-        KMessageBox::error(this,message);
+        message = KGlobal::formatMessage( i18n("Calendar(s) not loaded:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); 
+        KMessageBox::error(this,message, i18n("Loding of calendar(s) failed"));
     }
+    QTimer::singleShot( 2000, this, SLOT ( checkAlarms() ));
+}
+void CalendarView::checkAlarms()
+{
+
+   
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c9e9870..651194b 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -202,4 +202,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
   public slots:
     void checkAlarms();
+    void checkFiles();
     void slotprintSelInc();
     void showNextAlarms();
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3cde103..20118aa 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -216,4 +216,5 @@ void KOCalEditView::infoCal( int id )
             emit needsUpdate();
             QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
+            QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
         }
     }
@@ -380,4 +381,5 @@ void KOCalEditView::addCal()
     }
     addCalendar ( name, file );
+    QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) ); 
 }
 int KOCalEditView::addCalendar( QString name, QString file, bool ask )
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 54fe2c5..02107cf 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -234,4 +234,5 @@ class KOCalEditView : public QScrollView
     void calendarAdded( int );
     void needsUpdate();
+    void checkCalendar();
 
   private:
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b797d8c..501eed5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -399,9 +399,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     mBRdisabled = false;
     //toggleBeamReceive();
-    int tiint= 3000;
-#ifndef DESKTOP_VERSION
-    tiint = 5000;
-#endif
-    QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() ));
+
+    QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
 }
 MainWindow::~MainWindow()