| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
| -rw-r--r-- | korganizer/koeditorgeneral.cpp | 5 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 2977795..3daf215 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1466,4 +1466,4 @@ { "Journal from: ","Journal vom: " }, -{ "","" }, -{ "","" }, +{ "Journal: %1 from ","Journal: %1 vom " }, +{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" }, { "","" }, diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 50a04ea..5c94f62 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -161,3 +161,2 @@ void KOEditorGeneral::selectedCatPopup( int index ) { - qDebug("i %d c %d ", index, KOPrefs::instance()->mCustomCategories.count()); QStringList categories = QStringList::split (",", mCategoriesLabel->text()); @@ -175,3 +174,3 @@ void KOEditorGeneral::selectedCatPopup( int index ) } - mCategoriesLabel->setText( categories.join(",") ); + setCategories( categories.join(",") ); } @@ -400,2 +399,4 @@ void KOEditorGeneral::setCategories(const QString &str) { + QString tt = str; + QToolTip::add( mCategoriesLabel, i18n("<b>Click here to edit categories: </b>") +"<em>"+tt.replace( QRegExp(","),", ")+"</em>"); mCategoriesLabel->setText(str); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 0c1ac7a..8f17e6e 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -669,3 +669,8 @@ void KOListView::saveDescriptionToFile() text += "\n************************************\n"; + if ( !incidence->summary().isEmpty() ) + text += i18n("Journal: %1 from ").arg( incidence->summary() ) +incidence->dtStartDateStr( false ); + else text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); @@ -680,2 +685,4 @@ void KOListView::saveDescriptionToFile() text += incidence->summary(); + if ( !incidence->location().isEmpty() ) + text +="\n(" + i18n("Location: ") + incidence->location()+ ")"; if ( incidence->hasStartDate() ) @@ -683,4 +690,2 @@ void KOListView::saveDescriptionToFile() text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); - if ( !incidence->location().isEmpty() ) - text += "\n" +i18n("Location: ") + incidence->location(); text += "\n" + i18n("Description: ") + "\n" + incidence->description(); |