-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 6 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 6ac79ad..4df2005 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1438,30 +1438,30 @@ | |||
1438 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, | 1438 | { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." }, |
1439 | { "Spouse","Ehegatte" }, | 1439 | { "Spouse","Ehegatte" }, |
1440 | { "Notes","Notizen" }, | 1440 | { "Notes","Notizen" }, |
1441 | { "Messanger","Messanger" }, | 1441 | { "Messanger","Messanger" }, |
1442 | { "Assistant","Assistent" }, | 1442 | { "Assistant","Assistent" }, |
1443 | { "Manager","Manager" }, | 1443 | { "Manager","Manager" }, |
1444 | { "Secrecy","Sichtbar" }, | 1444 | { "Secrecy","Sichtbar" }, |
1445 | { "male","männlich" }, | 1445 | { "male","männlich" }, |
1446 | { "female","weiblich" }, | 1446 | { "female","weiblich" }, |
1447 | { "Hide!","Verbergen!" }, | 1447 | { "Hide!","Verbergen!" }, |
1448 | { "Show!","Anzeigen!" }, | 1448 | { "Show!","Anzeigen!" }, |
1449 | { "Details","Details" }, | 1449 | { "Details","Details" }, |
1450 | { "Profession","Beruf" }, | 1450 | { "Profession","Beruf" }, |
1451 | { "Children","Kinder" }, | 1451 | { "Children","Kinder" }, |
1452 | { "Department","Abteilung" }, | 1452 | { "Department","Abteilung" }, |
1453 | { "Backup cancelled","Backup abgebrochen" }, | 1453 | { "Backup cancelled","Backup abgebrochen" }, |
1454 | { "Backup globally disabled","Backup global abgeschaltet" }, | 1454 | { "Backup globally disabled","Backup global abgeschaltet" }, |
1455 | { "Backup succesfully finished","Backup erfolgreich beendet" }, | 1455 | { "Backup succesfully finished","Backup erfolgreich beendet" }, |
1456 | { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, | 1456 | { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" }, |
1457 | { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, | 1457 | { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, |
1458 | { "Birthdays","Geburtstage" }, | 1458 | { "Birthdays","Geburtstage" }, |
1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, | 1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, |
1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, | 1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, |
1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, | 1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, |
1462 | { "","" }, | 1462 | { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, |
1463 | { "","" }, | 1463 | { "Reload","Neu laden" }, |
1464 | { "","" }, | 1464 | { "Timezone settings","Zeitzoneneinstellung" }, |
1465 | { "","" }, | 1465 | { "","" }, |
1466 | { "","" }, | 1466 | { "","" }, |
1467 | { "","" }, \ No newline at end of file | 1467 | { "","" }, \ No newline at end of file |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index f179c58..13cf69b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2652,56 +2652,56 @@ void CalendarView::edit_copy() | |||
2652 | KNotifyClient::beep(); | 2652 | KNotifyClient::beep(); |
2653 | return; | 2653 | return; |
2654 | } | 2654 | } |
2655 | DndFactory factory( mCalendar ); | 2655 | DndFactory factory( mCalendar ); |
2656 | factory.copyIncidence(anEvent); | 2656 | factory.copyIncidence(anEvent); |
2657 | } | 2657 | } |
2658 | 2658 | ||
2659 | void CalendarView::edit_paste() | 2659 | void CalendarView::edit_paste() |
2660 | { | 2660 | { |
2661 | QDate date = mNavigator->selectedDates().first(); | 2661 | QDate date = mNavigator->selectedDates().first(); |
2662 | 2662 | ||
2663 | DndFactory factory( mCalendar ); | 2663 | DndFactory factory( mCalendar ); |
2664 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); | 2664 | Event *pastedEvent = (Event *)factory.pasteIncidence( date ); |
2665 | 2665 | ||
2666 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); | 2666 | changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED ); |
2667 | } | 2667 | } |
2668 | void CalendarView::edit_global_options() | 2668 | void CalendarView::edit_global_options() |
2669 | { | 2669 | { |
2670 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; | 2670 | QString tz = KPimGlobalPrefs::instance()->mTimeZoneId; |
2671 | emit save(); | 2671 | emit save(); |
2672 | emit saveStopTimer(); | 2672 | emit saveStopTimer(); |
2673 | mDialogManager->showGlobalOptionsDialog(); | 2673 | mDialogManager->showGlobalOptionsDialog(); |
2674 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { | 2674 | if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) { |
2675 | emit saveStopTimer(); | 2675 | emit saveStopTimer(); |
2676 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), | 2676 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"), |
2677 | i18n("Timezone settings"),i18n("Reload"))) { | 2677 | i18n("Timezone settings"),i18n("Reload"))) { |
2678 | qDebug("KO: TZ reload cancelled "); | 2678 | qDebug("KO: TZ reload cancelled "); |
2679 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 2679 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
2680 | return; | 2680 | return; |
2681 | } | 2681 | } |
2682 | qDebug("KO: Timezone change "); | 2682 | qDebug("KO: Timezone change "); |
2683 | openCalendar( MainWindow::defaultFileName() ); | 2683 | loadCalendars(); |
2684 | setModified(true); | 2684 | setModified(true); |
2685 | } | 2685 | } |
2686 | else | 2686 | else |
2687 | qDebug("KO: No tz change "); | 2687 | qDebug("KO: No tz change "); |
2688 | } | 2688 | } |
2689 | void CalendarView::edit_options() | 2689 | void CalendarView::edit_options() |
2690 | { | 2690 | { |
2691 | mDialogManager->showOptionsDialog(); | 2691 | mDialogManager->showOptionsDialog(); |
2692 | } | 2692 | } |
2693 | 2693 | ||
2694 | 2694 | ||
2695 | void CalendarView::slotSelectPickerDate( QDate d) | 2695 | void CalendarView::slotSelectPickerDate( QDate d) |
2696 | { | 2696 | { |
2697 | mDateFrame->hide(); | 2697 | mDateFrame->hide(); |
2698 | if ( mDatePickerMode == 1 ) { | 2698 | if ( mDatePickerMode == 1 ) { |
2699 | mNavigator->slotDaySelect( d ); | 2699 | mNavigator->slotDaySelect( d ); |
2700 | } else if ( mDatePickerMode == 2 ) { | 2700 | } else if ( mDatePickerMode == 2 ) { |
2701 | if ( mMoveIncidence->typeID() == todoID ) { | 2701 | if ( mMoveIncidence->typeID() == todoID ) { |
2702 | Todo * to = (Todo *) mMoveIncidence; | 2702 | Todo * to = (Todo *) mMoveIncidence; |
2703 | QTime tim; | 2703 | QTime tim; |
2704 | int len = 0; | 2704 | int len = 0; |
2705 | if ( to->hasStartDate() && to->hasDueDate() ) | 2705 | if ( to->hasStartDate() && to->hasDueDate() ) |
2706 | len = to->dtStart().secsTo( to->dtDue()); | 2706 | len = to->dtStart().secsTo( to->dtDue()); |
2707 | if ( to->hasDueDate() ) | 2707 | if ( to->hasDueDate() ) |