summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt16
-rw-r--r--korganizer/kotodoview.cpp7
2 files changed, 13 insertions, 10 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ca73f9b..4d44e32 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -122,13 +122,13 @@
122{ "December","Dezember" }, 122{ "December","Dezember" },
123{ "Default alarm time:","Standard Alarmzeit:" }, 123{ "Default alarm time:","Standard Alarmzeit:" },
124{ "Default appointment time:","Standard Termin Startzeit:" }, 124{ "Default appointment time:","Standard Termin Startzeit:" },
125{ "Default event color:","Standard Terminfarbe:" }, 125{ "Default event color:","Standard Terminfarbe:" },
126{ "Default","Standard" }, 126{ "Default","Standard" },
127{ "Def. duration of new app.:","Standard Termin Länge:" }, 127{ "Def. duration of new app.:","Standard Termin Länge:" },
128{ "Delete all completed To-Dos?","Alle bereits erledigten Todos löschen?" }, 128{ "Delete all completed ToDos?","Alle bereits erledigten Todos löschen?" },
129{ "Delete All","Lösche alles" }, 129{ "Delete All","Lösche alles" },
130{ "Delete all selected","Lösche alle Selektierten" }, 130{ "Delete all selected","Lösche alle Selektierten" },
131{ "Delete Current","Aktuellen löschen" }, 131{ "Delete Current","Aktuellen löschen" },
132{ "Delete Event...","Lösche Termin..." }, 132{ "Delete Event...","Lösche Termin..." },
133{ "Delete Event","Lösche Termin" }, 133{ "Delete Event","Lösche Termin" },
134{ "&Delete","Löschen" }, 134{ "&Delete","Löschen" },
@@ -307,13 +307,13 @@
307{ "Printing","Drucken" }, 307{ "Printing","Drucken" },
308{ "Priority:","Priorität:" }, 308{ "Priority:","Priorität:" },
309{ "Private","Privat" }, 309{ "Private","Privat" },
310{ "Proceed","Weiter" }, 310{ "Proceed","Weiter" },
311{ "Public","Öffentlich" }, 311{ "Public","Öffentlich" },
312{ "Purge","Entferne" }, 312{ "Purge","Entferne" },
313{ "Purge Completed","Entferne erledigte ToDos" }, 313{ "Purge Completed","Entferne erledigte Todos" },
314{ "Purge To-Dos","Todos bereinigen" }, 314{ "Purge To-Dos","Todos bereinigen" },
315{ "read-only","schreibgeschützt" }, 315{ "read-only","schreibgeschützt" },
316{ "Recur every","Wiederh. alle" }, 316{ "Recur every","Wiederh. alle" },
317{ "Recur in the month of","Wiederh. im Monat" }, 317{ "Recur in the month of","Wiederh. im Monat" },
318{ "Recur on the","Wiederh. am" }, 318{ "Recur on the","Wiederh. am" },
319{ "Recur on this day","Wiederh. am diesen Tag" }, 319{ "Recur on this day","Wiederh. am diesen Tag" },
@@ -876,13 +876,13 @@
876{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, 876{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
877{ "I/O device: ","I/O device: " }, 877{ "I/O device: ","I/O device: " },
878{ "Connection: ","Connection: " }, 878{ "Connection: ","Connection: " },
879{ "Model(opt.): ","Model(opt.): " }, 879{ "Model(opt.): ","Model(opt.): " },
880{ "Write back events in future only","Schreibe nur zukünftige Termine zurück" }, 880{ "Write back events in future only","Schreibe nur zukünftige Termine zurück" },
881{ "Max. weeks in future: ","Max. Wochen in der Zukunft: " }, 881{ "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
882{ "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nToDo/Kalender Daten auf dem Handy!" }, 882{ "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nTodo/Kalender Daten auf dem Handy!" },
883{ "Export to mobile phone!","Exportiere auf das Handy!" }, 883{ "Export to mobile phone!","Exportiere auf das Handy!" },
884{ "Export complete calendar","Exportiere kompletten Kalender" }, 884{ "Export complete calendar","Exportiere kompletten Kalender" },
885{ "Writing to phone...","Sende Daten ans Handy..." }, 885{ "Writing to phone...","Sende Daten ans Handy..." },
886{ " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" }, 886{ " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
887{ "Retry","Nochmal versuchen" }, 887{ "Retry","Nochmal versuchen" },
888{ "KDE/Pim phone access","KDE/Pim Handy Zugriff" }, 888{ "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
@@ -921,13 +921,13 @@
921{ "5 minutes","5 Min." }, 921{ "5 minutes","5 Min." },
922{ "1 minute","1 Min." }, 922{ "1 minute","1 Min." },
923{ "23","23" }, 923{ "23","23" },
924{ "Mon 15","Mon 15" }, 924{ "Mon 15","Mon 15" },
925{ "Configure KO","Konfiguriere KO" }, 925{ "Configure KO","Konfiguriere KO" },
926{ "Event text","Termin Text" }, 926{ "Event text","Termin Text" },
927{ "ToDo","ToDo" }, 927{ "ToDo","Todo" },
928{ "Today","Heute" }, 928{ "Today","Heute" },
929{ "What's Next View","What's Next Ansicht" }, 929{ "What's Next View","What's Next Ansicht" },
930{ "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" }, 930{ "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
931{ "Alarm","Alarm" }, 931{ "Alarm","Alarm" },
932{ "Used %1 Client","Benutzter %1 Client" }, 932{ "Used %1 Client","Benutzter %1 Client" },
933{ "No email client installed","Kein Email Klient installiert" }, 933{ "No email client installed","Kein Email Klient installiert" },
@@ -1340,17 +1340,23 @@
1340{ "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, 1340{ "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" },
1341{ "Todo is started","Todo is gestarted" }, 1341{ "Todo is started","Todo is gestarted" },
1342{ "Stop todo","Stoppe Todo" }, 1342{ "Stop todo","Stoppe Todo" },
1343{ "Todo is stopped","Todo ist gestoppt" }, 1343{ "Todo is stopped","Todo ist gestoppt" },
1344{ "Start todo","Starte Todo" }, 1344{ "Start todo","Starte Todo" },
1345{ "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?" }, 1345{ "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?" },
1346{ "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\nalle Untertodos auch klonen?" }, 1346{ "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?" },
1347{ "Todo has subtodos","Todo hat Untertodos" }, 1347{ "Todo has subtodos","Todo hat Untertodos" },
1348{ "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, 1348{ "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" },
1349{ "Alternate background","Abwechselnder Hintergrund" }, 1349{ "Alternate background","Abwechselnder Hintergrund" },
1350{ "Colors","Farben" }, 1350{ "Colors","Farben" },
1351{ "Click on new parent item","Klicke auf neues Übertodo" },
1352{ "Reparenting aborted!","Übertodo setzen abgebrochen" },
1353{ "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" },
1354{ "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" },
1355{ "","" },
1356{ "","" },
1351{ "","" }, 1357{ "","" },
1352{ "","" }, 1358{ "","" },
1353{ "","" }, 1359{ "","" },
1354{ "","" }, 1360{ "","" },
1355{ "","" }, 1361{ "","" },
1356{ "","" }, 1362{ "","" },
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 7817a75..dd2c081 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -158,14 +158,14 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
158 158
159 if(existingTodo) { 159 if(existingTodo) {
160 Incidence *to = destinationEvent; 160 Incidence *to = destinationEvent;
161 while(to) { 161 while(to) {
162 if (to->uid() == todo->uid()) { 162 if (to->uid() == todo->uid()) {
163 KMessageBox::sorry(this, 163 KMessageBox::sorry(this,
164 i18n("Cannot move To-Do to itself\nor a child of itself"), 164 i18n("Cannot move Todo to itself\nor a child of itself"),
165 i18n("Drop To-Do")); 165 i18n("Drop Todo"));
166 delete todo; 166 delete todo;
167 return; 167 return;
168 } 168 }
169 to = to->relatedTo(); 169 to = to->relatedTo();
170 } 170 }
171 internalDrop = true; 171 internalDrop = true;
@@ -959,13 +959,12 @@ void KOTodoView::unparentTodo()
959 } 959 }
960} 960}
961 961
962void KOTodoView::reparentTodo() 962void KOTodoView::reparentTodo()
963{ 963{
964 if (mActiveItem) { 964 if (mActiveItem) {
965 qDebug("KOTodoView::reparentTodo() ");
966 topLevelWidget()->setCaption(i18n("Click on new parent item")); 965 topLevelWidget()->setCaption(i18n("Click on new parent item"));
967 pendingSubtodo = mActiveItem; 966 pendingSubtodo = mActiveItem;
968 } 967 }
969} 968}
970void KOTodoView::editTodo() 969void KOTodoView::editTodo()
971{ 970{
@@ -1159,13 +1158,12 @@ void KOTodoView::itemClicked(QListViewItem *item)
1159 break; 1158 break;
1160 } 1159 }
1161 par = par->parent(); 1160 par = par->parent();
1162 } 1161 }
1163 if ( !allowReparent ) { 1162 if ( !allowReparent ) {
1164 topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!")); 1163 topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
1165 qDebug("Recursive reparenting not possible ");
1166 pendingSubtodo = 0; 1164 pendingSubtodo = 0;
1167 } else { 1165 } else {
1168 Todo* newParent = todoItem->todo(); 1166 Todo* newParent = todoItem->todo();
1169 Todo* newSub = pendingSubtodo->todo(); 1167 Todo* newSub = pendingSubtodo->todo();
1170 pendingSubtodo = 0; 1168 pendingSubtodo = 0;
1171 emit reparentTodoSignal( newParent,newSub ); 1169 emit reparentTodoSignal( newParent,newSub );
@@ -1192,13 +1190,12 @@ void KOTodoView::itemClicked(QListViewItem *item)
1192 } 1190 }
1193#endif 1191#endif
1194} 1192}
1195 1193
1196void KOTodoView::setDocumentId( const QString &id ) 1194void KOTodoView::setDocumentId( const QString &id )
1197{ 1195{
1198 kdDebug() << "KOTodoView::setDocumentId()" << endl;
1199 1196
1200 mDocPrefs->setDoc( id ); 1197 mDocPrefs->setDoc( id );
1201} 1198}
1202 1199
1203void KOTodoView::itemStateChanged( QListViewItem *item ) 1200void KOTodoView::itemStateChanged( QListViewItem *item )
1204{ 1201{