-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 | |||
@@ -1414,54 +1414,54 @@ | |||
1414 | { "Kx/Pi","Kx/Pi" }, | 1414 | { "Kx/Pi","Kx/Pi" }, |
1415 | { "Backup","Backup" }, | 1415 | { "Backup","Backup" }, |
1416 | { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" }, | 1416 | { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" }, |
1417 | { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" }, | 1417 | { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" }, |
1418 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, | 1418 | { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" }, |
1419 | { "Choose Color","Wähle Farbe" }, | 1419 | { "Choose Color","Wähle Farbe" }, |
1420 | { " OK "," OK " }, | 1420 | { " OK "," OK " }, |
1421 | { " Cancel "," Abbrechen " }, | 1421 | { " Cancel "," Abbrechen " }, |
1422 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, | 1422 | { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" }, |
1423 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, | 1423 | { "Matching items will be removed from list","Passende werden von der Liste entfernt" }, |
1424 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, | 1424 | { "Search on displayed list only","Suche auf der dargestellten Liste" }, |
1425 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, | 1425 | { "List will be cleared before search","Liste wird vor der Suche gelöscht" }, |
1426 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, | 1426 | { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" }, |
1427 | { "%1\nis running!","%1\nist am Laufen!" }, | 1427 | { "%1\nis running!","%1\nist am Laufen!" }, |
1428 | { "Additional Comment:","Zusätzlicher Kommentar:" }, | 1428 | { "Additional Comment:","Zusätzlicher Kommentar:" }, |
1429 | { "Stop and save","Stopp und Speichern" }, | 1429 | { "Stop and save","Stopp und Speichern" }, |
1430 | { "Continue running","Weiter laufen lassen" }, | 1430 | { "Continue running","Weiter laufen lassen" }, |
1431 | { "Stop - do not save","Stopp - nicht Speichern" }, | 1431 | { "Stop - do not save","Stopp - nicht Speichern" }, |
1432 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, | 1432 | { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" }, |
1433 | { "Time mismatch!","Zeiten stimmen nicht!" }, | 1433 | { "Time mismatch!","Zeiten stimmen nicht!" }, |
1434 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, | 1434 | { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" }, |
1435 | { "Yes, stop todo","Ja, stoppe Todo" }, | 1435 | { "Yes, stop todo","Ja, stoppe Todo" }, |
1436 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, | 1436 | { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" }, |
1437 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, | 1437 | { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" }, |
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 | |||
@@ -2628,104 +2628,104 @@ void CalendarView::edit_cut() | |||
2628 | } | 2628 | } |
2629 | 2629 | ||
2630 | if (!anEvent) { | 2630 | if (!anEvent) { |
2631 | KNotifyClient::beep(); | 2631 | KNotifyClient::beep(); |
2632 | return; | 2632 | return; |
2633 | } | 2633 | } |
2634 | DndFactory factory( mCalendar ); | 2634 | DndFactory factory( mCalendar ); |
2635 | factory.cutIncidence(anEvent); | 2635 | factory.cutIncidence(anEvent); |
2636 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2636 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2637 | } | 2637 | } |
2638 | 2638 | ||
2639 | void CalendarView::edit_copy() | 2639 | void CalendarView::edit_copy() |
2640 | { | 2640 | { |
2641 | Event *anEvent=0; | 2641 | Event *anEvent=0; |
2642 | 2642 | ||
2643 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2643 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2644 | 2644 | ||
2645 | if (mViewManager->currentView()->isEventView()) { | 2645 | if (mViewManager->currentView()->isEventView()) { |
2646 | if ( incidence && incidence->typeID() == eventID ) { | 2646 | if ( incidence && incidence->typeID() == eventID ) { |
2647 | anEvent = static_cast<Event *>(incidence); | 2647 | anEvent = static_cast<Event *>(incidence); |
2648 | } | 2648 | } |
2649 | } | 2649 | } |
2650 | 2650 | ||
2651 | if (!anEvent) { | 2651 | if (!anEvent) { |
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() ) |
2708 | tim = to->dtDue().time(); | 2708 | tim = to->dtDue().time(); |
2709 | else { | 2709 | else { |
2710 | tim = QTime ( 0,0,0 ); | 2710 | tim = QTime ( 0,0,0 ); |
2711 | to->setFloats( true ); | 2711 | to->setFloats( true ); |
2712 | to->setHasDueDate( true ); | 2712 | to->setHasDueDate( true ); |
2713 | } | 2713 | } |
2714 | QDateTime dt ( d,tim ); | 2714 | QDateTime dt ( d,tim ); |
2715 | to->setDtDue( dt ); | 2715 | to->setDtDue( dt ); |
2716 | 2716 | ||
2717 | if ( to->hasStartDate() ) { | 2717 | if ( to->hasStartDate() ) { |
2718 | if ( len>0 ) | 2718 | if ( len>0 ) |
2719 | to->setDtStart(to->dtDue().addSecs( -len )); | 2719 | to->setDtStart(to->dtDue().addSecs( -len )); |
2720 | else | 2720 | else |
2721 | if (to->dtStart() > to->dtDue() ) | 2721 | if (to->dtStart() > to->dtDue() ) |
2722 | to->setDtStart(to->dtDue().addDays( -3 )); | 2722 | to->setDtStart(to->dtDue().addDays( -3 )); |
2723 | } | 2723 | } |
2724 | 2724 | ||
2725 | todoChanged( to ); | 2725 | todoChanged( to ); |
2726 | } else { | 2726 | } else { |
2727 | if ( mMoveIncidence->doesRecur() ) { | 2727 | if ( mMoveIncidence->doesRecur() ) { |
2728 | #if 0 | 2728 | #if 0 |
2729 | // PENDING implement this | 2729 | // PENDING implement this |
2730 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); | 2730 | Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate ); |
2731 | mCalendar()->addIncidence( newInc ); | 2731 | mCalendar()->addIncidence( newInc ); |