-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 | |||
@@ -1459,9 +1459,9 @@ | |||
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 | |||
@@ -2673,14 +2673,14 @@ void CalendarView::edit_global_options() | |||
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 |