summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt40
-rw-r--r--korganizer/koeventviewer.cpp2
-rw-r--r--korganizer/mainwindow.cpp42
3 files changed, 34 insertions, 50 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 9dde910..d7954c6 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -125,19 +125,19 @@
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","Lösche alles" }, 128{ "Delete All","Lösche alles" },
129{ "Delete all selected","Lösche alle Selektierten" }, 129{ "Delete all selected","Lösche alle Selektierten" },
130{ "Delete Current","Aktuellen löschen" }, 130{ "Delete Current","Aktuellen löschen" },
131{ "Delete Event...","Lösche Termin..." }, 131{ "Delete Event...","Lösche Termin..." },
132{ "Delete Event","Lösche Termin" }, 132{ "Delete Event","Lösche Termin" },
133{ "&Delete...","Löschen..." }, 133{ "&Delete...","Lösche..." },
134{ "Delete...","Löschen..." }, 134{ "Delete...","Lösche..." },
135{ "Delete","Löschen" }, 135{ "Delete","Lösche" },
136{ "Delete Todo...","Lösche Todo..." }, 136{ "Delete Todo...","Lösche Todo..." },
137{ "Delete To-Do","Lösche Todo" }, 137{ "Delete To-Do","Lösche Todo" },
138{ "Deleting item %d ...","Lösche Eintrag %d..." }, 138{ "Deleting item %d ...","Lösche Eintrag %d..." },
139{ "Descriptions","Beschreibungen" }, 139{ "Descriptions","Beschreibungen" },
140{ "Deselect all","Deselektiere Alle" }, 140{ "Deselect all","Deselektiere Alle" },
141{ "Details","Details" }, 141{ "Details","Details" },
142{ "Dinner","Abendessen" }, 142{ "Dinner","Abendessen" },
143{ "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" }, 143{ "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" },
@@ -234,17 +234,17 @@
234{ "minute(s)","Minute(n)" }, 234{ "minute(s)","Minute(n)" },
235{ "Monday","Montag" }, 235{ "Monday","Montag" },
236{ "Mon","Mo" }, 236{ "Mon","Mo" },
237{ "Monthly","Monatlich" }, 237{ "Monthly","Monatlich" },
238{ "Month not long enough","Monat ist nicht lang genug" }, 238{ "Month not long enough","Monat ist nicht lang genug" },
239{ "month(s)","Monat(e)" }, 239{ "month(s)","Monat(e)" },
240{ "Month view:","Monatsansicht:" }, 240{ "Month view:","Monatsansicht:" },
241{ "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" }, 241{ "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" },
242{ "Todo view uses category colors","To-Do Ansicht zeigt Kategorie Farben" }, 242{ "Todo view uses category colors","Todo Ansicht zeigt Kategorie Farben" },
243{ "Move &Down","Nach unten verschieben" }, 243{ "Move &Down","Nach unten verschieben" },
244{ "Move &Up","Nach oben verschieben" }, 244{ "Move &Up","Nach oben verschieben" },
245{ "Name:","Name:" }, 245{ "Name:","Name:" },
246{ "Name","Name" }, 246{ "Name","Name" },
247{ "\nAre you sure you want\nto delete this event?","\nSind Sie sicher, dass Sie\nden Termin löschen möchten?" }, 247{ "\nAre you sure you want\nto delete this event?","\nSind Sie sicher, dass Sie\nden Termin löschen möchten?" },
248{ "%n Days","%n Tage" }, 248{ "%n Days","%n Tage" },
249{ "Never","Nie" }, 249{ "Never","Nie" },
250{ "New event...","Neuer Termin..." }, 250{ "New event...","Neuer Termin..." },
@@ -346,26 +346,26 @@
346{ "Select a year","Wähle Jahr" }, 346{ "Select a year","Wähle Jahr" },
347{ "Send directly","Sende direkt" }, 347{ "Send directly","Sende direkt" },
348{ "&Send Messages","&Sende Nachrichten", }, 348{ "&Send Messages","&Sende Nachrichten", },
349{ "Sep","Sep" }, 349{ "Sep","Sep" },
350{ "September","September" }, 350{ "September","September" },
351{ "Shopping","Einkaufen" }, 351{ "Shopping","Einkaufen" },
352{ "Show Dates","Zeige Daten" }, 352{ "Show Dates","Zeige Daten" },
353{ "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, 353{ "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
354{ "Show Event...","Zeige Termin..." }, 354{ "Show Event","Termin anzeigen" },
355{ "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." }, 355{ "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
356{ "Show Marcus Bains line","Zeige Marcus Bains Linie" }, 356{ "Show Marcus Bains line","Zeige Marcus Bains Linie" },
357{ "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, 357{ "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
358{ "Show time as:","Zeige Zeit als" }, 358{ "Show time as:","Zeige Zeit als" },
359{ "Show Todo...","Zeige To-Do" }, 359{ "Show Todo","Todo anzeigen" },
360{ "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, 360{ "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
361{ "&Show","Zeige" }, 361{ "&Show","Anzeigen" },
362{ "Show...","Zeige..." }, 362{ "Show...","Anzeigen..." },
363{ "Show","Zeige" }, 363{ "Show","Anzeigen" },
364{ "Small","Klein" }, 364{ "Small","Klein" },
365{ "Sorry","Tut mir leid" }, 365{ "Sorry","Tut mir leid" },
366{"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, 366{"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
367{ "Start:","Start:" }, 367{ "Start:","Start:" },
368{ "Start Date","Start Datum" }, 368{ "Start Date","Start Datum" },
369{ "Start date: %1","Start Datum: %1" }, 369{ "Start date: %1","Start Datum: %1" },
370{ "Start Time","Start Zeit" }, 370{ "Start Time","Start Zeit" },
371{ "Status:","Status:" }, 371{ "Status:","Status:" },
@@ -376,17 +376,17 @@
376{ "Sunday","Sonntag" }, 376{ "Sunday","Sonntag" },
377{ "Sun","So" }, 377{ "Sun","So" },
378{ "Sync preferences:","Sync Einstellungen" }, 378{ "Sync preferences:","Sync Einstellungen" },
379{ "Sync Prefs","Sync Einstellungen" }, 379{ "Sync Prefs","Sync Einstellungen" },
380{ "Syncronize","Daten abgleich" }, 380{ "Syncronize","Daten abgleich" },
381{ "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, 381{ "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },
382{ "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, 382{ "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },
383{ "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, 383{ "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },
384{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, 384{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges Todo" },
385{ "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, 385{ "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" },
386{ "Template...","Vorlage..." }, 386{ "Template...","Vorlage..." },
387{ "This day","Dieser Tag" }, 387{ "This day","Dieser Tag" },
388{ "This is an experimental feature. ","Dieses Feature ist experimentel" }, 388{ "This is an experimental feature. ","Dieses Feature ist experimentel" },
389{ "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, 389{ "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." },
390{ "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, 390{ "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." },
391{ "Thu","Do" }, 391{ "Thu","Do" },
392{ "Thursday","Donnerstag" }, 392{ "Thursday","Donnerstag" },
@@ -396,21 +396,21 @@
396{ "Time Format","Zeit Format" }, 396{ "Time Format","Zeit Format" },
397{ "Time Format(nr):","Zeit Format(Neustart!)" }, 397{ "Time Format(nr):","Zeit Format(Neustart!)" },
398{ "Date Labels:","Datumsleiste:" }, 398{ "Date Labels:","Datumsleiste:" },
399{ "Time: ","Zeit: " }, 399{ "Time: ","Zeit: " },
400{ "Timezone:","Zeitzone:" }, 400{ "Timezone:","Zeitzone:" },
401{ "To: ","Bis: " }, 401{ "To: ","Bis: " },
402{ "To:","Bis:" }, 402{ "To:","Bis:" },
403{ "Today: ","Heute: " }, 403{ "Today: ","Heute: " },
404{ "Todo due today color:","Heute fällige To-Do's" }, 404{ "Todo due today color:","Heute fällige Todos" },
405{ "To-do items:","To-Do items:" }, 405{ "To-do items:","To-Do items:" },
406{ "Todo overdue color:","Überfällige To-Do's" }, 406{ "Todo overdue color:","Überfällige Todos" },
407{ "Todo","Todo" }, 407{ "Todo","Todo" },
408{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, 408{ "To-do view shows completed Todos","Todo Ansicht zeigt erledigte Todos" },
409{ "ToDoView:","Todo Ansicht:" }, 409{ "ToDoView:","Todo Ansicht:" },
410{ "Toggle Alarm","Wechsle Alarm" }, 410{ "Toggle Alarm","Wechsle Alarm" },
411{ "Toggle Allday","Umschalten Ganztag" }, 411{ "Toggle Allday","Umschalten Ganztag" },
412{ "Tomorrow: ","Morgen: " }, 412{ "Tomorrow: ","Morgen: " },
413{ "Tue","Di" }, 413{ "Tue","Di" },
414{ "Tuesday","Dienstag" }, 414{ "Tuesday","Dienstag" },
415{ "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" }, 415{ "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" },
416{ "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." }, 416{ "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." },
@@ -474,17 +474,17 @@
474{ "File","Datei" }, 474{ "File","Datei" },
475{ "Clone...","Dupliziere..." }, 475{ "Clone...","Dupliziere..." },
476{ "Move...","Bewege..." }, 476{ "Move...","Bewege..." },
477{ "Beam...","Sende via IR..." }, 477{ "Beam...","Sende via IR..." },
478{ "&Clone...","Dupliziere..." }, 478{ "&Clone...","Dupliziere..." },
479{ "&Move...","Bewege..." }, 479{ "&Move...","Bewege..." },
480{ "&Beam...","Sende via IR..." }, 480{ "&Beam...","Sende via IR..." },
481{ "Show Completed","Zeige erledigte Todos" }, 481{ "Show Completed","Zeige erledigte Todos" },
482{ "Show Quick Todo","Zeige Quick Todo" }, 482{ "Show Quick Todo","Zeige Quick-Todo" },
483{ "Unparent Todo","Un-sub Todo" }, 483{ "Unparent Todo","Un-sub Todo" },
484{ "Save selected to file...","Speichere Selektierte..." }, 484{ "Save selected to file...","Speichere Selektierte..." },
485{ "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, 485{ "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
486{ "Set Categ. for selected...","Setze Kateg. für Selekt." }, 486{ "Set Categ. for selected...","Setze Kateg. für Selekt." },
487{ "Beam via IR...","Sende via IR..." }, 487{ "Beam via IR...","Sende via IR..." },
488{ "Search","Suchen" }, 488{ "Search","Suchen" },
489{ "Date Picker","Datum auswählen" }, 489{ "Date Picker","Datum auswählen" },
490{ "Day View","Tagesansicht" }, 490{ "Day View","Tagesansicht" },
@@ -549,17 +549,17 @@
549{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." }, 549{ "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
550{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" }, 550{ "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
551{ "h","Std" }, 551{ "h","Std" },
552{ "min","Min" }, 552{ "min","Min" },
553{ "hou","Std" }, 553{ "hou","Std" },
554{ "day","Tag" }, 554{ "day","Tag" },
555{ "French","Französich" }, 555{ "French","Französich" },
556{ "Time","Zeit" }, 556{ "Time","Zeit" },
557{ "Event Viewer","Termin Ansicht" }, 557{ "Event Viewer","Termin Anzeige" },
558{ "Cancel Sync","Sync Abbrechen" }, 558{ "Cancel Sync","Sync Abbrechen" },
559{ "Remote","Fern" }, 559{ "Remote","Fern" },
560{ "Local","Lokal" }, 560{ "Local","Lokal" },
561{ "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" }, 561{ "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
562{ "Local: ","Lokal: " }, 562{ "Local: ","Lokal: " },
563{ "Remote: ","Fern: " }, 563{ "Remote: ","Fern: " },
564{ "Last modified: ","Zuletzt geändert: " }, 564{ "Last modified: ","Zuletzt geändert: " },
565{ "Location: ","Ort: " }, 565{ "Location: ","Ort: " },
@@ -666,17 +666,17 @@
666{ "icons","Icons" }, 666{ "icons","Icons" },
667{ "Show Sat/Sun together","Zeige Sam/Son zusammen" }, 667{ "Show Sat/Sun together","Zeige Sam/Son zusammen" },
668{ "Category colors are applied to text","Kategorie Farben färben Text" }, 668{ "Category colors are applied to text","Kategorie Farben färben Text" },
669{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" }, 669{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
670{ "Day color odd months","Tagesfarbe ungerade Monate" }, 670{ "Day color odd months","Tagesfarbe ungerade Monate" },
671{ "Day color even months","Tagesfarbe gerade Monate" }, 671{ "Day color even months","Tagesfarbe gerade Monate" },
672{ "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" }, 672{ "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
673{ "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" }, 673{ "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
674{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" }, 674{ "Small To-do view uses smaller font","Kleine Todo Ansicht nutzt kleineren Font" },
675{ "Colors are applied to text","Farben werden auf Text angewendet" }, 675{ "Colors are applied to text","Farben werden auf Text angewendet" },
676{ "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" }, 676{ "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
677{ "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" }, 677{ "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" },
678{ "Play beeps count:","Anzahl der Alarmpiepse: " }, 678{ "Play beeps count:","Anzahl der Alarmpiepse: " },
679{ "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " }, 679{ "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " },
680{ "Default suspend time in min:","Standard Supendierungs Zeit: " }, 680{ "Default suspend time in min:","Standard Supendierungs Zeit: " },
681{ "Auto suspend count:","Anzahl der auto Suspendierungen" }, 681{ "Auto suspend count:","Anzahl der auto Suspendierungen" },
682{ "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei für neu angelegte Alarme:" }, 682{ "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei für neu angelegte Alarme:" },
@@ -854,17 +854,17 @@
854{ "Complete calendar...","Kompletten Kalender..." }, 854{ "Complete calendar...","Kompletten Kalender..." },
855{ "Filtered calendar...","Gefilterten Kalender..." }, 855{ "Filtered calendar...","Gefilterten Kalender..." },
856{ "Export to phone","Exportiere zum Handy" }, 856{ "Export to phone","Exportiere zum Handy" },
857{ "Beam receive enabled","Beam Empfang an" }, 857{ "Beam receive enabled","Beam Empfang an" },
858{ "What's new?","Was ist neu?" }, 858{ "What's new?","Was ist neu?" },
859{ "FAQ...","FAQ..." }, 859{ "FAQ...","FAQ..." },
860{ "Licence...","Licence..." }, 860{ "Licence...","Licence..." },
861{ "What's This?","What's This?" }, 861{ "What's This?","What's This?" },
862{ "&Edit...","&Editiere..." }, 862{ "&Edit...","Bearbeite..." },
863{ "Oktober","Oktober" }, 863{ "Oktober","Oktober" },
864{ "Title","Titel" }, 864{ "Title","Titel" },
865{ "%1 %","%1 %" }, 865{ "%1 %","%1 %" },
866{ "Enable Pi-Sync","Schalte Pi-Sync an" }, 866{ "Enable Pi-Sync","Schalte Pi-Sync an" },
867{ "Import!","Importiere!" }, 867{ "Import!","Importiere!" },
868{ "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, 868{ "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" },
869{ "Export to phone options","Export ans Handy Optionen" }, 869{ "Export to phone options","Export ans Handy Optionen" },
870{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." }, 870{ "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
@@ -1035,17 +1035,17 @@
1035{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" }, 1035{ "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
1036{ "About KOrganizer/Pi","Über KOrganizer/Pi" }, 1036{ "About KOrganizer/Pi","Über KOrganizer/Pi" },
1037{ "From: ","Von: " }, 1037{ "From: ","Von: " },
1038{ "Remove sync info","Entferne Sync Info" }, 1038{ "Remove sync info","Entferne Sync Info" },
1039{ "For all profiles","Für alle Profile" }, 1039{ "For all profiles","Für alle Profile" },
1040{ "Hide not Running","Verstecke nicht Laufende" }, 1040{ "Hide not Running","Verstecke nicht Laufende" },
1041{ "ME","ME" }, 1041{ "ME","ME" },
1042{ "Toolbar","Toolbar" }, 1042{ "Toolbar","Toolbar" },
1043{ "Undo Delete...","Undo Löschen..." }, 1043{ "Undo Delete...","UNDO Löschen..." },
1044{ "Undo Delete","Löschen rückgängig machen" }, 1044{ "Undo Delete","Löschen rückgängig machen" },
1045{ "KDE Sync HowTo...","KDE Sync HowTo..." }, 1045{ "KDE Sync HowTo...","KDE Sync HowTo..." },
1046{ "Multi Sync HowTo...","Multi Sync HowTo..." }, 1046{ "Multi Sync HowTo...","Multi Sync HowTo..." },
1047{ "Januar","Januar" }, 1047{ "Januar","Januar" },
1048{ "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" }, 1048{ "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
1049{ "No Filter","Kein Filter" }, 1049{ "No Filter","Kein Filter" },
1050{ "Multiple Sync options","Multi Sync Optionen" }, 1050{ "Multiple Sync options","Multi Sync Optionen" },
1051{ "Sync algo options","Sync Ablauf Optionen" }, 1051{ "Sync algo options","Sync Ablauf Optionen" },
@@ -1387,17 +1387,17 @@
1387{ "Timetracking HowTo...","Timetracking HowTo..." }, 1387{ "Timetracking HowTo...","Timetracking HowTo..." },
1388{ "Juni","Juni" }, 1388{ "Juni","Juni" },
1389{ "Juli","Juli" }, 1389{ "Juli","Juli" },
1390{ "ToDo:","ToDo:" }, 1390{ "ToDo:","ToDo:" },
1391{ "Set Calendar","Setze Kalender" }, 1391{ "Set Calendar","Setze Kalender" },
1392{ "Todo: %1","Todo: %1" }, 1392{ "Todo: %1","Todo: %1" },
1393{ ": (Prio ",": (Prio " }, 1393{ ": (Prio ",": (Prio " },
1394{ "Todos","Todos" }, 1394{ "Todos","Todos" },
1395{ "Todo Viewer","Todo Viewer" }, 1395{ "Todo Viewer","Todo Anzeige" },
1396{ "Todo ","Todo " }, 1396{ "Todo ","Todo " },
1397{ " Calendar \n Resource "," Kalender \n Resource " }, 1397{ " Calendar \n Resource "," Kalender \n Resource " },
1398{ " Color "," Farbe " }, 1398{ " Color "," Farbe " },
1399{ "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" }, 1399{ "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" },
1400{ "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" }, 1400{ "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" },
1401{ "Add new Calendar","Füge Kalender hinzu" }, 1401{ "Add new Calendar","Füge Kalender hinzu" },
1402{ "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" }, 1402{ "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" },
1403{ "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" }, 1403{ "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" },
@@ -1484,13 +1484,13 @@
1484{ "Reset","Neu setzen" }, 1484{ "Reset","Neu setzen" },
1485{ "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" }, 1485{ "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
1486{ "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, 1486{ "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, 1487{ "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
1488{ "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" }, 1488{ "\nNO\n WRITEABLE\n CALENDAR\n FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n SCHREIBBARER\n KALENDER\n GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
1489{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" }, 1489{ "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
1490{ "Edit","Edit" }, 1490{ "Edit","Edit" },
1491{ "Last Modified","Zuletzt geändert" }, 1491{ "Last Modified","Zuletzt geändert" },
1492{ "","" }, 1492{ "Journal viewer","Journal Anzeige" },
1493{ "","" }, 1493{ "","" },
1494{ "","" }, 1494{ "","" },
1495{ "","" }, 1495{ "","" },
1496{ "","" }, 1496{ "","" },
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index d3b2ccf..f6c252b 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -696,17 +696,17 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
696 } 696 }
697 else { 697 else {
698 if ( mode == 1 ) { 698 if ( mode == 1 ) {
699 addTag("h3",i18n( "Local: " ) + text_d ); 699 addTag("h3",i18n( "Local: " ) + text_d );
700 } else { 700 } else {
701 addTag("h3",i18n( "Remote: " ) + text_d ); 701 addTag("h3",i18n( "Remote: " ) + text_d );
702 } 702 }
703 } 703 }
704 topLevelWidget()->setCaption("Journal Viewer"); 704 topLevelWidget()->setCaption(i18n("Journal viewer"));
705 mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); 705 mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer)));
706 formatReadOnly(jour); 706 formatReadOnly(jour);
707 addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); 707 addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) );
708 708
709 if (!jour->description().isEmpty()) { 709 if (!jour->description().isEmpty()) {
710 addTag("p",deTag(jour->description())); 710 addTag("p",deTag(jour->description()));
711 } 711 }
712 setText(mText); 712 setText(mText);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 5d26d35..88dbd4f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -793,17 +793,17 @@ void MainWindow::initActions()
793 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 793 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
794 configureToolBarMenu->insertSeparator(); 794 configureToolBarMenu->insertSeparator();
795 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 795 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
796 configureToolBarMenu->insertSeparator(); 796 configureToolBarMenu->insertSeparator();
797 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 797 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
798 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 798 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
799 799
800 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 800 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
801 mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); 801 mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
802 mShowAction->addTo( mCurrentItemMenu ); 802 mShowAction->addTo( mCurrentItemMenu );
803 connect( mShowAction, SIGNAL( activated() ), 803 connect( mShowAction, SIGNAL( activated() ),
804 mView, SLOT( showIncidence() ) ); 804 mView, SLOT( showIncidence() ) );
805 805
806 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 806 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
807 mEditAction->addTo( mCurrentItemMenu ); 807 mEditAction->addTo( mCurrentItemMenu );
808 connect( mEditAction, SIGNAL( activated() ), 808 connect( mEditAction, SIGNAL( activated() ),
809 mView, SLOT( editIncidence() ) ); 809 mView, SLOT( editIncidence() ) );
@@ -817,20 +817,22 @@ void MainWindow::initActions()
817 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 817 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
818 mCloneAction->addTo( mCurrentItemMenu ); 818 mCloneAction->addTo( mCurrentItemMenu );
819 connect( mCloneAction, SIGNAL( activated() ), 819 connect( mCloneAction, SIGNAL( activated() ),
820 mView, SLOT( cloneIncidence() ) ); 820 mView, SLOT( cloneIncidence() ) );
821 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 821 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
822 mMoveAction->addTo( mCurrentItemMenu ); 822 mMoveAction->addTo( mCurrentItemMenu );
823 connect( mMoveAction, SIGNAL( activated() ), 823 connect( mMoveAction, SIGNAL( activated() ),
824 mView, SLOT( moveIncidence() ) ); 824 mView, SLOT( moveIncidence() ) );
825#ifndef DESKTOP_VERSION
825 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 826 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
826 mBeamAction->addTo(mCurrentItemMenu ); 827 mBeamAction->addTo(mCurrentItemMenu );
827 connect( mBeamAction, SIGNAL( activated() ), 828 connect( mBeamAction, SIGNAL( activated() ),
828 mView, SLOT( beamIncidence() ) ); 829 mView, SLOT( beamIncidence() ) );
830#endif
829 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 831 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
830 mCancelAction->addTo( mCurrentItemMenu ); 832 mCancelAction->addTo( mCurrentItemMenu );
831 connect( mCancelAction, SIGNAL( activated() ), 833 connect( mCancelAction, SIGNAL( activated() ),
832 mView, SLOT( toggleCancelIncidence() ) ); 834 mView, SLOT( toggleCancelIncidence() ) );
833 835
834 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 836 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
835 ne_action->addTo( actionMenu ); 837 ne_action->addTo( actionMenu );
836 connect( ne_action, SIGNAL( activated() ), 838 connect( ne_action, SIGNAL( activated() ),
@@ -1642,96 +1644,78 @@ void MainWindow::updateWeek(QDate seda)
1642 1644
1643} 1645}
1644void MainWindow::updateWeekNum(const DateList &selectedDates) 1646void MainWindow::updateWeekNum(const DateList &selectedDates)
1645{ 1647{
1646 updateWeek( selectedDates.first() ); 1648 updateWeek( selectedDates.first() );
1647} 1649}
1648void MainWindow::processIncidenceSelection( Incidence *incidence ) 1650void MainWindow::processIncidenceSelection( Incidence *incidence )
1649{ 1651{
1650
1651 if ( !incidence ) { 1652 if ( !incidence ) {
1653 mShowAction->setMenuText( i18n("Show") );
1652 enableIncidenceActions( false ); 1654 enableIncidenceActions( false );
1653
1654 mNewSubTodoAction->setEnabled( false ); 1655 mNewSubTodoAction->setEnabled( false );
1655 setCaptionToDates(); 1656 setCaptionToDates();
1656 return; 1657 return;
1657
1658 } 1658 }
1659
1660 //KGlobal::locale()->formatDateTime(nextA, true);
1661 QString startString = ""; 1659 QString startString = "";
1662 if ( incidence->typeID() != todoID ) { 1660 if ( incidence->typeID() != todoID ) {
1663 if ( incidence->dtStart().date() < incidence->dtEnd().date() ) { 1661 if ( incidence->dtStart().date() < incidence->dtEnd().date() ) {
1664 if ( incidence->doesFloat() ) { 1662 if ( incidence->doesFloat() ) {
1665 startString += ": "+incidence->dtStartDateStr( true ); 1663 startString += ": "+incidence->dtStartDateStr( true );
1666 startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); 1664 startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
1667
1668 } else { 1665 } else {
1669 startString = ": "+incidence->dtStartStr(true); 1666 startString = ": "+incidence->dtStartStr(true);
1670 startString += " --- "+((Event*)incidence)->dtEndStr(true); 1667 startString += " --- "+((Event*)incidence)->dtEndStr(true);
1671
1672 } 1668 }
1673
1674 } else { 1669 } else {
1675 if ( incidence->dtStart().time() != incidence->dtEnd().time() ) 1670 if ( incidence->dtStart().time() != incidence->dtEnd().time() )
1676 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ 1671 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
1677 "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); 1672 "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
1678
1679 if ( incidence->isBirthday() || incidence->isAnniversary() ) { 1673 if ( incidence->isBirthday() || incidence->isAnniversary() ) {
1680 bool ok; 1674 bool ok;
1681 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); 1675 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
1682 if ( ok ) { 1676 if ( ok ) {
1683 int years = noc.date().year() - incidence->dtStart().date().year(); 1677 int years = noc.date().year() - incidence->dtStart().date().year();
1684 startString += i18n(" (%1 y.)"). arg( years ); 1678 startString += i18n(" (%1 y.)"). arg( years );
1685 } 1679 }
1686 } 1680 }
1687 else 1681 else
1688 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); 1682 startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
1689 } 1683 }
1690
1691 } 1684 }
1692 else 1685 else
1693 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); 1686 startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
1694 if ( !incidence->location().isEmpty() ) 1687 if ( !incidence->location().isEmpty() )
1695 startString += " (" +incidence->location()+")"; 1688 startString += " (" +incidence->location()+")";
1696 setCaption( incidence->summary()+startString); 1689 setCaption( incidence->summary()+startString);
1697
1698 enableIncidenceActions( true ); 1690 enableIncidenceActions( true );
1699
1700 if ( incidence->typeID() == eventID ) { 1691 if ( incidence->typeID() == eventID ) {
1701 mShowAction->setText( i18n("Show Event...") ); 1692 mShowAction->setMenuText( i18n("Show Event") );
1702 mEditAction->setText( i18n("Edit Event...") );
1703 mDeleteAction->setText( i18n("Delete Event...") );
1704
1705 mNewSubTodoAction->setEnabled( false ); 1693 mNewSubTodoAction->setEnabled( false );
1706 } else if ( incidence->typeID() == todoID ) { 1694 } else if ( incidence->typeID() == todoID ) {
1707 mShowAction->setText( i18n("Show Todo...") ); 1695 mShowAction->setMenuText( i18n("Show Todo") );
1708 mEditAction->setText( i18n("Edit Todo...") );
1709 mDeleteAction->setText( i18n("Delete Todo...") );
1710
1711 mNewSubTodoAction->setEnabled( true ); 1696 mNewSubTodoAction->setEnabled( true );
1712 } else { 1697 } else {
1713 mShowAction->setText( i18n("Show...") ); 1698 mShowAction->setMenuText( i18n("Show") );
1714 mShowAction->setText( i18n("Edit...") );
1715 mShowAction->setText( i18n("Delete...") );
1716
1717 mNewSubTodoAction->setEnabled( false ); 1699 mNewSubTodoAction->setEnabled( false );
1718 } 1700 }
1719} 1701}
1720 1702
1721void MainWindow::enableIncidenceActions( bool enabled ) 1703void MainWindow::enableIncidenceActions( bool enabled )
1722{ 1704{
1723 mShowAction->setEnabled( enabled ); 1705 mShowAction->setEnabled( enabled );
1724 mEditAction->setEnabled( enabled ); 1706 mEditAction->setEnabled( enabled );
1725 mDeleteAction->setEnabled( enabled ); 1707 mDeleteAction->setEnabled( enabled );
1726 1708
1727 mCloneAction->setEnabled( enabled ); 1709 mCloneAction->setEnabled( enabled );
1728 mMoveAction->setEnabled( enabled ); 1710 mMoveAction->setEnabled( enabled );
1711#ifndef DESKTOP_VERSION
1729 mBeamAction->setEnabled( enabled ); 1712 mBeamAction->setEnabled( enabled );
1713#endif
1730 mCancelAction->setEnabled( enabled ); 1714 mCancelAction->setEnabled( enabled );
1731} 1715}
1732 1716
1733void MainWindow::importOL() 1717void MainWindow::importOL()
1734{ 1718{
1735#ifdef _OL_IMPORT_ 1719#ifdef _OL_IMPORT_
1736 mView->clearAllViews(); 1720 mView->clearAllViews();
1737 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); 1721 KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this );