4 files changed, 25 insertions, 4 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index bc5cbb7..a5e2597 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1490,6 +1490,15 @@
 { "Edit","Edit" },
 { "Last Modified","Zuletzt geändert" },
 { "Journal viewer","Journal Anzeige" },
+{ "Configure Calendar Files...","Konfiguriere Kalenderdateien..." },
+{ "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index ef5c4dd..131a345 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -836,7 +836,10 @@ void KOAgendaView::createDayLabels()
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
                 addString = i18n("Day after tomorrow");
             if ( !addString.isEmpty() ) {
-                str = addString+", " + str;
+                if (  QApplication::desktop()->width() < 640 )
+                    str = addString+", " + str;
+                else
+                    str = addString+", "+ KGlobal::locale()->formatDate( date, false);
             } else {
                 str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer);
             }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index cbf6096..e960424 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1019,7 +1019,10 @@ void MainWindow::initActions()
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );  
-    icon = loadPixmap( pathString + "configure" );
+    action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
+    action->addTo( actionMenu );
+    connect( action, SIGNAL( activated() ),
+             this, SLOT( calHint() ) );  
     action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
@@ -1360,7 +1363,12 @@ void MainWindow::initActions()
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
-
+void MainWindow::calHint()
+{
+    QString message = i18n("You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.");
+    
+    KMessageBox::information( this, message);
+}
 void MainWindow::exportToPhone( int mode )
 {
 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a948a52..adab95d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -51,7 +51,8 @@ class MainWindow : public QMainWindow
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
- protected slots:  
+ protected slots: 
+    void calHint(); 
     void startMultiSync();
     void setCaptionToDates();
     void weekAction();