summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-02 21:45:23 (UTC)
committer zautrix <zautrix>2005-07-02 21:45:23 (UTC)
commit5cf73f798229641d23025af064e87fa88ab3de91 (patch) (unidiff)
tree12b618f0eedea62fb281e576b657b60bd2c3cc9c
parentc69004813dce7402f56e7f90e172c8fb56e9cc55 (diff)
downloadkdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.zip
kdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.tar.gz
kdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.tar.bz2
fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt14
-rw-r--r--korganizer/koeventpopupmenu.cpp2
-rw-r--r--korganizer/kolistview.cpp2
-rw-r--r--korganizer/mainwindow.cpp17
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 @@
44{ "Accept A&ll","A&lles Akzepieren" }, 44{ "Accept A&ll","A&lles Akzepieren" },
45{ "Access:","Zugriff:" }, 45{ "Access:","Zugriff:" },
46{ "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" }, 46{ "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" },
47{ "Actions","Aktionen" }, 47{ "Action","Aktion" },
48{ "Add Filter","Filter Hinzufügen" }, 48{ "Add Filter","Filter Hinzufügen" },
49{ "&Add","Hinzufügen" }, 49{ "&Add","Hinzufügen" },
50{ "Add","Hinzufügen" }, 50{ "Add","Hinzufügen" },
@@ -130,7 +130,7 @@
130{ "Delete Current","Aktuellen löschen" }, 130{ "Delete Current","Aktuellen löschen" },
131{ "Delete Event...","Lösche Termin..." }, 131{ "Delete Event...","Lösche Termin..." },
132{ "Delete Event","Lösche Termin" }, 132{ "Delete Event","Lösche Termin" },
133{ "&Delete","Löschen" }, 133{ "&Delete...","Löschen..." },
134{ "Delete...","Löschen..." }, 134{ "Delete...","Löschen..." },
135{ "Delete","Löschen" }, 135{ "Delete","Löschen" },
136{ "Delete Todo...","Lösche Todo..." }, 136{ "Delete Todo...","Lösche Todo..." },
@@ -147,7 +147,6 @@
147{ "Due:","Fällig:"}, 147{ "Due:","Fällig:"},
148{ "Duration: ","Dauer: " }, 148{ "Duration: ","Dauer: " },
149{ "Edit...","Bearbeite..." }, 149{ "Edit...","Bearbeite..." },
150{ "Edit","Bearbeite" },
151{ "Edit Event...","Bearbeite Termin..." }, 150{ "Edit Event...","Bearbeite Termin..." },
152{ "Edit Event","Bearbeite Termin" }, 151{ "Edit Event","Bearbeite Termin" },
153{ "Edit exceptions","Bearbeite Ausnahmen" }, 152{ "Edit exceptions","Bearbeite Ausnahmen" },
@@ -220,7 +219,7 @@
220{ "List View","Listenansicht" }, 219{ "List View","Listenansicht" },
221{ "Load/Save","Laden/Speichern" }, 220{ "Load/Save","Laden/Speichern" },
222{ "Load Template","Lade Vorlage" }, 221{ "Load Template","Lade Vorlage" },
223{ "Locale","Localisation" }, 222{ "Locale","Lokalisation" },
224{ "Local temp file:","Lokale temp. Datei:" }, 223{ "Local temp file:","Lokale temp. Datei:" },
225{ "Location: ","Ort: " }, 224{ "Location: ","Ort: " },
226{ "Location:","Ort:" }, 225{ "Location:","Ort:" },
@@ -476,7 +475,7 @@
476{ "Clone...","Dupliziere..." }, 475{ "Clone...","Dupliziere..." },
477{ "Move...","Bewege..." }, 476{ "Move...","Bewege..." },
478{ "Beam...","Sende via IR..." }, 477{ "Beam...","Sende via IR..." },
479{ "&Clone...","Dupliziere.." }, 478{ "&Clone...","Dupliziere..." },
480{ "&Move...","Bewege..." }, 479{ "&Move...","Bewege..." },
481{ "&Beam...","Sende via IR..." }, 480{ "&Beam...","Sende via IR..." },
482{ "Show Completed","Zeige erledigte Todos" }, 481{ "Show Completed","Zeige erledigte Todos" },
@@ -485,7 +484,7 @@
485{ "Save selected to file...","Speichere Selektierte..." }, 484{ "Save selected to file...","Speichere Selektierte..." },
486{ "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, 485{ "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
487{ "Set Categ. for selected...","Setze Kateg. für Selekt." }, 486{ "Set Categ. for selected...","Setze Kateg. für Selekt." },
488{ "Beam via IR","Sende via IR" }, 487{ "Beam via IR...","Sende via IR..." },
489{ "Search","Suchen" }, 488{ "Search","Suchen" },
490{ "Date Picker","Datum auswählen" }, 489{ "Date Picker","Datum auswählen" },
491{ "Day View","Tagesansicht" }, 490{ "Day View","Tagesansicht" },
@@ -1097,7 +1096,7 @@
1097{ "Set complete","Setze auf erledigt" }, 1096{ "Set complete","Setze auf erledigt" },
1098{ "(cancelled)","(gecancelt)" }, 1097{ "(cancelled)","(gecancelt)" },
1099{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" }, 1098{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
1100{ " Local time "," Locale Zeit " }, 1099{ " Local time "," Lokale Zeit " },
1101{ "Form2","Form2" }, 1100{ "Form2","Form2" },
1102{ "Filter enabled","Filter angeschaltet" }, 1101{ "Filter enabled","Filter angeschaltet" },
1103{ "Edit Filters","Ändere Filter" }, 1102{ "Edit Filters","Ändere Filter" },
@@ -1488,6 +1487,7 @@
1488{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, 1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
1489{ "\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" }, 1488{ "\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" },
1490{ "\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" }, 1489{ "\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" },
1490{ "Edit","Edit" },
1491{ "","" }, 1491{ "","" },
1492{ "","" }, 1492{ "","" },
1493{ "","" }, 1493{ "","" },
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()
40 40
41 mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow()))); 41 mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow())));
42 mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); 42 mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit())));
43 mEditOnlyItems.append(insertItem (i18n("&Delete"), 43 mEditOnlyItems.append(insertItem (i18n("&Delete..."),
44 this,SLOT(popupDelete()))); 44 this,SLOT(popupDelete())));
45 mEditOnlyItems.append(insertItem (i18n("&Clone..."), 45 mEditOnlyItems.append(insertItem (i18n("&Clone..."),
46 this,SLOT(popupClone()))); 46 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,
347 //mPopupMenu->insertSeparator(); 347 //mPopupMenu->insertSeparator();
348#ifndef DESKTOP_VERSION 348#ifndef DESKTOP_VERSION
349 selPopup->insertSeparator(); 349 selPopup->insertSeparator();
350 selPopup->insertItem( i18n("Beam via IR"),this, 350 selPopup->insertItem( i18n("Beam via IR..."),this,
351 SLOT(beamSelected())); 351 SLOT(beamSelected()));
352#if 0 352#if 0
353 mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), 353 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()
675 menuBar1 = menuBar(); 675 menuBar1 = menuBar();
676 menuBar1->insertItem( i18n("File"), importMenu ); 676 menuBar1->insertItem( i18n("File"), importMenu );
677 menuBar1->insertItem( i18n("View"), viewMenu ); 677 menuBar1->insertItem( i18n("View"), viewMenu );
678 menuBar1->insertItem( i18n("Actions"), actionMenu ); 678 menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
679 menuBar1->insertItem( i18n("Action"), actionMenu );
679#ifdef DESKTOP_VERSION 680#ifdef DESKTOP_VERSION
680 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 681 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
681 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 682 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
@@ -695,7 +696,8 @@ void MainWindow::initActions()
695 //menuBar1->insertItem( i18n("ME"), menuBar); 696 //menuBar1->insertItem( i18n("ME"), menuBar);
696 menuBar->insertItem( i18n("File"), importMenu ); 697 menuBar->insertItem( i18n("File"), importMenu );
697 menuBar->insertItem( i18n("View"), viewMenu ); 698 menuBar->insertItem( i18n("View"), viewMenu );
698 menuBar->insertItem( i18n("Actions"), actionMenu ); 699 menuBar->insertItem( i18n("Edit"), mCurrentItemMenu );
700 menuBar->insertItem( i18n("Action"), actionMenu );
699 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 701 menuBar->insertItem( i18n("Synchronize"), syncMenu );
700 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 702 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
701 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 703 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
@@ -782,10 +784,10 @@ void MainWindow::initActions()
782 784
783 785
784 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 786 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
785 action->addTo( actionMenu ); 787 action->addTo( mCurrentItemMenu );
786 connect( action, SIGNAL( activated() ), 788 connect( action, SIGNAL( activated() ),
787 mView, SLOT( undo_delete() ) ); 789 mView, SLOT( undo_delete() ) );
788 790 mCurrentItemMenu->insertSeparator();
789 icon = loadPixmap( pathString + "newevent" ); 791 icon = loadPixmap( pathString + "newevent" );
790 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 792 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
791 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 793 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
@@ -795,7 +797,7 @@ void MainWindow::initActions()
795 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 797 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
796 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 798 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
797 799
798 actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 800 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
799 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 801 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
800 mShowAction->addTo( mCurrentItemMenu ); 802 mShowAction->addTo( mCurrentItemMenu );
801 connect( mShowAction, SIGNAL( activated() ), 803 connect( mShowAction, SIGNAL( activated() ),
@@ -1722,10 +1724,6 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
1722 1724
1723void MainWindow::enableIncidenceActions( bool enabled ) 1725void MainWindow::enableIncidenceActions( bool enabled )
1724{ 1726{
1725
1726#ifndef DESKTOP_VERSION
1727 mCurrentItemMenu->setEnabled( enabled );
1728#else
1729 mShowAction->setEnabled( enabled ); 1727 mShowAction->setEnabled( enabled );
1730 mEditAction->setEnabled( enabled ); 1728 mEditAction->setEnabled( enabled );
1731 mDeleteAction->setEnabled( enabled ); 1729 mDeleteAction->setEnabled( enabled );
@@ -1734,7 +1732,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
1734 mMoveAction->setEnabled( enabled ); 1732 mMoveAction->setEnabled( enabled );
1735 mBeamAction->setEnabled( enabled ); 1733 mBeamAction->setEnabled( enabled );
1736 mCancelAction->setEnabled( enabled ); 1734 mCancelAction->setEnabled( enabled );
1737#endif
1738} 1735}
1739 1736
1740void MainWindow::importOL() 1737void MainWindow::importOL()