fixes

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
@@ -121,27 +121,27 @@
 { "Dec","Dez" },
 { "December","Dezember" },
 { "Default alarm time:","Standard Alarmzeit:" },
 { "Default appointment time:","Standard Termin Startzeit:" },
 { "Default event color:","Standard Terminfarbe:"   },
 { "Default","Standard" },
 { "Def. duration of new app.:","Standard Termin Länge:" },
 { "Delete All","Lösche alles" },
 { "Delete all selected","Lösche alle Selektierten" },
 { "Delete Current","Aktuellen löschen" },
 { "Delete Event...","Lösche Termin..." },
 { "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..." },
 { "Delete To-Do","Lösche Todo" },
 { "Deleting item %d ...","Lösche Eintrag %d..." },
 { "Descriptions","Beschreibungen" },
 { "Deselect all","Deselektiere Alle" },
 { "Details","Details" },
 { "Dinner","Abendessen" },
 { "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" },
 { "Due Date","Fällig am" },
 { "Due: ","Fällig: "},
 { "Due Time","Fällig um"  },
 { "Due:","Fällig:"},
@@ -230,25 +230,25 @@
 { "May","Mai" },
 { "M. Bains line:","M. Bains Linie:" },
 { "Medium","Medium" },
 { "Method","Methode" },
 { "minute(s)","Minute(n)" },
 { "Monday","Montag" },
 { "Mon","Mo" },
 { "Monthly","Monatlich" },
 { "Month not long enough","Monat ist nicht lang genug" },
 { "month(s)","Monat(e)" },
 { "Month view:","Monatsansicht:" },
 { "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" },
 { "Move &Up","Nach oben verschieben" },
 { "Name:","Name:" },
 { "Name","Name" },
 { "\nAre you sure you want\nto delete this event?","\nSind Sie sicher, dass Sie\nden Termin löschen möchten?" },
 { "%n Days","%n Tage" },
 { "Never","Nie" },
 { "New event...","Neuer Termin..." },
 { "New event","Neuer Termin" },
 { "New Event...","Neuer Termin..." },
 { "New Events/Todos should","Neue Termine/Todos sollten" },
 { "&New","&Neu" },
