author | zautrix <zautrix> | 2005-07-03 14:15:13 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-03 14:15:13 (UTC) |
commit | 3be76edf08827e1e00206399469904fe69887854 (patch) (side-by-side diff) | |
tree | 02e2d16a6f133afcd3c54be1f4fe9f2bd424b177 | |
parent | 971bfd3cf502fbbafc96bef70e21beb545e450b5 (diff) | |
download | kdepimpi-3be76edf08827e1e00206399469904fe69887854.zip kdepimpi-3be76edf08827e1e00206399469904fe69887854.tar.gz kdepimpi-3be76edf08827e1e00206399469904fe69887854.tar.bz2 |
fixes
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 40 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 34 |
3 files changed, 30 insertions, 46 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 @@ { "Default event color:","Standard Terminfarbe:" }, { "Default","Standard" }, { "Def. duration of new app.:","Standard Termin Länge:" }, { "Delete All","Lösche alles" }, { "Delete all selected","Lösche alle Selektierten" }, { "Delete Current","Aktuellen löschen" }, { "Delete Event...","Lösche Termin..." }, { "Delete Event","Lösche Termin" }, -{ "&Delete...","Löschen..." }, -{ "Delete...","Löschen..." }, -{ "Delete","Löschen" }, +{ "&Delete...","Lösche..." }, +{ "Delete...","Lösche..." }, +{ "Delete","Lösche" }, { "Delete Todo...","Lösche Todo..." }, { "Delete To-Do","Lösche Todo" }, { "Deleting item %d ...","Lösche Eintrag %d..." }, { "Descriptions","Beschreibungen" }, { "Deselect all","Deselektiere Alle" }, { "Details","Details" }, { "Dinner","Abendessen" }, { "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" }, @@ -234,17 +234,17 @@ { "minute(s)","Minute(n)" }, { "Monday","Montag" }, { "Mon","Mo" }, { "Monthly","Monatlich" }, { "Month not long enough","Monat ist nicht lang genug" }, { "month(s)","Monat(e)" }, { "Month view:","Monatsansicht:" }, { "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" }, -{ "Todo view uses category colors","To-Do Ansicht zeigt Kategorie Farben" }, +{ "Todo view uses category colors","Todo Ansicht zeigt Kategorie Farben" }, { "Move &Down","Nach unten verschieben" }, { "Move &Up","Nach oben verschieben" }, { "Name:","Name:" }, { "Name","Name" }, { "\nAre you sure you want\nto delete this event?","\nSind Sie sicher, dass Sie\nden Termin löschen möchten?" }, { "%n Days","%n Tage" }, { "Never","Nie" }, { "New event...","Neuer Termin..." }, @@ -346,26 +346,26 @@ { "Select a year","Wähle Jahr" }, { "Send directly","Sende direkt" }, { "&Send Messages","&Sende Nachrichten", }, { "Sep","Sep" }, { "September","September" }, { "Shopping","Einkaufen" }, { "Show Dates","Zeige Daten" }, { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." }, -{ "Show Event...","Zeige Termin..." }, +{ "Show Event","Termin anzeigen" }, { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." }, { "Show Marcus Bains line","Zeige Marcus Bains Linie" }, { "Show summary after syncing","Zeige Zusammenfassung nach Sync." }, { "Show time as:","Zeige Zeit als" }, -{ "Show Todo...","Zeige To-Do" }, +{ "Show Todo","Todo anzeigen" }, { "Vertical screen layout(Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" }, -{ "&Show","Zeige" }, -{ "Show...","Zeige..." }, -{ "Show","Zeige" }, +{ "&Show","Anzeigen" }, +{ "Show...","Anzeigen..." }, +{ "Show","Anzeigen" }, { "Small","Klein" }, { "Sorry","Tut mir leid" }, {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"}, { "Start:","Start:" }, { "Start Date","Start Datum" }, { "Start date: %1","Start Datum: %1" }, { "Start Time","Start Zeit" }, { "Status:","Status:" }, @@ -376,17 +376,17 @@ { "Sunday","Sonntag" }, { "Sun","So" }, { "Sync preferences:","Sync Einstellungen" }, { "Sync Prefs","Sync Einstellungen" }, { "Syncronize","Daten abgleich" }, { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" }, { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" }, { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" }, -{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" }, +{ "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges Todo" }, { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" }, { "Template...","Vorlage..." }, { "This day","Dieser Tag" }, { "This is an experimental feature. ","Dieses Feature ist experimentel" }, { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." }, { "This item will be permanently deleted.", "Dieser Eintrag wird komplett gelöscht." }, { "Thu","Do" }, { "Thursday","Donnerstag" }, @@ -396,21 +396,21 @@ { "Time Format","Zeit Format" }, { "Time Format(nr):","Zeit Format(Neustart!)" }, { "Date Labels:","Datumsleiste:" }, { "Time: ","Zeit: " }, { "Timezone:","Zeitzone:" }, { "To: ","Bis: " }, { "To:","Bis:" }, { "Today: ","Heute: " }, -{ "Todo due today color:","Heute fällige To-Do's" }, +{ "Todo due today color:","Heute fällige Todos" }, { "To-do items:","To-Do items:" }, -{ "Todo overdue color:","Überfällige To-Do's" }, +{ "Todo overdue color:","Überfällige Todos" }, { "Todo","Todo" }, -{ "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" }, +{ "To-do view shows completed Todos","Todo Ansicht zeigt erledigte Todos" }, { "ToDoView:","Todo Ansicht:" }, { "Toggle Alarm","Wechsle Alarm" }, { "Toggle Allday","Umschalten Ganztag" }, { "Tomorrow: ","Morgen: " }, { "Tue","Di" }, { "Tuesday","Dienstag" }, { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" }, { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." }, @@ -474,17 +474,17 @@ { "File","Datei" }, { "Clone...","Dupliziere..." }, { "Move...","Bewege..." }, { "Beam...","Sende via IR..." }, { "&Clone...","Dupliziere..." }, { "&Move...","Bewege..." }, { "&Beam...","Sende via IR..." }, { "Show Completed","Zeige erledigte Todos" }, -{ "Show Quick Todo","Zeige Quick Todo" }, +{ "Show Quick Todo","Zeige Quick-Todo" }, { "Unparent Todo","Un-sub Todo" }, { "Save selected to file...","Speichere Selektierte..." }, { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." }, { "Set Categ. for selected...","Setze Kateg. für Selekt." }, { "Beam via IR...","Sende via IR..." }, { "Search","Suchen" }, { "Date Picker","Datum auswählen" }, { "Day View","Tagesansicht" }, @@ -549,17 +549,17 @@ { "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." }, { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" }, { "h","Std" }, { "min","Min" }, { "hou","Std" }, { "day","Tag" }, { "French","Französich" }, { "Time","Zeit" }, -{ "Event Viewer","Termin Ansicht" }, +{ "Event Viewer","Termin Anzeige" }, { "Cancel Sync","Sync Abbrechen" }, { "Remote","Fern" }, { "Local","Lokal" }, { "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" }, { "Local: ","Lokal: " }, { "Remote: ","Fern: " }, { "Last modified: ","Zuletzt geändert: " }, { "Location: ","Ort: " }, @@ -666,17 +666,17 @@ { "icons","Icons" }, { "Show Sat/Sun together","Zeige Sam/Son zusammen" }, { "Category colors are applied to text","Kategorie Farben färben Text" }, { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" }, { "Day color odd months","Tagesfarbe ungerade Monate" }, { "Day color even months","Tagesfarbe gerade Monate" }, { "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" }, { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" }, -{ "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" }, +{ "Small To-do view uses smaller font","Kleine Todo Ansicht nutzt kleineren Font" }, { "Colors are applied to text","Farben werden auf Text angewendet" }, { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" }, { "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" }, { "Play beeps count:","Anzahl der Alarmpiepse: " }, { "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " }, { "Default suspend time in min:","Standard Supendierungs Zeit: " }, { "Auto suspend count:","Anzahl der auto Suspendierungen" }, { "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei für neu angelegte Alarme:" }, @@ -854,17 +854,17 @@ { "Complete calendar...","Kompletten Kalender..." }, { "Filtered calendar...","Gefilterten Kalender..." }, { "Export to phone","Exportiere zum Handy" }, { "Beam receive enabled","Beam Empfang an" }, { "What's new?","Was ist neu?" }, { "FAQ...","FAQ..." }, { "Licence...","Licence..." }, { "What's This?","What's This?" }, -{ "&Edit...","&Editiere..." }, +{ "&Edit...","Bearbeite..." }, { "Oktober","Oktober" }, { "Title","Titel" }, { "%1 %","%1 %" }, { "Enable Pi-Sync","Schalte Pi-Sync an" }, { "Import!","Importiere!" }, { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" }, { "Export to phone options","Export ans Handy Optionen" }, { "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 @@ { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" }, { "About KOrganizer/Pi","Über KOrganizer/Pi" }, { "From: ","Von: " }, { "Remove sync info","Entferne Sync Info" }, { "For all profiles","Für alle Profile" }, { "Hide not Running","Verstecke nicht Laufende" }, { "ME","ME" }, { "Toolbar","Toolbar" }, -{ "Undo Delete...","Undo Löschen..." }, +{ "Undo Delete...","UNDO Löschen..." }, { "Undo Delete","Löschen rückgängig machen" }, { "KDE Sync HowTo...","KDE Sync HowTo..." }, { "Multi Sync HowTo...","Multi Sync HowTo..." }, { "Januar","Januar" }, { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" }, { "No Filter","Kein Filter" }, { "Multiple Sync options","Multi Sync Optionen" }, { "Sync algo options","Sync Ablauf Optionen" }, @@ -1387,17 +1387,17 @@ { "Timetracking HowTo...","Timetracking HowTo..." }, { "Juni","Juni" }, { "Juli","Juli" }, { "ToDo:","ToDo:" }, { "Set Calendar","Setze Kalender" }, { "Todo: %1","Todo: %1" }, { ": (Prio ",": (Prio " }, { "Todos","Todos" }, -{ "Todo Viewer","Todo Viewer" }, +{ "Todo Viewer","Todo Anzeige" }, { "Todo ","Todo " }, { " Calendar \n Resource "," Kalender \n Resource " }, { " Color "," Farbe " }, { "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!)" }, { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" }, { "Add new Calendar","Füge Kalender hinzu" }, { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" }, { "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" }, @@ -1484,13 +1484,13 @@ { "Reset","Neu setzen" }, { "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)?" }, { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" }, { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" }, { "\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" }, { "\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" }, { "Edit","Edit" }, { "Last Modified","Zuletzt geändert" }, -{ "","" }, +{ "Journal viewer","Journal Anzeige" }, { "","" }, { "","" }, { "","" }, { "","" }, 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 ) } else { if ( mode == 1 ) { addTag("h3",i18n( "Local: " ) + text_d ); } else { addTag("h3",i18n( "Remote: " ) + text_d ); } } - topLevelWidget()->setCaption("Journal Viewer"); + topLevelWidget()->setCaption(i18n("Journal viewer")); mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); formatReadOnly(jour); addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); if (!jour->description().isEmpty()) { addTag("p",deTag(jour->description())); } 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() configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); configureToolBarMenu->insertSeparator(); configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); configureToolBarMenu->insertSeparator(); configureToolBarMenu->insertItem(i18n("Week Number"), 400); configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); - mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); + mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this ); mShowAction->addTo( mCurrentItemMenu ); connect( mShowAction, SIGNAL( activated() ), mView, SLOT( showIncidence() ) ); mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); mEditAction->addTo( mCurrentItemMenu ); connect( mEditAction, SIGNAL( activated() ), mView, SLOT( editIncidence() ) ); @@ -817,20 +817,22 @@ void MainWindow::initActions() mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); mCloneAction->addTo( mCurrentItemMenu ); connect( mCloneAction, SIGNAL( activated() ), mView, SLOT( cloneIncidence() ) ); mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); mMoveAction->addTo( mCurrentItemMenu ); connect( mMoveAction, SIGNAL( activated() ), mView, SLOT( moveIncidence() ) ); +#ifndef DESKTOP_VERSION mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); mBeamAction->addTo(mCurrentItemMenu ); connect( mBeamAction, SIGNAL( activated() ), mView, SLOT( beamIncidence() ) ); +#endif mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); mCancelAction->addTo( mCurrentItemMenu ); connect( mCancelAction, SIGNAL( activated() ), mView, SLOT( toggleCancelIncidence() ) ); QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); ne_action->addTo( actionMenu ); connect( ne_action, SIGNAL( activated() ), @@ -1642,96 +1644,78 @@ void MainWindow::updateWeek(QDate seda) } void MainWindow::updateWeekNum(const DateList &selectedDates) { updateWeek( selectedDates.first() ); } void MainWindow::processIncidenceSelection( Incidence *incidence ) { - if ( !incidence ) { + mShowAction->setMenuText( i18n("Show") ); enableIncidenceActions( false ); - mNewSubTodoAction->setEnabled( false ); setCaptionToDates(); return; - } - - //KGlobal::locale()->formatDateTime(nextA, true); QString startString = ""; if ( incidence->typeID() != todoID ) { if ( incidence->dtStart().date() < incidence->dtEnd().date() ) { if ( incidence->doesFloat() ) { startString += ": "+incidence->dtStartDateStr( true ); startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); - } else { startString = ": "+incidence->dtStartStr(true); startString += " --- "+((Event*)incidence)->dtEndStr(true); - } - } else { if ( incidence->dtStart().time() != incidence->dtEnd().time() ) startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+ "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time()); - if ( incidence->isBirthday() || incidence->isAnniversary() ) { bool ok; QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok ); if ( ok ) { int years = noc.date().year() - incidence->dtStart().date().year(); startString += i18n(" (%1 y.)"). arg( years ); } } else startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); } - } else startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed"); if ( !incidence->location().isEmpty() ) startString += " (" +incidence->location()+")"; setCaption( incidence->summary()+startString); - enableIncidenceActions( true ); - if ( incidence->typeID() == eventID ) { - mShowAction->setText( i18n("Show Event...") ); - mEditAction->setText( i18n("Edit Event...") ); - mDeleteAction->setText( i18n("Delete Event...") ); - + mShowAction->setMenuText( i18n("Show Event") ); mNewSubTodoAction->setEnabled( false ); } else if ( incidence->typeID() == todoID ) { - mShowAction->setText( i18n("Show Todo...") ); - mEditAction->setText( i18n("Edit Todo...") ); - mDeleteAction->setText( i18n("Delete Todo...") ); - + mShowAction->setMenuText( i18n("Show Todo") ); mNewSubTodoAction->setEnabled( true ); } else { - mShowAction->setText( i18n("Show...") ); - mShowAction->setText( i18n("Edit...") ); - mShowAction->setText( i18n("Delete...") ); - + mShowAction->setMenuText( i18n("Show") ); mNewSubTodoAction->setEnabled( false ); } } void MainWindow::enableIncidenceActions( bool enabled ) { mShowAction->setEnabled( enabled ); mEditAction->setEnabled( enabled ); mDeleteAction->setEnabled( enabled ); mCloneAction->setEnabled( enabled ); mMoveAction->setEnabled( enabled ); +#ifndef DESKTOP_VERSION mBeamAction->setEnabled( enabled ); +#endif mCancelAction->setEnabled( enabled ); } void MainWindow::importOL() { #ifdef _OL_IMPORT_ mView->clearAllViews(); KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |