summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -502,21 +502,21 @@
{ "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" },
{ "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." },
{ "Load Calendar Backup","Lade Kalender Backup" },
-{ "Save Calendar Backup","Speichere Kalender Backup" },
+{ "Save Calendar Backup...","Speichere Kalender Backup..." },
{ "Export VCalendar","Exportiere VCalendar" },
{ "Manage new categories...","Verwalte neue Kategorien..." },
-{ "Beam complete calendar...","Sende kompletten Kalender via IR" },
-{ "Beam filtered calendar...","Sende gefilterten Kalender via IR" },
+{ "Beam complete calendar...","Sende kompletten Kalender..." },
+{ "Beam filtered calendar...","Sende gefilterten Kalender..." },
{ "Remote via ssh","Über Netzwerk via ssh" },
{ "With local file","Mit lokaler Datei" },
{ "With last file","Mit letzter Datei" },
{ "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" },
{ "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" },
{ "Save filename","Speichern: Dateinamen wählen" },
{ "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" },
{ "KO/Pi: Warning!","KO/Pi: Warnung!" },
@@ -1088,17 +1088,17 @@
{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
{ "KO/Pi","KO/Pi" },
{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
{ "Sound.Al.: ","Sound.Al.: " },
{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" },
{ "Restore","Wiederherstellen" },
-{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
+{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklich\nwiederherstellen?" },
{ "% completed","% erledigt" },
{ "%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 " },
{ "Form2","Form2" },
{ "Filter enabled","Filter angeschaltet" },
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a5d8824..b6ce7d5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -649,21 +649,17 @@ void MainWindow::initActions()
{
//KOPrefs::instance()->mShowFullMenu
iconToolBar->clear();
KOPrefs *p = KOPrefs::instance();
//QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
QPopupMenu *viewMenu = new QPopupMenu( this );
QPopupMenu *actionMenu = new QPopupMenu( this );
-#ifdef DESKTOP_VERSION
- mCurrentItemMenu = actionMenu;
-#else
mCurrentItemMenu = new QPopupMenu ( this );
-#endif
QPopupMenu *importMenu = new QPopupMenu( this );
QPopupMenu *importMenu_X = new QPopupMenu( this );
QPopupMenu *exportMenu_X = new QPopupMenu( this );
QPopupMenu *beamMenu_X = new QPopupMenu( this );
selectFilterMenu = new QPopupMenu( this );
selectFilterMenu->setCheckable( true );
syncMenu = new QPopupMenu( this );
configureAgendaMenu = new QPopupMenu( this );
@@ -801,19 +797,17 @@ void MainWindow::initActions()
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 );
-#ifndef DESKTOP_VERSION
actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
-#endif
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() ),
@@ -1073,17 +1067,17 @@ void MainWindow::initActions()
//importMenu->insertSeparator();
#if 0
action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
this );
action->addTo( importMenu );
connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
#endif
- action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
+ action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
this );
action->addTo( importMenu );
connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
importMenu->insertSeparator();
importMenu->insertItem( i18n("Import"), importMenu_X );
//importMenu->insertSeparator();
action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
this );