author | zautrix <zautrix> | 2005-06-27 05:12:12 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-27 05:12:12 (UTC) |
commit | fe17413ed808afb7b3e722e1f2ea9a5381a44955 (patch) (unidiff) | |
tree | 33b23a8e2429d934ace835f46d194b9aed5dd57f | |
parent | 9b2bf31715226dfa8210f31843616a04f810f012 (diff) | |
download | kdepimpi-fe17413ed808afb7b3e722e1f2ea9a5381a44955.zip kdepimpi-fe17413ed808afb7b3e722e1f2ea9a5381a44955.tar.gz kdepimpi-fe17413ed808afb7b3e722e1f2ea9a5381a44955.tar.bz2 |
tz fix
-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 | |||
@@ -1450,18 +1450,18 @@ | |||
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 | |||
@@ -2664,32 +2664,32 @@ void CalendarView::edit_paste() | |||
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) |