diff --git a/NEWS b/NEWS
index 673fac9b7..83632bb73 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@
- added custom DAV methods for managing user permissions from the SOGo Integrator
- pressing enter in the contact edition dialog will perform the creation/update operation
- implemented more of the CalDAV specification for compatibility with Lightning 0.8
-- added Italian translation, thanks to Marco Lertora
+- added Italian translation, thanks to Marco Lertora and Sauro Saltini
- added initial logic for splitting overlapping events
- improved restoration of drag handles state
- improved contextual menu handling of Address Book module
@@ -18,6 +18,8 @@
- added support for calendar colors, both in the web and DAV interfaces
- refactored and fixed the implementation of DAV acl, with partial support for CalDAV Scheduling extensions
- removed the limitation that prevented the user of underscore characters in usernames
+- added Spanish translation, thanks to Ernesto Revilla
+- added Dutch translation, thanks to Wilco Baan Hofman
0.9.0-20080208 (1.0 rc5)
------------------------
diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index f4fb6874a..332bb75c1 100644
--- a/SoObjects/Appointments/GNUmakefile
+++ b/SoObjects/Appointments/GNUmakefile
@@ -35,6 +35,11 @@ Appointments_RESOURCE_FILES += \
product.plist \
Appointments_COMPONENTS += \
+ SOGoAptMailDutchInvitation.wo \
+ SOGoAptMailDutchICalReply.wo \
+ SOGoAptMailDutchUpdate.wo \
+ SOGoAptMailDutchRemoval.wo \
+ SOGoAptMailDutchDeletion.wo \
SOGoAptMailEnglishInvitation.wo \
SOGoAptMailEnglishICalReply.wo \
SOGoAptMailEnglishUpdate.wo \
@@ -50,11 +55,16 @@ Appointments_COMPONENTS += \
SOGoAptMailGermanUpdate.wo \
SOGoAptMailGermanRemoval.wo \
SOGoAptMailGermanDeletion.wo \
- SOGoAptMailItalianInvitation.wo \
- SOGoAptMailItalianICalReply.wo \
- SOGoAptMailItalianUpdate.wo \
- SOGoAptMailItalianRemoval.wo \
- SOGoAptMailItalianDeletion.wo \
+ SOGoAptMailItalianInvitation.wo \
+ SOGoAptMailItalianICalReply.wo \
+ SOGoAptMailItalianUpdate.wo \
+ SOGoAptMailItalianRemoval.wo \
+ SOGoAptMailItalianDeletion.wo \
+ SOGoAptMailSpanishInvitation.wo \
+ SOGoAptMailSpanishICalReply.wo \
+ SOGoAptMailSpanishUpdate.wo \
+ SOGoAptMailSpanishRemoval.wo \
+ SOGoAptMailSpanishDeletion.wo \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html
new file mode 100644
index 000000000..2353f8f3c
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.html
@@ -0,0 +1,4 @@
+<#IsSubject>Appointment <#AptStartDate /> at <#AptStartTime /> has been cancelled#IsSubject>
+<#IsBody>
+The appointment at <#AptStartDate /> <#AptStartTime /> has been cancelled by <#Organizer />.
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchDeletion.wo/SOGoAptMailDutchDeletion.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
new file mode 100644
index 000000000..c861c2714
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.html
@@ -0,0 +1,4 @@
+<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/>#IsSubject>
+<#IsBody>
+<#Attendee/> has <#HasAccepted>accepted#HasAccepted><#HasDeclined>declined#HasDeclined> your invitation.
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod
new file mode 100644
index 000000000..71a954616
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchICalReply.wo/SOGoAptMailDutchICalReply.wod
@@ -0,0 +1,33 @@
+AptStartDate: WOString {
+ value = startDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = startDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Attendee: WOString {
+ value = attendee.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasAccepted: WOConditional {
+ condition = hasAccepted;
+}
+
+HasDeclined: WOConditional {
+ condition = hasDeclined;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html
new file mode 100644
index 000000000..4d6bbab40
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.html
@@ -0,0 +1,7 @@
+<#IsSubject>Appointment on <#AptStartDate /> at <#AptStartTime />#IsSubject>
+<#IsBody>
+You're invited by <#Organizer /> to a meeting.
+<#HasHomePageURL>
+Please make a decision for this invitation at <#HomePageURL />.
+#HasHomePageURL>
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchInvitation.wo/SOGoAptMailDutchInvitation.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html
new file mode 100644
index 000000000..32fdc2623
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.html
@@ -0,0 +1,4 @@
+<#IsSubject>Removed from appointment <#AptStartDate /> at <#AptStartTime />#IsSubject>
+<#IsBody>
+You have been removed by <#Organizer /> from the appointment scheduled at <#AptStartDate /> <#AptStartTime />.
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchRemoval.wo/SOGoAptMailDutchRemoval.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html
new file mode 100644
index 000000000..6a733247b
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.html
@@ -0,0 +1,8 @@
+<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed#IsSubject>
+<#IsBody>
+This appointment, previously set for <#OldAptStartDate />
+at <#OldAptStartTime /> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime />
+<#HasHomePageURL>
+Please make a decision for these new settings at <#HomePageURL />.
+#HasHomePageURL>
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod
new file mode 100644
index 000000000..3dccef2aa
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailDutchUpdate.wo/SOGoAptMailDutchUpdate.wod
@@ -0,0 +1,46 @@
+OldAptStartDate: WOString {
+ value = oldStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+OldAptStartTime: WOString {
+ value = oldStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+NewAptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+NewAptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html
new file mode 100644
index 000000000..2353f8f3c
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.html
@@ -0,0 +1,4 @@
+<#IsSubject>Appointment <#AptStartDate /> at <#AptStartTime /> has been cancelled#IsSubject>
+<#IsBody>
+The appointment at <#AptStartDate /> <#AptStartTime /> has been cancelled by <#Organizer />.
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishDeletion.wo/SOGoAptMailSpanishDeletion.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
new file mode 100644
index 000000000..c861c2714
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.html
@@ -0,0 +1,4 @@
+<#IsSubject>Re: rendez-vous le <#AptStartDate/> à <#AptStartTime/>#IsSubject>
+<#IsBody>
+<#Attendee/> has <#HasAccepted>accepted#HasAccepted><#HasDeclined>declined#HasDeclined> your invitation.
+#IsBody>
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod
new file mode 100644
index 000000000..71a954616
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishICalReply.wo/SOGoAptMailSpanishICalReply.wod
@@ -0,0 +1,33 @@
+AptStartDate: WOString {
+ value = startDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = startDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Attendee: WOString {
+ value = attendee.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasAccepted: WOConditional {
+ condition = hasAccepted;
+}
+
+HasDeclined: WOConditional {
+ condition = hasDeclined;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html
new file mode 100644
index 000000000..4d6bbab40
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.html
@@ -0,0 +1,7 @@
+<#IsSubject>Appointment on <#AptStartDate /> at <#AptStartTime />#IsSubject>
+<#IsBody>
+You're invited by <#Organizer /> to a meeting.
+<#HasHomePageURL>
+Please make a decision for this invitation at <#HomePageURL />.
+#HasHomePageURL>
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishInvitation.wo/SOGoAptMailSpanishInvitation.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html
new file mode 100644
index 000000000..32fdc2623
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.html
@@ -0,0 +1,4 @@
+<#IsSubject>Removed from appointment <#AptStartDate /> at <#AptStartTime />#IsSubject>
+<#IsBody>
+You have been removed by <#Organizer /> from the appointment scheduled at <#AptStartDate /> <#AptStartTime />.
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod
new file mode 100644
index 000000000..3e37496c4
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishRemoval.wo/SOGoAptMailSpanishRemoval.wod
@@ -0,0 +1,34 @@
+AptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+AptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html
new file mode 100644
index 000000000..6a733247b
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.html
@@ -0,0 +1,8 @@
+<#IsSubject>The appointment for the <#OldAptStartDate /> at <#OldAptStartTime /> has changed#IsSubject>
+<#IsBody>
+This appointment, previously set for <#OldAptStartDate />
+at <#OldAptStartTime /> is now scheduled for <#NewAptStartDate /> at <#NewAptStartTime />
+<#HasHomePageURL>
+Please make a decision for these new settings at <#HomePageURL />.
+#HasHomePageURL>
+#IsBody>
\ No newline at end of file
diff --git a/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod
new file mode 100644
index 000000000..3dccef2aa
--- /dev/null
+++ b/SoObjects/Appointments/SOGoAptMailSpanishUpdate.wo/SOGoAptMailSpanishUpdate.wod
@@ -0,0 +1,46 @@
+OldAptStartDate: WOString {
+ value = oldStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+OldAptStartTime: WOString {
+ value = oldStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+NewAptStartDate: WOString {
+ value = newStartDate;
+ dateformat = "%d/%m/%y";
+ escapeHTML = NO;
+}
+
+NewAptStartTime: WOString {
+ value = newStartDate;
+ dateformat = "%H:%M";
+ escapeHTML = NO;
+}
+
+Organizer: WOString {
+ value = newApt.organizer.cnWithoutQuotes;
+ escapeHTML = NO;
+}
+
+HasHomePageURL: WOConditional {
+ condition = homePageURL.length;
+}
+
+HomePageURL: WOString {
+ value = appointmentURL;
+ escapeHTML = NO;
+}
+
+IsSubject: WOConditional {
+ condition = isSubject;
+}
+
+IsBody: WOConditional {
+ condition = isSubject;
+ negate = YES;
+}
diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index b80b24053..370dece0a 100644
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -39,14 +39,18 @@ Mailer_RESOURCE_FILES += \
product.plist \
Mailer_RESOURCE_FILES += \
+ SOGoMailDutchForward.wo \
SOGoMailEnglishForward.wo \
SOGoMailFrenchForward.wo \
SOGoMailGermanForward.wo \
- SOGoMailItalianForward.wo \
+ SOGoMailItalianForward.wo \
+ SOGoMailSpanishForward.wo \
+ SOGoMailDutchReply.wo \
SOGoMailEnglishReply.wo \
SOGoMailFrenchReply.wo \
SOGoMailGermanReply.wo \
- SOGoMailItalianReply.wo
+ SOGoMailItalianReply.wo \
+ SOGoMailSpanishReply.wo
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
diff --git a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html
new file mode 100644
index 000000000..3f50a3f64
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html
@@ -0,0 +1,10 @@
+-------- Original Message --------
+Subject: <#subject/>
+Date: <#date/>
+From: <#from/>
+<#hasReplyTo>Reply-To: <#replyTo/>#hasReplyTo><#hasOrganization>Organization: <#organization/>#hasOrganization>To: <#to/>
+<#hasCc>CC: <#cc/>#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/>#hasNewsGroups><#hasReferences>References: <#references/>#hasReferences>
+
+<#messageBody/>
+
+<#signature/>
diff --git a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod
new file mode 100644
index 000000000..df237286f
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod
@@ -0,0 +1,74 @@
+subject: WOString {
+ value = subject;
+ escapeHTML = NO;
+}
+
+date: WOString {
+ value = date;
+ escapeHTML = NO;
+}
+
+from: WOString {
+ value = from;
+ escapeHTML = NO;
+}
+
+hasReplyTo: WOConditional {
+ condition = hasReplyTo;
+}
+
+replyTo: WOString {
+ value = replyTo;
+ escapeHTML = NO;
+}
+
+hasOrganization: WOConditional {
+ condition = hasOrganization;
+}
+
+organization: WOString {
+ value = organization;
+ escapeHTML = NO;
+}
+
+to: WOString {
+ value = to;
+ escapeHTML = NO;
+}
+
+hasCc: WOConditional {
+ condition = hasCc;
+}
+
+cc: WOString {
+ value = cc;
+ escapeHTML = NO;
+}
+
+hasNewsGroups: WOConditional {
+ condition = hasNewsGroups;
+}
+
+newsgroups: WOString {
+ value = newsgroups;
+ escapeHTML = NO;
+}
+
+hasReferences: WOConditional {
+ condition = hasReferences;
+}
+
+references: WOString {
+ value = references;
+ escapeHTML = NO;
+}
+
+messageBody: WOString {
+ value = messageBody;
+ escapeHTML = NO;
+}
+
+signature: WOString {
+ value = signature;
+ escapeHTML = NO;
+}
diff --git a/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html
new file mode 100644
index 000000000..0ccbf4549
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html
@@ -0,0 +1,5 @@
+On <#date/>, <#from/> wrote:
+
+<#messageBody/>
+
+<#signature/>
diff --git a/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.wod b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.wod
new file mode 100644
index 000000000..7a66a17bf
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.wod
@@ -0,0 +1,19 @@
+date: WOString {
+ value = date;
+ escapeHTML = NO;
+}
+
+from: WOString {
+ value = from;
+ escapeHTML = NO;
+}
+
+messageBody: WOString {
+ value = messageBody;
+ escapeHTML = NO;
+}
+
+signature: WOString {
+ value = signature;
+ escapeHTML = NO;
+}
diff --git a/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html
new file mode 100644
index 000000000..3f50a3f64
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html
@@ -0,0 +1,10 @@
+-------- Original Message --------
+Subject: <#subject/>
+Date: <#date/>
+From: <#from/>
+<#hasReplyTo>Reply-To: <#replyTo/>#hasReplyTo><#hasOrganization>Organization: <#organization/>#hasOrganization>To: <#to/>
+<#hasCc>CC: <#cc/>#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/>#hasNewsGroups><#hasReferences>References: <#references/>#hasReferences>
+
+<#messageBody/>
+
+<#signature/>
diff --git a/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.wod b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.wod
new file mode 100644
index 000000000..df237286f
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.wod
@@ -0,0 +1,74 @@
+subject: WOString {
+ value = subject;
+ escapeHTML = NO;
+}
+
+date: WOString {
+ value = date;
+ escapeHTML = NO;
+}
+
+from: WOString {
+ value = from;
+ escapeHTML = NO;
+}
+
+hasReplyTo: WOConditional {
+ condition = hasReplyTo;
+}
+
+replyTo: WOString {
+ value = replyTo;
+ escapeHTML = NO;
+}
+
+hasOrganization: WOConditional {
+ condition = hasOrganization;
+}
+
+organization: WOString {
+ value = organization;
+ escapeHTML = NO;
+}
+
+to: WOString {
+ value = to;
+ escapeHTML = NO;
+}
+
+hasCc: WOConditional {
+ condition = hasCc;
+}
+
+cc: WOString {
+ value = cc;
+ escapeHTML = NO;
+}
+
+hasNewsGroups: WOConditional {
+ condition = hasNewsGroups;
+}
+
+newsgroups: WOString {
+ value = newsgroups;
+ escapeHTML = NO;
+}
+
+hasReferences: WOConditional {
+ condition = hasReferences;
+}
+
+references: WOString {
+ value = references;
+ escapeHTML = NO;
+}
+
+messageBody: WOString {
+ value = messageBody;
+ escapeHTML = NO;
+}
+
+signature: WOString {
+ value = signature;
+ escapeHTML = NO;
+}
diff --git a/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html b/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html
new file mode 100644
index 000000000..0ccbf4549
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html
@@ -0,0 +1,5 @@
+On <#date/>, <#from/> wrote:
+
+<#messageBody/>
+
+<#signature/>
diff --git a/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod b/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod
new file mode 100644
index 000000000..7a66a17bf
--- /dev/null
+++ b/SoObjects/Mailer/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod
@@ -0,0 +1,19 @@
+date: WOString {
+ value = date;
+ escapeHTML = NO;
+}
+
+from: WOString {
+ value = from;
+ escapeHTML = NO;
+}
+
+messageBody: WOString {
+ value = messageBody;
+ escapeHTML = NO;
+}
+
+signature: WOString {
+ value = signature;
+ escapeHTML = NO;
+}
diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index 4c45d86b3..e6952c123 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = CommonUI
CommonUI_PRINCIPAL_CLASS = CommonUIProduct
-CommonUI_LANGUAGES = English French German Italian
+CommonUI_LANGUAGES = Dutch English French German Italian Spanish
CommonUI_OBJC_FILES += \
CommonUIProduct.m \
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index 1360378b5..462aa340e 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = ContactsUI
ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct
-ContactsUI_LANGUAGES = English French German Italian
+ContactsUI_LANGUAGES = Dutch English French German Italian Spanish
ContactsUI_OBJC_FILES = \
UIxContactsUserFolders.m \
diff --git a/UI/GNUmakefile b/UI/GNUmakefile
index 3570614b0..417b9df1f 100644
--- a/UI/GNUmakefile
+++ b/UI/GNUmakefile
@@ -13,6 +13,7 @@ SUBPROJECTS += \
MainUI \
PreferencesUI \
Scheduler \
- Templates
+ Templates \
+ WebServerResources
include $(GNUSTEP_MAKEFILES)/aggregate.make
diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index 2c5689d26..42faacd23 100644
--- a/UI/MailPartViewers/GNUmakefile
+++ b/UI/MailPartViewers/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = MailPartViewers
MailPartViewers_PRINCIPAL_CLASS = MailPartViewersProduct
-MailPartViewers_LANGUAGES = English French German Italian
+MailPartViewers_LANGUAGES = Dutch English French German Italian Spanish
MailPartViewers_OBJC_FILES += \
MailPartViewersProduct.m \
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index dc6e918af..02422396e 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = MailerUI
MailerUI_PRINCIPAL_CLASS = MailerUIProduct
-MailerUI_LANGUAGES = English French German Italian
+MailerUI_LANGUAGES = Dutch English French German Italian Spanish
MailerUI_OBJC_FILES += \
MailerUIProduct.m \
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 6ed1e7e5d..ae5da413c 100644
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = MainUI
MainUI_PRINCIPAL_CLASS = MainUIProduct
-MainUI_LANGUAGES = English French German Italian
+MainUI_LANGUAGES = Dutch English French German Italian Spanish
MainUI_OBJC_FILES += \
MainUIProduct.m \
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index b9f0e7610..58b42bb03 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -85,6 +85,7 @@
"Default identity:" = "Default identity:";
"Manage identities..." = "Manage identities...";
+"Signature:" = "Signature:";
/* password */
"New password:" = "New password:";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 4fe9850ed..685021029 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -83,6 +83,7 @@
/* Identities */
"Default identity:" = "Identité par défaut :";
"Manage identities..." = "Gérer les identitiés...";
+"Signature:" = "Signature :";
/* password */
"New password:" = "Nouveau mot de passe :";
diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index e36ec4dc8..21227112b 100644
--- a/UI/PreferencesUI/GNUmakefile
+++ b/UI/PreferencesUI/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = PreferencesUI
PreferencesUI_PRINCIPAL_CLASS = PreferencesUIProduct
-PreferencesUI_LANGUAGES = English French German Italian
+PreferencesUI_LANGUAGES = Dutch English French German Italian Spanish
PreferencesUI_OBJC_FILES = \
PreferencesUIProduct.m \
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index ffd805ddd..6fa6c2bd9 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -82,6 +82,7 @@
"Default identity:" = "Standard Identität:";
"Manage identities..." = "Identitäten verwalten...";
+"Signature:" = "Unterschrift:";
/* password */
"New password:" = "Neues Passwort:";
diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h
index 65c13c429..bfd0a3130 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.h
+++ b/UI/SOGoUI/SOGoACLAdvisory.h
@@ -65,40 +65,58 @@
@end
+@interface SOGoACLDutchAdditionAdvisory : SOGoACLAdditionAdvisory
+@end
+
+@interface SOGoACLDutchModificationAdvisory : SOGoACLModificationAdvisory
+@end
+
+@interface SOGoACLDutchRemovalAdvisory : SOGoACLRemovalAdvisory
+@end
+
@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory
@end
-@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdditionAdvisory
-@end
-
-@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
-@end
-
-@interface SOGoACLItalianAdditionAdvisory : SOGoACLAdditionAdvisory
-@end
-
@interface SOGoACLEnglishModificationAdvisory : SOGoACLModificationAdvisory
@end
-@interface SOGoACLFrenchModificationAdvisory : SOGoACLModificationAdvisory
-@end
-
-@interface SOGoACLGermanModificationAdvisory : SOGoACLModificationAdvisory
-@end
-
-@interface SOGoACLItalianModificationAdvisory : SOGoACLModificationAdvisory
-@end
-
@interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory
@end
+@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdditionAdvisory
+@end
+
+@interface SOGoACLFrenchModificationAdvisory : SOGoACLModificationAdvisory
+@end
+
@interface SOGoACLFrenchRemovalAdvisory : SOGoACLRemovalAdvisory
@end
+@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
+@end
+
+@interface SOGoACLGermanModificationAdvisory : SOGoACLModificationAdvisory
+@end
+
@interface SOGoACLGermanRemovalAdvisory : SOGoACLRemovalAdvisory
@end
+@interface SOGoACLItalianAdditionAdvisory : SOGoACLAdditionAdvisory
+@end
+
+@interface SOGoACLItalianModificationAdvisory : SOGoACLModificationAdvisory
+@end
+
@interface SOGoACLItalianRemovalAdvisory : SOGoACLRemovalAdvisory
@end
+@interface SOGoACLSpanishAdditionAdvisory : SOGoACLAdditionAdvisory
+@end
+
+@interface SOGoACLSpanishModificationAdvisory : SOGoACLModificationAdvisory
+@end
+
+@interface SOGoACLSpanishRemovalAdvisory : SOGoACLRemovalAdvisory
+@end
+
#endif /* SOGOACLADVISORY_H */
diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m
index 621950ada..4e77deca3 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -246,39 +246,56 @@
@end
+@implementation SOGoACLDutchAdditionAdvisory
+@end
+
+@implementation SOGoACLDutchModificationAdvisory
+@end
+
+@implementation SOGoACLDutchRemovalAdvisory
+@end
+
@implementation SOGoACLEnglishAdditionAdvisory
@end
-@implementation SOGoACLFrenchAdditionAdvisory
-@end
-
-@implementation SOGoACLGermanAdditionAdvisory
-@end
-
-@implementation SOGoACLItalianAdditionAdvisory
-@end
-
@implementation SOGoACLEnglishModificationAdvisory
@end
-@implementation SOGoACLFrenchModificationAdvisory
-@end
-
-@implementation SOGoACLGermanModificationAdvisory
-@end
-
-@implementation SOGoACLItalianModificationAdvisory
-@end
-
@implementation SOGoACLEnglishRemovalAdvisory
@end
+@implementation SOGoACLFrenchAdditionAdvisory
+@end
+
+@implementation SOGoACLFrenchModificationAdvisory
+@end
+
@implementation SOGoACLFrenchRemovalAdvisory
@end
+@implementation SOGoACLGermanAdditionAdvisory
+@end
+
+@implementation SOGoACLGermanModificationAdvisory
+@end
+
@implementation SOGoACLGermanRemovalAdvisory
@end
+@implementation SOGoACLItalianModificationAdvisory
+@end
+
+@implementation SOGoACLItalianAdditionAdvisory
+@end
+
@implementation SOGoACLItalianRemovalAdvisory
@end
+@implementation SOGoACLSpanishAdditionAdvisory
+@end
+
+@implementation SOGoACLSpanishModificationAdvisory
+@end
+
+@implementation SOGoACLSpanishRemovalAdvisory
+@end
diff --git a/UI/SOGoUI/SOGoFolderAdvisory.h b/UI/SOGoUI/SOGoFolderAdvisory.h
index 36ee75b96..e98721c3f 100644
--- a/UI/SOGoUI/SOGoFolderAdvisory.h
+++ b/UI/SOGoUI/SOGoFolderAdvisory.h
@@ -47,29 +47,46 @@
@end
-@interface SOGoFolderEnglishAdditionAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderAdditionAdvisory : SOGoFolderAdvisory
@end
-@interface SOGoFolderEnglishRemovalAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderRemovalAdvisory : SOGoFolderAdvisory
@end
-@interface SOGoFolderFrenchAdditionAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderDutchAdditionAdvisory : SOGoFolderAdditionAdvisory
@end
-@interface SOGoFolderFrenchRemovalAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderDutchRemovalAdvisory : SOGoFolderRemovalAdvisory
@end
-@interface SOGoFolderGermanAdditionAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderEnglishAdditionAdvisory : SOGoFolderAdditionAdvisory
@end
-@interface SOGoFolderGermanRemovalAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderEnglishRemovalAdvisory : SOGoFolderRemovalAdvisory
@end
-@interface SOGoFolderItalianAdditionAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderFrenchAdditionAdvisory : SOGoFolderAdditionAdvisory
@end
-@interface SOGoFolderItalianRemovalAdvisory : SOGoFolderAdvisory
+@interface SOGoFolderFrenchRemovalAdvisory : SOGoFolderRemovalAdvisory
@end
+@interface SOGoFolderGermanAdditionAdvisory : SOGoFolderAdditionAdvisory
+@end
+
+@interface SOGoFolderGermanRemovalAdvisory : SOGoFolderRemovalAdvisory
+@end
+
+@interface SOGoFolderItalianAdditionAdvisory : SOGoFolderAdditionAdvisory
+@end
+
+@interface SOGoFolderItalianRemovalAdvisory : SOGoFolderRemovalAdvisory
+@end
+
+@interface SOGoFolderSpanishAdditionAdvisory : SOGoFolderAdditionAdvisory
+@end
+
+@interface SOGoFolderSpanishRemovalAdvisory : SOGoFolderRemovalAdvisory
+@end
#endif /* SOGOFOLDERADVISORY_H */
diff --git a/UI/SOGoUI/SOGoFolderAdvisory.m b/UI/SOGoUI/SOGoFolderAdvisory.m
index 26cddaa82..9bfa0245a 100644
--- a/UI/SOGoUI/SOGoFolderAdvisory.m
+++ b/UI/SOGoUI/SOGoFolderAdvisory.m
@@ -207,35 +207,50 @@
@end
-@implementation SOGoFolderEnglishAdditionAdvisory
+@implementation SOGoFolderAdditionAdvisory
+
- (NSString *) folderMethod { return @"add"; }
+
+@end
+
+@implementation SOGoFolderRemovalAdvisory
+
+- (NSString *) folderMethod { return @"remove"; }
+
+@end
+
+@implementation SOGoFolderDutchAdditionAdvisory
+@end
+
+@implementation SOGoFolderDutchRemovalAdvisory
+@end
+
+@implementation SOGoFolderEnglishAdditionAdvisory
@end
@implementation SOGoFolderEnglishRemovalAdvisory
-- (NSString *) folderMethod { return @"remove"; }
@end
@implementation SOGoFolderFrenchAdditionAdvisory
-- (NSString *) folderMethod { return @"add"; }
@end
@implementation SOGoFolderFrenchRemovalAdvisory
-- (NSString *) folderMethod { return @"remove"; }
@end
@implementation SOGoFolderGermanAdditionAdvisory
-- (NSString *) folderMethod { return @"add"; }
@end
@implementation SOGoFolderGermanRemovalAdvisory
-- (NSString *) folderMethod { return @"remove"; }
@end
@implementation SOGoFolderItalianAdditionAdvisory
-- (NSString *) folderMethod { return @"add"; }
@end
@implementation SOGoFolderItalianRemovalAdvisory
-- (NSString *) folderMethod { return @"remove"; }
@end
+@implementation SOGoFolderSpanishAdditionAdvisory
+@end
+
+@implementation SOGoFolderSpanishRemovalAdvisory
+@end
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 3c7558322..ab7281bec 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -11,6 +11,10 @@
"Switch to week view" = "Switch to week view";
"Switch to month view" = "Switch to month view";
+/* Tabs */
+"Date" = "Date";
+"Calendars" = "Calendars";
+
/* Day */
"Sunday" = "Sunday";
@@ -83,7 +87,6 @@
/* Menu */
-"Calendars" = "Calendars";
"Calendar" = "Calendar";
"Contacts" = "Contacts";
@@ -442,7 +445,9 @@ validate_endbeforestart = "The end date that you entered occurs before the st
"Maybe busy" = "Maybe busy";
"No free-busy information" = "No free-busy information";
-/* FreeBusy panel buttons */
+/* FreeBusy panel buttons and labels */
+"Suggest time slot:" = "Suggest time slot:";
+"Zoom:" = "Zoom:";
"Previous slot" = "Previous slot";
"Next slot" = "Next slot";
"Previous hour" = "Previous hour";
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 1d7967c0d..05ef723b8 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -11,6 +11,10 @@
"Switch to week view" = "Passer à la vue par semaine";
"Switch to month view" = "Passer à la vue par mois";
+/* Tabs */
+"Date" = "Date";
+"Calendars" = "Agendas";
+
/* Day */
"Sunday" = "Dimanche";
@@ -84,7 +88,6 @@
/* Menu */
-"Calendars" = "Agendas";
"Calendar" = "Agenda";
"Contacts" = "Contacts";
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 005b36d4a..be6f42394 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -6,7 +6,7 @@ BUNDLE_NAME = SchedulerUI
SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct
-SchedulerUI_LANGUAGES = English French German Italian
+SchedulerUI_LANGUAGES = Dutch English French German Italian Spanish
SchedulerUI_OBJC_FILES = \
SchedulerUIProduct.m \
diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index 0394ad271..0c2ff42e5 100644
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -10,6 +10,10 @@
"Friday" = "Freitag";
"Saturday" = "Samstag";
+/* Tabs */
+"Date" = "Datum";
+"Calendars" = "Kalenderliste";
+
"Sun" = "So";
"Mon" = "Mo";
"Tue" = "Di";
@@ -72,7 +76,6 @@
/* Menu */
-"Calendars" = "Kalenderliste";
"Calendar" = "Kalender";
"Contacts" = "Kontakte";
@@ -88,7 +91,7 @@
"Compose E-Mail to Undecided Attendees" = "E-Mail an unentschlossene Teilnehmer erstellen";
/* Folders */
-"Personal calendar" = "Persönlicher Kalendar";
+"Personal calendar" = "Persönlicher Kalender";
/* Misc */
@@ -113,7 +116,7 @@
/* Button Titles */
-"New Calendar..." = "New Calendar...";
+"New Calendar..." = "Neuer Kalender...";
"Subscribe to a Calendar..." = "Einen Kalender abonnieren...";
"Remove the selected Calendar" = "Ausgewählten Kalender löschen";
@@ -123,7 +126,7 @@
"printview" = "Druckversion";
"edit" = "Bearbeiten";
"delete" = "Löschen";
-"proposal" = "Recherche de plages horaires";
+"proposal" = "Vorschlag";
"Save and Close" = "Speichern und schließen";
"Close" = "Schließen";
"Invite Attendees" = "Teilnehmer";
diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings
index 46beb6746..ae064e47a 100644
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@@ -11,6 +11,10 @@
"Switch to week view" = "Settimana";
"Switch to month view" = "Mese";
+/* Tabs */
+"Date" = "Data";
+"Calendars" = "Calendari";
+
/* Day */
"Sunday" = "Domenica";
@@ -83,7 +87,6 @@
/* Menu */
-"Calendars" = "Calendari";
"Calendar" = "Calendario";
"Contacts" = "Contatti";
diff --git a/UI/Templates/SOGoACLSpanishAdditionAdvisory.wox b/UI/Templates/SOGoACLSpanishAdditionAdvisory.wox
new file mode 100644
index 000000000..1802daf49
--- /dev/null
+++ b/UI/Templates/SOGoACLSpanishAdditionAdvisory.wox
@@ -0,0 +1,27 @@
+
+
+
+
+
+ El usuario le ha agregado
+
+
+
+El usuario le ha agregado a la lista de acceso de su carpeta .
+
+Puede suscribirse directamente a esta carpeta activando el siguiente enlace:
+ subscribe?mail-invitation=YES
+
+O, si desea, puede suscribirse más tarde usando la interfaz Web de SOGo.
+
+También puede acceder a este recurso usando la siguiente URL:
+
+
+
+
+
diff --git a/UI/Templates/SOGoACLSpanishModificationAdvisory.wox b/UI/Templates/SOGoACLSpanishModificationAdvisory.wox
new file mode 100644
index 000000000..76e9e060a
--- /dev/null
+++ b/UI/Templates/SOGoACLSpanishModificationAdvisory.wox
@@ -0,0 +1,27 @@
+
+
+
+
+
+ El usuario ha modificado los permisos de acceso
+
+
+
+El usuario ha modifcado los permisos de acceso a su carpeta .
+
+Puede suscribirse directamente a esta carpeta activando el siguiente enlace:
+ subscribe?mail-invitation=YES
+
+O, si desea, puede suscribirse más tarde usando la interfaz Web de SOGo.
+
+También puede acceder a este recurso usando la siguiente URL:
+
+
+
+
+
diff --git a/UI/Templates/SOGoACLSpanishRemovalAdvisory.wox b/UI/Templates/SOGoACLSpanishRemovalAdvisory.wox
new file mode 100644
index 000000000..efdd27c80
--- /dev/null
+++ b/UI/Templates/SOGoACLSpanishRemovalAdvisory.wox
@@ -0,0 +1,27 @@
+
+
+
+
+
+ El usuario le ha quitado el acceso
+
+
+
+El usuario le ha quitado de la lista de acceso a su carpeta .
+
+Puede desuscribirse directamente de esta carpeta activando el siguiente enlace:
+ unsubscribe?mail-invitation=YES
+
+O, si desea, puede desuscribirse de esta carpeta más tarde usando la interfaz Web de SOGo.
+
+Ya no puede acceder a este recurso usando la siguiente URL:
+
+
+
+
+
diff --git a/UI/Templates/SOGoFolderSpanishAdditionAdvisory.wox b/UI/Templates/SOGoFolderSpanishAdditionAdvisory.wox
new file mode 100644
index 000000000..309da6687
--- /dev/null
+++ b/UI/Templates/SOGoFolderSpanishAdditionAdvisory.wox
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Creación de
+
+
+
+La carpeta ha sido creada.
+
+Puede acceder a este recurso usando la siguiente URL:
+
+
+
+
+
diff --git a/UI/Templates/SOGoFolderSpanishRemovalAdvisory.wox b/UI/Templates/SOGoFolderSpanishRemovalAdvisory.wox
new file mode 100644
index 000000000..41378f75d
--- /dev/null
+++ b/UI/Templates/SOGoFolderSpanishRemovalAdvisory.wox
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Eliminación de
+
+
+
+La carpeta ha sido eliminada.
+
+La siguiente URL ya no es válida:
+
+
+
+
+