6 files changed, 29 insertions, 15 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index ab6d220..58be545 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1286,2 +1286,10 @@
 { "<b>Last modified: ","<b>Zuletzt geändert am: " },
+{ "Journal: ","Journal: " },
+{ "yearly","jährlich" },
+{ "(%1) ","%1-" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 1f5afc0..4a6e17d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -143,3 +143,3 @@ bool ListItemVisitor::visit(Todo *t)
 {
-    mItem->setText(0,i18n("To-Do: %1").arg(t->summary()));
+    mItem->setText(0,i18n("Todo: %1").arg(t->summary()));
     if (t->hasStartDate()) {
@@ -192,3 +192,3 @@ bool ListItemVisitor::visit(Journal * j)
 { 
-    QString des = j->description().left(50);
+    QString des = j->description().left(30);
     des = des.simplifyWhiteSpace ();
@@ -196,3 +196,3 @@ bool ListItemVisitor::visit(Journal * j)
     des.replace (QRegExp ("\\r"),"" );
-    mItem->setText(0,i18n("Journal")+": "+des.left(25));
+    mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5181eaf..8a175c9 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -193,3 +193,3 @@ QString Recurrence::recurrenceText() const
 {
-    QString recurText = i18n("No");
+    QString recurText;
     if ( recurs == Recurrence::rMinutely  )
@@ -205,5 +205,5 @@ QString Recurrence::recurrenceText() const
     else if ( recurs ==  Recurrence::rMonthlyDay )
-        recurText = i18n("day-monthly");
+        recurText = i18n("monthly");
     else if ( recurs ==  Recurrence::rYearlyMonth )
-        recurText = i18n("month-yearly");
+        recurText = i18n("yearly");
     else if ( recurs ==  Recurrence::rYearlyDay )
@@ -212,2 +212,8 @@ QString Recurrence::recurrenceText() const
         recurText = i18n("position-yearly");
+    if ( !recurText.isEmpty() ) {
+        if ( rFreq > 1 ){
+            recurText = i18n("(%1) ").arg(rFreq ) + recurText;
+        }
+    } else
+         recurText = i18n("No");
     return recurText;
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 083e6d1..48257ef 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -199,3 +199,3 @@ PwM::~PwM()
 {
-    qDebug("PwM::~PwM() %x", this);
+    //qDebug("PwM::~PwM() %x", this);
 	disconnect(curDoc(), SIGNAL(docClosed(PwMDoc *)),
@@ -901,3 +901,3 @@ void PwM::closeEvent(QCloseEvent *e)
 {
-    qDebug("PwM::closeEvent ");
+    //qDebug("PwM::closeEvent ");
     emit closed( this );
@@ -909,3 +909,3 @@ void PwM::docClosed(PwMDoc *doc)
 {
-    qDebug("PwM::docClosed ");
+    //qDebug("PwM::docClosed ");
 	PARAM_UNUSED(doc);
@@ -1386,3 +1386,3 @@ void PwM::showStatMsg(const QString &msg)
 #else
-	qDebug("Statusbar : %s",msg.latin1());
+	//qDebug("Statusbar : %s",msg.latin1());
     Global::statusMessage(msg);
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 0cf248c..d59d4d8 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -90,3 +90,3 @@ PwMInit::~PwMInit()
 {
-    qDebug("PwMInit::~PwMInit() ");
+    //qDebug("PwMInit::~PwMInit() ");
 #ifndef PWM_EMBEDDED
@@ -157,3 +157,3 @@ void PwMInit::initializeApp()
 		PwMDoc *newDoc = createDoc();
-        qDebug("  createDoc()");
+        //qDebug("  createDoc()");
 		if (!newDoc->openDocUi(newDoc,
@@ -401,3 +401,3 @@ again:
 	if (doMinimizeToTray) {
-        qDebug("doMinimizeToTray ");
+        //qDebug("doMinimizeToTray ");
 		PWM_ASSERT(_tray);
@@ -417,3 +417,3 @@ again:
 	} else if (doDeleteDoc) {
-        qDebug("doDeleteDoc ");
+        //qDebug("doDeleteDoc ");
 		if (!wnd->curDoc()->tryDelete()) {
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index cd816e5..8c4d9cc 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -207,3 +207,3 @@ void PwMView::updateCategories()
 {
-    qDebug("PwMView::updateCategories() ");
+    //qDebug("PwMView::updateCategories() ");
 	QString oldSel(getCurrentCategory());