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
@@ -109,51 +109,51 @@
 { "Daily","Täglich" },
 { "Date Format","Datums Format" },
 { "Date Format:","Datums Format:" },
 { "DateNavigator:(nr)","Datums Navigator" },
 { "Dates: ","Datum: " },
 { "Date && Time","Datum && Zeit" },
 { "Day begins at:","Der Tag beginnt um:" },
 { "Days in Next-X-Days:","Tage in Nächste-X-Tage:" },
 { "Days in What's Next:","Tage in What's Next:" },
 { "day(s)","Tag(e)" },
 { "Days to show in Next-X-Days view:","Welche Tage in Nächste-X-Tagen anzeigen:" },
 { "day","Tag" },
 { "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:"},
 { "Duration: ","Dauer: " },
 { "Edit...","Bearbeite..." },
 { "Edit Event...","Bearbeite Termin..." },
 { "Edit Event","Bearbeite Termin" },
 { "Edit exceptions","Bearbeite Ausnahmen" },
 { "EditorBox:","Editor Fenster:" },
 { "Edit Recurrence Range","Bearbeite Wiederholung"  },
 { "Edit Todo...","Berabeite Todo..." },
 { "Edit To-Do","Todo bearbeiten" },
 { "E&mail address:","E&mail Adresse:" },
 { "(EmptyEmail)","(KeineEmail)" },
 { "(EmptyName)","(KeinName)" },
@@ -218,49 +218,49 @@
 { "List View:","Listenansicht:" },
 { "List View","Listenansicht" },
 { "Load/Save","Laden/Speichern" },
 { "Load Template","Lade Vorlage" },
 { "Locale","Lokalisation" },
 { "Local temp file:","Lokale temp. Datei:" },
 { "Location: ","Ort: " },
 { "Location:","Ort:" },
 { "Mail client","Mail Programm" },
 { "Mail Client","Mail Programm" },
 { "March","März" },
 { "Mar","Mär" },
 { "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" },
 { "New","Neu", },
 { "New Sub-Todo...","Neues Sub-Todo..." },
 { "New Todo...","Neues Todo..." },
 { "Next Alarm: ","Nächster Alarm: ", },
 { "&Next Day","&Nächster Tag", },
 { "Next days view uses full window","Nächste-X-Tage nutzt Vollbild" },
 { "Next month","Nächster Monat" },
 { "&Next Week","&Nächste Woche" },
 { "Next year","Nächstes Jahr" },
 { "Next Year","Nächstes Jahr" },
 { "%n h","%n Std" },
 { "No ending date","Kein End-Datum", },
@@ -330,103 +330,103 @@
 { "Remote user:","Remote Benutzer"},
 { "&Remove","Entfe&rnen" },
 { "Remove","Entfernen" },
 { "Request response","Bemerkung anfordern" },
 { "Role:","Rolle:" },
 { "Role","Rolle" },
 { "Sat","Sa" },
 { "Saturday","Samstag" },
 { "Search for:","Suche nach:" },
 { "Search In","Suche in" },
 { "Search...","Suche..." },
 { "Search","Suche" },
 { "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" },
 { "User long date:","Format langes Datum:" },
 { "User short date:","Forma kurzes Datum:" },
 { "View","Ansicht" },
 { "View Fonts","Schriftarten Ansichten" },
 { "Views","Ansichten" },
 { "Wed","Mi" },
 { "Wednesday","Mittwoch" },
 { "Week %1","Woche %1" },
 { "Weekly","Wöchentlich" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "What's Next View:","What's Next Anz." },
 { "What's next ?","Was kommt als nächstes?(What's Next)" },
