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) (ignore 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
@@ -46,3 +46,3 @@
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" },
@@ -132,3 +132,3 @@
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..." },
@@ -149,3 +149,2 @@
149{ "Edit...","Bearbeite..." }, 149{ "Edit...","Bearbeite..." },
150{ "Edit","Bearbeite" },
151{ "Edit Event...","Bearbeite Termin..." }, 150{ "Edit Event...","Bearbeite Termin..." },
@@ -222,3 +221,3 @@
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:" },
@@ -478,3 +477,3 @@
478{ "Beam...","Sende via IR..." }, 477{ "Beam...","Sende via IR..." },
479{ "&Clone...","Dupliziere.." }, 478{ "&Clone...","Dupliziere..." },
480{ "&Move...","Bewege..." }, 479{ "&Move...","Bewege..." },
@@ -487,3 +486,3 @@
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" },
@@ -1099,3 +1098,3 @@
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" },
@@ -1490,2 +1489,3 @@
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{ "","" },
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()
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())));
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,
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()));
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()
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
@@ -697,3 +698,4 @@ void MainWindow::initActions()
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 );
@@ -784,6 +786,6 @@ void MainWindow::initActions()
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" );
@@ -797,3 +799,3 @@ void MainWindow::initActions()
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 );
@@ -1724,6 +1726,2 @@ void 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 );
@@ -1736,3 +1734,2 @@ void MainWindow::enableIncidenceActions( bool enabled )
1736 mCancelAction->setEnabled( enabled ); 1734 mCancelAction->setEnabled( enabled );
1737#endif
1738} 1735}