@@ -342,79 +342,79 @@
 { "Select Addresses","Wähle Adressen" },
 { "Select all","Selektiere Alle" },
 { "Select a month","Wähle Monat" },
 { "Select a week","Wähle Woche" },
 { "Select a year","Wähle Jahr" },
 { "Send directly","Sende direkt" },
 { "&Send Messages","&Sende Nachrichten", },
 { "Sep","Sep" },
 { "September","September" },
 { "Shopping","Einkaufen" },
 { "Show Dates","Zeige Daten" },
 { "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." },
 { "Show Marcus Bains line","Zeige Marcus Bains Linie" },
 { "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
 { "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" },
 { "Sorry","Tut mir leid" },
 {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
 { "Start:","Start:" },
 { "Start Date","Start Datum" },
 { "Start date: %1","Start Datum: %1" },
 { "Start Time","Start Zeit" },
 { "Status:","Status:" },
 { "Status","Status:" },
 { "Summaries","Titel" },
 { "Summary:","Titel:" },
 { "Summary","Titel" },
 { "Sunday","Sonntag" },
 { "Sun","So" },
 { "Sync preferences:","Sync Einstellungen" },
 { "Sync Prefs","Sync Einstellungen" },
 { "Syncronize","Daten abgleich" },
 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },
 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },
 { "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" },
 { "Template...","Vorlage..." },
 { "This day","Dieser Tag" },
 { "This is an experimental feature. ","Dieses Feature ist experimentel" },
 { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." },
 { "This item will be permanently deleted.",  "Dieser Eintrag wird komplett gelöscht." },
 { "Thu","Do" },
 { "Thursday","Donnerstag" },
 { "Time associated","Mit Zeit" },
 { "Time bar:","Uhrzeit Zeile:" },
 { "Time && Date","Zeit und Datum" },
 { "Time Format","Zeit Format" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
 { "Date Labels:","Datumsleiste:" },
 { "Time: ","Zeit: " },
 { "Timezone:","Zeitzone:" },
 { "To: ","Bis: " },
 { "To:","Bis:" },
 { "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:" },
 { "Toggle Alarm","Wechsle Alarm" },
 { "Toggle Allday","Umschalten Ganztag" },
 { "Tomorrow: ","Morgen: " },
 { "Tue","Di" },
 { "Tuesday","Dienstag" },
 { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" },
 { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." },
 { "Unknown","Unbekannt" },
 { "Up","Hinauf" },
 { "Use password (if not, ask when syncing)","Passwort: (sonst jedesmal anfragen)" },
 { "User defined","Benutzerdefiniert" },
@@ -470,25 +470,25 @@
 { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" },
 { "ViewChange","Ansichtswechsel" },
 { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" },
 { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" },
 { "File","Datei" },
 { "Clone...","Dupliziere..." },
 { "Move...","Bewege..." },
 { "Beam...","Sende via IR..." },
 { "&Clone...","Dupliziere..." },
 { "&Move...","Bewege..." },
 { "&Beam...","Sende via IR..." },
 { "Show Completed","Zeige erledigte Todos" },
-{ "Show Quick Todo","Zeige Quick Todo" },
+{ "Show Quick Todo","Zeige Quick-Todo" },
 { "Unparent Todo","Un-sub Todo" },
 { "Save selected to file...","Speichere Selektierte..." },
 { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
 { "Set Categ. for selected...","Setze Kateg. für Selekt." },
 { "Beam via IR...","Sende via IR..." },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
 { "Work Week","Arbeitswoche" },
 { "Week","Wochenansicht" },
 { "Month","Monatsansicht" },
 { "Todo View","Todo Liste" },
@@ -545,25 +545,25 @@
 { "Remove from Events/Todos","Entferne von Terminen/Todos" },
 { "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
 { "File format","Datei Format" },
 { "Time format","Zeit Format" },
 { "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
 { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
 { "h","Std" },
 { "min","Min" },
 { "hou","Std" },
 { "day","Tag" },
 { "French","Französich" },
 { "Time","Zeit" },
-{ "Event Viewer","Termin Ansicht" },
+{ "Event Viewer","Termin Anzeige" },
 { "Cancel Sync","Sync Abbrechen" },
 { "Remote","Fern" },
 { "Local","Lokal" },
 { "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
 { "Local: ","Lokal: " },
 { "Remote: ","Fern: " },
 { "Last modified: ","Zuletzt geändert: " },
 { "Location: ","Ort: " },
 { "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" },
 { "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" },
 { "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " },
 { "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" },
@@ -662,25 +662,25 @@
 { "Show location","Zeige Orte" },
 { "Show events that recur ","Zeige Termine, die sich wiederholen:" },
 { "Show in every cell ","Zeige in jeder Zelle " },
 { "short month","kurzen Monat" },
 { "icons","Icons" },
 { "Show Sat/Sun together","Zeige Sam/Son zusammen" },
 { "Category colors are applied to text","Kategorie Farben färben Text" },
 { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
 { "Day color odd months","Tagesfarbe ungerade Monate" },
 { "Day color even months","Tagesfarbe gerade Monate" },
 { "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
 { "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" },
 { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
 { "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" },
 { "Play beeps count:","Anzahl der Alarmpiepse: " },
 { "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " },
 { "Default suspend time in min:","Standard Supendierungs Zeit: " },
 { "Auto suspend count:","Anzahl der auto Suspendierungen" },
 { "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei für neu angelegte Alarme:" },
 { "New profile","Neues Profil" },
 { "Clone profile","Klone Profil" },
 { "Delete profile","Lösche Profil" },
 { "Profile:","Profil:" },
@@ -850,25 +850,25 @@
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "What's Next","What's Next" },
 { "Complete calendar...","Kompletten Kalender..." },
 { "Filtered calendar...","Gefilterten Kalender..." },
 { "Export to phone","Exportiere zum Handy" },
 { "Beam receive enabled","Beam Empfang an" },
 { "What's new?","Was ist neu?" },
 { "FAQ...","FAQ..." },
 { "Licence...","Licence..." },
 { "What's This?","What's This?" },
-{ "&Edit...","&Editiere..." },
+{ "&Edit...","Bearbeite..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
 { "Enable Pi-Sync","Schalte Pi-Sync an" },
 { "Import!","Importiere!" },
 { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" },
 { "Export to phone options","Export ans Handy Optionen" },
 { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
 { "I/O device: ","I/O device: " },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Write back events in future only","Schreibe nur zukünftige Termine zurück" },
@@ -1031,25 +1031,25 @@
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n","PDA-Edition\nfür: Zaurus 5x00/7x0/860/3000/6000\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
-{ "Undo Delete...","Undo Löschen..." },
+{ "Undo Delete...","UNDO Löschen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
@@ -1383,25 +1383,25 @@
 { "Filtermenu","Filtermenu" },
 { "Toggle Fullscreen","Vollbild umschalten" },
 { "Toggle Resource View","Resourcenansicht umschalten" },
 { "Storage HowTo...","Speicherort HowTo..." },
 { "Timetracking HowTo...","Timetracking HowTo..." },
 { "Juni","Juni" },
 { "Juli","Juli" },
 { "ToDo:","ToDo:" },
 { "Set Calendar","Setze Kalender" },
 { "Todo: %1","Todo: %1" },
 { ": (Prio ",": (Prio " },
 { "Todos","Todos" },
-{ "Todo Viewer","Todo Viewer" },
+{ "Todo Viewer","Todo Anzeige" },
 { "Todo ","Todo " },
 { " Calendar \n Resource "," Kalender \n Resource " },
 { " Color "," Farbe " },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" },
 { "Add new Calendar","Füge Kalender hinzu" },
 { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" },
 { "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" },
 { "Sorry, the calendar name is empty!","Sorry, der Kalendername ist leer!" },
 { "Sorry, the file name is empty!","Sorry, der Dateiname ist leer!" },
 { "Error loading calendar file\n%1.","Fehler beim Laden der Kalenderdatei\n%1." },
 { "The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>","Der Kalender <b>%1</b> ist nicht geladen! Das Laden der Datei <b>%2</b> schlug fehl! <b>Soll erneut versucht werden den Kalender zu laden?</b>" },
@@ -1480,17 +1480,17 @@
 { "None","Nichts" },
 { "Selection","Auswahl" },
 { "Set categories","Setze Kategorien" },
 { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
 { "Reset","Neu setzen" },
 { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
 { "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" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index d3b2ccf..f6c252b 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -692,25 +692,25 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
     if ( !jour->summary().isEmpty() )
         text_d = jour->summary();
     if (mode == 0 ) {
         addTag("h2", text_d );
     }
     else {
         if ( mode == 1 ) {
             addTag("h3",i18n( "Local: " ) + text_d );
         } else {
             addTag("h3",i18n( "Remote: " ) + text_d ); 
         } 
     }
-    topLevelWidget()->setCaption("Journal Viewer");
+    topLevelWidget()->setCaption(i18n("Journal viewer"));
     mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 
     formatReadOnly(jour);
     addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
    
     if (!jour->description().isEmpty()) {
         addTag("p",deTag(jour->description()));
     }
     setText(mText);
 }
 
 void KOEventViewer::formatReadOnly(Incidence *event)
 {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -789,52 +789,54 @@ void MainWindow::initActions()
              mView, SLOT( undo_delete() ) );
     mCurrentItemMenu->insertSeparator();
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
 
     //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  );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( mCurrentItemMenu  );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
     mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo(  mCurrentItemMenu );
     connect( mDeleteAction, SIGNAL( activated() ),
              mView, SLOT( deleteIncidence() ) );
 
 
     mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
     mCloneAction->addTo( mCurrentItemMenu  );
     connect( mCloneAction, SIGNAL( activated() ),
              mView, SLOT( cloneIncidence() ) );
     mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
     mMoveAction->addTo( mCurrentItemMenu  );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
+#ifndef DESKTOP_VERSION
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo(mCurrentItemMenu  );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
+#endif
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( mCurrentItemMenu  );
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
 
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
@@ -1638,104 +1640,86 @@ void MainWindow::updateWeek(QDate seda)
     p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
     p.end();   
     QIconSet icon3 ( mWeekPixmap );
     mWeekAction->setIconSet ( icon3 );
 
 }
 void MainWindow::updateWeekNum(const DateList &selectedDates)
 {
     updateWeek( selectedDates.first() );
 }
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
-
     if ( !incidence ) {
+        mShowAction->setMenuText( i18n("Show") );
         enableIncidenceActions( false );
-
         mNewSubTodoAction->setEnabled( false );
         setCaptionToDates();
         return;
-
     }
-
-    //KGlobal::locale()->formatDateTime(nextA, true);
     QString startString = "";
     if ( incidence->typeID() != todoID ) {
         if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
             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 {
             if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-
             if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
                 if ( ok ) {
                     int years = noc.date().year() - incidence->dtStart().date().year();
                     startString += i18n(" (%1 y.)"). arg( years );
                 }
             }
             else
                 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
         }
-
     }
     else
         startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
     if ( !incidence->location().isEmpty() )
         startString += " (" +incidence->location()+")";
     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 );
     }
 }
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
 
     mCloneAction->setEnabled( enabled );
     mMoveAction->setEnabled( enabled );
+#ifndef DESKTOP_VERSION
     mBeamAction->setEnabled( enabled );
+#endif
     mCancelAction->setEnabled( enabled );
 }
 
 void MainWindow::importOL()
 { 
 #ifdef _OL_IMPORT_
       mView->clearAllViews();
       KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );
       id->exec();
       delete id;
       mView->calendar()->checkAlarmForIncidence( 0, true );
       mView->updateView();