summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt11
-rw-r--r--korganizer/koeventviewer.cpp9
2 files changed, 16 insertions, 4 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index cb63a5e..71d07e7 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1576,8 +1576,19 @@
{ "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
{ "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
{ "Waiting a second before syncing next resource...","Warte eine Sekunde vor dem Syncen der nächsten resource..." },
{ "Multi-resource Pi-sync finished","Multi-Resourcen Pi-sync beendet" },
+{ "Work","Arbeit" },
+{ "Mobile","Handy" },
+{ "Work2","Arbeit2" },
+{ "Mobile2","Handy2" }
+{ "Home2","Zuhause2" },
+{ "Other","Sonstige" },
+{ "Meeting ","Treffen " },
+{ "(cancelled)","(aufgehoben)" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 92d2a80..c0acf34 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -178,9 +178,9 @@ void KOEventViewer::setSource(const QString& n)
mailToAttendees( true );
} else if ( n.mid(7,4) == "RSVP" ) {
mailToAttendees( false );
} else {
- ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
+ ExternalAppHandler::instance()->mailToOneContact( n.mid(7) );
//QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
//e << n.mid(7);
}
//#endif
@@ -354,9 +354,9 @@ void KOEventViewer::appendEvent(Event *event, int mode )
}
}
if (!event->location().isEmpty()) {
addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) );
- mMailSubject += i18n(" at ") + event->location();
+ mMailSubject += " (" + i18n("Location: ") + event->location() + ")";
}
if (event->doesRecur()) {
QString recurText = event->recurrenceText();
@@ -513,15 +513,16 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
}
if (event->hasStartDate()) {
mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
}
+ if (!event->location().isEmpty()) {
+ mMailSubject += " (" + i18n("Location: ") + event->location() + ")";
+ }
if (event->hasDueDate()) {
mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
- mMailSubject += i18n(" - " )+event->dtDueStr( true );
}
if (!event->location().isEmpty()) {
addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) );
- mMailSubject += i18n(" at ") + event->location();
}
mText.append(i18n("<p><b>Priority:</b> %2</p>")
.arg(QString::number(event->priority())));