-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 | |||
@@ -132,5 +132,5 @@ | |||
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..." }, |
@@ -241,3 +241,3 @@ | |||
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" }, |
@@ -353,3 +353,3 @@ | |||
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." }, |
@@ -358,7 +358,7 @@ | |||
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" }, |
@@ -383,3 +383,3 @@ | |||
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" }, |
@@ -403,7 +403,7 @@ | |||
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:" }, |
@@ -481,3 +481,3 @@ | |||
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" }, |
@@ -556,3 +556,3 @@ | |||
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" }, |
@@ -673,3 +673,3 @@ | |||
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" }, |
@@ -861,3 +861,3 @@ | |||
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" }, |
@@ -1042,3 +1042,3 @@ | |||
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" }, |
@@ -1394,3 +1394,3 @@ | |||
1394 | { "Todos","Todos" }, | 1394 | { "Todos","Todos" }, |
1395 | { "Todo Viewer","Todo Viewer" }, | 1395 | { "Todo Viewer","Todo Anzeige" }, |
1396 | { "Todo ","Todo " }, | 1396 | { "Todo ","Todo " }, |
@@ -1491,3 +1491,3 @@ | |||
1491 | { "Last Modified","Zuletzt geändert" }, | 1491 | { "Last Modified","Zuletzt geändert" }, |
1492 | { "","" }, | 1492 | { "Journal viewer","Journal Anzeige" }, |
1493 | { "","" }, | 1493 | { "","" }, |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index d3b2ccf..f6c252b 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -703,3 +703,3 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) | |||
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))); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 5d26d35..88dbd4f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -800,3 +800,3 @@ void MainWindow::initActions() | |||
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 ); |
@@ -824,2 +824,3 @@ void MainWindow::initActions() | |||
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 ); |
@@ -828,2 +829,3 @@ void MainWindow::initActions() | |||
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 ); |
@@ -1649,6 +1651,5 @@ void 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 ); |
@@ -1656,6 +1657,3 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1656 | return; | 1657 | return; |
1657 | |||
1658 | } | 1658 | } |
1659 | |||
1660 | //KGlobal::locale()->formatDateTime(nextA, true); | ||
1661 | QString startString = ""; | 1659 | QString startString = ""; |
@@ -1666,3 +1664,2 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1666 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); | 1664 | startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); |
1667 | |||
1668 | } else { | 1665 | } else { |
@@ -1670,5 +1667,3 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1670 | startString += " --- "+((Event*)incidence)->dtEndStr(true); | 1667 | startString += " --- "+((Event*)incidence)->dtEndStr(true); |
1671 | |||
1672 | } | 1668 | } |
1673 | |||
1674 | } else { | 1669 | } else { |
@@ -1677,3 +1672,2 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
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() ) { |
@@ -1689,3 +1683,2 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1689 | } | 1683 | } |
1690 | |||
1691 | } | 1684 | } |
@@ -1696,22 +1689,11 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
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 ); |
@@ -1728,3 +1710,5 @@ void MainWindow::enableIncidenceActions( bool 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 ); |