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
@@ -46,3 +46,3 @@
 { "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" },
@@ -132,3 +132,3 @@
 { "Delete Event","Lösche Termin" },
-{ "&Delete","Löschen" },
+{ "&Delete...","Löschen..." },
 { "Delete...","Löschen..." },
@@ -149,3 +149,2 @@
 { "Edit...","Bearbeite..." },
-{ "Edit","Bearbeite" },
 { "Edit Event...","Bearbeite Termin..." },
@@ -222,3 +221,3 @@
 { "Load Template","Lade Vorlage" },
-{ "Locale","Localisation" },
+{ "Locale","Lokalisation" },
 { "Local temp file:","Lokale temp. Datei:" },
@@ -478,3 +477,3 @@
 { "Beam...","Sende via IR..." },
-{ "&Clone...","Dupliziere.." },
+{ "&Clone...","Dupliziere..." },
 { "&Move...","Bewege..." },
@@ -487,3 +486,3 @@
 { "Set Categ. for selected...","Setze Kateg. für Selekt." },
-{ "Beam via IR","Sende via IR" },
+{ "Beam via IR...","Sende via IR..." },
 { "Search","Suchen" },
@@ -1099,3 +1098,3 @@
 { "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" },
@@ -1490,2 +1489,3 @@
 { "\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
@@ -42,3 +42,3 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
-    mEditOnlyItems.append(insertItem (i18n("&Delete"),
+    mEditOnlyItems.append(insertItem (i18n("&Delete..."),
                                       this,SLOT(popupDelete())));
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index cdcbbf0..ea037a9 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -349,3 +349,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     selPopup->insertSeparator();
-    selPopup->insertItem( i18n("Beam via IR"),this,
+    selPopup->insertItem( i18n("Beam via IR..."),this,
                           SLOT(beamSelected()));
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f68f032..7a5f3e5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -677,3 +677,4 @@ void MainWindow::initActions()
         menuBar1->insertItem( i18n("View"), viewMenu );
-        menuBar1->insertItem( i18n("Actions"), actionMenu );
+        menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
+        menuBar1->insertItem( i18n("Action"), actionMenu );
 #ifdef DESKTOP_VERSION
@@ -697,3 +698,4 @@ void MainWindow::initActions()
         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 );
@@ -784,6 +786,6 @@ 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" );
@@ -797,3 +799,3 @@ void MainWindow::initActions()
 
-    actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
+    //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
     mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
@@ -1724,6 +1726,2 @@ void MainWindow::enableIncidenceActions( bool enabled )
 {
-
-#ifndef DESKTOP_VERSION
-    mCurrentItemMenu->setEnabled( enabled );
-#else
     mShowAction->setEnabled( enabled );
@@ -1736,3 +1734,2 @@ void MainWindow::enableIncidenceActions( bool enabled )
     mCancelAction->setEnabled( enabled );
-#endif
 }