-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 @@ | |||
1457 | { "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" }, | 1457 | { "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" }, |
1458 | { "Birthdays","Geburtstage" }, | 1458 | { "Birthdays","Geburtstage" }, |
1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, | 1459 | { "KO/Pi import information!","KO/Pi Import Information!" }, |
1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, | 1460 | { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" }, |
1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, | 1461 | { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, |
1462 | { "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?"" }, | 1462 | { "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?"" }, |
1463 | { "Reload","Neu laden" }, | 1463 | { "Reload","Neu laden" }, |
1464 | { "Timezone settings","Zeitzoneneinstellung" }, | 1464 | { "Timezone settings","Zeitzoneneinstellung" }, |
1465 | { " Title: "," Titel: " }, | 1465 | { "Title: ","Titel: " }, |
1466 | { "","" }, | 1466 | { "Journal from: ","Journal vom: " }, |
1467 | { "","" }, | 1467 | { "","" }, |
1468 | { "","" }, | 1468 | { "","" }, |
1469 | { "","" }, | 1469 | { "","" }, |
1470 | { "","" }, | 1470 | { "","" }, |
1471 | { "","" }, | 1471 | { "","" }, |
1472 | { "","" }, \ No newline at end of file | 1472 | { "","" }, \ 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) : | |||
63 | mJournal = 0; | 63 | mJournal = 0; |
64 | visibleMode = true; | 64 | visibleMode = true; |
65 | QHBox * vb = new QHBox ( this ); | 65 | QHBox * vb = new QHBox ( this ); |
66 | QPixmap iconp; | 66 | QPixmap iconp; |
67 | 67 | ||
68 | QPushButton * toggleJournal = new QPushButton( vb ); | 68 | QPushButton * toggleJournal = new QPushButton( vb ); |
69 | iconp = SmallIcon("1updownarrow"); | 69 | iconp = SmallIcon("1updownarrow"); |
70 | toggleJournal->setPixmap (iconp ) ; | 70 | toggleJournal->setPixmap (iconp ) ; |
71 | new QLabel(i18n(" Title: "),vb); | 71 | new QLabel(" "+i18n("Title: "),vb); |
72 | mTitle = new KLineEdit ( vb ); | 72 | mTitle = new KLineEdit ( vb ); |
73 | mTitleLabel = new QLabel(i18n("Title"),vb); | 73 | mTitleLabel = new QLabel(i18n("Title"),vb); |
74 | mTitleLabel->setMargin(0); | 74 | mTitleLabel->setMargin(0); |
75 | mTitleLabel->setAlignment(AlignCenter); | 75 | mTitleLabel->setAlignment(AlignCenter); |
76 | QPushButton * loadTemplate = new QPushButton( vb ); | 76 | QPushButton * loadTemplate = new QPushButton( vb ); |
77 | QPushButton * saveTemplate = new QPushButton( vb ); | 77 | QPushButton * saveTemplate = new QPushButton( vb ); |
78 | if ( QApplication::desktop()->width() < 321 ) | 78 | if ( QApplication::desktop()->width() < 321 ) |
79 | iconp = SmallIcon("fileexport16"); | 79 | 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) | |||
683 | mText += "<br>\n"; | 683 | mText += "<br>\n"; |
684 | } | 684 | } |
685 | } | 685 | } |
686 | 686 | ||
687 | } | 687 | } |
688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 688 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
689 | { | 689 | { |
690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 690 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
691 | QString text_d = i18n("Journal from: "); | ||
692 | if ( !jour->summary().isEmpty() ) | ||
693 | text_d = jour->summary(); | ||
691 | if (mode == 0 ) { | 694 | if (mode == 0 ) { |
692 | addTag("h2",i18n("Journal from: ")); | 695 | addTag("h2", text_d ); |
693 | } | 696 | } |
694 | else { | 697 | else { |
695 | if ( mode == 1 ) { | 698 | if ( mode == 1 ) { |
696 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); | 699 | addTag("h3",i18n( "Local: " ) + text_d ); |
697 | } else { | 700 | } else { |
698 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); | 701 | addTag("h3",i18n( "Remote: " ) + text_d ); |
699 | } | 702 | } |
700 | } | 703 | } |
701 | topLevelWidget()->setCaption("Journal Viewer"); | 704 | topLevelWidget()->setCaption("Journal Viewer"); |
702 | 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))); |
703 | if (!jour->summary().isEmpty()) { | ||
704 | addTag("b",i18n(" Title: ") + deTag(jour->summary())); | ||
705 | } | ||
706 | formatReadOnly(jour); | 706 | formatReadOnly(jour); |
707 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | 707 | addTag("p","<b>"+i18n( "Last modified: " ) + "</b>"+KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); |
708 | 708 | ||
709 | if (!jour->description().isEmpty()) { | 709 | if (!jour->description().isEmpty()) { |
710 | addTag("p",deTag(jour->description())); | 710 | addTag("p",deTag(jour->description())); |
711 | } | 711 | } |
712 | setText(mText); | 712 | setText(mText); |
713 | } | 713 | } |
714 | 714 | ||
715 | void KOEventViewer::formatReadOnly(Incidence *event) | 715 | void KOEventViewer::formatReadOnly(Incidence *event) |