-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 4 | ||||
-rw-r--r-- | libkcal/todo.cpp | 1 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 2 |
7 files changed, 10 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index fc364c9..0884a83 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -755,10 +755,10 @@ | |||
755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, | 755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, |
756 | { "Mobile (home)","Handy (Arbeit)" }, | 756 | { "Mobile (home)","Handy (Arbeit)" }, |
757 | { "Mobile (work)","Handy (Privat)" }, | 757 | { "Mobile (work)","Handy (Privat)" }, |
758 | { "Def.Formatted Name","Def. Format. Name" }, | 758 | { "Def.Formatted Name","Def. Format. Name" }, |
759 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
760 | { "Colors","Farben" }, | 759 | { "Colors","Farben" }, |
760 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | ||
761 | { "","" }, | 761 | { "","" }, |
762 | { "","" }, | 762 | { "","" }, |
763 | { "","" }, | 763 | { "","" }, |
764 | { "","" }, \ No newline at end of file | 764 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index e9aa28a..903abdf 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -272,9 +272,9 @@ | |||
272 | { "Select SMTP Account","Wähle SMTP Zugang" }, | 272 | { "Select SMTP Account","Wähle SMTP Zugang" }, |
273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, | 273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, |
274 | { "Error sending mail","Fehler beim Mailversand" }, | 274 | { "Error sending mail","Fehler beim Mailversand" }, |
275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, | 275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, |
276 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
277 | { "Colors","Farben" }, | 276 | { "Colors","Farben" }, |
277 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | ||
278 | { "","" }, | 278 | { "","" }, |
279 | { "","" }, | 279 | { "","" }, |
280 | { "","" }, \ No newline at end of file | 280 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 907eb23..4e6f994 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1343,16 +1343,15 @@ | |||
1343 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, | 1343 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, |
1344 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, | 1344 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" }, |
1345 | { "Todo has subtodos","Todo hat Untertodos" }, | 1345 | { "Todo has subtodos","Todo hat Untertodos" }, |
1346 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, | 1346 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, |
1347 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
1348 | { "Colors","Farben" }, | 1347 | { "Colors","Farben" }, |
1349 | { "Click on new parent item","Klicke auf neues Übertodo" }, | 1348 | { "Click on new parent item","Klicke auf neues Übertodo" }, |
1350 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, | 1349 | { "Reparenting aborted!","Übertodo setzen abgebrochen" }, |
1351 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, | 1350 | { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" }, |
1352 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, | 1351 | { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" }, |
1353 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, | 1352 | { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" }, |
1354 | { "","" }, | 1353 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, |
1355 | { "","" }, | 1354 | { "","" }, |
1356 | { "","" }, | 1355 | { "","" }, |
1357 | { "","" }, | 1356 | { "","" }, |
1358 | { "","" }, | 1357 | { "","" }, |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index 80b22a6..beb066e 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -350,10 +350,10 @@ | |||
350 | { "Add new password","Passwort hinzufügen" }, | 350 | { "Add new password","Passwort hinzufügen" }, |
351 | { "Successfully saved data.","Datei gespeichert." }, | 351 | { "Successfully saved data.","Datei gespeichert." }, |
352 | { "Category:","Kategorie:" }, | 352 | { "Category:","Kategorie:" }, |
353 | { "LOCKED","GESPERRT" }, | 353 | { "LOCKED","GESPERRT" }, |
354 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
355 | { "Colors","Farben" }, | 354 | { "Colors","Farben" }, |
355 | { "Alternating background of list views","Abwechselnder Hintergrund für Listen" }, | ||
356 | { "","" }, | 356 | { "","" }, |
357 | { "","" }, | 357 | { "","" }, |
358 | { "","" }, | 358 | { "","" }, |
359 | { "","" }, | 359 | { "","" }, |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 00a43e5..e75df70 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -81,8 +81,12 @@ bool CalendarLocal::save( const QString &fileName, CalFormat *format ) | |||
81 | } | 81 | } |
82 | 82 | ||
83 | void CalendarLocal::close() | 83 | void CalendarLocal::close() |
84 | { | 84 | { |
85 | |||
86 | Todo * i; | ||
87 | for( i = mTodoList.first(); i; i = mTodoList.next() ) i->setRunning(false); | ||
88 | |||
85 | mEventList.setAutoDelete( true ); | 89 | mEventList.setAutoDelete( true ); |
86 | mTodoList.setAutoDelete( true ); | 90 | mTodoList.setAutoDelete( true ); |
87 | mJournalList.setAutoDelete( false ); | 91 | mJournalList.setAutoDelete( false ); |
88 | 92 | ||
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index b89abce..5e6ac22 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -64,8 +64,9 @@ Todo::~Todo() | |||
64 | void Todo::setRunning( bool run ) | 64 | void Todo::setRunning( bool run ) |
65 | { | 65 | { |
66 | if ( run == mRunning ) | 66 | if ( run == mRunning ) |
67 | return; | 67 | return; |
68 | //qDebug("Todo::setRunning %d ", run); | ||
68 | if ( !mRunSaveTimer ) { | 69 | if ( !mRunSaveTimer ) { |
69 | mRunSaveTimer = new QTimer ( this ); | 70 | mRunSaveTimer = new QTimer ( this ); |
70 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); | 71 | connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( saveRunningInfoToFile() ) ); |
71 | } | 72 | } |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 759b29d..753d90a 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -120,9 +120,9 @@ void KDEPIMConfigWidget::setupStoreTab() | |||
120 | QVBox *colorPage = new QVBox( this ); | 120 | QVBox *colorPage = new QVBox( this ); |
121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); | 121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); |
122 | QWidget* cw = new QWidget( colorPage ); | 122 | QWidget* cw = new QWidget( colorPage ); |
123 | KPrefsWidColor *holidayColor = | 123 | KPrefsWidColor *holidayColor = |
124 | addWidColor(i18n("Alternate background"), | 124 | addWidColor(i18n("Alternating background of list views"), |
125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); | 125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); |
126 | QHBoxLayout *topLayout = new QHBoxLayout(cw); | 126 | QHBoxLayout *topLayout = new QHBoxLayout(cw); |
127 | topLayout->addWidget(holidayColor->label()); | 127 | topLayout->addWidget(holidayColor->label()); |
128 | topLayout->addWidget( (QWidget* )holidayColor->button()); | 128 | topLayout->addWidget( (QWidget* )holidayColor->button()); |