fixes

4 files changed, 16 insertions, 19 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 5fece5b..bd946fd 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -44,7 +44,7 @@
 { "Accept A&ll","A&lles Akzepieren" },
 { "Access:","Zugriff:" },
 { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" },
-{ "Actions","Aktionen" },
+{ "Action","Aktion" },
 { "Add Filter","Filter Hinzufügen" },
 { "&Add","Hinzufügen" },
 { "Add","Hinzufügen" },
@@ -130,7 +130,7 @@
 { "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öschen" },
 { "Delete Todo...","Lösche Todo..." },
@@ -147,7 +147,6 @@
 { "Due:","Fällig:"},
 { "Duration: ","Dauer: " },
 { "Edit...","Bearbeite..." },
-{ "Edit","Bearbeite" },
 { "Edit Event...","Bearbeite Termin..." },
 { "Edit Event","Bearbeite Termin" },
 { "Edit exceptions","Bearbeite Ausnahmen" },
@@ -220,7 +219,7 @@
 { "List View","Listenansicht" },
 { "Load/Save","Laden/Speichern" },
 { "Load Template","Lade Vorlage" },
-{ "Locale","Localisation" },
+{ "Locale","Lokalisation" },
 { "Local temp file:","Lokale temp. Datei:" },
 { "Location: ","Ort: " },
 { "Location:","Ort:" },
@@ -476,7 +475,7 @@
 { "Clone...","Dupliziere..." },
 { "Move...","Bewege..." },
 { "Beam...","Sende via IR..." },
-{ "&Clone...","Dupliziere.." },
+{ "&Clone...","Dupliziere..." },
 { "&Move...","Bewege..." },
 { "&Beam...","Sende via IR..." },
 { "Show Completed","Zeige erledigte Todos" },
@@ -485,7 +484,7 @@
 { "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" },
+{ "Beam via IR...","Sende via IR..." },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
@@ -1097,7 +1096,7 @@
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
-{ " Local time "," Locale Zeit " },
+{ " Local time "," Lokale Zeit " },
 { "Form2","Form2" },
 { "Filter enabled","Filter angeschaltet" },
 { "Edit Filters","Ändere Filter" },
@@ -1488,6 +1487,7 @@
 { "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" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 41d331a..0b0fe8e 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -40,7 +40,7 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
   
     mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
     mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
-    mEditOnlyItems.append(insertItem (i18n("&Delete"),
+    mEditOnlyItems.append(insertItem (i18n("&Delete..."),
                                       this,SLOT(popupDelete())));
     mEditOnlyItems.append(insertItem (i18n("&Clone..."),
                                       this,SLOT(popupClone())));
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index cdcbbf0..ea037a9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -347,7 +347,7 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     //mPopupMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
     selPopup->insertSeparator();
-    selPopup->insertItem( i18n("Beam via IR"),this,
+    selPopup->insertItem( i18n("Beam via IR..."),this,
                           SLOT(beamSelected()));
 #if 0
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -675,7 +675,8 @@ void MainWindow::initActions()
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
-        menuBar1->insertItem( i18n("Actions"), actionMenu );
+        menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
+        menuBar1->insertItem( i18n("Action"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
@@ -695,7 +696,8 @@ void MainWindow::initActions()
         //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
-        menuBar->insertItem( i18n("Actions"), actionMenu );
+        menuBar->insertItem( i18n("Edit"), mCurrentItemMenu );
+        menuBar->insertItem( i18n("Action"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
@@ -782,10 +784,10 @@ void MainWindow::initActions()
    
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
-    action->addTo( actionMenu );
+    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 );
@@ -795,7 +797,7 @@ void MainWindow::initActions()
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
 
-    actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
+    //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
     mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
     mShowAction->addTo( mCurrentItemMenu  );
     connect( mShowAction, SIGNAL( activated() ),
@@ -1722,10 +1724,6 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
 
 void MainWindow::enableIncidenceActions( bool enabled )
 {
-
-#ifndef DESKTOP_VERSION
-    mCurrentItemMenu->setEnabled( enabled );
-#else
     mShowAction->setEnabled( enabled );
     mEditAction->setEnabled( enabled );
     mDeleteAction->setEnabled( enabled );
@@ -1734,7 +1732,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
     mMoveAction->setEnabled( enabled );
     mBeamAction->setEnabled( enabled );
     mCancelAction->setEnabled( enabled );
-#endif
 }
 
 void MainWindow::importOL()