| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 14 | ||||
| -rw-r--r-- | korganizer/koeventpopupmenu.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 17 |
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 @@ -43,9 +43,9 @@ { "Accept","Akzeptieren" }, { "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" }, { "Additional email addresses:","Zusätzliche E-Mail Adressen:" }, @@ -129,9 +129,9 @@ { "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öschen" }, { "Delete Todo...","Lösche Todo..." }, { "Delete To-Do","Lösche Todo" }, @@ -146,9 +146,8 @@ { "Due Time","Fällig um" }, { "Due:","Fällig:"}, { "Duration: ","Dauer: " }, { "Edit...","Bearbeite..." }, -{ "Edit","Bearbeite" }, { "Edit Event...","Bearbeite Termin..." }, { "Edit Event","Bearbeite Termin" }, { "Edit exceptions","Bearbeite Ausnahmen" }, { "EditorBox:","Editor Fenster:" }, @@ -219,9 +218,9 @@ { "List View:","Listenansicht:" }, { "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:" }, { "Mail client","Mail Programm" }, @@ -475,18 +474,18 @@ { "File","Datei" }, { "Clone...","Dupliziere..." }, { "Move...","Bewege..." }, { "Beam...","Sende via IR..." }, -{ "&Clone...","Dupliziere.." }, +{ "&Clone...","Dupliziere..." }, { "&Move...","Bewege..." }, { "&Beam...","Sende via IR..." }, { "Show Completed","Zeige erledigte Todos" }, { "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" }, +{ "Beam via IR...","Sende via IR..." }, { "Search","Suchen" }, { "Date Picker","Datum auswählen" }, { "Day View","Tagesansicht" }, { "Work Week","Arbeitswoche" }, @@ -1096,9 +1095,9 @@ { "%d item(s) found.","%d Item(s) gefunden." }, { "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" }, { "Print What's Next View...","Drucke What's Next Ansicht..." }, @@ -1487,8 +1486,9 @@ { "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" }, { "","" }, { "","" }, { "","" }, { "","" }, diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 41d331a..0b0fe8e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -39,9 +39,9 @@ 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()))); mEditOnlyItems.append(insertItem (i18n("&Move..."), diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index cdcbbf0..ea037a9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -346,9 +346,9 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, // SLOT(addCat()),true); //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()), i18n("Beam via IR"),this, diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f68f032..7a5f3e5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -674,9 +674,10 @@ void MainWindow::initActions() QMenuBar *menuBar1; 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 ); #else @@ -694,9 +695,10 @@ void MainWindow::initActions() menuBar1->insertItem( icon.pixmap(), menuBar); //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 ); menuBar->insertItem( i18n("Filter"),selectFilterMenu ); @@ -781,12 +783,12 @@ 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 ); configureToolBarMenu->insertSeparator(); @@ -794,9 +796,9 @@ void MainWindow::initActions() configureToolBarMenu->insertSeparator(); 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() ), mView, SLOT( showIncidence() ) ); @@ -1721,21 +1723,16 @@ 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 ); mCloneAction->setEnabled( enabled ); mMoveAction->setEnabled( enabled ); mBeamAction->setEnabled( enabled ); mCancelAction->setEnabled( enabled ); -#endif } void MainWindow::importOL() { |