amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-12 11:55:09 +00:00
Code Issues Projects Releases Wiki Activity

merge of '2f965a12f5d7a6534d7420384246c30f0c8a4bda'

Browse Source 
and 'e485b1c09e36d4173f7845bec12d40de808f3c3b'

Monotone-Parent: 2f965a12f5d7a6534d7420384246c30f0c8a4bda
Monotone-Parent: e485b1c09e36d4173f7845bec12d40de808f3c3b
Monotone-Revision: 56159df9717624adf99da2f21377b40d435b1db7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-17T13:45:53
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-12-17 13:45:53 +00:00
parent ad6d40bd15 e8346b5fc6
commit d1835209f7
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAptMailGermanICalReply.wo/SOGoAptMailGermanICalReply.html
+1 -1
View File
@@ -1,2 +1,2 @@
<#IsSubject>Antwort Termineinladung: <#summary/></#IsSubject>
<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> hat Ihre Termineinladung <#HasAccepted>akzeptiert</#HasAccepted><#HasDeclined>abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>not yet decided upon</#HasNotAcceptedNotDeclined></#IsBody>.
<#IsBody><#attendee/><#HasSentBy>(sent by <#sentBy/>) </#HasSentBy> hat <#HasAccepted>Ihre Termineinladung akzeptiert</#HasAccepted><#HasDeclined>Ihre Termineinladung abgelehnt</#HasDeclined><#HasNotAcceptedNotDeclined>noch nicht über Ihre Termineinladung entschieden</#HasNotAcceptedNotDeclined></#IsBody>.
SoObjects/Appointments/SOGoAptMailGermanUpdate.wo/SOGoAptMailGermanUpdate.html
+3 -3
View File
@@ -1,5 +1,5 @@
<#IsSubject>The appointment "<#Summary />" for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed</#IsSubject>
<#IsSubject>Der Termin "<#Summary />" am <#OldAptStartDate /> um <#OldAptStartTime /> hat sich geändert</#IsSubject>
<#IsBody>
This appointment, previously set for <#OldAptStartDate /> at <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
Please make a decision for these new settings.
Dieser Termin, ursprünglich geplant am <#OldAptStartDate /> um <#OldAptStartTime /><#HasOldLocation> (<#OldAptLocation />)</#HasOldLocation>, ist nun verschoben auf den <#NewAptStartDate /> um <#NewAptStartTime /><#HasNewLocation> (<#NewAptLocation />)</#HasNewLocation>.
Bitte treffen Sie eine Entscheidung über diese Änderung.
</#IsBody>
SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html
+3 -3
View File
@@ -1,8 +1,8 @@
-------- Original E-Mail --------
-------- Original-Nachricht --------
Betreff: <#subject/>
Datum: <#date/>
Sender: <#from/>
<#hasReplyTo>Antworten an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
Von: <#from/>
<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences>
<#messageBody/>
SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html
+4 -4
View File
@@ -3,13 +3,13 @@
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Original E-Mail --------
<#outlookMode>-------- Original-Nachricht --------
Betreff: <#subject/>
Datum: <#date/>
Sender: <#from/>
<#hasReplyTo>Antworten an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
Von: <#from/>
<#hasReplyTo>Antwort an: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>An: <#to/>
<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences></#outlookMode>
<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
<#standardMode>Am <#date/>, <#from/> schrieb:</#standardMode>
<#messageBody/>