summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--korganizer/koeditorgeneral.cpp5
-rw-r--r--korganizer/kolistview.cpp11
3 files changed, 13 insertions, 7 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 @@
1466{ "Journal from: ","Journal vom: " }, 1466{ "Journal from: ","Journal vom: " },
1467{ "","" }, 1467{ "Journal: %1 from ","Journal: %1 vom " },
1468{ "","" }, 1468{ "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
1469{ "","" }, 1469{ "","" },
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 )
161{ 161{
162 qDebug("i %d c %d ", index, KOPrefs::instance()->mCustomCategories.count());
163 QStringList categories = QStringList::split (",", mCategoriesLabel->text()); 162 QStringList categories = QStringList::split (",", mCategoriesLabel->text());
@@ -175,3 +174,3 @@ void KOEditorGeneral::selectedCatPopup( int index )
175 } 174 }
176 mCategoriesLabel->setText( categories.join(",") ); 175 setCategories( categories.join(",") );
177} 176}
@@ -400,2 +399,4 @@ void KOEditorGeneral::setCategories(const QString &str)
400{ 399{
400 QString tt = str;
401 QToolTip::add( mCategoriesLabel, i18n("<b>Click here to edit categories: </b>") +"<em>"+tt.replace( QRegExp(","),", ")+"</em>");
401 mCategoriesLabel->setText(str); 402 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()
669 text += "\n************************************\n"; 669 text += "\n************************************\n";
670 text += i18n("Journal from: ") +incidence->dtStartDateStr( false ); 670 if ( !incidence->summary().isEmpty() )
671 text += i18n("Journal: %1 from ").arg( incidence->summary() ) +incidence->dtStartDateStr( false );
672 else
673 text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
674 if ( !incidence->location().isEmpty() )
675 text +="\n(" + i18n("Location: ") + incidence->location()+ ")";
671 text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); 676 text +="\n" + i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
@@ -680,2 +685,4 @@ void KOListView::saveDescriptionToFile()
680 text += incidence->summary(); 685 text += incidence->summary();
686 if ( !incidence->location().isEmpty() )
687 text +="\n(" + i18n("Location: ") + incidence->location()+ ")";
681 if ( incidence->hasStartDate() ) 688 if ( incidence->hasStartDate() )
@@ -683,4 +690,2 @@ void KOListView::saveDescriptionToFile()
683 text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false); 690 text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
684 if ( !incidence->location().isEmpty() )
685 text += "\n" +i18n("Location: ") + incidence->location();
686 text += "\n" + i18n("Description: ") + "\n" + incidence->description(); 691 text += "\n" + i18n("Description: ") + "\n" + incidence->description();