@@ -458,49 +458,49 @@
 { "month-yearly","monat-jährlich" },
 { "day-yearly","tag-jährlich" },
 { "position-yearly","pos-jährlich" },
 { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
 { "Highlight current day in agenda","Hebe >>heute<< in Agenda hervor" },
 { "Use light color for highlight current day","Helle Farbe für >>heute<< Hervorhebung" },
 { "Highlight selection in Time Edit","Hebe Auswahl in Zeit Edit hervor" },
 { "Hold fullscreen on view change","Behalte Vollbild bei Ansichswechsel" },
 { "Hold non-fullscreen on view change","Behalte Nicht-Vollbild bei Ansichtsw." },
 { "Event list view uses full window","Listenansicht nutzt Vollbild" },
 { "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" },
 { "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" },
 { "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" },
 { "Journal","Journal" },
 { "Next days","Nächste Tage" },
 { "Print agenda selection...","Drucke Agendaselektion..." },
 { "Toggle DateNavigator","Navigator umschalten" },
 { "Toggle FilterView","Filteransicht umschalten" },
 { "Prev. month","Vorheriger Monat" },
 { "Go backward","Gehe zurück" },
 { "Go forward","Gehe weiter" },
 { "Synchronize","Synchronisieren" },
 { "AgendaSize","Agendagröße" },
 { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" },
 { "Import last file","Importiere letzte Datei" },
@@ -533,49 +533,49 @@
 { "Documents","DoKumente" },
 { "Select Categories","Selektiere Kategorien" },
 { " &Deselect All "," Auswahl aufheben " },
 { "A&dd","Hinzu" },
 { "&Modify","Ändern" },
 { "Edit Categories","Editiere Kategorien" },
 { " &Edit Categories "," &Editiere Kategorien " },
 { "Beam Options","Beam Einstellungen" },
 { " With timezone "," Mit Zeitzone " },
 { " Local time ",  " Lokale Zeit " },
 { "Manage new Categories","Verwalte neue Kategorien" },
 { "Add to category list","Füge zur Kategorieliste hinzu" },
 { "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>" },
 { "<p><b>On:</b> %1</p> ","<p><b>Am:</b> %1</p> " },
 { "<p><b>From:</b> %1 <b>To:</b> %2</p>","<p><b>Von:</b> %1 <b>Bis:</b> %2</p>" },
 { "This is a %1 recurring event.","Das ist ein %1 wiederholender Termin." },
 { "<b>Next recurrence is on:</b>","<b>Nächste Wiederholung ist am:</b>" },
 { "<b>Last recurrence was on:</b>","<b>Letzte Wiederholung war am:</b>" },
 { "( %1 min before )","( %1 min vorher )" },
 { "<b>Alarm on: ","<b>Alarm am: " },
 { "<b>Details: </b>","<b>Details: </b>" },
 { "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
 { "<p><i>%1 % completed</i></p>","<p><i>%1 % erledigt</i></p>" },
 { "Organizer","Organisator" },
 { "Save","Speichern" },
@@ -650,49 +650,49 @@
 { "Cancelled","Gecancelt" },
 { "Multiple sync","Mehrfach Sync" },
 { "Local file","Lokale Datei" },
 { "Last file","Letzte Datei" },
 { "Keys + Colors...","Tasten + Farben..." },
 { "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
 { "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" },
 { "Choose...","Wähle..." },
 { "Use colors for application:","Setze Farben für Programm:" },
 { "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" },
 { "Frames, labels, etc.:","Rahmen, Label, etc.:" },
 { "Show parent To-Do's","Zeige Ober-Todos" },
 { "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:" },
 { "Include in multiple sync","Beziehe Profil in mehrfach Sync mit ein" },
 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },
 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },
 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },
 { "Write back file","Schreibe Datei zurück" },
 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },
 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },
 { "Local device name:","Name dieses Gerätes:" },
 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },
 { "Sync preferences","Synchronisations Einstellungen" },
 { "Profile kind","Profil Art" },
 { "Local file","Lokale Datei" },
