3 files changed, 34 insertions, 50 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 9dde910..d7954c6 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -132,5 +132,5 @@
 { "Delete Event","Lösche Termin" },
-{ "&Delete...","Löschen..." },
-{ "Delete...","Löschen..." },
-{ "Delete","Löschen" },
+{ "&Delete...","Lösche..." },
+{ "Delete...","Lösche..." },
+{ "Delete","Lösche" },
 { "Delete Todo...","Lösche Todo..." },
@@ -241,3 +241,3 @@
 { "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" },
-{ "Todo view uses category colors","To-Do Ansicht zeigt Kategorie Farben" },
+{ "Todo view uses category colors","Todo Ansicht zeigt Kategorie Farben" },
 { "Move &Down","Nach unten verschieben" },
@@ -353,3 +353,3 @@
 { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
-{ "Show Event...","Zeige Termin..." },
+{ "Show Event","Termin anzeigen" },
 { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
@@ -358,7 +358,7 @@
 { "Show time as:","Zeige Zeit als" },
-{ "Show Todo...","Zeige To-Do" },
+{ "Show Todo","Todo anzeigen" },
 { "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
-{ "&Show","Zeige" },
-{ "Show...","Zeige..." },
-{ "Show","Zeige" },
+{ "&Show","Anzeigen" },
+{ "Show...","Anzeigen..." },
+{ "Show","Anzeigen" },
 { "Small","Klein" },
@@ -383,3 +383,3 @@
 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },
-{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" },
+{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges Todo" },
 { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" },
@@ -403,7 +403,7 @@
 { "Today: ","Heute: " },
-{ "Todo due today color:","Heute fällige To-Do's" },
+{ "Todo due today color:","Heute fällige Todos" },
 { "To-do items:","To-Do items:" },
-{ "Todo overdue color:","Überfällige To-Do's" },
+{ "Todo overdue color:","Überfällige Todos" },
 { "Todo","Todo" },
-{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" },
+{ "To-do view shows completed Todos","Todo Ansicht zeigt erledigte Todos" },
 { "ToDoView:","Todo Ansicht:" },
@@ -481,3 +481,3 @@
 { "Show Completed","Zeige erledigte Todos" },
-{ "Show Quick Todo","Zeige Quick Todo" },
+{ "Show Quick Todo","Zeige Quick-Todo" },
 { "Unparent Todo","Un-sub Todo" },
@@ -556,3 +556,3 @@
 { "Time","Zeit" },
-{ "Event Viewer","Termin Ansicht" },
+{ "Event Viewer","Termin Anzeige" },
 { "Cancel Sync","Sync Abbrechen" },
@@ -673,3 +673,3 @@
 { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
-{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
+{ "Small To-do view uses smaller font","Kleine Todo Ansicht nutzt kleineren Font" },
 { "Colors are applied to text","Farben werden auf Text angewendet" },
@@ -861,3 +861,3 @@
 { "What's This?","What's This?" },
-{ "&Edit...","&Editiere..." },
+{ "&Edit...","Bearbeite..." },
 { "Oktober","Oktober" },
@@ -1042,3 +1042,3 @@
 { "Toolbar","Toolbar" },
-{ "Undo Delete...","Undo Löschen..." },
+{ "Undo Delete...","UNDO Löschen..." },
 { "Undo Delete","Löschen rückgängig machen" },
@@ -1394,3 +1394,3 @@
 { "Todos","Todos" },
-{ "Todo Viewer","Todo Viewer" },
+{ "Todo Viewer","Todo Anzeige" },
 { "Todo ","Todo " },
@@ -1491,3 +1491,3 @@
 { "Last Modified","Zuletzt geändert" },
-{ "","" },
+{ "Journal viewer","Journal Anzeige" },
 { "","" },
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 );