fixes

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
@@ -1487,10 +1487,19 @@
 { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
 { "\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n  SCHREIBBARER\n    KALENDER\n      GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
 { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "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
@@ -833,13 +833,16 @@ void KOAgendaView::createDayLabels()
                 addString = i18n("Yesterday");
             else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
                 addString = i18n("Day before yesterday");
             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);
             }
         }
         dayLabel->setText(str);
         //dayLabel->setAlignment(QLabel::AlignHCenter);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index cbf6096..e960424 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1016,13 +1016,16 @@ void MainWindow::initActions()
     actionMenu->insertSeparator();
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     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() ),
              mView, SLOT( edit_global_options() ) );
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
@@ -1357,13 +1360,18 @@ void MainWindow::initActions()
         connect( mView, SIGNAL( filtersUpdated() ), SLOT( updateFilterToolbar() ) );
     }
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     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 )
 {
 
     //ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     //ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     KOex2phonePrefs ex2phone; 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a948a52..adab95d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -48,13 +48,14 @@ class MainWindow : public QMainWindow
     void updateWeekNum(const KCal::DateList &);
     void updateWeek(QDate);
     void updateFilterToolbar();
     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();
     void about(); 
     void licence(); 
     void faq();