@@ -838,49 +838,49 @@
 { "Email","Email" },
 { "RSVP","RSVP" },
 { "Email:","Email:" },
 { "Appointment Time ","Termin Zeit " },
 { "2","2" },
 { "3","3" },
 { "4","4" },
 { "  0 %","  0 %" },
 { " 20 %"," 20 %" },
 { " 40 %"," 40 %" },
 { " 60 %"," 60 %" },
 { " 80 %"," 80 %" },
 { "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" },
 { "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
 { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nTodo/Kalender Daten auf dem Handy!" },
 { "Export to mobile phone!","Exportiere auf das Handy!" },
 { "Export complete calendar","Exportiere kompletten Kalender" },
 { "Writing to phone...","Sende Daten ans Handy..." },
 { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
 { "Retry","Nochmal versuchen" },
 { "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },
 { "Export filtered calendar","Exportiere gefilterten Kalender" },
 { "Preferences","Vorlieben" },
@@ -1019,49 +1019,49 @@
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.info\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "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" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
@@ -1371,49 +1371,49 @@
 { "Hide all selected","Verstecke Ausgewählte" },
 { "Add items","hinzufügen" },
 { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" },
 { "Print List View...","Drucke Listenansicht..." },
 { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." },
 { "Configure KO/Pi...","Konfiguriere KO/Pi..." },
 { "Global Settings...","Globale Einstellungen..." },
 { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" },
 { "(disabled)","(abgeschaltet)" },
 { "New Calendar","Neuer Kalender" },
 { "Calendar","Kalender" },
 { "Filter selector","Filterauswahl" },
 { "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>" },
 { "Global application font for all apps:","Globale Schriftart:" },
 { "Application Font","Applikationsschriftart" },
 { "Kx/Pi","Kx/Pi" },
 { "Backup","Backup" },
 { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" },
 { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" },
 { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" },
 { "Choose Color","Wähle Farbe" },
 { " OK "," OK " },
 { " Cancel "," Abbrechen " },
 { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" },
 { "Matching items will be removed from list","Passende werden von der Liste entfernt" },
@@ -1468,29 +1468,29 @@
 { "Change category list now!","Ändere Kategorieliste jetzt!" },
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
 { "Alarm Options","Alarm Einstellungen" },
 { "Delete selected...","Lösche Ausgewählte..." },
 { "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
@@ -680,49 +680,49 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 mText += i18n( "Mail to selected" );
                 mText += "</a> ( ";
                 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
                 mText += "<br>\n";
         }
     }
 
 }
 void KOEventViewer::appendJournal(Journal *jour, int mode )
 { 
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     QString text_d = i18n("Journal from: ");
     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)
 {
     int id = event->calID();
     if ( id > 1 ) {
         addTag("p", "<em>("+i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName + ")</em>");
     }
     if (event->isReadOnly()) {
         addTag("p","<em>(" + i18n("read-only") + ")</em>");
     }
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -777,76 +777,78 @@ void MainWindow::initActions()
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
     actionMenu->insertSeparator();
     
    
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( mCurrentItemMenu );
     connect( action, SIGNAL( activated() ),
              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 );
     nt_action->addTo( actionMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
 
    
 
     // ***********************
     if ( KOPrefs::instance()->mVerticalScreen ) {
          icon = SmallIcon( "1updownarrow" );
     } else {
         icon = SmallIcon("1leftrightarrow" );
     }
@@ -1626,128 +1628,110 @@ QString MainWindow::syncFileName()
 #else
     return QString( "/tmp/synccalendar.ics" );
 #endif
 }
 #include "koglobals.h"
 #include <kcalendarsystem.h>
 void MainWindow::updateWeek(QDate seda)
 {
     int weekNum = KGlobal::locale()->weekNum ( seda );
     mWeekPixmap.fill( mWeekBgColor );
     QPainter p ( &mWeekPixmap );
     p.setFont( mWeekFont );
     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();
 #endif
 }
 void MainWindow::importBday()
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result == 0 ) {
         mView->importBday();
 
     }