summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt8
-rw-r--r--korganizer/mainwindow.cpp8
2 files changed, 5 insertions, 11 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 2bfdb2f..11a0413 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -504,17 +504,17 @@
504{ "Synchronize","Synchronisieren" }, 504{ "Synchronize","Synchronisieren" },
505{ "AgendaSize","Agendagröße" }, 505{ "AgendaSize","Agendagröße" },
506{ "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" }, 506{ "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" },
507{ "Import last file","Importiere letzte Datei" }, 507{ "Import last file","Importiere letzte Datei" },
508{ "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." }, 508{ "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." },
509{ "Load Calendar Backup","Lade Kalender Backup" }, 509{ "Load Calendar Backup","Lade Kalender Backup" },
510{ "Save Calendar Backup","Speichere Kalender Backup" }, 510{ "Save Calendar Backup...","Speichere Kalender Backup..." },
511{ "Export VCalendar","Exportiere VCalendar" }, 511{ "Export VCalendar","Exportiere VCalendar" },
512{ "Manage new categories...","Verwalte neue Kategorien..." }, 512{ "Manage new categories...","Verwalte neue Kategorien..." },
513{ "Beam complete calendar...","Sende kompletten Kalender via IR" }, 513{ "Beam complete calendar...","Sende kompletten Kalender..." },
514{ "Beam filtered calendar...","Sende gefilterten Kalender via IR" }, 514{ "Beam filtered calendar...","Sende gefilterten Kalender..." },
515{ "Remote via ssh","Über Netzwerk via ssh" }, 515{ "Remote via ssh","Über Netzwerk via ssh" },
516{ "With local file","Mit lokaler Datei" }, 516{ "With local file","Mit lokaler Datei" },
517{ "With last file","Mit letzter Datei" }, 517{ "With last file","Mit letzter Datei" },
518{ "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" }, 518{ "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" },
519{ "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" }, 519{ "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" },
520{ "Save filename","Speichern: Dateinamen wählen" }, 520{ "Save filename","Speichern: Dateinamen wählen" },
@@ -1090,13 +1090,13 @@
1090{ "KO/Pi","KO/Pi" }, 1090{ "KO/Pi","KO/Pi" },
1091{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" }, 1091{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
1092{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." }, 1092{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
1093{ "Sound.Al.: ","Sound.Al.: " }, 1093{ "Sound.Al.: ","Sound.Al.: " },
1094{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" }, 1094{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" },
1095{ "Restore","Wiederherstellen" }, 1095{ "Restore","Wiederherstellen" },
1096{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" }, 1096{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklich\nwiederherstellen?" },
1097{ "% completed","% erledigt" }, 1097{ "% completed","% erledigt" },
1098{ "%d item(s) found.","%d Item(s) gefunden." }, 1098{ "%d item(s) found.","%d Item(s) gefunden." },
1099{ "Set complete","Setze auf erledigt" }, 1099{ "Set complete","Setze auf erledigt" },
1100{ "(cancelled)","(gecancelt)" }, 1100{ "(cancelled)","(gecancelt)" },
1101{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" }, 1101{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
1102{ " Local time "," Locale Zeit " }, 1102{ " Local time "," Locale Zeit " },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a5d8824..b6ce7d5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -651,17 +651,13 @@ void MainWindow::initActions()
651 iconToolBar->clear(); 651 iconToolBar->clear();
652 KOPrefs *p = KOPrefs::instance(); 652 KOPrefs *p = KOPrefs::instance();
653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 653 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
654 654
655 QPopupMenu *viewMenu = new QPopupMenu( this ); 655 QPopupMenu *viewMenu = new QPopupMenu( this );
656 QPopupMenu *actionMenu = new QPopupMenu( this ); 656 QPopupMenu *actionMenu = new QPopupMenu( this );
657#ifdef DESKTOP_VERSION
658 mCurrentItemMenu = actionMenu;
659#else
660 mCurrentItemMenu = new QPopupMenu ( this ); 657 mCurrentItemMenu = new QPopupMenu ( this );
661#endif
662 QPopupMenu *importMenu = new QPopupMenu( this ); 658 QPopupMenu *importMenu = new QPopupMenu( this );
663 QPopupMenu *importMenu_X = new QPopupMenu( this ); 659 QPopupMenu *importMenu_X = new QPopupMenu( this );
664 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 660 QPopupMenu *exportMenu_X = new QPopupMenu( this );
665 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 661 QPopupMenu *beamMenu_X = new QPopupMenu( this );
666 selectFilterMenu = new QPopupMenu( this ); 662 selectFilterMenu = new QPopupMenu( this );
667 selectFilterMenu->setCheckable( true ); 663 selectFilterMenu->setCheckable( true );
@@ -803,15 +799,13 @@ void MainWindow::initActions()
803 configureToolBarMenu->insertSeparator(); 799 configureToolBarMenu->insertSeparator();
804 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 800 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
805 configureToolBarMenu->insertSeparator(); 801 configureToolBarMenu->insertSeparator();
806 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 802 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
807 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 803 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
808 804
809#ifndef DESKTOP_VERSION
810 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 805 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
811#endif
812 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 806 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
813 mShowAction->addTo( mCurrentItemMenu ); 807 mShowAction->addTo( mCurrentItemMenu );
814 connect( mShowAction, SIGNAL( activated() ), 808 connect( mShowAction, SIGNAL( activated() ),
815 mView, SLOT( showIncidence() ) ); 809 mView, SLOT( showIncidence() ) );
816 810
817 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 811 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
@@ -1075,13 +1069,13 @@ void MainWindow::initActions()
1075#if 0 1069#if 0
1076 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0, 1070 action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
1077 this ); 1071 this );
1078 action->addTo( importMenu ); 1072 action->addTo( importMenu );
1079 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) ); 1073 connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
1080#endif 1074#endif
1081 action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0, 1075 action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
1082 this ); 1076 this );
1083 action->addTo( importMenu ); 1077 action->addTo( importMenu );
1084 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) ); 1078 connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
1085 importMenu->insertSeparator(); 1079 importMenu->insertSeparator();
1086 importMenu->insertItem( i18n("Import"), importMenu_X ); 1080 importMenu->insertItem( i18n("Import"), importMenu_X );
1087 //importMenu->insertSeparator(); 1081 //importMenu->insertSeparator();