2 files changed, 14 insertions, 30 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index d3b2ccf..f6c252b 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -703,3 +703,3 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
     }
-    topLevelWidget()->setCaption("Journal Viewer");
+    topLevelWidget()->setCaption(i18n("Journal viewer"));
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -800,3 +800,3 @@ void MainWindow::initActions()
     //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
-    mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
+    mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
     mShowAction->addTo( mCurrentItemMenu  );
@@ -824,2 +824,3 @@ void MainWindow::initActions()
              mView, SLOT( moveIncidence() ) );
+#ifndef DESKTOP_VERSION
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
@@ -828,2 +829,3 @@ void MainWindow::initActions()
              mView, SLOT( beamIncidence() ) );
+#endif
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
@@ -1649,6 +1651,5 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
-
     if ( !incidence ) {
+        mShowAction->setMenuText( i18n("Show") );
         enableIncidenceActions( false );
-
         mNewSubTodoAction->setEnabled( false );
@@ -1656,6 +1657,3 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
         return;
-
     }
-
-    //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
@@ -1664,11 +1662,8 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
             if ( incidence->doesFloat() ) {
-            startString += ": "+incidence->dtStartDateStr( true );
-            startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
-
+                startString += ": "+incidence->dtStartDateStr( true );
+                startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
             } else {
-            startString = ": "+incidence->dtStartStr(true);
-            startString += " --- "+((Event*)incidence)->dtEndStr(true);
-
+                startString = ": "+incidence->dtStartStr(true);
+                startString += " --- "+((Event*)incidence)->dtEndStr(true);
             }
-
         } else {
@@ -1677,3 +1672,2 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-
             if ( incidence->isBirthday() || incidence->isAnniversary() ) {
@@ -1689,3 +1683,2 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
         }
-
     }
@@ -1696,22 +1689,11 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
     setCaption( incidence->summary()+startString);
-
     enableIncidenceActions( true );
-
     if ( incidence->typeID() == eventID ) {
-        mShowAction->setText( i18n("Show Event...") );
-        mEditAction->setText( i18n("Edit Event...") );
-        mDeleteAction->setText( i18n("Delete Event...") );
-
+        mShowAction->setMenuText( i18n("Show Event") );
         mNewSubTodoAction->setEnabled( false );
     } else if ( incidence->typeID() == todoID ) {
-        mShowAction->setText( i18n("Show Todo...") );
-        mEditAction->setText( i18n("Edit Todo...") );
-        mDeleteAction->setText( i18n("Delete Todo...") );
-
+        mShowAction->setMenuText( i18n("Show Todo") );
         mNewSubTodoAction->setEnabled( true );
     } else {
-        mShowAction->setText( i18n("Show...") );
-        mShowAction->setText( i18n("Edit...") );
-        mShowAction->setText( i18n("Delete...") );
-
+        mShowAction->setMenuText( i18n("Show") );
         mNewSubTodoAction->setEnabled( false );
@@ -1728,3 +1710,5 @@ void MainWindow::enableIncidenceActions( bool enabled )
     mMoveAction->setEnabled( enabled );
+#ifndef DESKTOP_VERSION
     mBeamAction->setEnabled( enabled );
+#endif
     mCancelAction->setEnabled( enabled );