| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
| -rw-r--r-- | korganizer/journalentry.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koeventviewer.cpp | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5e2180f..2977795 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1457,16 +1457,16 @@ { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" }, { "Birthdays","Geburtstage" }, { "KO/Pi import information!","KO/Pi Import Information!" }, { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" }, { "Reload","Neu laden" }, { "Timezone settings","Zeitzoneneinstellung" }, -{ " Title: "," Titel: " }, -{ "","" }, +{ "Title: ","Titel: " }, +{ "Journal from: ","Journal vom: " }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" }, { "","" },
\ No newline at end of file diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 3c01eeb..9e2c902 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -63,17 +63,17 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : mJournal = 0; visibleMode = true; QHBox * vb = new QHBox ( this ); QPixmap iconp; QPushButton * toggleJournal = new QPushButton( vb ); iconp = SmallIcon("1updownarrow"); toggleJournal->setPixmap (iconp ) ; - new QLabel(i18n(" Title: "),vb); + new QLabel(" "+i18n("Title: "),vb); mTitle = new KLineEdit ( vb ); mTitleLabel = new QLabel(i18n("Title"),vb); mTitleLabel->setMargin(0); mTitleLabel->setAlignment(AlignCenter); QPushButton * loadTemplate = new QPushButton( vb ); QPushButton * saveTemplate = new QPushButton( vb ); if ( QApplication::desktop()->width() < 321 ) iconp = SmallIcon("fileexport16"); diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 52c5247..d3b2ccf 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -683,33 +683,33 @@ void KOEventViewer::formatAttendees(Incidence *event) mText += "<br>\n"; } } } void KOEventViewer::appendJournal(Journal *jour, int mode ) { bool shortDate = KOPrefs::instance()->mShortDateInViewer; + QString text_d = i18n("Journal from: "); + if ( !jour->summary().isEmpty() ) + text_d = jour->summary(); if (mode == 0 ) { - addTag("h2",i18n("Journal from: ")); + addTag("h2", text_d ); } else { if ( mode == 1 ) { - addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); + addTag("h3",i18n( "Local: " ) + text_d ); } else { - addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); + addTag("h3",i18n( "Remote: " ) + text_d ); } } topLevelWidget()->setCaption("Journal Viewer"); mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); - if (!jour->summary().isEmpty()) { - addTag("b",i18n(" Title: ") + deTag(jour->summary())); - } formatReadOnly(jour); - addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); + addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); if (!jour->description().isEmpty()) { addTag("p",deTag(jour->description())); } setText(mText); } void KOEventViewer::formatReadOnly(Incidence *event) |