LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_17' (head dac25405c6ab2f1d735ddb9f6db4243e5e96d14b)

Browse source 
to branch 'ca.inverse.sogo' (head 919ac12670dffae621309b1826bc13e0a9ecbe21)

Monotone-Parent: 919ac12670dffae621309b1826bc13e0a9ecbe21
Monotone-Parent: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b
Monotone-Revision: f48e9e2abfb00e03cccd2aa8fd8998a415bb5ce1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:04:58
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2012-07-12 15:04:58 +00:00
parent 8a9bdcd31b 825686eaed
commit 6c5bbadfd0
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -12,6 +12,26 @@
* Added strings to translate and cleaned up the template to send
HTML mails instead of text/plain.
2012-07-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-davNotifyOnPersonalModifications)
(-setDavNotifyOnPersonalModifications:)
(-davNotifyOnExternalModifications)
(-setDavNotifyOnExternalModifications:)
(-davNotifyUserOnPersonalModifications)
(-setDavNotifyUserOnPersonalModifications:)
(-davNotifiedUserOnPersonalModifications)
(-setDavNotifiedUserOnPersonalModifications:): new dav accessors.
* SoObjects/SOGo/SOGoObject.m (-davBooleanForResult:): new method
that returns a valid DAV boolean from a BOOL.
(-isValidDAVBoolean:): new method that validates the value as a
DAV boolean.
(-resultForDAVBoolean:): new method that returns a BOOL from a DAV
boolean.
>>>>>>> variant B
2012-07-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>

4
UI/Scheduler/English.lproj/Localizable.strings
View file

@ -537,6 +537,10 @@ vtodo_class2 = "(Confidential task)";
"Show alarms" = "Show alarms";
"Show tasks" = "Show tasks";
"Receive a mail when I modify my calendar" = "Receive a mail when I modify my calendar";
"Receive a mail when someone else modifies my calendar" = "Receive a mail when someone else modifies my calendar";
"When I modify my calendar, send a mail to:" = "When I modify my calendar, send a mail to:";
"Links to this Calendar" = "Links to this Calendar";
"Authenticated User Access" = "Authenticated User Access";
"CalDAV URL" = "CalDAV URL";

16
UI/Templates/PreferencesUI/UIxPreferences.wox
View file

@ -304,12 +304,12 @@
<input const:name="serverName" const:id="serverName" type="text" const:value=""/></label>
<label><var:string label:value="Port:"/>
<input const:name="port" const:id="port" type="text" const:value=""/></label><br/>
<var:string label:value="Encryption:"/>
<label><input const:name="encryption" type="radio" const:value="none"/>
<var:string label:value="None"/></label>
<label><input const:name="encryption" type="radio" const:value="ssl"/>
<var:string label:value="SSL"/></label>
<label><input const:name="encryption" type="radio" const:value="tls"/>
<label><var:string label:value="Encryption:"/>
<input const:name="encryption" type="radio" const:value="none"/>
<var:string label:value="None"/>
<input const:name="encryption" type="radio" const:value="ssl"/>
<var:string label:value="SSL"/>
<input const:name="encryption" type="radio" const:value="tls"/>
<var:string label:value="TLS"/></label><br/>
<label><var:string label:value="User Name:"/>
<input const:name="userName" const:id="userName" type="text" const:value=""/></label><br/>
@ -331,8 +331,8 @@
<input const:name="email" const:id="email" type="text" const:value=""/></label><br/>
<label><var:string label:value="Reply To Email:"/>
<input const:name="replyTo" const:id="replyTo" type="text" const:value=""/></label><br/>
<var:string label:value="Signature:"/>
<span id="actSignature"><!--space --></span>
<label><var:string label:value="Signature:"/>
<span id="actSignature"><!--space --></span></label>
</fieldset>
<fieldset const:id="returnReceiptsInfo">