translation fixes

2 files changed, 15 insertions, 3 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
@@ -1564,22 +1564,33 @@
 { "<p><b>Duration:</b> %1 days</p>","<p><b>Dauer:</b> %1 Tage</p>" },
 { " (Duration: %1 days)"," (Dauer: %1 Tage)" },
 { "Autosave enabled!","Auto-Speichern angeschaltet!" },
 { "Autosave disabled! Save timer stopped!","Auto-Speichern ausgeschaltet! Speicher Timer gestoppt!" },
 { "Autosave disabled!","Auto-Speichern ist ausgeschaltet!" },
 { "Yes, Save!","Ja, Speichern!" },
 { "Calendar is modified\nbut Autosave is disabled!\nDo you want\nto save the data?","Der Kalender wurde verändert,\naber Auto-Speichern ist\nabgeschaltet. Möchten Sie\ndie Daten speichern?" },
 { "<p><b>C+ctrl</b>: Dis/enable automatic saving</p>\n","<p><b>C+ctrl</b>: Auto-Speichern ab/anschalten</p>\n" },
 { "<br>The calendar contains<br><b>%1 events<br>%2 todos<br>%3 journals</b>","<br>Der Kalender enthält<br><b>%1 Termine<br>%2 Todos<br>%3 Journale</b>" },
 { "Enable alarm in resource settings","Schalte Alarm in Resourcenansicht wieder an" },
 { "The alarm for this calendar\nis currently disabled!\nEnable it in resource settings.","Der Alarm für diesen Kalender\nist abgeschaltet.\nSchalten Sie ihn in der\nResourcenansicht ggf. an." },
 { "Alarm disabled warning","Nichtaktiver Alarm" },
 { "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
@@ -342,33 +342,33 @@ void KOEventViewer::appendEvent(Event *event, int mode )
     } else {
         if (event->isMultiDay()) {
             mText.append(i18n("<p><b>From:</b> %1</p> ")
                          .arg(event->dtStartStr( shortDate)));
             mText.append(i18n("<p><b>To:</b> %1</p>")
                          .arg(event->dtEndStr(shortDate)));
         } else {
             mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
                          .arg(event->dtStartTimeStr())
                          .arg(event->dtEndTimeStr()));
             mText.append(i18n("<p><b>On:</b> %1</p> ")
                          .arg(event->dtStartDateStr( shortDate )));
         }
     }
     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();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
         bool ok;
         QDate start = QDate::currentDate();
         QDateTime next;
         next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
         if ( ok ) {
             if ( wideScreen ){
                 addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) );
             } else {
                 addTag("p",i18n("<b>Next recurrence is on:</b>")  );
                 addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
             }
@@ -501,39 +501,40 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
    
 
     if (event->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
             
     }
     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())));
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
 	if (event->doesRecur()) {
 	  bool ok = false;
 	  int offset = 0;
 	  QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
 	  if ( ok ) {
 	    t = next;
 	  }
 	}
 	QString s =i18n("( %1 before )").arg( alarm->offsetText() );